From 4995829d050ed2219e53decb9a2d91e42813d8fb Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 05 十二月 2024 15:21:04 +0800
Subject: [PATCH] merge
---
app/api/auth.py | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 6e74966..880d744 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -3,16 +3,20 @@
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
from sqlalchemy.ext.asyncio import AsyncSession
+
+from Log import logger
from app.api import Response, pwd_context, get_current_user
from app.config.config import settings
+from app.config.const import RAGFLOW, BISHENG, DIFY
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
+from app.models.token_model import upsert_token, get_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.service.bisheng import BishengService
+from app.service.common.app_register import AppRegisterDao
from app.service.ragflow import RagflowService
from sqlalchemy.future import select
@@ -94,38 +98,41 @@
return Response(code=400, msg="token not found")
return Response(code=200, msg="success", data={
"ragflow_token": token.ragflow_token,
+ "bisheng_token": token.bisheng_token,
})
-@router.post("/login_test", response_model=Response)
+@router.post("/v2/login", response_model=Response)
async def login_test(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")
-
- bisheng_service = BishengService(settings.sgb_base_url)
- ragflow_service = RagflowService(settings.fwr_base_url)
-
- # 鐧诲綍鍒版瘯鏄�
- try:
- bisheng_token = await bisheng_service.login(login_data.username, login_data.password)
- except Exception as e:
- return Response(code=500, msg=f"Failed to login with Bisheng: {str(e)}")
-
- # 鐧诲綍鍒皉agflow
- try:
- ragflow_token = await ragflow_service.login(login_data.username, login_data.password)
- except Exception as e:
- return Response(code=500, msg=f"Failed to login with Ragflow: {str(e)}")
+ app_register = AppRegisterDao(db).get_apps()
+ token_dict = {}
+ 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
+ else:
+ logger.error("鏈煡娉ㄥ唽搴旂敤---")
+ continue
+ try:
+ token = await service.login(login_data.username, login_data.password)
+ token_dict[app["id"]] = token
+ except Exception as e:
+ return Response(code=500, msg=f"Failed to login with {app['id']}: {str(e)}")
# 鍒涘缓鏈湴token
access_token = create_access_token(data={"sub": user.username, "user_id": user.id})
- upsert_token(db, user.id, access_token, bisheng_token, ragflow_token)
+ await update_token(db, user.id, access_token, token_dict)
result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
db_app_token = result.scalars().first()
if not db_app_token:
- app_token_str = json.dumps({"rag_token": ragflow_token, "bs_token":bisheng_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)
pdb.add(app_token)
@@ -133,7 +140,7 @@
await pdb.refresh(app_token)
else:
db_app_token.token = access_token.decode()
- db_app_token.app_token = json.dumps({"rag_token": ragflow_token, "bs_token":bisheng_token})
+ 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={
@@ -143,3 +150,39 @@
"nickname": "",
# "user": user.to_login_json()
})
+
+
+
+@router.post("/v2/register", response_model=Response)
+async def register_test(user: UserCreate, db=Depends(get_db)):
+ 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 = {}
+ 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
+ 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 ""
+ except Exception as e:
+ return Response(code=500, msg=f"Failed to register with {app['id']}: {str(e)}")
+
+ # 瀛樺偍鐢ㄦ埛淇℃伅
+ 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
--
Gitblit v1.8.0