Refactor email and phone code login rate limiting logic in AccountService. Simplified conditions for debug code handling and improved readability.

pull/21891/head
ytqh 1 year ago
parent 1d72b70d82
commit 33c5319254

@ -479,13 +479,13 @@ class AccountService:
email = account.email if account else email email = account.email if account else email
if email is None: if email is None:
raise ValueError("Email must be provided.") raise ValueError("Email must be provided.")
if cls.email_code_login_rate_limiter.is_rate_limited(email) and not DeploymentConfig().DEBUG:
if dify_config.DEBUG_CODE_FOR_LOGIN:
code = dify_config.DEBUG_CODE_FOR_LOGIN
elif cls.email_code_login_rate_limiter.is_rate_limited(email):
from controllers.console.auth.error import EmailCodeLoginRateLimitExceededError from controllers.console.auth.error import EmailCodeLoginRateLimitExceededError
raise EmailCodeLoginRateLimitExceededError() raise EmailCodeLoginRateLimitExceededError()
if dify_config.DEBUG_CODE_FOR_LOGIN and dify_config.DEBUG_CODE_FOR_LOGIN != "":
code = dify_config.DEBUG_CODE_FOR_LOGIN
else: else:
code = "".join([str(random.randint(0, 9)) for _ in range(6)]) code = "".join([str(random.randint(0, 9)) for _ in range(6)])
@ -674,11 +674,11 @@ class AccountService:
Send verification code to phone number for admin login. Send verification code to phone number for admin login.
Returns a token that can be used to verify the code. Returns a token that can be used to verify the code.
""" """
if cls.phone_code_login_rate_limiter.is_rate_limited(phone) and not DeploymentConfig().DEBUG:
raise Exception("Phone verification code rate limit exceeded")
if dify_config.DEBUG_CODE_FOR_LOGIN: if dify_config.DEBUG_CODE_FOR_LOGIN:
code = dify_config.DEBUG_CODE_FOR_LOGIN code = dify_config.DEBUG_CODE_FOR_LOGIN
elif cls.phone_code_login_rate_limiter.is_rate_limited(phone):
raise Exception("Phone verification code rate limit exceeded")
else: else:
code = "".join([str(random.randint(0, 9)) for _ in range(6)]) code = "".join([str(random.randint(0, 9)) for _ in range(6)])

Loading…
Cancel
Save