fix reset password
This commit is contained in:
@@ -75,14 +75,15 @@ class DatabaseService:
|
||||
user_name=data[1],
|
||||
user_mail=data[2],
|
||||
user_password=data[3],
|
||||
user_first_name=data[4],
|
||||
user_last_name=data[5],
|
||||
user_birth_day=data[6],
|
||||
is_active=bool(data[7]),
|
||||
is_team_member=bool(data[8]),
|
||||
is_admin=bool(data[9]),
|
||||
created_at=data[10],
|
||||
last_updated_at=data[11]
|
||||
user_fallback_password=data[4],
|
||||
user_first_name=data[5],
|
||||
user_last_name=data[6],
|
||||
user_birth_day=data[7],
|
||||
is_active=bool(data[8]),
|
||||
is_team_member=bool(data[9]),
|
||||
is_admin=bool(data[10]),
|
||||
created_at=data[11],
|
||||
last_updated_at=data[12]
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
@@ -185,10 +186,10 @@ class DatabaseService:
|
||||
async with conn.cursor(aiomysql.Cursor) as cursor:
|
||||
try:
|
||||
await cursor.execute(
|
||||
"UPDATE users SET user_name=%s, user_mail=%s, user_password=%s, user_first_name=%s, "
|
||||
"user_last_name=%s, user_birth_date=%s, is_active=%s, is_team_member=%s, is_admin=%s "
|
||||
"WHERE (user_id=%s)",
|
||||
(user.user_name, user.user_mail.lower(), user.user_password,
|
||||
"UPDATE users SET user_name=%s, user_mail=%s, user_password=%s, user_fallback_password=%s,"
|
||||
"user_first_name=%s, user_last_name=%s, user_birth_date=%s, is_active=%s, is_team_member=%s,"
|
||||
" is_admin=%s WHERE (user_id=%s)",
|
||||
(user.user_name, user.user_mail.lower(), user.user_password, user.user_fallback_password,
|
||||
user.user_first_name, user.user_last_name, user.user_birth_day,
|
||||
user.is_active, user.is_team_member, user.is_admin,
|
||||
user.user_id)
|
||||
|
||||
@@ -61,6 +61,8 @@ class UserService:
|
||||
user = await self.get_user(user_name_or_mail)
|
||||
if not user:
|
||||
return False
|
||||
if user.user_fallback_password:
|
||||
user.user_fallback_password == sha256(password_clear_text.encode(encoding="utf-8")).hexdigest()
|
||||
return user.user_password == sha256(password_clear_text.encode(encoding="utf-8")).hexdigest()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user