From 057f034d4cd728c1bd0284e7c6b4a47739d5220d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 12 十二月 2024 19:57:41 +0800
Subject: [PATCH] yonghu
---
app/api/auth.py | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index ba86a89..116d9e2 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -12,12 +12,13 @@
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
from app.models.user import UserCreate, LoginData
-from app.models.user_model import UserModel
+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.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
@@ -115,7 +116,7 @@
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
@@ -171,35 +172,31 @@
return Response(code=200, msg="Username already registered")
app_register = AppRegisterDao(db).get_apps()
register_dict = {}
+ token = ""
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:
+ 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:
name = app["id"] + str(int(time.time()))
- register_info = await service.register(name, user.password)
+ register_info = await service.register(name, user.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)}")
-
- # 瀛樺偍鐢ㄦ埛淇℃伅
- # 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)
-
- is_sava = await save_register_user(db, user.username, user.password, user.email, register_dict)
- if not is_sava:
+ user_id = await save_register_user(db, user.username, user.password, user.email, register_dict)
+ if not user_id:
return Response(code=500, msg=f"Failed to register with app")
+ is_update = await update_user_group(db, user_id)
return Response(code=200, msg="User registered successfully",data={"username": user.username})
\ No newline at end of file
--
Gitblit v1.8.0