From fe8e77104db4503d65f13ad66eaa48d631619d7c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 15 一月 2025 17:28:16 +0800
Subject: [PATCH] tmp
---
app/api/auth.py | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 1de0449..3637cda 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -111,6 +111,7 @@
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:
@@ -136,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):
@@ -158,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",
@@ -170,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 = ""
@@ -201,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