feat/cli-framework (#12)

Reviewed-on: #12
Co-authored-by: Ron Rise <ron@siteworxpro.com>
Co-committed-by: Ron Rise <ron@siteworxpro.com>

src/Http/Middleware/ScopeMiddleware.php

@@ -5,45 +5,32 @@ declare(strict_types=1);
 namespace Siteworxpro\App\Http\Middleware;
 
 use League\Route\Dispatcher;
-use League\Route\Route;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Siteworxpro\App\Annotations\Guards\Scope;
+use Siteworxpro\App\Controllers\Controller;
 use Siteworxpro\App\Http\JsonResponseFactory;
 use Siteworxpro\HttpStatus\CodesEnum;
 
-class ScopeMiddleware implements MiddlewareInterface
+class ScopeMiddleware extends Middleware
 {
     /**
      * @throws \JsonException
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface | Dispatcher $handler): ResponseInterface
-    {
-        if (!$handler instanceof Dispatcher) {
+    public function process(
+        ServerRequestInterface $request,
+        RequestHandlerInterface | Dispatcher $handler
+    ): ResponseInterface {
+        $callable = $this->extractRouteCallable($request, $handler);
+        if ($callable === null) {
             return $handler->handle($request);
         }
 
-        /** @var Route | null $lastSegment */
-        $lastSegment = array_last($handler->getMiddlewareStack());
+        /** @var Controller $class */
+        [$class, $method] = $callable;
 
-        if ($lastSegment === null) {
-            return $handler->handle($request);
-        }
-
-        $callable = $lastSegment->getCallable();
-        $class = null;
-        $method = null;
-
-        if (is_array($callable) && count($callable) === 2) {
-            [$class, $method] = $callable;
-        } elseif (is_string($callable)) {
-            // Handle the case where the callable is a string (e.g., 'ClassName::methodName')
-            [$class, $method] = explode('::', $callable);
-        }
-
-        if (class_exists($class)) {
+        if (class_exists($class::class)) {
             $reflectionClass = new \ReflectionClass($class);
             if ($reflectionClass->hasMethod($method)) {
                 $reflectionMethod = $reflectionClass->getMethod($method);
@@ -56,10 +43,16 @@ class ScopeMiddleware implements MiddlewareInterface
 
                     $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([
                             '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);
                     }
                 }
@@ -68,4 +61,4 @@ class ScopeMiddleware implements MiddlewareInterface
 
         return $handler->handle($request);
     }
-}
+}