feat/cli-framework #12

Merged
rrise merged 3 commits from feat/cli-framework into master 2025-11-11 14:52:31 +00:00
3 changed files with 13 additions and 7 deletions
Showing only changes of commit 5de0d6d844 - Show all commits

View File

@@ -43,7 +43,7 @@ class JwtMiddleware extends Middleware
return $handler->handle($request); return $handler->handle($request);
} }
/** @var $class Controller */ /** @var Controller $class */
[$class, $method] = $callable; [$class, $method] = $callable;
if (class_exists($class::class)) { if (class_exists($class::class)) {

View File

@@ -22,7 +22,7 @@ abstract class Middleware implements MiddlewareInterface
$lastSegment = array_last($handler->getMiddlewareStack()); $lastSegment = array_last($handler->getMiddlewareStack());
if ($lastSegment === null) { if ($lastSegment === null) {
return $handler->handle($request); return null;
} }
$callable = $lastSegment->getCallable(); $callable = $lastSegment->getCallable();

View File

@@ -27,7 +27,7 @@ class ScopeMiddleware extends Middleware
return $handler->handle($request); return $handler->handle($request);
} }
/** @var $class Controller */ /** @var Controller $class */
[$class, $method] = $callable; [$class, $method] = $callable;
if (class_exists($class::class)) { if (class_exists($class::class)) {
@@ -43,10 +43,16 @@ class ScopeMiddleware extends Middleware
$userScopes = $request->getAttribute('scopes', []); $userScopes = $request->getAttribute('scopes', []);
if (array_any($requiredScopes, fn($requiredScope) => !in_array($requiredScope, $userScopes, true))) { if (
array_any(
$requiredScopes,
fn($requiredScope) => !in_array($requiredScope, $userScopes, true)
)
) {
return JsonResponseFactory::createJsonResponse([ return JsonResponseFactory::createJsonResponse([
'error' => 'insufficient_scope', 'error' => 'insufficient_scope',
'error_description' => 'The request requires higher privileges than provided by the access token.' 'error_description' =>
'The request requires higher privileges than provided by the access token.'
], CodesEnum::FORBIDDEN); ], CodesEnum::FORBIDDEN);
} }
} }