fix context; decoupling decode_token algo
This commit is contained in:
+17
-2
@@ -28,7 +28,7 @@ async def load_members_by_workspace_ids(workspace_ids: List[str]) -> List[List[W
|
|||||||
|
|
||||||
class CustomContext(BaseContext):
|
class CustomContext(BaseContext):
|
||||||
def __init__(self, request: Request):
|
def __init__(self, request: Request):
|
||||||
super().__init__(request)
|
super().__init__()
|
||||||
self.db = SessionLocal()
|
self.db = SessionLocal()
|
||||||
self.request = request
|
self.request = request
|
||||||
self._current_user: Optional[User] = None
|
self._current_user: Optional[User] = None
|
||||||
@@ -41,17 +41,32 @@ class CustomContext(BaseContext):
|
|||||||
return self._current_user
|
return self._current_user
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
# 打印 Request Headers,确认 Token 是否真的传过来了
|
||||||
|
# print(f"DEBUG: Auth Headers: {self.request.headers.get('authorization')}")
|
||||||
|
# print(f"DEBUG: Cookies: {self.request.cookies}")
|
||||||
# 借用 auth 包的纯工具解出 ID
|
# 借用 auth 包的纯工具解出 ID
|
||||||
user_id = get_current_user_id(self.request)
|
user_id = get_current_user_id(self.request)
|
||||||
|
# print(f"DEBUG: Extracted User ID: {user_id}") # 确认 ID 是否解出
|
||||||
|
|
||||||
|
if not user_id:
|
||||||
|
return None
|
||||||
|
|
||||||
# 在 Context 的数据库连接中查询完整用户
|
# 在 Context 的数据库连接中查询完整用户
|
||||||
user = self.db.query(User).filter(User.id == user_id).first()
|
user = self.db.query(User).filter(User.id == user_id).first()
|
||||||
|
# print(f"DEBUG: DB User Found: {user}") # 确认数据库是否查到
|
||||||
|
|
||||||
self._current_user = user
|
self._current_user = user
|
||||||
return user
|
return user
|
||||||
except Exception:
|
except Exception as e:
|
||||||
|
# 打印真实的异常信息
|
||||||
|
# print(f"DEBUG: Error in get_current_user: {str(e)}")
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc() # 打印堆栈
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
async def get_context(request: Request) -> AsyncGenerator[CustomContext, None]:
|
async def get_context(request: Request) -> AsyncGenerator[CustomContext, None]:
|
||||||
|
# print("--- NEW GRAPHQL REQUEST RECEIVED ---")
|
||||||
context = CustomContext(request)
|
context = CustomContext(request)
|
||||||
try:
|
try:
|
||||||
yield context
|
yield context
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class Query:
|
|||||||
@strawberry.field
|
@strawberry.field
|
||||||
async def me(self, info: Info[CustomContext, None]) -> Optional[UserType]:
|
async def me(self, info: Info[CustomContext, None]) -> Optional[UserType]:
|
||||||
# 从 context 获取当前登录用户
|
# 从 context 获取当前登录用户
|
||||||
user = await info.context. xzz()
|
user = await info.context.get_current_user()
|
||||||
# Strawberry 会自动将 SQLAlchemy 实例映射为 UserType
|
# Strawberry 会自动将 SQLAlchemy 实例映射为 UserType
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ def get_current_user_id(request: Request):
|
|||||||
raise HTTPException(status_code=401, detail="Not authenticated")
|
raise HTTPException(status_code=401, detail="Not authenticated")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
payload = decode_token(token, JWT_SECRET, algorithms=[JWT_ALGORITHM])
|
payload = decode_token(token)
|
||||||
return payload["sub"]
|
return payload["sub"]
|
||||||
except:
|
except:
|
||||||
raise HTTPException(status_code=401, detail="Invalid token")
|
raise HTTPException(status_code=401, detail="Invalid token")
|
||||||
Reference in New Issue
Block a user