Remove usage of the OAUTH2_REDIRECT_URL env var

Author: ArtyomVancyan

.env

@@ -1,7 +1,6 @@
 OAUTH2_CLIENT_ID=eccd08d6736b7999a32a
 OAUTH2_CLIENT_SECRET=642999c1c5f2b3df8b877afdc78252ef5b594d31
 OAUTH2_CALLBACK_URL=http://127.0.0.1:8000/oauth2/token
-OAUTH2_REDIRECT_URL=http://127.0.0.1:8000/
 
 JWT_SECRET=secret
 JWT_ALGORITHM=HS256

src/fastapi_oauth2/config.py

@@ -1,14 +1,39 @@
 import os
+from typing import List
 
 from dotenv import load_dotenv
 
+from .client import OAuth2Client
+
 load_dotenv()
 
 OAUTH2_CLIENT_ID = os.getenv("OAUTH2_CLIENT_ID")
 OAUTH2_CLIENT_SECRET = os.getenv("OAUTH2_CLIENT_SECRET")
 OAUTH2_CALLBACK_URL = os.getenv("OAUTH2_CALLBACK_URL")
-OAUTH2_REDIRECT_URL = os.getenv("OAUTH2_REDIRECT_URL")
 
 JWT_SECRET = os.getenv("JWT_SECRET")
 JWT_ALGORITHM = os.getenv("JWT_ALGORITHM")
 JWT_EXPIRES = int(os.getenv("JWT_EXPIRES", "15"))
+
+
+class OAuth2Config:
+    allow_http: bool
+    jwt_secret: str
+    jwt_expires: int
+    jwt_algorithm: str
+    clients: List[OAuth2Client]
+
+    def __init__(
+            self,
+            *,
+            allow_http: bool = False,
+            jwt_secret: str = "",
+            jwt_expires: int = 900,
+            jwt_algorithm: str = "HS256",
+            clients: List[OAuth2Client] = None,
+    ):
+        self.allow_http = allow_http
+        self.jwt_secret = jwt_secret
+        self.jwt_expires = jwt_expires
+        self.jwt_algorithm = jwt_algorithm
+        self.clients = clients or []

src/fastapi_oauth2/base.py renamed to src/fastapi_oauth2/core.py

@@ -8,7 +8,7 @@
 from starlette.requests import Request
 from starlette.responses import RedirectResponse
 
-from .config import JWT_EXPIRES, OAUTH2_REDIRECT_URL
+from .config import JWT_EXPIRES
 from .exceptions import OAuth2LoginError
 from .utils import jwt_create
 
@@ -130,7 +130,7 @@ async def token_redirect(
     ) -> RedirectResponse:
         token_data = await self.get_token_data(request, params=params, headers=headers)
         access_token = jwt_create(token_data)
-        response = RedirectResponse(OAUTH2_REDIRECT_URL)
+        response = RedirectResponse(request.base_url)
         response.set_cookie(
             "Authorization",
             value=f"Bearer {access_token}",

src/fastapi_oauth2/github.py

@@ -1,7 +1,7 @@
-from .base import OAuth2Base
+from .core import OAuth2Core
 
 
-class GitHubOAuth2(OAuth2Base):
+class GitHubOAuth2(OAuth2Core):
     """Class providing login via GitHub SSO"""
 
     scope = ["user:email"]

src/fastapi_oauth2/middleware.py

@@ -1,12 +1,18 @@
-from typing import Optional, Tuple, Union
+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 AuthenticationBackend, AuthCredentials
+from starlette.authentication import AuthCredentials
+from starlette.authentication import AuthenticationBackend
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.requests import Request
-from starlette.types import Send, Receive, Scope, ASGIApp
+from starlette.types import ASGIApp
+from starlette.types import Receive
+from starlette.types import Scope
+from starlette.types import Send
 
-from .types import OAuth2Config
+from .config import OAuth2Config
 from .utils import jwt_decode
 
 
@@ -24,13 +30,16 @@ async def authenticate(self, request: Request) -> Optional[Tuple["AuthCredential
 
 
 class OAuth2Middleware:
+    config: OAuth2Config
+    auth_middleware: AuthenticationMiddleware
+
     def __init__(self, app: ASGIApp, config: Union[OAuth2Config, dict]) -> None:
         if isinstance(config, OAuth2Config):
             self.config = config
         elif isinstance(config, dict):
             self.config = OAuth2Config(**config)
         else:
-            raise ValueError("config does not contain valid parameters")
+            raise TypeError("config is not a valid type")
         self.auth_middleware = AuthenticationMiddleware(app, OAuth2Backend())
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:

src/fastapi_oauth2/router.py

@@ -7,7 +7,6 @@
     OAUTH2_CLIENT_ID,
     OAUTH2_CLIENT_SECRET,
     OAUTH2_CALLBACK_URL,
-    OAUTH2_REDIRECT_URL,
 )
 
 router = APIRouter(prefix="/oauth2")
@@ -19,8 +18,9 @@
 )
 
 
-@router.get("/login")
-async def login():
+@router.get("/{provider}/auth")
+async def login(provider: str):
+    print(provider)
     return await oauth2.login_redirect()
 
 
@@ -30,7 +30,7 @@ async def token(request: Request):
 
 
 @router.get("/logout")
-async def logout():
-    response = RedirectResponse(OAUTH2_REDIRECT_URL)
+async def logout(request: Request):
+    response = RedirectResponse(request.base_url)
     response.delete_cookie("Authorization")
     return response