From 81d420d88e87ccbbe3b0e7681bea17f31239fcdb Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期三, 23 十月 2024 10:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/api/auth.py | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index d12fec9..ac974d3 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,25 +1,17 @@
-from typing import Dict
-import json
-
-from fastapi import APIRouter, Depends, HTTPException
-from fastapi.security import OAuth2PasswordBearer
-from passlib.context import CryptContext
+from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
-from app.api import Response
+from app.api import Response, pwd_context, get_current_user
from app.config.config import settings
from app.models.base_model import get_db
-from app.models.token_model import upsert_token
-from app.models.user import User, UserCreate, LoginData
+from app.models.token_model import upsert_token, get_token
+from app.models.user import UserCreate, LoginData
from app.models.user_model import UserModel
from app.service.auth import authenticate_user, create_access_token
from app.service.bisheng import BishengService
from app.service.ragflow import RagflowService
router = APIRouter()
-
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
@router.post("/register", response_model=Response)
@@ -74,11 +66,24 @@
return Response(code=500, msg=f"Failed to login with Ragflow: {str(e)}")
# 鍒涘缓鏈湴token
- access_token = create_access_token(data={"sub": user.username})
+ access_token = create_access_token(data={"sub": user.username, "user_id": user.id})
upsert_token(db, user.id, access_token, bisheng_token, ragflow_token)
return Response(code=200, msg="Login successful", data={
"access_token": access_token,
- "token_type": "bearer"
+ "token_type": "bearer",
+ "username": user.username,
+ "nickname": "",
+ })
+
+
+@router.get("/token", response_model=Response)
+async def token_api(db: Session = Depends(get_db), current_user: UserModel = Depends(get_current_user)):
+ # 鏌ヨ鐜版湁璁板綍
+ token = get_token(db, current_user.id)
+ if token is None:
+ return Response(code=400, msg="token not found")
+ return Response(code=200, msg="success", data={
+ "ragflow_token": token.ragflow_token,
})
--
Gitblit v1.8.0