From f2c43713b16e821f4a1ae97804c60f18734d5f6a Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 13 十二月 2024 17:25:12 +0800
Subject: [PATCH] 问题优化
---
app/api/auth.py | 89 ++++++++++++++++++++++++++++----------------
1 files changed, 57 insertions(+), 32 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index f0c6fce..faad16d 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,6 +1,6 @@
import json
+import time
-from Tools.scripts.mailerdaemon import emparse_list_from
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
from sqlalchemy.ext.asyncio import AsyncSession
@@ -12,15 +12,19 @@
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, get_token, update_token
+from app.models.token_model import upsert_token, update_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.models.user_model import UserModel, UserAppModel
+from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, \
+ update_user_token, UserAppDao, update_user_info
from app.service.bisheng import BishengService
-from app.service.common.app_register import AppRegisterDao
+from app.service.service_token import get_new_token, get_token, update_user_group
+from app.service.v2.app_register import AppRegisterDao
+from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from sqlalchemy.future import select
+from app.utils.password_handle import generate_password
router = APIRouter()
@@ -81,29 +85,27 @@
access_token = create_access_token(data={"sub": user.username, "user_id": user.id})
upsert_token(db, user.id, access_token, bisheng_token, ragflow_token)
-
+ # print(111)
return Response(code=200, msg="Login successful", data={
"access_token": access_token,
"token_type": "bearer",
"username": user.username,
"nickname": "",
- "user": user.to_login_json()
+ # "user": user.to_login_json()
})
@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)
+ token = await 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,
- })
+ return Response(code=200, msg="success", data=token)
-@router.post("/login_test", response_model=Response)
-async def login_test(login_data: LoginData, db: Session = Depends(get_db), pdb: AsyncSession = Depends(get_pdb)):
+@router.post("/v2/login", response_model=Response)
+async def login_v2(login_data: LoginData, db: Session = Depends(get_db), pdb: AsyncSession = Depends(get_pdb)):
user = authenticate_user(db, login_data.username, login_data.password)
if not user:
return Response(code=400, msg="Incorrect username or password")
@@ -115,12 +117,20 @@
elif app["id"] == BISHENG:
service = BishengService(settings.sgb_base_url)
elif app["id"] == DIFY:
- continue
+ service = DifyService(settings.dify_base_url)
else:
logger.error("鏈煡娉ㄥ唽搴旂敤---")
continue
try:
- token = await service.login(login_data.username, login_data.password)
+ name = login_data.username
+ app_password = login_data.password
+ user_app = await UserAppDao(db).get_data_by_id(user.id, app["id"])
+ if user_app:
+ name = user_app.username
+ app_password = user_app.decrypted_password(user_app.password)
+ else:
+ await update_user_info(db, user.id)
+ token = await service.login(name, app_password)
token_dict[app["id"]] = token
except Exception as e:
return Response(code=500, msg=f"Failed to login with {app['id']}: {str(e)}")
@@ -129,17 +139,20 @@
access_token = create_access_token(data={"sub": user.username, "user_id": user.id})
await update_token(db, user.id, access_token, token_dict)
+ await update_user_token(db, user.id, token_dict)
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.decode(), app_token=app_token_str)
+ app_token = AppToken(id=user.id, token=access_token, app_token=app_token_str)
pdb.add(app_token)
await pdb.commit()
await pdb.refresh(app_token)
else:
- db_app_token.token = access_token.decode()
+ db_app_token.token = access_token
db_app_token.app_token = json.dumps(token_dict)
await pdb.commit()
await pdb.refresh(db_app_token)
@@ -153,36 +166,48 @@
-@router.post("/register_test", response_model=Response)
-async def register_test(user: UserCreate, db=Depends(get_db)):
+@router.post("/v2/register", response_model=Response)
+async def register_v2(user: UserCreate, db=Depends(get_db)):
+ if not is_valid_password(user.password):
+ return Response(code=400, msg="The password must be at least 8 and contain both numbers and letters")
db_user = db.query(UserModel).filter(UserModel.username == user.username).first()
if db_user:
return Response(code=200, msg="Username already registered")
app_register = AppRegisterDao(db).get_apps()
register_dict = {}
+ token = ""
+ app_password = await generate_password(10)
for app in app_register:
if app["id"] == RAGFLOW:
service = RagflowService(settings.fwr_base_url)
elif app["id"] == BISHENG:
service = BishengService(settings.sgb_base_url)
elif app["id"] == DIFY:
- continue
+ admin_user = db.query(UserModel).filter(UserModel.permission == "admin").first()
+ token = await get_new_token(db, admin_user.id, DIFY)
+ if not token:
+ logger.error("鐢ㄦ埛娉ㄥ唽鑾峰彇dftoken澶辫触锛�")
+ return Response(code=500, msg=f"Failed to register with app")
+ service = DifyService(settings.dify_base_url)
else:
logger.error("鏈煡娉ㄥ唽搴旂敤---")
continue
try:
- register_info = await service.register(user.username, user.password)
- register_dict[app['id']] = register_info.get("id") if app['id'] == RAGFLOW else register_info.get("user_id") if app['id'] == BISHENG else ""
+ name = app["id"] + str(int(time.time()))
+ register_info = await service.register(name, app_password, token)
+ # print(register_info)
+ register_dict[app['id']] = {"id":register_info.get("id"), "name": name, "email": register_info.get("email")}
except Exception as e:
return Response(code=500, msg=f"Failed to register with {app['id']}: {str(e)}")
+ user_id = await save_register_user(db, user.username, user.password, user.email, app_password, register_dict)
+ if not user_id:
+ return Response(code=500, msg=f"Failed to register with app")
+ return Response(code=200, msg="User registered successfully",data={"userFlag": user_id})
- # 瀛樺偍鐢ㄦ埛淇℃伅
- hashed_password = pwd_context.hash(user.password)
- db_user = UserModel(username=user.username, hashed_password=hashed_password, email=user.email)
- db_user.password = db_user.encrypted_password(user.password)
- for k, v in register_dict.items():
- setattr(db_user, k.replace("app", "id"), v)
- db.add(db_user)
- db.commit()
- db.refresh(db_user)
- return Response(code=200, msg="User registered successfully",data={"username": db_user.username})
\ No newline at end of file
+
+@router.get("/v2/sync", response_model=Response)
+async def sync_user_tenant(userFlag: str, db=Depends(get_db)):
+ app_register = AppRegisterDao(db).get_app_by_id(RAGFLOW)
+ if app_register:
+ is_update = await update_user_group(db, userFlag)
+ return Response(code=200, msg="success", data={})
\ No newline at end of file
--
Gitblit v1.8.0