Merge pull request #2 from danielvalchev/fix/redirect-master-requests…

…-only Add check to redirect master requests only
despark · Mar 27, 2019 · 11b2252 · 11b2252
2 parents dd71bb1 + b804736
commit 11b2252
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/EventListener/PasswordExpiryListener.php b/src/EventListener/PasswordExpiryListener.php
@@ -34,6 +34,10 @@ public function __construct(PasswordExpiryServiceInterface $passwordExpiryServic
 
     public function onKernelRequest(GetResponseEvent $event)
     {
+        if (!$event->isMasterRequest()) {
+            return;
+        }
+
         $request = $event->getRequest();
         $route = $request->get('_route');
 

diff --git a/tests/Unit/EventListener/PasswordExpiryListenerTest.php b/tests/Unit/EventListener/PasswordExpiryListenerTest.php
@@ -65,6 +65,8 @@ public function testOnKernelRequest()
                     ->andReturn('route');
 
         $responseEventMock = \Mockery::mock(GetResponseEvent::class);
+        $responseEventMock->shouldReceive('isMasterRequest')
+                          ->andReturn(true);
         $responseEventMock->shouldReceive('getRequest')
                           ->andReturn($requestMock);
 
@@ -101,6 +103,8 @@ public function testOnKernelRequestAsLockedRoute()
                     ->andReturn('/route');
 
         $responseEventMock = \Mockery::mock(GetResponseEvent::class);
+        $responseEventMock->shouldReceive('isMasterRequest')
+                          ->andReturn(true);
         $responseEventMock->shouldReceive('getRequest')
                           ->andReturn($requestMock);
 
@@ -123,6 +127,8 @@ public function testOnKernelRequestExcludedRoute()
                     ->andReturn('/excluded-2');
 
         $responseEventMock = \Mockery::mock(GetResponseEvent::class);
+        $responseEventMock->shouldReceive('isMasterRequest')
+                          ->andReturn(true);
         $responseEventMock->shouldReceive('getRequest')
                           ->andReturn($requestMock);
 
@@ -145,6 +151,8 @@ public function testOnKernelRequestPasswordNotExpired()
                     ->andReturn('/route');
 
         $responseEventMock = \Mockery::mock(GetResponseEvent::class);
+        $responseEventMock->shouldReceive('isMasterRequest')
+                          ->andReturn(true);
         $responseEventMock->shouldReceive('getRequest')
                           ->andReturn($requestMock);
 
@@ -156,4 +164,17 @@ public function testOnKernelRequestPasswordNotExpired()
 
         $this->assertTrue(true);
     }
+
+    public function testOnKernelRequestAsSubRequest()
+    {
+        $responseEventMock = \Mockery::mock(GetResponseEvent::class);
+        $responseEventMock->shouldReceive('isMasterRequest')
+                          ->andReturn(false);
+
+        $this->passwordExpiryServiceMock->shouldNotReceive('isPasswordExpired');
+
+        $this->passwordExpiryListenerMock->onKernelRequest($responseEventMock);
+
+        $this->assertTrue(true);
+    }
 }