django-pfx 1.7.4.dev2__tar.gz → 1.7.5.dev3__tar.gz

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/.gitlab-ci.yml

@@ -38,6 +38,7 @@ quality check:
     - python manage.py makemigrations --check --dry-run
     - python manage.py makemigrations tests_base_user --check --dry-run
     - python manage.py makemigrations tests_custom_user --check --dry-run
+    - python manage.py makemigrations tests_user_email_login --check --dry-run
 
 test:
   image: $IMAGE
@@ -52,6 +53,7 @@ test:
     - coverage run -a --source='.' manage.py test
     - coverage run -a --source='.' manage.py test tests_base_user
     - coverage run -a --source='.' manage.py test tests_custom_user
+    - coverage run -a --source='.' manage.py test tests_user_email_login
     - coverage report
     - coverage xml
     - coverage html

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.4.dev2
+Version: 1.7.5.dev3
 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-1.7.5.dev3}/django_pfx.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ pfx/emails/mailjet/message_result.py
 pfx/emails/migrations/0001_initial.py
 pfx/emails/migrations/0002_alter_email_headers.py
 pfx/emails/migrations/0003_alter_email_options.py
+pfx/emails/migrations/0004_alter_email_mail_from.py
 pfx/emails/migrations/__init__.py
 pfx/emails/models/__init__.py
 pfx/emails/models/email.py
@@ -103,6 +104,8 @@ pfx/pfxcore/migrations/0002_pfxpermissionsuser.py
 pfx/pfxcore/migrations/0003_delete_pfxpermissionsuser.py
 pfx/pfxcore/migrations/0004_alter_loginban_failed_counter_and_more.py
 pfx/pfxcore/migrations/0005_mfadevice_mfadevice_mfa_device_unique_backend.py
+pfx/pfxcore/migrations/0006_alter_pfxuser_managers.py
+pfx/pfxcore/migrations/0007_alter_pfxuser_options.py
 pfx/pfxcore/migrations/__init__.py
 pfx/pfxcore/migrations/operations/__init__.py
 pfx/pfxcore/migrations/operations/permissions.py
@@ -193,13 +196,6 @@ tests/urls.py
 tests/views.py
 tests/locale/fr/LC_MESSAGES/django.po
 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/0006_rename_otp_enabled_user_mfa_authenticator_enabled_and_more.py
-tests/migrations/0007_attachment.py
-tests/migrations/0008_remove_user_hotp_count_remove_user_hotp_expiry_and_more.py
 tests/migrations/__init__.py
 tests/settings/__init__.py
 tests/settings/ci.py
@@ -253,7 +249,6 @@ tests/tests/test_view_fields.py
 tests_base_user/__init__.py
 tests_base_user/urls.py
 tests_base_user/views.py
-tests_base_user/migrations/0001_initial.py
 tests_base_user/migrations/__init__.py
 tests_base_user/settings/__init__.py
 tests_base_user/settings/ci.py
@@ -278,4 +273,19 @@ tests_custom_user/settings/dev_custom_example.py
 tests_custom_user/settings/dev_default.py
 tests_custom_user/tests/__init__.py
 tests_custom_user/tests/test_api.py
-tests_custom_user/tests/test_auth_api.py
+tests_custom_user/tests/test_auth_api.py
+tests_user_email_login/__init__.py
+tests_user_email_login/models.py
+tests_user_email_login/urls.py
+tests_user_email_login/views.py
+tests_user_email_login/migrations/0001_initial.py
+tests_user_email_login/migrations/__init__.py
+tests_user_email_login/settings/__init__.py
+tests_user_email_login/settings/ci.py
+tests_user_email_login/settings/common.py
+tests_user_email_login/settings/dev.py
+tests_user_email_login/settings/dev_custom_example.py
+tests_user_email_login/settings/dev_default.py
+tests_user_email_login/tests/__init__.py
+tests_user_email_login/tests/test_api.py
+tests_user_email_login/tests/test_auth_api.py

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/django_pfx.egg-info/scm_file_list.json

@@ -69,15 +69,8 @@
     "tests/settings/__init__.py",
     "tests/settings/dev_custom_example.py",
     "tests/settings/ci.py",
-    "tests/migrations/0004_mfausermixin_fields.py",
-    "tests/migrations/0006_rename_otp_enabled_user_mfa_authenticator_enabled_and_more.py",
-    "tests/migrations/0008_remove_user_hotp_count_remove_user_hotp_expiry_and_more.py",
     "tests/migrations/__init__.py",
-    "tests/migrations/0002_alter_book_cover.py",
     "tests/migrations/0001_initial.py",
-    "tests/migrations/0007_attachment.py",
-    "tests/migrations/0005_mfausermixin_fields_fix.py",
-    "tests/migrations/0003_book_local_file.py",
     "tests/locale/fr/LC_MESSAGES/django.po",
     "doc/conf.py",
     "doc/index.rst",
@@ -167,6 +160,8 @@
     "pfx/pfxcore/templates/registration/otp_code_email.txt",
     "pfx/pfxcore/migrations/0003_delete_pfxpermissionsuser.py",
     "pfx/pfxcore/migrations/__init__.py",
+    "pfx/pfxcore/migrations/0007_alter_pfxuser_options.py",
+    "pfx/pfxcore/migrations/0006_alter_pfxuser_managers.py",
     "pfx/pfxcore/migrations/0005_mfadevice_mfadevice_mfa_device_unique_backend.py",
     "pfx/pfxcore/migrations/0001_initial.py",
     "pfx/pfxcore/migrations/0004_alter_loginban_failed_counter_and_more.py",
@@ -239,6 +234,7 @@
     "pfx/emails/migrations/0002_alter_email_headers.py",
     "pfx/emails/migrations/__init__.py",
     "pfx/emails/migrations/0001_initial.py",
+    "pfx/emails/migrations/0004_alter_email_mail_from.py",
     "pfx/emails/providers/email_django_q_executor.py",
     "pfx/emails/providers/__init__.py",
     "pfx/emails/email_backend/q_mailjet_email_backend.py",
@@ -258,6 +254,21 @@
     "tests_custom_user/settings/ci.py",
     "tests_custom_user/migrations/__init__.py",
     "tests_custom_user/migrations/0001_initial.py",
+    "tests_user_email_login/urls.py",
+    "tests_user_email_login/views.py",
+    "tests_user_email_login/__init__.py",
+    "tests_user_email_login/models.py",
+    "tests_user_email_login/tests/test_api.py",
+    "tests_user_email_login/tests/test_auth_api.py",
+    "tests_user_email_login/tests/__init__.py",
+    "tests_user_email_login/settings/dev.py",
+    "tests_user_email_login/settings/common.py",
+    "tests_user_email_login/settings/dev_default.py",
+    "tests_user_email_login/settings/__init__.py",
+    "tests_user_email_login/settings/dev_custom_example.py",
+    "tests_user_email_login/settings/ci.py",
+    "tests_user_email_login/migrations/__init__.py",
+    "tests_user_email_login/migrations/0001_initial.py",
     "tests_base_user/urls.py",
     "tests_base_user/views.py",
     "tests_base_user/__init__.py",
@@ -270,7 +281,6 @@
     "tests_base_user/settings/__init__.py",
     "tests_base_user/settings/dev_custom_example.py",
     "tests_base_user/settings/ci.py",
-    "tests_base_user/migrations/__init__.py",
-    "tests_base_user/migrations/0001_initial.py"
+    "tests_base_user/migrations/__init__.py"
   ]
 }

django_pfx-1.7.5.dev3/django_pfx.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.7.4",
+  "distance": 3,
+  "node": "ga9e75757076cdd1b35fb703f8ef59937d9689ba0",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-30"
+}

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/pfx/emails/email_backend/q_mailjet_email_backend.py

@@ -7,7 +7,7 @@ from django.core.mail import EmailMultiAlternatives
 from django.core.mail.backends.base import BaseEmailBackend
 
 from pfx.emails.models import get_email_model
-from pfx.emails.shortcuts import default_mail_from, default_reply_to
+from pfx.emails.shortcuts import default_mail_from_json, default_reply_to
 
 
 def getaddresses(fieldvalues):
@@ -28,7 +28,7 @@ class QMailjetEmailBackend(BaseEmailBackend):
 
     def create_mail(self, message):
         if not message.from_email:
-            mail_from = default_mail_from()
+            mail_from = default_mail_from_json()
         else:
             mail_from = self.mail_dict(*getaddresses(
                 [message.from_email])[0])

django_pfx-1.7.5.dev3/pfx/emails/migrations/0004_alter_email_mail_from.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.30 on 2026-07-30 01:07
+# flake8: noqa
+
+from django.db import migrations, models
+
+import pfx.emails.shortcuts
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('emails', '0003_alter_email_options'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='email',
+            name='mail_from',
+            field=models.JSONField(default=pfx.emails.shortcuts.default_mail_from_json, verbose_name='Mail From'),
+        ),
+    ]

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/pfx/emails/models/email.py

@@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from pfx.emails.exceptions import HasRunningTaskException
 from pfx.emails.mailjet import Mailjet, Message, MessageResult
 from pfx.emails.shortcuts import (
-    default_mail_from,
+    default_mail_from_json,
     default_reply_to,
     format_json_mail_list,
 )
@@ -70,7 +70,8 @@ class AbstractEmail(models.Model):
 
     send_date = models.DateTimeField(
         _('Send date'), blank=True, null=True, auto_now_add=True)
-    mail_from = models.JSONField(_("Mail From"), default=default_mail_from)
+    mail_from = models.JSONField(
+        _("Mail From"), default=default_mail_from_json)
     mail_to = models.JSONField(_("Mail To"), default=list)
     mail_cc = models.JSONField(_("Mail Cc"), blank=True, default=list)
     mail_bcc = models.JSONField(_("Mail Bcc"), blank=True, default=list)

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/pfx/emails/shortcuts.py

@@ -6,6 +6,8 @@ from django.core.mail import EmailMultiAlternatives
 from django.template import loader
 from django.utils.module_loading import import_string
 
+from pfx.pfxcore.shortcuts import default_mail_from, default_mail_from_rfc
+
 logger = logging.getLogger(__name__)
 
 
@@ -24,9 +26,9 @@ def format_json_mail_list(json):
     return ', '.join([format_json_mail(a) for a in json])
 
 
-def default_mail_from():
-    name = getattr(settings, "PFX_EMAILS_DEFAULT_FROM_NAME", None)
-    res = {'Email': getattr(settings, "PFX_EMAILS_DEFAULT_FROM_EMAIL", None)}
+def default_mail_from_json():
+    name, email = default_mail_from()
+    res = {'Email': email}
     if name:
         res['Name'] = name
     return res
@@ -60,10 +62,11 @@ def send_email_message(
     def get_email(obj):
         if isinstance(obj, str):
             return obj
-        if hasattr(obj, 'full_email'):
+        if hasattr(obj, 'get_email_rfc') and callable(obj.get_email_rfc):
+            return obj.get_email_rfc()
+        if hasattr(obj, 'email_rfc'):
             return (
-                obj.full_email() if callable(obj.full_email)
-                else obj.full_email)
+                obj.email_rfc() if callable(obj.email_rfc) else obj.email_rfc)
         if hasattr(obj, 'email'):
             return obj.email() if callable(obj.email) else obj.email
         raise RuntimeError(f"Invalid recipient: {obj}")
@@ -88,7 +91,7 @@ def send_email_message(
     email = EmailMultiAlternatives(
         subject=subject,
         body=text_body,
-        from_email=from_email or format_json_mail(default_mail_from()),
+        from_email=from_email or default_mail_from_rfc(),
         to=to_email,
         reply_to=reply_to,
         headers=headers or {}

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/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-29 14:36+0200\n"
+"POT-Creation-Date: 2026-07-30 09:14+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -66,13 +66,13 @@ msgstr ""
 msgid "Your {site_name} verification code: {otp_code}"
 msgstr "Votre code pour {site_name} : {otp_code}"
 
-#: models/abstract_pfx_base_user.py:58
-msgid "user"
-msgstr "utilisateur"
+#: models/abstract_pfx_base_user.py:89 models/mfa_device.py:20
+msgid "User"
+msgstr "Utilisateur"
 
-#: models/abstract_pfx_base_user.py:59
-msgid "users"
-msgstr "utilisateurs"
+#: models/abstract_pfx_base_user.py:90
+msgid "Users"
+msgstr "Utilisateurs"
 
 #: models/attachment_mixin.py:25
 msgid "File"
@@ -98,10 +98,6 @@ msgstr "Login banni"
 msgid "Login bans"
 msgstr "Login bannis"
 
-#: models/mfa_device.py:20
-msgid "User"
-msgstr "Utilisateur"
-
 #: models/mfa_device.py:22
 msgid "Backend"
 msgstr "Backend"
@@ -276,11 +272,11 @@ msgstr "Bienvenue sur %(site_name)s."
 msgid "Welcome on %(site_name)s"
 msgstr "Bienvenue sur %(site_name)s"
 
-#: views/authentication_views.py:84
+#: views/authentication_views.py:87
 msgid "Login failed"
 msgstr "La connexion a échoué"
 
-#: views/authentication_views.py:93
+#: views/authentication_views.py:96
 #, python-brace-format
 msgid ""
 "Your connection is temporarily disabled after several unsuccessful attempts, "
@@ -289,31 +285,31 @@ msgstr ""
 "Votre connexion est temporairement désactivée après plusieurs tentatives "
 "infructueuses, veuillez réessayer dans {seconds} secondes."
 
-#: views/authentication_views.py:185
+#: views/authentication_views.py:192
 msgid "Successful login"
 msgstr "Connexion réussie"
 
-#: views/authentication_views.py:259 views/authentication_views.py:427
+#: views/authentication_views.py:267 views/authentication_views.py:435
 msgid "password updated successfully"
 msgstr "le mot de passe a été mis à jour avec succès"
 
-#: views/authentication_views.py:264
+#: views/authentication_views.py:272
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: views/authentication_views.py:267 views/authentication_views.py:436
+#: views/authentication_views.py:275 views/authentication_views.py:444
 msgid "Empty password is not allowed"
 msgstr "Un mot de passe vide n’est pas autorisé"
 
-#: views/authentication_views.py:356
+#: views/authentication_views.py:364
 msgid "User and token are valid"
 msgstr "L’utilisateur et le token sont valides"
 
-#: views/authentication_views.py:358
+#: views/authentication_views.py:366
 msgid "User or token is invalid"
 msgstr "L’utilisateur ou le token est invalide"
 
-#: views/authentication_views.py:633
+#: views/authentication_views.py:637
 msgid ""
 "If the email address you entered is correct, you will receive an email from "
 "us with instructions to reset your password."
@@ -403,33 +399,3 @@ msgstr "{model} {obj} modifié."
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."
-
-#~ msgid "OTP secret token"
-#~ msgstr "Jeton secret OTP"
-
-#~ msgid "Temporary OTP secret token"
-#~ msgstr "Jeton secret OTP temporaire"
-
-#~ msgid "Temporary SMS phone number"
-#~ msgstr "Numéro de téléphone temporaire (SMS)"
-
-#~ msgid "Email MFA disabled"
-#~ msgstr "MFA par email désactivé"
-
-#~ msgid "SMS MFA is already enabled"
-#~ msgstr "MFA par SMS déjà activé."
-
-#~ msgid "Authenticator MFA is already enabled"
-#~ msgstr "MFA par application déjà activé"
-
-#~ msgid "Authenticator MFA disabled"
-#~ msgstr "MFA par application activée"
-
-#~ msgid "A new authentication code has been sent by email."
-#~ msgstr "Un nouveau code d’authentification a été envoyé par e-mail."
-
-#~ msgid "OTP enabled"
-#~ msgstr "OTP activé"
-
-#~ msgid "OTP disabled"
-#~ msgstr "OTP désactivé"

django_pfx-1.7.5.dev3/pfx/pfxcore/migrations/0006_alter_pfxuser_managers.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.30 on 2026-07-30 01:07
+# flake8: noqa
+
+from django.db import migrations
+
+import pfx.pfxcore.models.abstract_pfx_base_user
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pfxcore', '0005_mfadevice_mfadevice_mfa_device_unique_backend'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='pfxuser',
+            managers=[
+                ('objects', pfx.pfxcore.models.abstract_pfx_base_user.PFXUserManager()),
+            ],
+        ),
+    ]

django_pfx-1.7.5.dev3/pfx/pfxcore/migrations/0007_alter_pfxuser_options.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.30 on 2026-07-30 02:26
+# flake8: noqa
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pfxcore', '0006_alter_pfxuser_managers'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='pfxuser',
+            options={'verbose_name': 'User', 'verbose_name_plural': 'Users'},
+        ),
+    ]

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/pfx/pfxcore/models/abstract_pfx_base_user.py

@@ -1,13 +1,27 @@
 from django.contrib.auth.models import (
     AbstractBaseUser,
     AbstractUser,
+    BaseUserManager,
     PermissionsMixin,
+    UserManager,
 )
 from django.utils.translation import gettext_lazy as _
 
 from .pfx_models import PFXModelMixin
 
 
+class PFXBaseUserManager(BaseUserManager):
+    def get_by_natural_key(self, username):
+        crit = self.model.USERNAME_FIELD
+        if not self.model.is_username_case_sensitive():
+            crit = f'{crit}__iexact'
+        return self.get(**{crit: username})
+
+
+class PFXUserManager(PFXBaseUserManager, UserManager):
+    pass
+
+
 class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     """The base abstract user for PFX."""
 
@@ -17,6 +31,14 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     def __str__(self):
         return self.get_username()
 
+    def get_email_name(self):
+        return f"{self}"
+
+    def get_email_rfc(self):
+        name = self.get_email_name()
+        email = getattr(self, self.get_email_field_name())
+        return f'"{name}" <{email}>'
+
     def auth_json_repr(self, **kw):
         res = self.json_repr(
             username=self.get_username(),
@@ -30,9 +52,6 @@ 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()
@@ -50,13 +69,25 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     def on_user_set_password(self, first_time=False):
         pass
 
+    @classmethod
+    def is_username_case_sensitive(cls):
+        return getattr(cls, 'USERNAME_FIELD_CASE_SENSITIVE', True)
+
+    @classmethod
+    def is_email_case_sensitive(cls):
+        if cls.get_email_field_name() == cls.USERNAME_FIELD:
+            return cls.is_username_case_sensitive()
+        return getattr(cls, 'EMAIL_FIELD_CASE_SENSITIVE', True)
+
 
 class AbstractPFXUser(AbstractUser, AbstractPFXBaseUser):
     """The base abstract user for PFX with permissions mixin."""
 
+    objects = PFXUserManager()
+
     class Meta:
-        verbose_name = _("user")
-        verbose_name_plural = _("users")
+        verbose_name = _("User")
+        verbose_name_plural = _("Users")
         abstract = True
 
     def __str__(self):

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/pfx/pfxcore/models/pfx_models.py

@@ -125,4 +125,15 @@ class ErrorMessageMixin():
 
 
 class PFXModelMixin(JSONReprMixin, ErrorMessageMixin):
-    pass
+    def extra_clean_fields(self, errors, exclude=...):
+        return errors
+
+    def clean_fields(self, exclude=...):
+        errors = {}
+        try:
+            super().clean_fields(exclude)
+        except ValidationError as e:
+            e.update_error_dict(errors)
+        errors = self.extra_clean_fields(errors, exclude=exclude)
+        if errors:
+            raise ValidationError(errors)

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/pfx/pfxcore/shortcuts.py

@@ -174,7 +174,14 @@ def get_system_error_user_message(context=None):
     return str(settings.PFX_SYSTEM_ERROR_USER_MESSAGE)
 
 
-def default_from_email_rfc():
+def default_mail_from():
     return (
-        f'"{settings.PFX_EMAILS_DEFAULT_FROM_NAME}" '
-        f'<{settings.PFX_EMAILS_DEFAULT_FROM_EMAIL}>')
+        getattr(settings, "PFX_EMAILS_DEFAULT_FROM_NAME", None),
+        getattr(settings, "PFX_EMAILS_DEFAULT_FROM_EMAIL", "pfx@localhost"))
+
+
+def default_mail_from_rfc():
+    name, email = default_mail_from()
+    if name:
+        return f'"{name}" <{email}>'
+    return email

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/pfx/pfxcore/test.py

@@ -222,9 +222,9 @@ class TestAssertMixin:
             return reduce(
                 lambda c, k: c[_p(k)], key.split("."), self.get_json(src))
         except IndexError:
-            assert False, f"'{key}' index not found in:" + msg
+            assert False, f"'{key}' index not found in: {msg}"
         except KeyError:
-            assert False, f"'{key}' not found in:" + msg
+            assert False, f"'{key}' not found in: {msg}"
 
     # assert JSON content at key equals value
     def assertJE(self, src, key, value, msg=None):

{django_pfx-1.7.4.dev2 → django_pfx-1.7.5.dev3}/pfx/pfxcore/views/authentication_views.py

@@ -31,11 +31,7 @@ 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 (
-    default_from_email_rfc,
-    delete_token_cookie,
-    f,
-)
+from pfx.pfxcore.shortcuts import default_mail_from_rfc, delete_token_cookie, f
 
 from .rest_views import (
     BaseRestView,
@@ -66,6 +62,13 @@ def token_validity(preset):
     return timedelta(**presets[preset])
 
 
+def get_users_by_email(email):
+    email_crit = UserModel.get_email_field_name()
+    if not UserModel.is_email_case_sensitive():
+        email_crit = f'{email_crit}__iexact'
+    return UserModel._default_manager.filter(**{email_crit: email})
+
+
 @rest_view("/auth")
 class AuthenticationView(
         ModelMixin, BodyMixin, JWTTokenDecodeMixin, BaseRestView):
@@ -146,11 +149,15 @@ class AuthenticationView(
         """
         data = self.deserialize_body()
         username = data.get('username')
+        if (isinstance(username, str) and
+                not UserModel.is_username_case_sensitive()):
+            username = username.lower()
         ban_dt = LoginBan.objects.is_ban(username)
         if ban_dt:
             return self.login_ban_response(ban_dt)
-        user = authenticate(self.request, username=username,
-                            password=data.get('password'))
+        user = authenticate(
+            self.request, username=username,
+            password=data.get('password'))
         if isinstance(user, CacheableMixin):
             user.cache_delete()
         if user is None:
@@ -242,14 +249,15 @@ class AuthenticationView(
                                     format: password
         """
         data = self.deserialize_body()
-        user = authenticate(self.request,
-                            username=self.request.user.get_username(),
-                            password=data.get('old_password'))
+        user = authenticate(
+            self.request,
+            username=self.request.user.get_username(),
+            password=data.get('old_password'))
         errors = dict()
         try:
             if user is not None and data.get('new_password'):
-                password_validation.validate_password(data['new_password'],
-                                                      user)
+                password_validation.validate_password(
+                    data['new_password'], user)
                 user.set_password(data.get('new_password'))
                 user.save()
 
@@ -526,7 +534,7 @@ class SendMessageTokenMixin:
             subject = ''.join(subject.splitlines())
             body = loader.render_to_string(self.email_template_name, data)
             email_message = EmailMultiAlternatives(
-                subject, body, self.from_email or default_from_email_rfc(),
+                subject, body, self.from_email or default_mail_from_rfc(),
                 [user.get_email_rfc()])
             if self.html_email_template_name is not None:
                 html_email = loader.render_to_string(
@@ -623,11 +631,7 @@ class ForgottenPasswordView(SendMessageTokenMixin, BodyMixin, BaseRestView):
             return JsonResponse(
                 ValidationError(dict(email=e.error_list)), status=422)
         if email:
-            try:
-                user = UserModel._default_manager.get(email=email)
-            except UserModel.DoesNotExist:
-                user = None
-            if user is not None:
+            for user in get_users_by_email(email):
                 self.send_token_message(user)
         return JsonResponse({
             'message': _('If the email address you entered is correct, '