From bf7c05f753db8c16cc93f16ea78c5216a4f9c878 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Thu, 7 Jul 2022 17:07:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4confirm=20(#8554)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng626 <1304903146@qq.com> --- apps/authentication/const.py | 4 +++- apps/authentication/serializers/confirm.py | 2 +- apps/common/permissions.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/authentication/const.py b/apps/authentication/const.py index ffe92ffbf..d85afed75 100644 --- a/apps/authentication/const.py +++ b/apps/authentication/const.py @@ -18,7 +18,9 @@ class ConfirmType(TextChoices): @classmethod def get_can_confirm_types(cls, confirm_type): start = cls.values.index(confirm_type) - return cls.values[start:] + types = cls.values[start:] + types.reverse() + return types @classmethod def get_can_confirm_backend_classes(cls, confirm_type): diff --git a/apps/authentication/serializers/confirm.py b/apps/authentication/serializers/confirm.py index 3133a8cf4..9c0da463c 100644 --- a/apps/authentication/serializers/confirm.py +++ b/apps/authentication/serializers/confirm.py @@ -7,4 +7,4 @@ from ..const import ConfirmType, MFAType class ConfirmSerializer(serializers.Serializer): confirm_type = serializers.ChoiceField(required=True, allow_blank=True, choices=ConfirmType.choices) mfa_type = serializers.ChoiceField(required=False, allow_blank=True, choices=MFAType.choices) - secret_key = EncryptedField() + secret_key = EncryptedField(allow_blank=True) diff --git a/apps/common/permissions.py b/apps/common/permissions.py index 7242c255b..3000b9533 100644 --- a/apps/common/permissions.py +++ b/apps/common/permissions.py @@ -33,7 +33,7 @@ class WithBootstrapToken(permissions.BasePermission): class UserConfirmation(permissions.BasePermission): - ttl = 300 + ttl = 60 * 5 min_level = 1 confirm_type = ConfirmType.ReLogin