diff options
| -rw-r--r-- | Http/Firewall/UsernamePasswordJsonAuthenticationListener.php | 4 | ||||
| -rw-r--r-- | Tests/Http/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php b/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php index bf3c621..dfbb4a4 100644 --- a/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php +++ b/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php @@ -101,8 +101,8 @@ class UsernamePasswordJsonAuthenticationListener implements ListenerInterface try { $token = new UsernamePasswordToken($username, $password, $this->providerKey); - $this->authenticationManager->authenticate($token); - $response = $this->onSuccess($request, $token); + $authenticatedToken = $this->authenticationManager->authenticate($token); + $response = $this->onSuccess($request, $authenticatedToken); } catch (AuthenticationException $e) { $response = $this->onFailure($request, $e); } diff --git a/Tests/Http/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php b/Tests/Http/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php index b381550..8127e94 100644 --- a/Tests/Http/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php +++ b/Tests/Http/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php @@ -17,6 +17,7 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; +use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface; @@ -38,8 +39,10 @@ class UsernamePasswordJsonAuthenticationListenerTest extends \PHPUnit_Framework_ $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock(); $authenticationManager = $this->getMockBuilder(AuthenticationManagerInterface::class)->getMock(); + $authenticatedToken = $this->getMockBuilder(TokenInterface::class)->getMock(); + if ($success) { - $authenticationManager->method('authenticate')->willReturn(true); + $authenticationManager->method('authenticate')->willReturn($authenticatedToken); } else { $authenticationManager->method('authenticate')->willThrowException(new AuthenticationException()); } |