修复登录后仍旧提示需要登录

middleware/user.py

@@ -3,16 +3,16 @@ from typing import Annotated
 import jwt
 from fastapi import Depends
 from jwt import InvalidTokenError
-from sqlmodel.ext.asyncio.session import AsyncSession
+from loguru import logger as l
 
 import JWT
 from model import User
-from model.database import Database
 from pkg import utils
+from middleware.dependencies import SessionDep
 
 async def get_current_user(
         token: Annotated[str, Depends(JWT.oauth2_scheme)],
-        session: Annotated[AsyncSession, Depends(Database.get_session)],
+        session: SessionDep,
 ) -> User:
     """
     验证用户身份并返回当前用户信息。
@@ -20,9 +20,13 @@ async def get_current_user(
 
     try:
         payload = jwt.decode(token, await JWT.get_secret_key(), algorithms=[JWT.ALGORITHM])
-        username = payload.get("sub")
-        stored_account = await User.get(session, User.email == username)
-        if username is None or stored_account.email != username:
+        email = payload.get("sub")
+        stored_account = await User.get(session, User.email == email)
+        if stored_account is None:
+            l.warning("Account not found")
+            utils.raise_unauthorized("Login required")
+        elif stored_account.email != email:
+            l.warning("Email mismatch")
             utils.raise_unauthorized("Login required")
         return stored_account
     except InvalidTokenError: