django-pfx 1.7.2.dev12__tar.gz → 1.7.2.dev14__tar.gz

{django_pfx-1.7.2.dev12 → django_pfx-1.7.2.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.2.dev12
+Version: 1.7.2.dev14
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.2.dev12 → django_pfx-1.7.2.dev14}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.2.dev12
+Version: 1.7.2.dev14
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.2.dev12 → django_pfx-1.7.2.dev14}/django_pfx.egg-info/SOURCES.txt

@@ -135,6 +135,7 @@ tests/migrations/0001_initial.py
 tests/migrations/0002_alter_book_cover.py
 tests/migrations/0003_book_local_file.py
 tests/migrations/0004_mfausermixin_fields.py
+tests/migrations/0005_mfausermixin_fields_fix.py
 tests/migrations/__init__.py
 tests/settings/__init__.py
 tests/settings/ci.py

{django_pfx-1.7.2.dev12 → django_pfx-1.7.2.dev14}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-20 16:17+0200\n"
+"POT-Creation-Date: 2026-04-22 09:37+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -112,10 +112,8 @@ msgid "Temporary SMS phone number"
 msgstr "Numéro de téléphone temporaire (SMS)"
 
 #: models/mfa_user_mixin.py:35
-#, fuzzy
-#| msgid "OTP enabled"
 msgid "SMS MFA enabled"
-msgstr "OTP activé"
+msgstr "MFA SMS activé"
 
 #: models/mfa_user_mixin.py:37
 msgid "Email MFA enabled"
@@ -125,7 +123,11 @@ msgstr "MFA par email activé"
 msgid "MFA setup dismissed"
 msgstr "Configuration MFA annulée"
 
-#: models/mfa_user_mixin.py:47 views/authentication_views.py:712
+#: models/mfa_user_mixin.py:43
+msgid "Authenticator MFA enabled"
+msgstr "Application MFA activée"
+
+#: models/mfa_user_mixin.py:50 views/authentication_views.py:718
 msgid "OTP enabled"
 msgstr "OTP activé"
 
@@ -249,47 +251,47 @@ msgstr ""
 msgid "Successful login"
 msgstr "Connexion réussie"
 
-#: views/authentication_views.py:385
+#: views/authentication_views.py:391
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: views/authentication_views.py:396
+#: views/authentication_views.py:402
 msgid "Code sent."
 msgstr "Code envoyé."
 
-#: views/authentication_views.py:459 views/authentication_views.py:629
+#: views/authentication_views.py:465 views/authentication_views.py:635
 msgid "password updated successfully"
 msgstr "le mot de passe a été mis à jour avec succès"
 
-#: views/authentication_views.py:464
+#: views/authentication_views.py:470
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: views/authentication_views.py:467 views/authentication_views.py:638
+#: views/authentication_views.py:473 views/authentication_views.py:644
 msgid "Empty password is not allowed"
 msgstr "Un mot de passe vide n’est pas autorisé"
 
-#: views/authentication_views.py:558
+#: views/authentication_views.py:564
 msgid "User and token are valid"
 msgstr "L'utilisateur et le token sont valides"
 
-#: views/authentication_views.py:560
+#: views/authentication_views.py:566
 msgid "User or token is invalid"
 msgstr "L'utilisateur ou le token est invalide"
 
-#: views/authentication_views.py:672
+#: views/authentication_views.py:678
 msgid "OTP is already enabled"
 msgstr "OTP est déjà activé"
 
-#: views/authentication_views.py:713 views/authentication_views.py:749
+#: views/authentication_views.py:719 views/authentication_views.py:755
 msgid "Invalid code"
 msgstr "Code invalide"
 
-#: views/authentication_views.py:748
+#: views/authentication_views.py:754
 msgid "OTP disabled"
 msgstr "OTP désactivé"
 
-#: views/authentication_views.py:1009
+#: views/authentication_views.py:1015
 msgid ""
 "If the email address you entered is correct, you will receive an email from "
 "us with instructions to reset your password."
@@ -298,7 +300,7 @@ msgstr ""
 "un courrier électronique de notre part contenant des instructions pour "
 "réinitialiser votre mot de passe."
 
-#: views/authentication_views.py:1083
+#: views/authentication_views.py:1089
 msgid "A new authentication code has been sent by email."
 msgstr "Un nouveau code d'authentification a été envoyé par e-mail."
 

{django_pfx-1.7.2.dev12 → django_pfx-1.7.2.dev14}/pfx/pfxcore/models/mfa_user_mixin.py

@@ -38,6 +38,9 @@ class MFAUserMixin(models.Model):
     #: User has dismissed or completed the MFA setup screen.
     mfa_setup_dismissed = models.BooleanField(
         _("MFA setup dismissed"), default=False)
+    #: Authenticator app MFA explicitly enabled by the user.
+    otp_enabled = models.BooleanField(
+        _("Authenticator MFA enabled"), default=False)
 
     class Meta:
         abstract = True
@@ -46,7 +49,7 @@ class MFAUserMixin(models.Model):
 
     @rest_property(_("OTP enabled"), "BooleanField")
     def is_otp(self):
-        return bool(self.otp_secret_token)
+        return self.otp_enabled
 
     def need_otp_response_extra(self):
         """Add extra attribute to response when need_otp=True."""
@@ -74,8 +77,9 @@ class MFAUserMixin(models.Model):
         if self.is_otp_valid(otp_code, tmp=True):
             self.otp_secret_token = self.otp_secret_token_tmp
             self.otp_secret_token_tmp = None
+            self.otp_enabled = True
             self.save(update_fields=[
-                'otp_secret_token', 'otp_secret_token_tmp'])
+                'otp_secret_token', 'otp_secret_token_tmp', 'otp_enabled'])
             return True
         return False
 
@@ -85,7 +89,8 @@ class MFAUserMixin(models.Model):
         Remove the OTP secret token.
         """
         self.otp_secret_token = None
-        self.save(update_fields=['otp_secret_token'])
+        self.otp_enabled = False
+        self.save(update_fields=['otp_secret_token', 'otp_enabled'])
 
     def get_otp_setup_uri(self, tmp=False, with_color=True):
         """Return the setup URL for OTP activation.

{django_pfx-1.7.2.dev12 → django_pfx-1.7.2.dev14}/pfx/pfxcore/views/authentication_views.py

@@ -230,6 +230,12 @@ class AuthenticationView(
             self.send_mfa_challenge(user, backend_id)
         token = self._prepare_token(user, mode, remember_me, otp_login=True)
         available = self.get_mfa_backends(user)
+        # Ensure the active OOB backend appears in available_backends so the
+        # frontend can offer a resend button (e.g. forced-email fallback where
+        # email_enabled is False but email is still the active channel).
+        available_for_response = list(available)
+        if is_oob and backend_id not in available_for_response:
+            available_for_response.append(backend_id)
         extra = user.need_otp_response_extra() if isinstance(
             user, MFAUserMixin) else {}
         return JsonResponse(dict(
@@ -239,7 +245,7 @@ class AuthenticationView(
             mfa_backend={'id': backend_id, 'is_oob': is_oob},
             available_backends=[
                 {'id': b, 'is_oob': b in {'email', 'sms'}}
-                for b in available
+                for b in available_for_response
             ]))
 
     # --- MFA helpers ---
@@ -253,7 +259,7 @@ class AuthenticationView(
             return []
         result = []
         for backend_id in settings.PFX_MFA_BACKENDS:
-            if backend_id == 'authenticator' and user.otp_secret_token:
+            if backend_id == 'authenticator' and user.otp_enabled:
                 result.append(backend_id)
             elif backend_id == 'sms' and user.sms_enabled:
                 result.append(backend_id)
@@ -667,7 +673,7 @@ class AuthenticationView(
         if not isinstance(self.request.user, MFAUserMixin):
             logger.error("User must inherit MFAUserMixin to use MFA")
             raise NotFoundError()
-        if self.request.user.otp_secret_token:
+        if self.request.user.otp_enabled:
             return JsonResponse(
                 dict(message=_("OTP is already enabled")), status=400)
         self.request.user.enable_otp()

django_pfx-1.7.2.dev14/tests/migrations/0005_mfausermixin_fields_fix.py

@@ -0,0 +1,17 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tests', '0004_mfausermixin_fields'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='otp_enabled',
+            field=models.BooleanField(
+                default=False, verbose_name='Authenticator MFA enabled'),
+        ),
+    ]

{django_pfx-1.7.2.dev12 → django_pfx-1.7.2.dev14}/tests/tests/test_auth_api.py

@@ -924,6 +924,7 @@ class MFALoginTest(TestAssertMixin, TransactionTestCase):
 
     def enable_otp(self, user):
         user.otp_secret_token = pyotp.random_base32()
+        user.otp_enabled = True
         user.save()
         user.refresh_from_db()
         return pyotp.totp.TOTP(user.otp_secret_token)