From d481a1b998d9b6481141f8e3595e64ae5289d992 Mon Sep 17 00:00:00 2001 From: Joe <1264204425@qq.com> Date: Sun, 29 Sep 2024 17:00:09 +0800 Subject: [PATCH] chore: lint chore: lint --- api/controllers/console/auth/login.py | 2 +- api/services/account_service.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/api/controllers/console/auth/login.py b/api/controllers/console/auth/login.py index 11c0d97410..ad6c036722 100644 --- a/api/controllers/console/auth/login.py +++ b/api/controllers/console/auth/login.py @@ -45,7 +45,7 @@ class LoginApi(Resource): invitation = args["invite_token"] if invitation: invitation = RegisterService.get_invitation_if_token_valid(None, args["email"], invitation) - + try: if invitation: data = invitation.get("data", {}) diff --git a/api/services/account_service.py b/api/services/account_service.py index 8be0589a9f..ad2a27f74f 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -102,7 +102,7 @@ class AccountService: if account.status in {AccountStatus.BANNED.value, AccountStatus.CLOSED.value}: raise AccountLoginError("Account is banned or closed.") - + if password and invite_token: # if invite_token is valid, set password and password_salt salt = secrets.token_bytes(16) @@ -111,7 +111,6 @@ class AccountService: base64_password_hashed = base64.b64encode(password_hashed).decode() account.password = base64_password_hashed account.password_salt = base64_salt - if account.password is None or not compare_password(password, account.password, account.password_salt): raise AccountPasswordError("Invalid email or password.") @@ -119,7 +118,7 @@ class AccountService: if account.status == AccountStatus.PENDING.value: account.status = AccountStatus.ACTIVE.value account.initialized_at = datetime.now(timezone.utc).replace(tzinfo=None) - + db.session.commit() return account