From 6efaa41969ab89c1e1bd468b1b895f6689b7f70d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 20 二月 2025 10:04:59 +0800
Subject: [PATCH] tmp
---
app/api/auth.py | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 3637cda..00b70be 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -9,13 +9,13 @@
from app.api import Response, pwd_context, get_current_user
from app.api.user import reset_user_pwd
from app.config.config import settings
-from app.config.const import RAGFLOW, BISHENG, DIFY
+from app.config.const import RAGFLOW, BISHENG, DIFY, chat_server, workflow_server
from app.models.app_token_model import AppToken
from app.models.base_model import get_db
from app.models.postgresql_base_model import get_pdb
from app.models.token_model import upsert_token, update_token
from app.models.user import UserCreate, LoginData
-from app.models.user_model import UserModel, UserAppModel
+from app.models.user_model import UserModel, UserAppModel, UserTokenModel
from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, \
update_user_token, UserAppDao, update_user_info, password_rsa
from app.service.bisheng import BishengService
@@ -143,15 +143,18 @@
# await update_token(db, user.id, access_token, token_dict)
# await update_user_token(db, user.id, token_dict)
- '''
+ token_dict = {}
+ for app in [{"app": RAGFLOW, "token_id": chat_server},
+ {"app": DIFY,"token_id": workflow_server}]:
+ user_token = db.query(UserTokenModel).filter(UserTokenModel.id == app["token_id"]).first()
+ if user_token and user_token.access_token:
+ token_dict[app["app"]] = user_token.access_token
result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
db_app_token = result.scalars().first()
if isinstance(access_token, bytes):
access_token = access_token.decode()
if not db_app_token:
- app_token_str = json.dumps(token_dict)
- # print(app_token_str)
- app_token = AppToken(id=user.id, token=access_token, app_token=app_token_str)
+ app_token = AppToken(id=user.id, token=access_token, app_token=json.dumps(token_dict))
pdb.add(app_token)
await pdb.commit()
await pdb.refresh(app_token)
@@ -160,7 +163,7 @@
db_app_token.app_token = json.dumps(token_dict)
await pdb.commit()
await pdb.refresh(db_app_token)
- '''
+
return Response(code=200, msg="Login successful", data={
"access_token": access_token,
"token_type": "bearer",
@@ -173,6 +176,8 @@
@router.post("/v2/register", response_model=Response)
async def register_v2(user: UserCreate, db=Depends(get_db)):
+ if "@" in user.username:
+ return Response(code=400, msg="Username cannot contain @")
password = await password_rsa(user.password)
if not is_valid_password(password):
return Response(code=400, msg="The password must be at least 8 and contain both numbers and letters")
--
Gitblit v1.8.0