Added specialized exceptions (markitosgv#239)

* Added specialized exceptions * Fixed styling * Fixed styling * Fixed styling Co-authored-by: Vyacheslav Mankevich <[email protected]>
misaert · Jul 2, 2021 · d77b3d9 · d77b3d9
1 parent 80eca74
commit d77b3d9
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/Exception/InvalidRefreshTokenException.php b/Exception/InvalidRefreshTokenException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Gesdinet\JWTRefreshTokenBundle\Exception;
+
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+
+class InvalidRefreshTokenException extends AuthenticationException
+{
+}
diff --git a/Exception/UnknownRefreshTokenException.php b/Exception/UnknownRefreshTokenException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Gesdinet\JWTRefreshTokenBundle\Exception;
+
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+
+class UnknownRefreshTokenException extends AuthenticationException
+{
+}
diff --git a/Exception/UnknownUserFromRefreshTokenException.php b/Exception/UnknownUserFromRefreshTokenException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Gesdinet\JWTRefreshTokenBundle\Exception;
+
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+
+class UnknownUserFromRefreshTokenException extends AuthenticationException
+{
+}
diff --git a/Security/Authenticator/RefreshTokenAuthenticator.php b/Security/Authenticator/RefreshTokenAuthenticator.php
@@ -12,6 +12,8 @@
 namespace Gesdinet\JWTRefreshTokenBundle\Security\Authenticator;
 
 use Gesdinet\JWTRefreshTokenBundle\Request\RequestRefreshToken;
+use Gesdinet\JWTRefreshTokenBundle\Exception\UnknownRefreshTokenException;
+use Gesdinet\JWTRefreshTokenBundle\Exception\UnknownUserFromRefreshTokenException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -76,13 +78,13 @@ public function getUser($credentials, UserProviderInterface $userProvider)
         $username = $userProvider->getUsernameForRefreshToken($refreshToken);
 
         if (null === $username) {
-            throw new AuthenticationException(sprintf('Refresh token "%s" does not exist.', $refreshToken));
+            throw new UnknownRefreshTokenException(sprintf('Refresh token "%s" does not exist.', $refreshToken));
         }
 
         $user = $userProvider->loadUserByUsername($username);
 
         if (null === $user) {
-            throw new AuthenticationException(sprintf('User with refresh token "%s" does not exist.', $refreshToken));
+            throw new UnknownUserFromRefreshTokenException(sprintf('User with refresh token "%s" does not exist.', $refreshToken));
         }
 
         $this->userChecker->checkPreAuth($user);

diff --git a/Service/RefreshToken.php b/Service/RefreshToken.php
@@ -13,6 +13,7 @@
 
 use Gesdinet\JWTRefreshTokenBundle\Event\RefreshEvent;
 use Gesdinet\JWTRefreshTokenBundle\Security\Authenticator\RefreshTokenAuthenticator;
+use Gesdinet\JWTRefreshTokenBundle\Exception\InvalidRefreshTokenException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface;
 use InvalidArgumentException;
@@ -133,7 +134,7 @@ public function refresh(Request $request)
         if (null === $refreshToken || !$refreshToken->isValid()) {
             return $this->failureHandler->onAuthenticationFailure(
                 $request,
-                new AuthenticationException(
+                new InvalidRefreshTokenException(
                     sprintf('Refresh token "%s" is invalid.', $refreshToken)
                 )
             );