app/auth/ is now an independent package, import nothing from app/

app/main.py

@@ -1,10 +1,11 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, Depends, HTTPException
 from strawberry import Schema
 from strawberry.fastapi import GraphQLRouter
 
-from app.auth import router as auth_router
-from app.db import engine
-from app.models import Base
+from app.auth import router as auth_router, get_user_by_id, get_current_user
+from app.db import engine, SessionLocal
+from app.models import Base, User
+from app.utils.format import get_image_url
 
 # 导入 GraphQL 组件
 from app.graphql.queries import Query
@@ -27,6 +28,22 @@ graphql_router = GraphQLRouter(schema, context_getter=get_context)
 app.include_router(auth_router)                         # 保留现有的 auth 路由供 Google OAuth 回调使用
 app.include_router(graphql_router, prefix="/graphql")   # 挂载 GraphQL 终点，前端以后只需要请求 /graphql
 
+def override_get_user_by_id(user_id: str = Depends(get_current_user)):
+    db = SessionLocal()
+    try:
+        user = db.query(User).filter(User.id == user_id).first()
+        if not user:
+            raise HTTPException(status_code=404, detail="User not found")
+        return {
+            "email": user.email,
+            "name": user.name,
+            "avatar": get_image_url(user.avatar),
+        }
+    finally:
+        db.close()
+        
+app.dependency_overrides[get_user_by_id] = override_get_user_by_id
+
 # test code
 for route in app.routes:
     methods = getattr(route, "methods", "N/A")