update definitions and middleware

src/Conduit/Middleware/Cors.php

@@ -27,11 +27,11 @@ class Cors implements MiddlewareInterface
     /**
      * Cors Constructor
      *
-     * @param array $settings
+     * @param array|string $settings
      */
-    public function __construct(array $settings)
+    public function __construct($allowedOrigins)
     {
-        $this->allowedOrigins = $settings['cors'];
+        $this->allowedOrigins = $allowedOrigins;
     }
 
     /**

src/Conduit/Middleware/OptionalAuth.php

@@ -2,46 +2,45 @@
 
 namespace Conduit\Middleware;
 
-use Interop\Container\ContainerInterface;
 use Slim\DeferredCallable;
-
-class OptionalAuth
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Tuupola\Middleware\JwtAuthentication;
+
+class OptionalAuth implements MiddlewareInterface
 {
 
     /**
-     * @var \Interop\Container\ContainerInterface
+     * @var ContainerInterface
      */
-    private $container;
+    private $jwtMiddleware;
 
     /**
-     * OptionalAuth constructor.
-     *
-     * @param \Interop\Container\ContainerInterface $container
+     * OptionalAuth constructor
      *
-     * @internal param \Slim\Middleware\JwtAuthentication $jwt
+     * @param JwtAuthentication $jwtMiddleware
      */
-    public function __construct(ContainerInterface $container)
+    public function __construct(JwtAuthentication $jwtMiddleware)
     {
-        $this->container = $container;
+        $this->jwtMiddleware = $jwtMiddleware;
     }
 
     /**
      * OptionalAuth middleware invokable class to verify JWT token when present in Request
      *
-     * @param  \Psr\Http\Message\ServerRequestInterface $request  PSR7 request
-     * @param  \Psr\Http\Message\ResponseInterface      $response PSR7 response
-     * @param  callable                                 $next     Next middleware
-     *
-     * @return \Psr\Http\Message\ResponseInterface
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
      */
-    public function __invoke($request, $response, $next)
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if ($request->hasHeader('HTTP_AUTHORIZATION')) {
-            $callable = new DeferredCallable($this->container->get('jwt'), $this->container);
-
-            return call_user_func($callable, $request, $response, $next);
+        if ($request->hasHeader('HTTP_AUTHORIZATION') || $request->hasHeader('Authorization')) {
+            return call_user_func([$this->jwtMiddleware, 'process'], $request, $handler);
         }
-
-        return $next($request, $response);
+        
+        return $handler->handle($request);
     }
 }

src/dependencies.php

@@ -1,19 +1,19 @@
 <?php
 
-use Conduit\Middleware\Cors;
 use Monolog\Logger;
 use DI\ContainerBuilder;
+use Conduit\Middleware\Cors;
 use Conduit\Services\Auth\Auth;
 use Respect\Validation\Validator;
 use Monolog\Handler\StreamHandler;
 use Monolog\Processor\UidProcessor;
 use Conduit\Middleware\OptionalAuth;
+use Tuupola\Middleware\JwtAuthentication;
+use Slim\Factory\Psr17\NyholmPsr17Factory;
 use Conduit\Middleware\RemoveTrailingSlash;
-use Slim\Middleware\JwtAuthentication;
 use League\Fractal\Manager as FractalManager;
 use League\Fractal\Serializer\ArraySerializer;
 use Illuminate\Database\Capsule\Manager as IlluminateDatabase;
-use Slim\Factory\Psr17\NyholmPsr17Factory;
 
 /**
  * Application dependencies definitions
@@ -33,24 +33,14 @@
             return $logger;
         },
 
-        // JWT Middleware
-        'jwt' => function (array $settings) {
-            return new JwtAuthentication($settings['jwt']);
-        },
-
-        // Optional Auth Middleware
-        'optionalAuth' => function ($c) {
-            return new OptionalAuth($c);
-        },
-
         // Request Validator
-        'validator' => function ($c) {
+        'validator' => function () {
             Validator::with('\\Conduit\\Validation\\Rules');
             return new Validator();
         },
 
         // Fractal
-        'fractal' => function ($c) {
+        'fractal' => function () {
             $manager = new FractalManager();
             $manager->setSerializer(new ArraySerializer());
             return $manager;
@@ -84,6 +74,16 @@
     // Middleware definitions
     $containerBuilder->addDefinitions([
 
+        // JWT Middleware
+        'jwt' => function ($c) {
+            return new JwtAuthentication($c->get('settings')['jwt']);
+        },
+
+        // Optional Auth Middleware
+        'optionalAuth' => function ($c) {
+            return new OptionalAuth($c->get('jwt'));
+        },
+
         // Remove trailing slash from URI path
         RemoveTrailingSlash::class => function () {
             $responseFactory = NyholmPsr17Factory::getResponseFactory();