Merge pull request #647 from cakephp/2.next-service-di

2.next: add authentication service to DIC by default

Author: markstory

src/Middleware/AuthenticationMiddleware.php

@@ -22,6 +22,7 @@
 use Authentication\Authenticator\AuthenticationRequiredException;
 use Authentication\Authenticator\StatelessInterface;
 use Authentication\Authenticator\UnauthenticatedException;
+use Cake\Core\ContainerApplicationInterface;
 use Cake\Core\InstanceConfigTrait;
 use InvalidArgumentException;
 use Laminas\Diactoros\Response;
@@ -101,6 +102,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     {
         $service = $this->getAuthenticationService($request);
 
+        if ($this->subject instanceof ContainerApplicationInterface) {
+            $container = $this->subject->getContainer();
+            $container->add(AuthenticationService::class, $service);
+        }
+
         try {
             $result = $service->authenticate($request);
         } catch (AuthenticationRequiredException $e) {

tests/TestCase/Middleware/AuthenticationMiddlewareTest.php

@@ -17,13 +17,12 @@
 namespace Authentication\Test\TestCase\Middleware;
 
 use Authentication\AuthenticationService;
-use Authentication\AuthenticationServiceInterface;
 use Authentication\AuthenticationServiceProviderInterface;
-use Authentication\Authenticator\ResultInterface;
 use Authentication\Authenticator\UnauthenticatedException;
 use Authentication\IdentityInterface;
 use Authentication\Middleware\AuthenticationMiddleware;
 use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;
+use Cake\Core\TestSuite\ContainerStubTrait;
 use Cake\Http\Response;
 use Cake\Http\ServerRequestFactory;
 use Cake\Http\Uri;
@@ -33,6 +32,8 @@
 
 class AuthenticationMiddlewareTest extends TestCase
 {
+    use ContainerStubTrait;
+
     /**
      * Fixtures
      */
@@ -105,31 +106,6 @@ public function testProviderAuthentication()
         $this->assertTrue($service->authenticators()->has('Form'));
     }
 
-    public function testApplicationAuthenticationRequestResponse()
-    {
-        $request = ServerRequestFactory::fromGlobals();
-        $handler = new TestRequestHandler();
-
-        $service = $this->createMock(AuthenticationServiceInterface::class);
-
-        $service->method('authenticate')
-            ->willReturn($this->createMock(ResultInterface::class));
-        $service->method('getIdentityAttribute')->willReturn('identity');
-
-        $application = $this->getMockBuilder(Application::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getAuthenticationService', 'middleware'])
-            ->getMock();
-
-        $application->expects($this->once())
-            ->method('getAuthenticationService')
-            ->with($request)
-            ->willReturn($service);
-
-        $middleware = new AuthenticationMiddleware($application);
-        $middleware->process($request, $handler);
-    }
-
     public function testInvalidSubject()
     {
         $this->expectException('InvalidArgumentException');
@@ -770,4 +746,20 @@ public function testServiceConfigurationFallback()
         $this->assertSame('redirect', $service->getConfig('queryParam'));
         $this->assertSame('/login', $service->getConfig('unauthenticatedRedirect'));
     }
+
+    public function testMiddlewareInjectsServiceIntoDIC(): void
+    {
+        $request = ServerRequestFactory::fromGlobals(
+            ['REQUEST_URI' => '/testpath'],
+            [],
+            ['username' => 'mariano', 'password' => 'password']
+        );
+        $handler = new TestRequestHandler();
+
+        $middleware = new AuthenticationMiddleware($this->application);
+        $middleware->process($request, $handler);
+
+        $container = $this->application->getContainer();
+        $this->assertInstanceOf(AuthenticationService::class, $container->get(AuthenticationService::class));
+    }
 }