From 5423f6b6eaff8c6c2c8b5ac1caaee5d84ef8affd Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 13 二月 2025 10:40:37 +0800
Subject: [PATCH] 問題優化
---
app/api/auth.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 1de0449..c17b48b 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -125,14 +125,16 @@
continue
try:
name = login_data.username
+ email = ""
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
+ email = user_app.email
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 = await service.login(name, app_password,email=email)
token_dict[app["id"]] = token
except Exception as e:
return Response(code=500, msg=f"Failed to login with {app['id']}: {str(e)}")
@@ -170,7 +172,8 @@
@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:
@@ -201,7 +204,7 @@
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, 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})
--
Gitblit v1.8.0