Bump fastapi oauth2 from 0.0.1a2 to 0.0.1 (#570)

Author: wu-clan

backend/app/admin/api/v1/oauth2/github.py

@@ -13,12 +13,12 @@
 router = APIRouter()
 
 _github_client = GitHubOAuth20(admin_settings.OAUTH2_GITHUB_CLIENT_ID, admin_settings.OAUTH2_GITHUB_CLIENT_SECRET)
-_github_oauth2 = FastAPIOAuth20(_github_client, admin_settings.OAUTH2_GITHUB_REDIRECT_URI)
+_github_oauth2 = FastAPIOAuth20(_github_client, redirect_route_name='github_login')
 
 
 @router.get('', summary='获取 Github 授权链接')
-async def github_auth2() -> ResponseSchemaModel[str]:
-    auth_url = await _github_client.get_authorization_url(redirect_uri=admin_settings.OAUTH2_GITHUB_REDIRECT_URI)
+async def github_oauth2(request: Request) -> ResponseSchemaModel[str]:
+    auth_url = await _github_client.get_authorization_url(redirect_uri=f'{request.url}/callback')
     return response_base.success(data=auth_url)
 
 

backend/app/admin/api/v1/oauth2/linux_do.py

@@ -16,12 +16,12 @@
     admin_settings.OAUTH2_LINUX_DO_CLIENT_ID,
     admin_settings.OAUTH2_LINUX_DO_CLIENT_SECRET,
 )
-_linux_do_oauth2 = FastAPIOAuth20(_linux_do_client, admin_settings.OAUTH2_LINUX_DO_REDIRECT_URI)
+_linux_do_oauth2 = FastAPIOAuth20(_linux_do_client, redirect_route_name='linux_do_login')
 
 
 @router.get('', summary='获取 LinuxDo 授权链接')
-async def linux_do_auth2() -> ResponseSchemaModel[str]:
-    auth_url = await _linux_do_client.get_authorization_url(redirect_uri=admin_settings.OAUTH2_LINUX_DO_REDIRECT_URI)
+async def linux_do_oauth2(request: Request) -> ResponseSchemaModel[str]:
+    auth_url = await _linux_do_client.get_authorization_url(redirect_uri=f'{request.url}/callback')
     return response_base.success(data=auth_url)
 
 

backend/app/admin/conf.py

@@ -19,8 +19,6 @@ class AdminSettings(BaseSettings):
     OAUTH2_LINUX_DO_CLIENT_SECRET: str
 
     # OAuth2
-    OAUTH2_GITHUB_REDIRECT_URI: str = 'http://127.0.0.1:8000/api/v1/oauth2/github/callback'
-    OAUTH2_LINUX_DO_REDIRECT_URI: str = 'http://127.0.0.1:8000/api/v1/oauth2/linux-do/callback'
     OAUTH2_FRONTEND_REDIRECT_URI: str = 'http://localhost:5173/oauth2/callback'
 
     # 验证码

pyproject.toml

@@ -27,7 +27,7 @@ dependencies = [
     "fast-captcha>=0.3.2",
     "fastapi-cli==0.0.5",
     "fastapi-limiter>=0.1.6",
-    "fastapi-oauth20>=0.0.1a2",
+    "fastapi-oauth20>=0.0.1",
     "fastapi-pagination>=0.12.34",
     "fastapi[standard]==0.115.11",
     "flower>=2.0.0",

requirements.txt

@@ -33,7 +33,7 @@ fast-captcha==0.3.2
 fastapi==0.115.11
 fastapi-cli==0.0.5
 fastapi-limiter==0.1.6
-fastapi-oauth20==0.0.1a2
+fastapi-oauth20==0.0.1
 fastapi-pagination==0.12.34
 filelock==3.18.0
 flower==2.0.1