jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Feat/optimize login (#9642)

Browse source
This commit is contained in:
Joe 2024-10-23 10:59:30 +08:00 • committed by GitHub
commit 22bdfb7e56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/services/account_service.py
View file

@ -98,8 +98,8 @@ class AccountService:
if not account:
return None
if account.status in {AccountStatus.BANNED.value, AccountStatus.CLOSED.value}:
raise Unauthorized("Account is banned or closed.")
if account.status == AccountStatus.BANNED.value:
raise Unauthorized("Account is banned.")
current_tenant = TenantAccountJoin.query.filter_by(account_id=account.id, current=True).first()
if current_tenant:
@ -143,8 +143,8 @@ class AccountService:
if not account:
raise AccountNotFoundError()
if account.status in {AccountStatus.BANNED.value, AccountStatus.CLOSED.value}:
raise AccountLoginError("Account is banned or closed.")
if account.status == AccountStatus.BANNED.value:
raise AccountLoginError("Account is banned.")
if password and invite_token and account.password is None:
# if invite_token is valid, set password and password_salt
@ -408,8 +408,8 @@ class AccountService:
if not account:
return None
if account.status in {AccountStatus.BANNED.value, AccountStatus.CLOSED.value}:
raise Unauthorized("Account is banned or closed.")
if account.status == AccountStatus.BANNED.value:
raise Unauthorized("Account is banned.")
return account