fix: preserve web behaviour for mailbox verify code override (#2240)

This commit is contained in:
Carlos Quintana 2024-09-30 12:23:58 +02:00 committed by GitHub
parent 6d17eaa1ec
commit 8cbd8eb841
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -212,10 +212,11 @@ def generate_activation_code(
mailbox: Mailbox, use_digit_code: bool = False
) -> MailboxActivation:
clear_activation_codes_for_mailbox(mailbox)
if config.MAILBOX_VERIFICATION_OVERRIDE_CODE:
code = config.MAILBOX_VERIFICATION_OVERRIDE_CODE
elif use_digit_code:
code = "{:06d}".format(random.randint(1, 999999))
if use_digit_code:
if config.MAILBOX_VERIFICATION_OVERRIDE_CODE:
code = config.MAILBOX_VERIFICATION_OVERRIDE_CODE
else:
code = "{:06d}".format(random.randint(1, 999999))
else:
code = secrets.token_urlsafe(16)
return MailboxActivation.create(