fix jwt token decoding; correctly import google auth routes; adjust app/auth/ package

app/auth/__init__.py

@@ -1,11 +1,50 @@
-from fastapi import APIRouter
-from .deps import get_current_user
-from .jwt import create_jwt_token, create_refresh_token, verify_access_token
+import os
+from fastapi import APIRouter, Depends, HTTPException, Request
+from app.utils.format import get_image_url
 
-# 统一创建并导出路由器，满足 main.py 的 include_router 需求
+from .deps import get_current_user
+from .jwt import create_jwt_token, create_refresh_token, verify_access_token, decode_token
+from .oauth import oauth_router
+
+# 创建全局 auth 路由器
 router = APIRouter(tags=["Authentication"])
 
-# 显式声明这个包对外暴露的接口
+# 挂载第三方 OAuth 的路由器
+router.include_router(oauth_router)
+
+@router.get("/me")
+def me(user_id = Depends(get_current_user)):
+    # 注意：根据上一轮修改，get_current_user 现在直接返回 user_id
+    from app.db import SessionLocal
+    from app.models import 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()
+    
+@router.post("/refresh")
+def refresh_token(refresh_token: str):
+    payload = decode_token(refresh_token)
+    if payload.get("type") != "refresh":
+        raise HTTPException(status_code=401)
+    user_id = payload.get("sub")
+    new_access = create_jwt_token({"sub": user_id})
+    return {"access_token": new_access}
+
+@router.post("/logout")
+def logout():
+    return {"message": "ok"}
+
+# 显式声明暴露的接口
 __all__ = [
     "router",
     "get_current_user",