From 9f116ea7e8f7d53a22b4dce10de942d564818a01 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 15 一月 2025 14:01:22 +0800
Subject: [PATCH] tmp
---
app/api/auth.py | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index faad16d..3637cda 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -7,6 +7,7 @@
from Log import logger
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.models.app_token_model import AppToken
@@ -16,7 +17,7 @@
from app.models.user import UserCreate, LoginData
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
+ update_user_token, UserAppDao, update_user_info, password_rsa
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
@@ -35,14 +36,14 @@
if db_user:
return Response(code=200, msg="Username already registered")
- bisheng_service = BishengService(settings.sgb_base_url)
+ # bisheng_service = BishengService(settings.sgb_base_url)
ragflow_service = RagflowService(settings.fwr_base_url)
# 娉ㄥ唽鍒版瘯鏄�
- try:
- bisheng_info = await bisheng_service.register(user.username, user.password)
- except Exception as e:
- return Response(code=500, msg=f"Failed to register with Bisheng: {str(e)}")
+ # try:
+ # bisheng_info = await bisheng_service.register(user.username, user.password)
+ # except Exception as e:
+ # return Response(code=500, msg=f"Failed to register with Bisheng: {str(e)}")
# 娉ㄥ唽鍒皉agflow
try:
@@ -52,7 +53,7 @@
# 瀛樺偍鐢ㄦ埛淇℃伅
hashed_password = pwd_context.hash(user.password)
- db_user = UserModel(username=user.username, hashed_password=hashed_password, email=ragflow_info.get("email", f"{user.username}@example.com"),ragflow_id=ragflow_info.get("id"),bisheng_id=bisheng_info.get("user_id"))
+ db_user = UserModel(username=user.username, hashed_password=hashed_password, email=ragflow_info.get("email", f"{user.username}@example.com"),ragflow_id=ragflow_info.get("id"),bisheng_id="")
db_user.password = db_user.encrypted_password(user.password)
db.add(db_user)
db.commit()
@@ -66,14 +67,14 @@
if not user:
return Response(code=400, msg="Incorrect username or password")
- bisheng_service = BishengService(settings.sgb_base_url)
+ # 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)}")
+ # 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:
@@ -84,7 +85,7 @@
# 鍒涘缓鏈湴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)
+ 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,
@@ -106,9 +107,11 @@
@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)
+ password = await password_rsa(login_data.password)
+ user = authenticate_user(db, login_data.username, password)
if not user:
return Response(code=400, msg="Incorrect username or password")
+ """
app_register = AppRegisterDao(db).get_apps()
token_dict = {}
for app in app_register:
@@ -134,12 +137,13 @@
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})
- await update_token(db, user.id, access_token, token_dict)
- await update_user_token(db, user.id, token_dict)
+ # 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):
@@ -156,6 +160,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",
@@ -168,11 +173,13 @@
@router.post("/v2/register", response_model=Response)
async def register_v2(user: UserCreate, db=Depends(get_db)):
- if not is_valid_password(user.password):
+ 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")
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 = ""
@@ -199,7 +206,8 @@
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)
+ """
+ user_id = await save_register_user(db, user.username, password, user.email, "", {})
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})
--
Gitblit v1.8.0