django-pfx 1.4.dev122__tar.gz → 1.4.dev126__tar.gz

{django_pfx-1.4.dev122 → django_pfx-1.4.dev126}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev122
+Version: 1.4.dev126
 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.4.dev122 → django_pfx-1.4.dev126}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev122
+Version: 1.4.dev126
 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.4.dev122 → django_pfx-1.4.dev126}/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: 2025-04-16 11:28+0200\n"
+"POT-Creation-Date: 2025-05-06 11:42+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -59,11 +59,11 @@ msgstr ""
 "Format non valide, il peut s’agir d’un nombre en heures, « 1:05 », « :05 », "
 "« 1h 5m », « 1.5h » ou « 30m »."
 
-#: models/abstract_pfx_base_user.py:49
+#: models/abstract_pfx_base_user.py:52
 msgid "user"
 msgstr ""
 
-#: models/abstract_pfx_base_user.py:50
+#: models/abstract_pfx_base_user.py:53
 msgid "users"
 msgstr ""
 
@@ -103,7 +103,7 @@ msgstr "Compte HOTP"
 msgid "HOTP expiry"
 msgstr "Expiration HOTP"
 
-#: models/otp_user_mixin.py:29 views/authentication_views.py:492
+#: models/otp_user_mixin.py:29 views/authentication_views.py:503
 msgid "OTP enabled"
 msgstr "OTP activé"
 
@@ -209,7 +209,7 @@ msgstr "Bienvenue sur %(site_name)s."
 msgid "Welcome on %(site_name)s"
 msgstr "Bienvenue sur %(site_name)s"
 
-#: views/authentication_views.py:82
+#: views/authentication_views.py:83
 #, python-brace-format
 msgid ""
 "Your connection is temporarily disabled after several unsuccessful attempts, "
@@ -218,43 +218,43 @@ msgstr ""
 "Votre connexion est temporairement désactivée après plusieurs tentatives "
 "infructueuses, veuillez réessayer dans {seconds} secondes."
 
-#: views/authentication_views.py:174
+#: views/authentication_views.py:177
 msgid "Successful login"
 msgstr "Connexion réussie"
 
-#: views/authentication_views.py:244 views/authentication_views.py:409
+#: views/authentication_views.py:250 views/authentication_views.py:420
 msgid "password updated successfully"
 msgstr "le mot de passe a été mis à jour avec succès"
 
-#: views/authentication_views.py:249
+#: views/authentication_views.py:255
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: views/authentication_views.py:252 views/authentication_views.py:418
+#: views/authentication_views.py:258 views/authentication_views.py:429
 msgid "Empty password is not allowed"
 msgstr "Un mot de passe vide n’est pas autorisé"
 
-#: views/authentication_views.py:343
+#: views/authentication_views.py:349
 msgid "User and token are valid"
 msgstr "L'utilisateur et le token sont valides"
 
-#: views/authentication_views.py:345
+#: views/authentication_views.py:351
 msgid "User or token is invalid"
 msgstr "L'utilisateur ou le token est invalide"
 
-#: views/authentication_views.py:452
+#: views/authentication_views.py:463
 msgid "OTP is already enabled"
 msgstr "OTP est déjà activé"
 
-#: views/authentication_views.py:493 views/authentication_views.py:529
+#: views/authentication_views.py:504 views/authentication_views.py:540
 msgid "Invalid code"
 msgstr "Code invalide"
 
-#: views/authentication_views.py:528
+#: views/authentication_views.py:539
 msgid "OTP disabled"
 msgstr "OTP désactivé"
 
-#: views/authentication_views.py:789
+#: views/authentication_views.py:800
 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:863
+#: views/authentication_views.py:874
 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.4.dev122 → django_pfx-1.4.dev126}/pfx/pfxcore/models/abstract_pfx_base_user.py

@@ -41,6 +41,9 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
         """
         return self.password
 
+    def on_user_set_password(self, first_time=False):
+        pass
+
 
 class AbstractPFXUser(AbstractUser, AbstractPFXBaseUser):
     """The base abstract user for PFX with permissions mixin."""
@@ -56,5 +59,6 @@ class AbstractPFXUser(AbstractUser, AbstractPFXBaseUser):
             last_name=self.last_name,
             is_staff=self.is_staff,
             date_joined=self.date_joined,
+            last_login=self.last_login,
             **kw)
         return res

{django_pfx-1.4.dev122 → django_pfx-1.4.dev126}/pfx/pfxcore/views/authentication_views.py

@@ -12,6 +12,7 @@ from django.core.mail import EmailMultiAlternatives
 from django.core.validators import validate_email
 from django.db import transaction
 from django.template import loader
+from django.utils import timezone as tz
 from django.utils.decorators import method_decorator
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
@@ -154,6 +155,8 @@ class AuthenticationView(
 
     def _login_success(
             self, user, mode, remember_me=False, message=None):
+        user.last_login = tz.now()
+        user.save(update_fields=['last_login'])
         token = self._prepare_token(user, mode, remember_me)
         if mode == 'cookie':
             if remember_me:
@@ -240,6 +243,9 @@ class AuthenticationView(
                                                       user)
                 user.set_password(data.get('new_password'))
                 user.save()
+
+                user.on_user_set_password(first_time=False)
+
                 return JsonResponse({
                     'message': _('password updated successfully')
                 })
@@ -399,9 +405,14 @@ class AuthenticationView(
                     self.token_generator.check_token(user, data['token'])):
                 password_validation.validate_password(data['password'], user)
                 user.set_password(data['password'])
-                user.is_active = True
                 user.save()
                 user.refresh_from_db()
+
+                if not user.last_login:
+                    user.on_user_set_password(first_time=True)
+                else:
+                    user.on_user_set_password(first_time=False)
+
                 if 'autologin' in data and data['autologin'] in (
                         'jwt', 'cookie'):
                     return self._login_success(user, data['autologin'])

{django_pfx-1.4.dev122 → django_pfx-1.4.dev126}/pfx/pfxcore/views/rest_views.py

@@ -838,7 +838,7 @@ class ListRestViewMixin(ModelResponseMixin):
             limit=limit,
             offset=offset)
 
-    def _get_list_extra_meta(self):
+    def _get_list_extra_meta(self, res):
         return {}
 
     def _get_list(self, *args, **kwargs):
@@ -854,14 +854,14 @@ class ListRestViewMixin(ModelResponseMixin):
             qs, meta['subset'] = self.offset_result(qs)
         elif settings.PFX_MAX_LIST_RESULT_SIZE:
             qs = qs[:settings.PFX_MAX_LIST_RESULT_SIZE]
-        meta.update(self._get_list_extra_meta())
-        if meta:
-            res['meta'] = meta
         if get_bool(self.request.GET, 'items', 'count' not in meta):
             if self.request.GET.get('mode', 'list') == 'select':
                 res['items'] = list(self.get_short_list_result(qs))
             else:
                 res['items'] = list(self.get_list_result(qs))
+        meta.update(self._get_list_extra_meta(res))
+        if meta:
+            res['meta'] = meta
         return JsonResponse(res)
 
     @rest_api(

{django_pfx-1.4.dev122 → django_pfx-1.4.dev126}/tests/tests/test_auth_api.py

@@ -2,6 +2,7 @@ import logging
 import re
 from datetime import datetime, timedelta
 from http.cookies import SimpleCookie
+from unittest.mock import patch
 from urllib.parse import parse_qs, urlparse
 
 from django.conf import settings
@@ -54,7 +55,6 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
                 '/api/auth/login', {
                     'username': 'jrr.tolkien',
                     'password': 'RIGHT PASSWORD'})
-
             self.assertRC(response, 200)
             token = self.get_val(response, 'token')
             headers = jwt.get_unverified_header(token)
@@ -66,6 +66,9 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
                 datetime.utcnow() + timedelta(minutes=25) <
                 datetime.utcfromtimestamp(decoded['exp'])
                 < datetime.utcnow() + timedelta(minutes=35))
+            self.assertEqual(
+                self.get_val(response, 'user.last_login')[0:17],
+                "2023-05-01T08:00:")
 
     @override_settings(PFX_TOKEN_LONG_VALIDITY={'minutes': 60})
     def test_valid_login_remember_me(self):
@@ -286,7 +289,8 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         sameSite = re.findall(regex, str(cookie))[0]
         self.assertEqual(sameSite, 'Lax')
 
-    def test_valid_change_password(self):
+    @patch.object(User, 'on_user_set_password')
+    def test_valid_change_password(self, mock_on_usr_set_pwd):
         self.client.login(
             username='jrr.tolkien',
             password='RIGHT PASSWORD')
@@ -295,7 +299,9 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
                 'old_password': 'RIGHT PASSWORD',
                 'new_password': 'NEW RIGHT PASSWORD'})
         self.assertRC(response, 200)
+        mock_on_usr_set_pwd.assert_called_once_with(first_time=False)
 
+        mock_on_usr_set_pwd.reset_mock()
         self.cookie_client.login(
             username='jrr.tolkien',
             password='NEW RIGHT PASSWORD')
@@ -304,6 +310,7 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
                 'old_password': 'NEW RIGHT PASSWORD',
                 'new_password': 'RIGHT PASSWORD'})
         self.assertRC(response, 200)
+        mock_on_usr_set_pwd.assert_called_once_with(first_time=False)
 
     @override_settings(AUTH_PASSWORD_VALIDATORS=[{
         'NAME':
@@ -717,7 +724,8 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         self.assertRC(response, 200)
         self.assertJE(response, '__all__.@0', "User and token are valid")
 
-    def test_set_password(self):
+    @patch.object(User, 'on_user_set_password')
+    def test_set_password(self, mock_on_usr_set_pwd):
         # Try with a wrong token and uid
         response = self.client.post(
             '/api/auth/set-password', {
@@ -738,6 +746,26 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
             })
         self.assertRC(response, 200)
         self.assertJE(response, 'message', "password updated successfully")
+        mock_on_usr_set_pwd.assert_called_once_with(first_time=True)
+
+    @patch.object(User, 'on_user_set_password')
+    def test_set_password_active_user(self, mock_on_usr_set_pwd):
+        # Set the last_login datetime, so that the user is an active user.
+        self.user1.last_login = datetime.now()
+        self.user1.save()
+
+        # Then try with a valid token and uid
+        token = default_token_generator.make_token(self.user1)
+        uid = urlsafe_base64_encode(force_bytes(self.user1.pk))
+        response = self.client.post(
+            '/api/auth/set-password', {
+                'token': token,
+                'uidb64': uid,
+                'password': 'NEW PASSWORD',
+            })
+        self.assertRC(response, 200)
+        self.assertJE(response, 'message', "password updated successfully")
+        mock_on_usr_set_pwd.assert_called_once_with(first_time=False)
 
     @override_settings(AUTH_PASSWORD_VALIDATORS=[{
         'NAME':

{django_pfx-1.4.dev122 → django_pfx-1.4.dev126}/tests/views.py

@@ -129,7 +129,7 @@ class AuthorRestView(AuthorRestViewMixin, SlugDetailRestViewMixin, RestView):
 class AuthorExtraMetaRestView(AuthorRestViewMixin, RestView):
     default_public = True
 
-    def _get_list_extra_meta(self):
+    def _get_list_extra_meta(self, res):
         return dict(test="Hello world")