django-pfx 1.5.dev2__tar.gz → 1.7.dev2__tar.gz

{django_pfx-1.5.dev2 → django_pfx-1.7.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.5.dev2
+Version: 1.7.dev2
 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.5.dev2 → django_pfx-1.7.dev2}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.5.dev2
+Version: 1.7.dev2
 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.5.dev2 → django_pfx-1.7.dev2}/pfx/pfxcore/exceptions.py

@@ -1,4 +1,4 @@
-from django.core.exceptions import NON_FIELD_ERRORS
+from django.core.exceptions import NON_FIELD_ERRORS, FieldDoesNotExist
 from django.utils.translation import gettext_lazy as _
 
 from pfx.pfxcore.http import JsonResponse
@@ -15,14 +15,26 @@ def validation_error_dict(e):
 class APIError(Exception):
     def __init__(
             self, message, status=400, delete_cookie=False,
-            validation_error=None, **kwargs):
+            validation_error=None, validation_models=None, **kwargs):
+        def field(name):
+            for model in (validation_models or []):
+                try:
+                    return model._meta.get_field(name).verbose_name
+                except FieldDoesNotExist:
+                    continue
+            return name
+
         self.status = status
         if validation_error:
-            d = validation_error_dict(validation_error)
-            mlist = d.get(NON_FIELD_ERRORS)
-            if mlist:
-                message = mlist[0]
-            self.data = dict(message=message, errors=d, **kwargs)
+            errors = []
+            errors_dict = validation_error_dict(validation_error)
+            for k, v in errors_dict.items():
+                if k == NON_FIELD_ERRORS:
+                    errors.extend(v)
+                else:
+                    errors.extend(f"{field(k)}: {e}" for e in v)
+            message = f"{message}\n{'\n'.join(errors)}"
+            self.data = dict(message=message, errors=errors_dict, **kwargs)
         else:
             self.data = dict(message=message, **kwargs)
         self.delete_cookie = delete_cookie

{django_pfx-1.5.dev2 → django_pfx-1.7.dev2}/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-02-25 10:08+0100\n"
+"POT-Creation-Date: 2026-03-05 16:44+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -22,28 +22,28 @@ msgstr ""
 msgid "An internal server error occured."
 msgstr "Une erreur interne du serveur est survenue."
 
-#: exceptions.py:41 exceptions.py:64
+#: exceptions.py:53 exceptions.py:76
 #, python-brace-format
 msgid "{model} not found."
 msgstr "{model} non trouvé."
 
-#: exceptions.py:48
+#: exceptions.py:60
 msgid "JSON Malformed {}"
 msgstr "JSON malformé {}"
 
-#: exceptions.py:71
+#: exceptions.py:83
 msgid "Login failed"
 msgstr "La connexion a échoué"
 
-#: exceptions.py:78
+#: exceptions.py:90
 msgid "Unauthorized"
 msgstr "Non autorisé"
 
-#: exceptions.py:85
+#: exceptions.py:97
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: exceptions.py:92
+#: exceptions.py:104
 msgid "Resource not found"
 msgstr "Ressource non trouvée"
 
@@ -103,7 +103,7 @@ msgstr "Compte HOTP"
 msgid "HOTP expiry"
 msgstr "Expiration HOTP"
 
-#: models/otp_user_mixin.py:29 views/authentication_views.py:503
+#: models/otp_user_mixin.py:29 views/authentication_views.py:504
 msgid "OTP enabled"
 msgstr "OTP activé"
 
@@ -222,39 +222,39 @@ msgstr ""
 msgid "Successful login"
 msgstr "Connexion réussie"
 
-#: views/authentication_views.py:250 views/authentication_views.py:420
+#: views/authentication_views.py:251 views/authentication_views.py:421
 msgid "password updated successfully"
 msgstr "le mot de passe a été mis à jour avec succès"
 
-#: views/authentication_views.py:255
+#: views/authentication_views.py:256
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: views/authentication_views.py:258 views/authentication_views.py:429
+#: views/authentication_views.py:259 views/authentication_views.py:430
 msgid "Empty password is not allowed"
 msgstr "Un mot de passe vide n’est pas autorisé"
 
-#: views/authentication_views.py:349
+#: views/authentication_views.py:350
 msgid "User and token are valid"
 msgstr "L'utilisateur et le token sont valides"
 
-#: views/authentication_views.py:351
+#: views/authentication_views.py:352
 msgid "User or token is invalid"
 msgstr "L'utilisateur ou le token est invalide"
 
-#: views/authentication_views.py:463
+#: views/authentication_views.py:464
 msgid "OTP is already enabled"
 msgstr "OTP est déjà activé"
 
-#: views/authentication_views.py:504 views/authentication_views.py:540
+#: views/authentication_views.py:505 views/authentication_views.py:541
 msgid "Invalid code"
 msgstr "Code invalide"
 
-#: views/authentication_views.py:539
+#: views/authentication_views.py:540
 msgid "OTP disabled"
 msgstr "OTP désactivé"
 
-#: views/authentication_views.py:800
+#: views/authentication_views.py:801
 msgid ""
 "If the email address you entered is correct, you will receive an email from "
 "us with instructions to reset your password."
@@ -263,7 +263,7 @@ msgstr ""
 "un courrier électronique de notre part contenant des instructions pour "
 "réinitialiser votre mot de passe."
 
-#: views/authentication_views.py:874
+#: views/authentication_views.py:875
 msgid "A new authentication code has been sent by email."
 msgstr "Un nouveau code d'authentification a été envoyé par e-mail."
 
@@ -302,7 +302,7 @@ msgstr "{model} {obj} créé."
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1269
+#: views/rest_views.py:1276
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.5.dev2 → django_pfx-1.7.dev2}/pfx/pfxcore/models/otp_user_mixin.py

@@ -30,6 +30,10 @@ class OtpUserMixin(models.Model):
     def is_otp(self):
         return bool(self.otp_secret_token)
 
+    def need_otp_response_extra(self):
+        """Add extra attribute to response when need_otp=True."""
+        return {}
+
     def enable_otp(self):
         """Activate OTP for this user.
 

{django_pfx-1.5.dev2 → django_pfx-1.7.dev2}/pfx/pfxcore/views/authentication_views.py

@@ -184,7 +184,8 @@ class AuthenticationView(
 
         Can be overridden to customize the response."""
         token = self._prepare_token(user, mode, remember_me, otp_login=True)
-        return JsonResponse(dict(need_otp=True, token=token))
+        return JsonResponse(dict(
+            need_otp=True, token=token, **user.need_otp_response_extra()))
 
     @method_decorator(never_cache)
     @rest_api(

{django_pfx-1.5.dev2 → django_pfx-1.7.dev2}/pfx/pfxcore/views/rest_views.py

@@ -958,6 +958,9 @@ class ListRestViewMixin(ModelResponseMixin):
 
     def get_navigation_meta(self, obj):
         qs = self.get_list_queryset()
+        if not qs.exists():
+            return {}
+
         order = qs.query.order_by
         qs_window = qs.annotate(
             prev_id=Window(Lag('id'), order_by=order),
@@ -975,7 +978,11 @@ class ListRestViewMixin(ModelResponseMixin):
 
         with connection.cursor() as cursor:
             cursor.execute(sql, list(params) + [obj.pk])
-            prev_id, next_id, index = cursor.fetchone() or (None, None)
+            row = cursor.fetchone()
+            if not row:
+                return {}
+
+            prev_id, next_id, index = row
             return {
                 'previous_pk': prev_id or qs.last().pk,
                 'next_pk': next_id or qs.first().pk,

{django_pfx-1.5.dev2 → django_pfx-1.7.dev2}/tests/tests/basic_api_errors.py

@@ -70,9 +70,9 @@ class BasicAPIErrorTest(TestAssertMixin, TestCase):
     def test_api_error_from_validation_error(self):
         error = APIError("Default", validation_error=ValidationError(
             ValidationError("Message")))
-        self.assertEqual(error.data['message'], "Message")
+        self.assertEqual(error.data['message'], "Default\nMessage")
 
         # If no general message, default message is used.
         error = APIError("Default", validation_error=ValidationError(
             ValidationError(dict(field1="Message"))))
-        self.assertEqual(error.data['message'], "Default")
+        self.assertEqual(error.data['message'], "Default\nfield1: Message")