Skip to content

Commit 1cc8437

Browse files
authored
fix: update token (#233)
- 修 update
2 parents 3d4f078 + 0013669 commit 1cc8437

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

server/routers/bot.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
from fastapi import APIRouter, Cookie, Depends, status, HTTPException, Query, Path
22
from fastapi.responses import JSONResponse
3+
from auth.get_user_info import get_user_id
34
from petercat_utils import get_client
45
from bot.builder import bot_builder, bot_info_generator
56
from type_class.bot import BotUpdateRequest, BotCreateRequest
6-
from typing import Optional
7+
from typing import Annotated, Optional
78

8-
def verify_user_id(user_id: Optional[str] = Cookie(None)):
9-
if not user_id:
10-
raise HTTPException(
11-
status_code=status.HTTP_401_UNAUTHORIZED,
12-
detail="Auth failed"
13-
)
14-
return user_id
159
router = APIRouter(
1610
prefix="/api/bot",
1711
tags=["bot"],
@@ -56,7 +50,7 @@ def get_bot_detail(id: Optional[str] = Query(None, description="Filter bots by p
5650
return JSONResponse(content={"success": False, "errorMessage": str(e)}, status_code=500)
5751

5852
@router.get("/config")
59-
def get_bot_config(id: Optional[str] = Query(None, description="Filter bots by personal category"), user_id: str = Depends(verify_user_id)):
53+
def get_bot_config(id: Optional[str] = Query(None, description="Filter bots by personal category"), user_id: Annotated[str | None, Depends(get_user_id)] = None):
6054
try:
6155
supabase = get_client()
6256
data = supabase.table("bots").select('*').eq('id', id).eq('uid', user_id).execute()
@@ -65,7 +59,7 @@ def get_bot_config(id: Optional[str] = Query(None, description="Filter bots by p
6559
return JSONResponse(content={"success": False, "errorMessage": e})
6660

6761
@router.post("/create", status_code=200)
68-
async def create_bot(bot_data: BotCreateRequest, user_id: str = Depends(verify_user_id)):
62+
async def create_bot(bot_data: BotCreateRequest, user_id: Annotated[str | None, Depends(get_user_id)] = None):
6963
try:
7064
res = await bot_builder(user_id, **bot_data.model_dump())
7165
if not res:
@@ -75,7 +69,7 @@ async def create_bot(bot_data: BotCreateRequest, user_id: str = Depends(verify_u
7569
return JSONResponse(content={"success": False, "errorMessage": str(e)}, status_code=500)
7670

7771
@router.post("/config/generator", status_code=200)
78-
async def bot_generator(bot_data: BotCreateRequest, user_id: str = Depends(verify_user_id)):
72+
async def bot_generator(bot_data: BotCreateRequest, user_id: Annotated[str | None, Depends(get_user_id)] = None):
7973
try:
8074
res = await bot_info_generator(user_id, **bot_data.model_dump())
8175
if not res:
@@ -85,7 +79,7 @@ async def bot_generator(bot_data: BotCreateRequest, user_id: str = Depends(verif
8579
return JSONResponse(content={"success": False, "errorMessage": str(e)}, status_code=500)
8680

8781
@router.put("/update/{id}", status_code=200)
88-
def update_bot(id: str, bot_data: BotUpdateRequest, user_id: str = Depends(verify_user_id)):
82+
def update_bot(id: str, bot_data: BotUpdateRequest, user_id: Annotated[str | None, Depends(get_user_id)] = None):
8983
if not id:
9084
return {
9185
"error": "Incomplete parameters",
@@ -110,7 +104,7 @@ def update_bot(id: str, bot_data: BotUpdateRequest, user_id: str = Depends(veri
110104
@router.delete("/delete/{id}", status_code=status.HTTP_200_OK)
111105
async def delete_bot(
112106
id: str = Path(..., description="The ID of the bot to delete"),
113-
user_id: str = Depends(verify_user_id)
107+
user_id: Annotated[str | None, Depends(get_user_id)] = None
114108
):
115109
try:
116110
supabase = get_client()

0 commit comments

Comments
 (0)