Make decoder a function

Signed-off-by: Federico Busetti <[email protected]>

Author: febus982

src/http_app/routes/auth.py

@@ -34,35 +34,31 @@ def _jwks_client(config: Annotated[AppConfig, Depends(app_config)]) -> jwt.PyJWK
     return jwt.PyJWKClient(config.AUTH.JWKS_URL)
 
 
-class JWTDecoder:
-    """Does all the token verification using PyJWT"""
-
-    async def __call__(
-        self,
-        security_scopes: SecurityScopes,
-        config: AppConfig = Depends(app_config),
-        jwks_client: jwt.PyJWKClient = Depends(_jwks_client),
-        token: Optional[HTTPAuthorizationCredentials] = Depends(HTTPBearer()),
-    ):
-        if token is None:
-            raise UnauthenticatedException()
-
-        try:
-            signing_key = jwks_client.get_signing_key_from_jwt(token.credentials).key
-        except jwt.exceptions.PyJWKClientError as error:
-            raise UnauthorizedException(str(error))
-        except jwt.exceptions.DecodeError as error:
-            raise UnauthorizedException(str(error))
-
-        try:
-            # TODO: Review decode setup and verifications
-            #       https://pyjwt.readthedocs.io/en/stable/api.html#jwt.decode
-            payload = jwt.decode(
-                jwt=token.credentials,
-                key=signing_key,
-                algorithms=[config.AUTH.JWT_ALGORITHM],
-            )
-        except Exception as error:
-            raise UnauthorizedException(str(error))
+async def decode_jwt(
+    security_scopes: SecurityScopes,
+    config: AppConfig = Depends(app_config),
+    jwks_client: jwt.PyJWKClient = Depends(_jwks_client),
+    token: Optional[HTTPAuthorizationCredentials] = Depends(HTTPBearer()),
+):
+    if token is None:
+        raise UnauthenticatedException()
+
+    try:
+        signing_key = jwks_client.get_signing_key_from_jwt(token.credentials).key
+    except jwt.exceptions.PyJWKClientError as error:
+        raise UnauthorizedException(str(error))
+    except jwt.exceptions.DecodeError as error:
+        raise UnauthorizedException(str(error))
+
+    try:
+        # TODO: Review decode setup and verifications
+        #       https://pyjwt.readthedocs.io/en/stable/api.html#jwt.decode
+        payload = jwt.decode(
+            jwt=token.credentials,
+            key=signing_key,
+            algorithms=[config.AUTH.JWT_ALGORITHM],
+        )
+    except Exception as error:
+        raise UnauthorizedException(str(error))
 
-        return payload
+    return payload

src/http_app/routes/hello.py

@@ -3,13 +3,13 @@
 
 from http_app.templates import templates
 
-from .auth import JWTDecoder
+from .auth import decode_jwt
 
 router = APIRouter(prefix="/hello")
 
 
 @router.get("/", response_class=HTMLResponse, include_in_schema=True)
-async def hello(request: Request, jwt_token=Security(JWTDecoder())):
+async def hello(request: Request, jwt_token=Security(decode_jwt)):
     return templates.TemplateResponse(
         "hello.html", {"request": request, "token_payload": jwt_token}
     )