fix: auth cookies (#202)

- Cookie 还是不对
petercat-ai · Aug 16, 2024 · 25f20b5 · 25f20b5
2 parents 3b189cc + 492aeac
commit 25f20b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/client/app/services/UserController.ts b/client/app/services/UserController.ts
@@ -3,6 +3,6 @@ import axios from 'axios';
 //  Get the public bot profile by id
 export async function getUserInfo({ clientId }: { clientId?: string }) {
   const apiDomain = process.env.NEXT_PUBLIC_API_DOMAIN;
-  const response = await axios.get(`${apiDomain}/api/auth/userinfo?clientId=${clientId}`);
+  const response = await axios.get(`${apiDomain}/api/auth/userinfo?clientId=${clientId}`, { withCredentials: true });
   return response.data.data;
 }
diff --git a/server/routers/auth.py b/server/routers/auth.py
@@ -1,4 +1,5 @@
-from fastapi import APIRouter,Cookie, Request, HTTPException, status, Response
+from typing import Annotated
+from fastapi import APIRouter, Cookie, Request, HTTPException, status, Response
 
 from fastapi.responses import RedirectResponse
 import httpx
@@ -72,12 +73,15 @@ async def callback(request: Request, response: Response):
     data = await getUserInfoByToken(token)
     supabase = get_client()
     supabase.table("profiles").upsert(data).execute()
+    print(f"auth_callback: {data}")
+    response = RedirectResponse(url=f'{WEB_URL}', status_code=302)
     response.set_cookie(key="petercat_user_token", value=token, httponly=True, secure=True, samesite='Lax')
 
-    return RedirectResponse(url=f'{WEB_URL}', status_code=302)
+    return response
 
 @router.get("/userinfo")
-async def userinfo(request: Request, response: Response, petercat_user_token: str = Cookie(None)):
+async def userinfo(request: Request, response: Response, petercat_user_token: Annotated[str | None, Cookie()] = None):
+    print(f"petercat_user_token: {petercat_user_token}")
     if not petercat_user_token:
         return await getAnonymousUser(request, response)
     data = await getAnonymousUserInfoByToken(petercat_user_token) if petercat_user_token.startswith("client|") else await getUserInfoByToken(petercat_user_token)