fix exception handler

Author: IndominusByte

fastapi_jwt_auth/auth_jwt.py

@@ -9,7 +9,10 @@
     CSRFError,
     JWTDecodeError,
     RevokedTokenError,
-    MissingTokenRequired
+    MissingTokenError,
+    AccessTokenRequired,
+    RefreshTokenRequired,
+    FreshTokenRequired
 )
 
 class AuthJWT(AuthConfig):
@@ -551,7 +554,7 @@ def verify_and_get_jwt_in_cookies(
                 csrf_token = request.headers.get(self._refresh_csrf_header_name)
 
         if not cookie:
-            raise MissingTokenRequired(status_code=401,message="Missing cookie {}".format(cookie_key))
+            raise MissingTokenError(status_code=401,message="Missing cookie {}".format(cookie_key))
 
         if self._cookie_csrf_protect and not csrf_token:
             if isinstance(request, WebSocket) or request.method in self._csrf_methods:
@@ -579,7 +582,7 @@ def verify_jwt_optional_in_request(self,token: str) -> None:
         if token: self._verifying_token(token)
 
         if token and self.get_raw_jwt(token)['type'] != 'access':
-            raise MissingTokenRequired(status_code=422,message="Only access tokens are allowed")
+            raise AccessTokenRequired(status_code=422,message="Only access tokens are allowed")
 
     def verify_jwt_in_request(
         self,
@@ -603,20 +606,23 @@ def verify_jwt_in_request(
 
         if not token:
             if token_from == 'headers':
-                raise MissingTokenRequired(status_code=401,message="Missing {} Header".format(self._header_name))
+                raise MissingTokenError(status_code=401,message="Missing {} Header".format(self._header_name))
             if token_from == 'websocket':
-                raise MissingTokenRequired(status_code=1008,message="Missing token from Query or Path")
+                raise MissingTokenError(status_code=1008,message="Missing token from Query or Path")
 
         # verify jwt
         issuer = self._decode_issuer if type_token == 'access' else None
         self._verifying_token(token,issuer)
 
         if self.get_raw_jwt(token)['type'] != type_token:
             msg = "Only {} tokens are allowed".format(type_token)
-            raise MissingTokenRequired(status_code=422,message=msg)
+            if type_token == 'access':
+                raise AccessTokenRequired(status_code=422,message=msg)
+            if type_token == 'refresh':
+                raise RefreshTokenRequired(status_code=422,message=msg)
 
         if fresh and not self.get_raw_jwt(token)['fresh']:
-            raise MissingTokenRequired(status_code=401,message="Fresh token required")
+            raise FreshTokenRequired(status_code=401,message="Fresh token required")
 
     def _verifying_token(self,encoded_token: str, issuer: Optional[str] = None) -> None:
         """

fastapi_jwt_auth/exceptions.py

@@ -28,9 +28,9 @@ def __init__(self,status_code: int, message: str):
         self.status_code = status_code
         self.message = message
 
-class MissingTokenRequired(AuthJWTException):
+class MissingTokenError(AuthJWTException):
     """
-    Error raised when token not found or invalid type
+    Error raised when token not found
     """
     def __init__(self,status_code: int, message: str):
         self.status_code = status_code
@@ -43,3 +43,30 @@ class RevokedTokenError(AuthJWTException):
     def __init__(self,status_code: int, message: str):
         self.status_code = status_code
         self.message = message
+
+class AccessTokenRequired(AuthJWTException):
+    """
+    Error raised when a valid, non-access JWT attempt to access an endpoint
+    protected by jwt_required, jwt_optional, fresh_jwt_required
+    """
+    def __init__(self,status_code: int, message: str):
+        self.status_code = status_code
+        self.message = message
+
+class RefreshTokenRequired(AuthJWTException):
+    """
+    Error raised when a valid, non-refresh JWT attempt to access an endpoint
+    protected by jwt_refresh_token_required
+    """
+    def __init__(self,status_code: int, message: str):
+        self.status_code = status_code
+        self.message = message
+
+class FreshTokenRequired(AuthJWTException):
+    """
+    Error raised when a valid, non-fresh JWT attempt to access an endpoint
+    protected by fresh_jwt_required
+    """
+    def __init__(self,status_code: int, message: str):
+        self.status_code = status_code
+        self.message = message