Revert "feat: email register refactor" (#25367)

api/services/account_service.py

@@ -37,6 +37,7 @@ from services.billing_service import BillingService
 from services.errors.account import (
     AccountAlreadyInTenantError,
     AccountLoginError,
+    AccountNotFoundError,
     AccountNotLinkTenantError,
     AccountPasswordError,
     AccountRegisterError,
@@ -64,11 +65,7 @@ from tasks.mail_owner_transfer_task import (
     send_old_owner_transfer_notify_email_task,
     send_owner_transfer_confirm_task,
 )
-from tasks.mail_register_task import send_email_register_mail_task, send_email_register_mail_task_when_account_exist
-from tasks.mail_reset_password_task import (
-    send_reset_password_mail_task,
-    send_reset_password_mail_task_when_account_not_exist,
-)
+from tasks.mail_reset_password_task import send_reset_password_mail_task
 
 logger = logging.getLogger(__name__)
 
@@ -85,7 +82,6 @@ REFRESH_TOKEN_EXPIRY = timedelta(days=dify_config.REFRESH_TOKEN_EXPIRE_DAYS)
 
 class AccountService:
     reset_password_rate_limiter = RateLimiter(prefix="reset_password_rate_limit", max_attempts=1, time_window=60 * 1)
-    email_register_rate_limiter = RateLimiter(prefix="email_register_rate_limit", max_attempts=1, time_window=60 * 1)
     email_code_login_rate_limiter = RateLimiter(
         prefix="email_code_login_rate_limit", max_attempts=1, time_window=60 * 1
     )
@@ -99,7 +95,6 @@ class AccountService:
     FORGOT_PASSWORD_MAX_ERROR_LIMITS = 5
     CHANGE_EMAIL_MAX_ERROR_LIMITS = 5
     OWNER_TRANSFER_MAX_ERROR_LIMITS = 5
-    EMAIL_REGISTER_MAX_ERROR_LIMITS = 5
 
     @staticmethod
     def _get_refresh_token_key(refresh_token: str) -> str:
@@ -176,7 +171,7 @@ class AccountService:
 
         account = db.session.query(Account).filter_by(email=email).first()
         if not account:
-            raise AccountPasswordError("Invalid email or password.")
+            raise AccountNotFoundError()
 
         if account.status == AccountStatus.BANNED.value:
             raise AccountLoginError("Account is banned.")
@@ -438,7 +433,6 @@ class AccountService:
         account: Optional[Account] = None,
         email: Optional[str] = None,
         language: str = "en-US",
-        is_allow_register: bool = False,
     ):
         account_email = account.email if account else email
         if account_email is None:
@@ -451,54 +445,14 @@ class AccountService:
 
         code, token = cls.generate_reset_password_token(account_email, account)
 
-        if account:
-            send_reset_password_mail_task.delay(
-                language=language,
-                to=account_email,
-                code=code,
-            )
-        else:
-            send_reset_password_mail_task_when_account_not_exist.delay(
-                language=language,
-                to=account_email,
-                is_allow_register=is_allow_register,
-            )
+        send_reset_password_mail_task.delay(
+            language=language,
+            to=account_email,
+            code=code,
+        )
         cls.reset_password_rate_limiter.increment_rate_limit(account_email)
         return token
 
-    @classmethod
-    def send_email_register_email(
-        cls,
-        account: Optional[Account] = None,
-        email: Optional[str] = None,
-        language: str = "en-US",
-    ):
-        account_email = account.email if account else email
-        if account_email is None:
-            raise ValueError("Email must be provided.")
-
-        if cls.email_register_rate_limiter.is_rate_limited(account_email):
-            from controllers.console.auth.error import EmailRegisterRateLimitExceededError
-
-            raise EmailRegisterRateLimitExceededError()
-
-        code, token = cls.generate_email_register_token(account_email)
-
-        if account:
-            send_email_register_mail_task_when_account_exist.delay(
-                language=language,
-                to=account_email,
-            )
-
-        else:
-            send_email_register_mail_task.delay(
-                language=language,
-                to=account_email,
-                code=code,
-            )
-        cls.email_register_rate_limiter.increment_rate_limit(account_email)
-        return token
-
     @classmethod
     def send_change_email_email(
         cls,
@@ -631,19 +585,6 @@ class AccountService:
         )
         return code, token
 
-    @classmethod
-    def generate_email_register_token(
-        cls,
-        email: str,
-        code: Optional[str] = None,
-        additional_data: dict[str, Any] = {},
-    ):
-        if not code:
-            code = "".join([str(secrets.randbelow(exclusive_upper_bound=10)) for _ in range(6)])
-        additional_data["code"] = code
-        token = TokenManager.generate_token(email=email, token_type="email_register", additional_data=additional_data)
-        return code, token
-
     @classmethod
     def generate_change_email_token(
         cls,
@@ -682,10 +623,6 @@ class AccountService:
     def revoke_reset_password_token(cls, token: str):
         TokenManager.revoke_token(token, "reset_password")
 
-    @classmethod
-    def revoke_email_register_token(cls, token: str):
-        TokenManager.revoke_token(token, "email_register")
-
     @classmethod
     def revoke_change_email_token(cls, token: str):
         TokenManager.revoke_token(token, "change_email")
@@ -698,10 +635,6 @@ class AccountService:
     def get_reset_password_data(cls, token: str) -> Optional[dict[str, Any]]:
         return TokenManager.get_token_data(token, "reset_password")
 
-    @classmethod
-    def get_email_register_data(cls, token: str) -> Optional[dict[str, Any]]:
-        return TokenManager.get_token_data(token, "email_register")
-
     @classmethod
     def get_change_email_data(cls, token: str) -> Optional[dict[str, Any]]:
         return TokenManager.get_token_data(token, "change_email")
@@ -809,16 +742,6 @@ class AccountService:
         count = int(count) + 1
         redis_client.setex(key, dify_config.FORGOT_PASSWORD_LOCKOUT_DURATION, count)
 
-    @staticmethod
-    @redis_fallback(default_return=None)
-    def add_email_register_error_rate_limit(email: str) -> None:
-        key = f"email_register_error_rate_limit:{email}"
-        count = redis_client.get(key)
-        if count is None:
-            count = 0
-        count = int(count) + 1
-        redis_client.setex(key, dify_config.EMAIL_REGISTER_LOCKOUT_DURATION, count)
-
     @staticmethod
     @redis_fallback(default_return=False)
     def is_forgot_password_error_rate_limit(email: str) -> bool:
@@ -838,24 +761,6 @@ class AccountService:
         key = f"forgot_password_error_rate_limit:{email}"
         redis_client.delete(key)
 
-    @staticmethod
-    @redis_fallback(default_return=False)
-    def is_email_register_error_rate_limit(email: str) -> bool:
-        key = f"email_register_error_rate_limit:{email}"
-        count = redis_client.get(key)
-        if count is None:
-            return False
-        count = int(count)
-        if count > AccountService.EMAIL_REGISTER_MAX_ERROR_LIMITS:
-            return True
-        return False
-
-    @staticmethod
-    @redis_fallback(default_return=None)
-    def reset_email_register_error_rate_limit(email: str):
-        key = f"email_register_error_rate_limit:{email}"
-        redis_client.delete(key)
-
     @staticmethod
     @redis_fallback(default_return=None)
     def add_change_email_error_rate_limit(email: str):