Implement Auth and User response types

ArtyomVancyan · ArtyomVancyan · commit ca20dace7f2a · 2023-06-25T18:20:46.000+04:00
diff --git a/src/fastapi_oauth2/middleware.py b/src/fastapi_oauth2/middleware.py
@@ -1,9 +1,9 @@
+from typing import List
 from typing import Optional
 from typing import Tuple
 from typing import Union
 
 from fastapi.security.utils import get_authorization_scheme_param
-from starlette.authentication import AuthCredentials
 from starlette.authentication import AuthenticationBackend
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.requests import Request
@@ -16,17 +16,32 @@
 from .utils import jwt_decode
 
 
+class Auth:
+    scopes: List[str]
+
+    def __init__(self, scopes: Optional[List[str]] = None) -> None:
+        self.scopes = scopes or []
+
+
+class User(dict):
+    is_authenticated: bool
+
+    def __init__(self, seq: Optional[dict] = None, **kwargs) -> None:
+        self.is_authenticated = seq is not None
+        super().__init__(seq or {}, **kwargs)
+
+
 class OAuth2Backend(AuthenticationBackend):
-    async def authenticate(self, request: Request) -> Optional[Tuple["AuthCredentials", Optional[dict]]]:
+    async def authenticate(self, request: Request) -> Optional[Tuple["Auth", "User"]]:
         authorization = request.cookies.get("Authorization")
         scheme, param = get_authorization_scheme_param(authorization)
 
         if not scheme or not param:
-            return AuthCredentials(), None
+            return Auth(), User()
 
-        access_token = jwt_decode(param)
-        scope = access_token.pop("scope")
-        return AuthCredentials(scope), access_token
+        user = jwt_decode(param)
+        scopes = user.pop("scope")
+        return Auth(scopes), User(user)
 
 
 class OAuth2Middleware:
diff --git a/templates/index.html b/templates/index.html
@@ -10,7 +10,7 @@
 <body style="margin: 0; display: flex; flex-direction: column; background: #1e1e20; color: #dfdfd6; font-family: sans-serif;">
 <header style="display: flex; background: #161618; height: 70px; width: 100%;">
     <div style="display: flex; align-items: center; margin: auto 50px auto auto;">
-        {% if request.user %}
+        {% if request.user.is_authenticated %}
             <a href="/oauth2/logout" style="text-decoration: none; color: #dfdfd6; margin-right: 20px;">Sign out</a>
             <img style="height: 50px; width: 50px;" src="{{ request.user.avatar_url }}" alt="Pic">
         {% else %}
@@ -26,7 +26,7 @@
 </header>
 <section
         style="display: flex; flex-direction: column; align-items: center; justify-content: center; height: calc(100vh - 70px);">
-    {% if request.user %}
+    {% if request.user.is_authenticated %}
         <h1>Hi, {{ request.user.name }}</h1>
         <p>This is what your JWT contains currently</p>
         <pre>{{ json.dumps(request.user, indent=4) }}</pre>
