diff --git a/api/controllers/console/auth/forgot_password.py b/api/controllers/console/auth/forgot_password.py index 735edae5f6..fb32bb2b60 100644 --- a/api/controllers/console/auth/forgot_password.py +++ b/api/controllers/console/auth/forgot_password.py @@ -12,7 +12,7 @@ from controllers.console.auth.error import ( InvalidTokenError, PasswordMismatchError, ) -from controllers.console.error import EmailSendIpLimitError, NotAllowedRegister +from controllers.console.error import AccountNotFound, EmailSendIpLimitError from controllers.console.wraps import setup_required from events.tenant_event import tenant_was_created from extensions.ext_database import db @@ -48,7 +48,7 @@ class ForgotPasswordSendEmailApi(Resource): token = AccountService.send_reset_password_email(email=args["email"], language=language) return {"result": "fail", "data": token, "code": "account_not_found"} else: - raise NotAllowedRegister() + raise AccountNotFound() else: token = AccountService.send_reset_password_email(account=account, email=args["email"], language=language) diff --git a/api/controllers/console/auth/login.py b/api/controllers/console/auth/login.py index e2e8f84920..f4463ce9cb 100644 --- a/api/controllers/console/auth/login.py +++ b/api/controllers/console/auth/login.py @@ -16,9 +16,9 @@ from controllers.console.auth.error import ( ) from controllers.console.error import ( AccountBannedError, + AccountNotFound, EmailSendIpLimitError, NotAllowedCreateWorkspace, - NotAllowedRegister, ) from controllers.console.wraps import setup_required from events.tenant_event import tenant_was_created @@ -76,7 +76,7 @@ class LoginApi(Resource): token = AccountService.send_reset_password_email(email=args["email"], language=language) return {"result": "fail", "data": token, "code": "account_not_found"} else: - raise NotAllowedRegister() + raise AccountNotFound() # SELF_HOSTED only have one workspace tenants = TenantService.get_join_tenants(account) if len(tenants) == 0: @@ -119,7 +119,7 @@ class ResetPasswordSendEmailApi(Resource): if FeatureService.get_system_features().is_allow_register: token = AccountService.send_reset_password_email(email=args["email"], language=language) else: - raise NotAllowedRegister() + raise AccountNotFound() else: token = AccountService.send_reset_password_email(account=account, language=language) @@ -148,7 +148,7 @@ class EmailCodeLoginSendEmailApi(Resource): if FeatureService.get_system_features().is_allow_register: token = AccountService.send_email_code_login_email(email=args["email"], language=language) else: - raise NotAllowedRegister() + raise AccountNotFound() else: token = AccountService.send_email_code_login_email(account=account, language=language) diff --git a/api/controllers/console/error.py b/api/controllers/console/error.py index 61561d56c8..1b4e6deae6 100644 --- a/api/controllers/console/error.py +++ b/api/controllers/console/error.py @@ -52,8 +52,8 @@ class AccountBannedError(BaseHTTPException): code = 400 -class NotAllowedRegister(BaseHTTPException): - error_code = "unauthorized" +class AccountNotFound(BaseHTTPException): + error_code = "account_not_found" description = "Account not found." code = 400 diff --git a/api/services/account_service.py b/api/services/account_service.py index aacc1c85f6..3d7f9e7dfb 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -198,9 +198,9 @@ class AccountService: ) -> Account: """create account""" if not FeatureService.get_system_features().is_allow_register and not is_setup: - from controllers.console.error import NotAllowedRegister + from controllers.console.error import AccountNotFound - raise NotAllowedRegister() + raise AccountNotFound() account = Account() account.email = email account.name = name