Update some interface definitions

Author: wu-clan

backend/plugin/oauth2/api/v1/user_social.py

@@ -4,21 +4,20 @@
 from backend.common.security.jwt import DependsJwtAuth
 from backend.database.db import CurrentSession, CurrentSessionTransaction
 from backend.plugin.oauth2.enums import UserSocialType
-from backend.plugin.oauth2.schema.user_social import GetUserSocialDetail
 from backend.plugin.oauth2.service.user_social_service import user_social_service
 
 router = APIRouter()
 
 
 @router.get('/me/bindings', summary='获取用户已绑定的社交账号', dependencies=[DependsJwtAuth])
-async def get_user_bindings(db: CurrentSession, request: Request) -> ResponseSchemaModel[GetUserSocialDetail]:
+async def get_user_bindings(db: CurrentSession, request: Request) -> ResponseSchemaModel[list[str]]:
     bindings = await user_social_service.get_bindings(db=db, user_id=request.user.id)
     return response_base.success(data=bindings)
 
 
-@router.get('/me/binding/{source}', summary='获取绑定授权链接', dependencies=[DependsJwtAuth])
+@router.get('/me/binding', summary='获取绑定授权链接', dependencies=[DependsJwtAuth])
 async def get_binding_auth_url(request: Request, source: UserSocialType) -> ResponseSchemaModel[str]:
-    binding_url = user_social_service.get_binding_auth_url(user_id=request.user.id, source=source)
+    binding_url = await user_social_service.get_binding_auth_url(user_id=request.user.id, source=source)
     return response_base.success(data=binding_url)
 
 

backend/plugin/oauth2/enums.py

@@ -4,6 +4,6 @@
 class UserSocialType(StrEnum):
     """用户社交类型"""
 
-    github = 'GitHub'
+    github = 'Github'
     google = 'Google'
     linux_do = 'LinuxDo'

backend/plugin/oauth2/service/user_social_service.py

@@ -1,30 +1,28 @@
 import json
 import uuid
 
-from collections.abc import Sequence
-
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.common.exception import errors
 from backend.core.conf import settings
 from backend.database.redis import redis_client
 from backend.plugin.oauth2.crud.crud_user_social import user_social_dao
 from backend.plugin.oauth2.enums import UserSocialType
-from backend.plugin.oauth2.model import UserSocial
 from backend.plugin.oauth2.schema.user_social import CreateUserSocialParam
 
 
 class UserSocialService:
     @staticmethod
-    async def get_bindings(*, db: AsyncSession, user_id: int) -> Sequence[UserSocial]:
+    async def get_bindings(*, db: AsyncSession, user_id: int) -> list[str]:
         """
         获取用户已绑定的社交账号
 
         :param db: 数据库会话
         :param user_id: 用户 ID
         :return: 绑定列表，每个元素包含 sid、source 等信息
         """
-        return await user_social_dao.get_by_user_id(db, user_id)
+        bindings = await user_social_dao.get_by_user_id(db, user_id)
+        return [binding.source for binding in bindings]
 
     @staticmethod
     async def binding_with_oauth2(