From 52ba4076f5ad55fdf3239a33a2a376eaa0e0dea5 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 09 十二月 2024 17:53:01 +0800
Subject: [PATCH] m
---
app/api/auth.py | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index aa56f3a..a4d96a3 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,4 +1,5 @@
import json
+import time
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
@@ -14,9 +15,11 @@
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.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, \
+ update_user_token, UserAppDao
from app.service.bisheng import BishengService
from app.service.common.app_register import AppRegisterDao
+from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from sqlalchemy.future import select
@@ -98,11 +101,12 @@
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)
-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")
@@ -119,7 +123,10 @@
logger.error("鏈煡娉ㄥ唽搴旂敤---")
continue
try:
- token = await service.login(login_data.username, login_data.password)
+ user_app = UserAppDao(db).get_data_by_id(user.id, app["id"])
+ if user_app:
+ name = user_app.username
+ token = await service.login(name, 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)}")
@@ -128,17 +135,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)
@@ -152,8 +162,10 @@
-@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")
@@ -165,23 +177,29 @@
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:
- 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, user.password)
+ 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)
- return Response(code=200, msg="User registered successfully",data={"username": db_user.username})
\ No newline at end of file
+ # 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:
+ return Response(code=500, msg=f"Failed to register with app")
+ return Response(code=200, msg="User registered successfully",data={"username": user.username})
\ No newline at end of file
--
Gitblit v1.8.0