Merge pull request #296 from cakephp/2.next

Prepare for 2.5.0

Author: ADmad

Diff for: composer.json

@@ -10,7 +10,7 @@
     "type": "cakephp-plugin",
     "require": {
         "php": ">=7.2",
-        "cakephp/http": "^4.0",
+        "cakephp/http": "^4.2",
         "psr/http-client": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",

Diff for: src/Middleware/AuthorizationMiddleware.php

@@ -17,6 +17,7 @@
 namespace Authorization\Middleware;
 
 use Authentication\IdentityInterface as AuthenIdentityInterface;
+use Authorization\AuthorizationService;
 use Authorization\AuthorizationServiceInterface;
 use Authorization\AuthorizationServiceProviderInterface;
 use Authorization\Exception\AuthorizationRequiredException;
@@ -25,6 +26,8 @@
 use Authorization\IdentityDecorator;
 use Authorization\IdentityInterface;
 use Authorization\Middleware\UnauthorizedHandler\UnauthorizedHandlerTrait;
+use Cake\Core\ContainerApplicationInterface;
+use Cake\Core\ContainerInterface;
 use Cake\Core\InstanceConfigTrait;
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
@@ -71,15 +74,26 @@ class AuthorizationMiddleware implements MiddlewareInterface
      */
     protected $subject;
 
+    /**
+     * The container instance from the application
+     *
+     * @var \Cake\Core\ContainerInterface|null
+     */
+    protected $container;
+
     /**
      * Constructor.
      *
      * @param \Authorization\AuthorizationServiceInterface|\Authorization\AuthorizationServiceProviderInterface $subject Authorization service or provider instance.
      * @param array $config Config array.
+     * @param \Cake\Core\ContainerInterface|null $container The container instance from the application
      * @throws \InvalidArgumentException
      */
-    public function __construct($subject, array $config = [])
-    {
+    public function __construct(
+        $subject,
+        array $config = [],
+        ?ContainerInterface $container = null
+    ) {
         /** @psalm-suppress DocblockTypeContradiction */
         if (
             !$subject instanceof AuthorizationServiceInterface &&
@@ -102,6 +116,7 @@ public function __construct($subject, array $config = [])
         }
 
         $this->subject = $subject;
+        $this->container = $container;
         $this->setConfig($config);
     }
 
@@ -117,6 +132,13 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $service = $this->getAuthorizationService($request);
         $request = $request->withAttribute('authorization', $service);
 
+        if ($this->subject instanceof ContainerApplicationInterface) {
+            $container = $this->subject->getContainer();
+            $container->add(AuthorizationService::class, $service);
+        } elseif ($this->container) {
+            $this->container->add(AuthorizationService::class, $service);
+        }
+
         $attribute = $this->getConfig('identityAttribute');
         $identity = $request->getAttribute($attribute);
 

Diff for: tests/TestCase/Middleware/AuthorizationMiddlewareTest.php

@@ -16,22 +16,26 @@
  */
 namespace Authorization\Test\TestCase\Middleware;
 
+use Authorization\AuthorizationService;
 use Authorization\AuthorizationServiceInterface;
 use Authorization\AuthorizationServiceProviderInterface;
 use Authorization\Exception\AuthorizationRequiredException;
 use Authorization\Exception\Exception;
 use Authorization\IdentityDecorator;
 use Authorization\IdentityInterface;
 use Authorization\Middleware\AuthorizationMiddleware;
+use Cake\Core\Container;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
+use Cake\Http\ServerRequestFactory;
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RuntimeException;
 use stdClass;
+use TestApp\Application;
 use TestApp\Http\TestRequestHandler;
 use TestApp\Identity;
 
@@ -282,4 +286,46 @@ public function testUnauthorizedHandlerRequireAuthz()
         $result = $middleware->process($request, $handler);
         $this->assertSame(200, $result->getStatusCode());
     }
+
+    public function testMiddlewareInjectsServiceIntoDIC()
+    {
+        $request = ServerRequestFactory::fromGlobals(
+            ['REQUEST_URI' => '/testpath'],
+            [],
+            ['username' => 'mariano', 'password' => 'password']
+        );
+        $handler = new TestRequestHandler();
+        $application = new Application('config');
+
+        $middleware = new AuthorizationMiddleware($application, ['requireAuthorizationCheck' => false]);
+        $middleware->process($request, $handler);
+
+        $container = $application->getContainer();
+        $this->assertInstanceOf(AuthorizationService::class, $container->get(AuthorizationService::class));
+    }
+
+    public function testMiddlewareInjectsServiceIntoDICViaCustomContainerInstance()
+    {
+        $request = ServerRequestFactory::fromGlobals(
+            ['REQUEST_URI' => '/testpath'],
+            [],
+            ['username' => 'mariano', 'password' => 'password']
+        );
+        $handler = new TestRequestHandler();
+
+        $service = $this->createMock(AuthorizationServiceInterface::class);
+        $provider = $this->createMock(AuthorizationServiceProviderInterface::class);
+        $provider
+            ->expects($this->once())
+            ->method('getAuthorizationService')
+            ->with($this->isInstanceOf(ServerRequestInterface::class))
+            ->willReturn($service);
+
+        $container = new Container();
+
+        $middleware = new AuthorizationMiddleware($provider, ['requireAuthorizationCheck' => false], $container);
+        $middleware->process($request, $handler);
+
+        $this->assertEquals($service, $container->get(AuthorizationService::class));
+    }
 }

Diff for: tests/test_app/TestApp/Application.php

@@ -3,11 +3,18 @@
 
 namespace TestApp;
 
+use Authorization\AuthorizationService;
+use Authorization\AuthorizationServiceInterface;
+use Authorization\AuthorizationServiceProviderInterface;
+use Authorization\Policy\MapResolver;
 use Cake\Http\BaseApplication;
 use Cake\Http\MiddlewareQueue;
 use Cake\Routing\RouteBuilder;
+use Psr\Http\Message\ServerRequestInterface;
+use TestApp\Model\Entity\Article;
+use TestApp\Policy\ArticlePolicy;
 
-class Application extends BaseApplication
+class Application extends BaseApplication implements AuthorizationServiceProviderInterface
 {
     public function middleware(MiddlewareQueue $middleware): MiddlewareQueue
     {
@@ -23,4 +30,13 @@ public function bootstrap(): void
         $this->addPlugin('Authorization');
         $this->addPlugin('Bake');
     }
+
+    public function getAuthorizationService(ServerRequestInterface $request): AuthorizationServiceInterface
+    {
+        $resolver = new MapResolver([
+            Article::class => ArticlePolicy::class,
+        ]);
+
+        return new AuthorizationService($resolver);
+    }
 }