From 8cbd8eb84170b0c1ec8e123d58fc41f0ef7235b8 Mon Sep 17 00:00:00 2001 From: Carlos Quintana <74399022+cquintana92@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:23:58 +0200 Subject: [PATCH] fix: preserve web behaviour for mailbox verify code override (#2240) --- app/mailbox_utils.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/mailbox_utils.py b/app/mailbox_utils.py index 76a472f4..9f94b7e9 100644 --- a/app/mailbox_utils.py +++ b/app/mailbox_utils.py @@ -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(