diff --git a/meta/definitions/authorize.php b/meta/definitions/authorize.php index 5fa621b..816f073 100644 --- a/meta/definitions/authorize.php +++ b/meta/definitions/authorize.php @@ -29,8 +29,8 @@ return [ return function(array $errorData) { return HttpFactory::createJsonResponse($errorData + [ 'api.error' => "Authorization failed", - 'api.datetime' => (new \DateTime)->format(\DateTime::ATOM), - ], 401); + 'api.datetime' => (new \DateTime)->format(\DateTime::ISO8601), + ], 403); }; }, diff --git a/skeleton/meta/definitions/definitions.php b/skeleton/meta/definitions/definitions.php index 4faf9f1..d6e82dc 100644 --- a/skeleton/meta/definitions/definitions.php +++ b/skeleton/meta/definitions/definitions.php @@ -4,7 +4,7 @@ use Taxus\Privilege; use function DI\{ autowire, add, create, get }; -$dir = getenv("META_PATH") . "/definitions"; +$dir = dirname(__DIR__, 2); return [ '%APPKEY%' => [ @@ -15,23 +15,23 @@ return [ ], 'ulmus' => [ - 'entities' => [ '%ESCAPED_NAMESPACE%\\Entity' => getenv("PROJECT_PATH") . '/src/Entity/' ], + 'entities' => [ '%ESCAPED_NAMESPACE%\\Entity' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Entity', '' ]) ], ], 'routes' => [ - '%ESCAPED_NAMESPACE%\\Controller' => getenv("PROJECT_PATH") . '/src/Controller/', + '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Controller', '' ]), ], 'events' => [ - '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]), + '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Controller', '' ]), ], 'cronard' => [ - '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]), + '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Controller', '' ]), ], 'cli' => [ - '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]), + '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ $dir, 'src', 'Controller', '' ]), ], 'taxus' => [ @@ -43,5 +43,7 @@ return [ ] ], - 'app.middlewares' => add([]), + 'app.middlewares' => \DI\add([ + Ulmus\User\Middleware\RememberMeMiddleware::class, + ]), ]; diff --git a/src/ControllerTrait.php b/src/ControllerTrait.php index 4b90d2a..341edeb 100644 --- a/src/ControllerTrait.php +++ b/src/ControllerTrait.php @@ -226,12 +226,6 @@ trait ControllerTrait { #[Ignore] public function isRoute(mixed $name, ServerRequestInterface $request) : bool { - foreach((array) $name as $item) { - if ( fnmatch($item, $request->getAttribute('lean.route')->name) ) { - return true; - } - } - - return false; + return $request->getAttribute('lean.route')->match($name); } } diff --git a/src/Lean.php b/src/Lean.php index 01a7998..6bd50ba 100644 --- a/src/Lean.php +++ b/src/Lean.php @@ -1,6 +1,5 @@