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/JwtMiddleware.php

@@ -18,48 +18,35 @@ use Lcobucci\JWT\Validation\Constraint\SignedWith;
 use Lcobucci\JWT\Validation\Constraint\StrictValidAt;
 use Lcobucci\JWT\Validation\RequiredConstraintsViolated;
 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\Jwt;
+use Siteworxpro\App\Controllers\Controller;
 use Siteworxpro\App\Http\JsonResponseFactory;
 use Siteworxpro\App\Services\Facades\Config;
 use Siteworxpro\HttpStatus\CodesEnum;
 
-class JwtMiddleware implements MiddlewareInterface
+class JwtMiddleware extends Middleware
 {
     /**
      * @throws \JsonException
      * @throws \Exception
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface|Dispatcher $handler): ResponseInterface
-    {
+    public function process(
+        ServerRequestInterface $request,
+        RequestHandlerInterface|Dispatcher $handler
+    ): ResponseInterface {
 
-        if (!$handler instanceof Dispatcher) {
+        $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)) {
@@ -150,4 +137,4 @@ class JwtMiddleware implements MiddlewareInterface
 
         return new SignedWith(new Hmac256(), $key);
     }
-}
+}