Refactor exceptions

Encoder/DefaultEncoder.php

@@ -56,14 +56,14 @@ public function decode($token)
             throw new JWTDecodeFailureException('Invalid JWT Token', $e);
         }
 
-        if ($jws->isExpired()) {
-            throw new JWTDecodeFailureException('Expired JWT Token');
-        }
-
         if (!$jws->isVerified()) {
             throw new JWTDecodeFailureException('Unable to verify the given JWT through the given configuration. If the "lexik_jwt_authentication.encoder" encryption options have been changed since your last authentication, please renew the token. If the problem persists, verify that the configured keys/passphrase are valid.');
         }
 
+        if ($jws->isExpired()) {
+            throw new JWTDecodeFailureException('Expired JWT Token');
+        }
+
         return $jws->getPayload();
     }
 }

Exception/ExpiredTokenException.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Lexik\Bundle\JWTAuthenticationBundle\Exception;
+
+/**
+ * Base class for exceptions thrown during JWT creation/loading.
+ *
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+class ExpiredTokenException extends JWTDecodeFailureException
+{
+}

Exception/InvalidTokenException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Lexik\Bundle\JWTAuthenticationBundle\Exception;
+
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+
+/**
+ * Exception to be thrown in case of invalid token during an authentication process.
+ *
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+class InvalidTokenException extends AuthenticationException
+{
+    public function getMessageKey()
+    {
+        return 'Invalid JWT Token';
+    }
+}

Exception/InvalidUserException.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Lexik\Bundle\JWTAuthenticationBundle\Exception;
+
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+
+/**
+ * Exception to be thrown in case of invalid user (not found, missing permissions, ...) during
+ * an authentication process.
+ *
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+class UserNotFoundException extends AuthenticationException
+{
+    /**
+     * @var string
+     */
+    private $userIdentityField;
+
+    /**
+     * @var string
+     */
+    private $identity;
+
+    /**
+     * @param string $userIdentityField
+     * @param string $identity
+     */
+    public function __construct($userIdentityField, $identity)
+    {
+        $this->userIdentityField = $userIdentityField;
+        $this->identity          = $identity;
+    }
+
+    public function getMessageKey()
+    {
+        return sprintf('Unable to load an user with property "%s" = "%s". If the user identity has changed, you must renew the token. Otherwise, verify that the "lexik_jwt_authentication.user_identity_field" config option is correctly set.', $this->userIdentity, $this->identity);
+    }
+}

Exception/JWTAuthenticationException.php

@@ -50,7 +50,7 @@ public static function tokenNotFound($message = 'JWT Token not found')
      */
     public static function invalidUser($identity, $identityField)
     {
-        return new self(sprintf('Unable to load a valid user with property "%s" = "%s". If the user identity has been changed, you must renew the token. Otherwise, verify that the "lexik_jwt_authentication.user_identity_field" config option is correctly set.', $identityField, $identity));
+        return new self(sprintf('Unable to load a valid user with property "%s" = "%s". If the user identity has been changed, you must renew the token. Otherwise, verify that the configured "user_identity_field" is correct.', $identityField, $identity));
     }
 
     /**

Exception/JWTDecodeFailureException.php

@@ -2,8 +2,10 @@
 
 namespace Lexik\Bundle\JWTAuthenticationBundle\Exception;
 
+use \Lexik\Bundle\JWTAuthenticationBundle\Encoder\JWTEncoderInterface;
+
 /**
- * Base class for exceptions thrown during JWTEncoderInterface::decode().
+ * JWTDecodeFailureException is thrown if an error occurs in {@link JWTEncoderInterface::decode().
  *
  * @author Robin Chalas <robin.chalas@gmail.com>
  */

Exception/JWTEncodeFailureException.php

@@ -2,8 +2,10 @@
 
 namespace Lexik\Bundle\JWTAuthenticationBundle\Exception;
 
+use \Lexik\Bundle\JWTAuthenticationBundle\Encoder\JWTEncoderInterface;
+
 /**
- * Base class for exceptions thrown during JWTEncoderInterface::encode().
+ * JWTEncodeFailureException is thrown if an error occurs in {@link JWTEncoderInterface::encode().
  *
  * @author Robin Chalas <robin.chalas@gmail.com>
  */