django-pfx 1.7.3.dev41__tar.gz → 1.7.4.dev2__tar.gz

{django_pfx-1.7.3.dev41 → django_pfx-1.7.4.dev2}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev41
+Version: 1.7.4.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.7.4.dev2/django_pfx.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.7.3",
+  "distance": 2,
+  "node": "g15eb0c06bfab2204f4fb2b90e4dedf18971179e8",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-29"
+}

{django_pfx-1.7.3.dev41 → django_pfx-1.7.4.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-07-08 16:13+0200\n"
+"POT-Creation-Date: 2026-07-29 14:36+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Your {site_name} verification code: {otp_code}"
 msgstr "Votre code pour {site_name} : {otp_code}"
 
-#: models/abstract_pfx_base_user.py:52
+#: models/abstract_pfx_base_user.py:58
 msgid "user"
 msgstr "utilisateur"
 
-#: models/abstract_pfx_base_user.py:53
+#: models/abstract_pfx_base_user.py:59
 msgid "users"
 msgstr "utilisateurs"
 
@@ -276,11 +276,11 @@ msgstr "Bienvenue sur %(site_name)s."
 msgid "Welcome on %(site_name)s"
 msgstr "Bienvenue sur %(site_name)s"
 
-#: views/authentication_views.py:80
+#: views/authentication_views.py:84
 msgid "Login failed"
 msgstr "La connexion a échoué"
 
-#: views/authentication_views.py:89
+#: views/authentication_views.py:93
 #, python-brace-format
 msgid ""
 "Your connection is temporarily disabled after several unsuccessful attempts, "
@@ -289,31 +289,31 @@ msgstr ""
 "Votre connexion est temporairement désactivée après plusieurs tentatives "
 "infructueuses, veuillez réessayer dans {seconds} secondes."
 
-#: views/authentication_views.py:181
+#: views/authentication_views.py:185
 msgid "Successful login"
 msgstr "Connexion réussie"
 
-#: views/authentication_views.py:255 views/authentication_views.py:423
+#: views/authentication_views.py:259 views/authentication_views.py:427
 msgid "password updated successfully"
 msgstr "le mot de passe a été mis à jour avec succès"
 
-#: views/authentication_views.py:260
+#: views/authentication_views.py:264
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: views/authentication_views.py:263 views/authentication_views.py:432
+#: views/authentication_views.py:267 views/authentication_views.py:436
 msgid "Empty password is not allowed"
 msgstr "Un mot de passe vide n’est pas autorisé"
 
-#: views/authentication_views.py:352
+#: views/authentication_views.py:356
 msgid "User and token are valid"
 msgstr "L’utilisateur et le token sont valides"
 
-#: views/authentication_views.py:354
+#: views/authentication_views.py:358
 msgid "User or token is invalid"
 msgstr "L’utilisateur ou le token est invalide"
 
-#: views/authentication_views.py:631
+#: views/authentication_views.py:633
 msgid ""
 "If the email address you entered is correct, you will receive an email from "
 "us with instructions to reset your password."

{django_pfx-1.7.3.dev41 → django_pfx-1.7.4.dev2}/pfx/pfxcore/models/abstract_pfx_base_user.py

@@ -14,6 +14,9 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     class Meta:
         abstract = True
 
+    def __str__(self):
+        return self.get_username()
+
     def auth_json_repr(self, **kw):
         res = self.json_repr(
             username=self.get_username(),
@@ -27,6 +30,9 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
             res['permissions'] = list(self.get_all_permissions())
         return res
 
+    def get_email_rfc(self):
+        return f'"{self}" <{getattr(self, self.get_email_field_name())}>'
+
     @classmethod
     def auth_json_repr_schema(cls):
         return cls.json_repr_schema()
@@ -53,6 +59,9 @@ class AbstractPFXUser(AbstractUser, AbstractPFXBaseUser):
         verbose_name_plural = _("users")
         abstract = True
 
+    def __str__(self):
+        return f"{self.first_name} {self.last_name}"
+
     def auth_json_repr(self, **kw):
         res = super().auth_json_repr(
             first_name=self.first_name,

{django_pfx-1.7.3.dev41 → django_pfx-1.7.4.dev2}/pfx/pfxcore/shortcuts.py

@@ -172,3 +172,9 @@ def file_extension(filename):
 def get_system_error_user_message(context=None):
     # use str() to force lazy gettext string to be translated.
     return str(settings.PFX_SYSTEM_ERROR_USER_MESSAGE)
+
+
+def default_from_email_rfc():
+    return (
+        f'"{settings.PFX_EMAILS_DEFAULT_FROM_NAME}" '
+        f'<{settings.PFX_EMAILS_DEFAULT_FROM_EMAIL}>')

{django_pfx-1.7.3.dev41 → django_pfx-1.7.4.dev2}/pfx/pfxcore/views/authentication_views.py

@@ -31,7 +31,11 @@ from pfx.pfxcore.middleware.authentication import JWTTokenDecodeMixin
 from pfx.pfxcore.models import CacheableMixin
 from pfx.pfxcore.models.login_ban import LoginBan
 from pfx.pfxcore.settings import settings
-from pfx.pfxcore.shortcuts import delete_token_cookie, f
+from pfx.pfxcore.shortcuts import (
+    default_from_email_rfc,
+    delete_token_cookie,
+    f,
+)
 
 from .rest_views import (
     BaseRestView,
@@ -494,8 +498,6 @@ class SendMessageTokenMixin:
     from_email = None
     #: The HTML email template.
     html_email_template_name = None
-    #: The email field of user model.
-    email_field = 'email'
     #: The language field of user model
     language_field = 'language'
 
@@ -524,8 +526,8 @@ class SendMessageTokenMixin:
             subject = ''.join(subject.splitlines())
             body = loader.render_to_string(self.email_template_name, data)
             email_message = EmailMultiAlternatives(
-                subject, body, self.from_email,
-                [getattr(user, self.email_field)])
+                subject, body, self.from_email or default_from_email_rfc(),
+                [user.get_email_rfc()])
             if self.html_email_template_name is not None:
                 html_email = loader.render_to_string(
                     self.html_email_template_name, data)

{django_pfx-1.7.3.dev41 → django_pfx-1.7.4.dev2}/tests/tests/test_auth_api.py

@@ -595,6 +595,9 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
             'Set-Cookie: token=""; expires=Thu, 01 Jan 1970 00:00:00 GMT; '
             'Max-Age=0; Path=/; SameSite=None; Secure')
 
+    @override_settings(
+        PFX_EMAILS_DEFAULT_FROM_NAME="PFX",
+        PFX_EMAILS_DEFAULT_FROM_EMAIL="pfx@example.com")
     def test_signup(self):
         # Try to create with an existing username
         response = self.client.post(
@@ -621,15 +624,16 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         self.assertRC(response, 200)
 
         # Must send a welcome email
-        self.assertEqual(
-            mail.outbox[0].subject,
-            f'Welcome on {settings.PFX_SITE_NAME}')
+        email = mail.outbox[0]
+        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
+        self.assertEqual(email.to, ['"Isaac Asimov" <isaac.asimov@bu.edu>'])
+        self.assertEqual(email.subject, f'Welcome on {settings.PFX_SITE_NAME}')
 
         self.client.logout()
 
         # Test that the token and uid are valid.
         regex = r"token=(.*)&uidb64=(.*)"
-        token, uidb64 = re.findall(regex, mail.outbox[0].body)[0]
+        token, uidb64 = re.findall(regex, email.body)[0]
         response = self.client.post(
             '/api/auth/set-password', {
                 'token': token,
@@ -646,6 +650,9 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         self.assertRC(response, 422)
         self.assertJE(response, 'username.@0', 'This field cannot be blank.')
 
+    @override_settings(
+        PFX_EMAILS_DEFAULT_FROM_NAME="PFX",
+        PFX_EMAILS_DEFAULT_FROM_EMAIL="pfx@example.com")
     def test_forgotten_password(self):
         # Try with an nonexistent email
         response = self.client.post(
@@ -672,15 +679,18 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
                       'instructions to reset your password.')
 
         # Must send a reset password email
+        email = mail.outbox[0]
+        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
+        self.assertEqual(email.to, [
+            '"John Ronald Reuel Tolkien" <jrr.tolkien@oxford.com>'])
         self.assertEqual(
-            mail.outbox[0].subject,
-            f'Password reset on {settings.PFX_SITE_NAME}')
+            email.subject, f'Password reset on {settings.PFX_SITE_NAME}')
 
         self.client.logout()
 
         # Test that the token and uid are valid.
         regex = r"token=(.*)&uidb64=(.*)"
-        token, uidb64 = re.findall(regex, mail.outbox[0].body)[0]
+        token, uidb64 = re.findall(regex, email.body)[0]
         response = self.client.post(
             '/api/auth/set-password', {
                 'token': token,

django_pfx-1.7.3.dev41/django_pfx.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.7.2",
-  "distance": 41,
-  "node": "g5546a817c1462a2ee070ac76715c941a3fb13435",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-22"
-}