0002-journal-add-user-profile-management-events-58554.patch

Paul Marillonnet, 07 février 2022 17:31

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/3] journal: add user profile management events (#58554)

 src/authentic2/journal_event_types.py | 57 +++++++++++++++++++++++++++
 tests/test_manager_journal.py         | 44 ++++++++++++++++++++-
 2 files changed, 99 insertions(+), 2 deletions(-)

             new_email = event.get_data('email')
             old_email = event.get_data('old_email')
             return _('email address changed from "{0}" to "{1}"').format(old_email, new_email)
     class UserProfileAdd(EventTypeDefinition):
         name = 'user.profile.add'
         label = _('user profile creation')
         @classmethod
         def record(cls, user, profile_type, object_user, api=False):
             data = {
                 'profile_type': profile_type.name or profile_type.slug,
                 'object_user': object_user.get_full_name(),
+            }
             super().record(user=user, data=data, api=api)
         @classmethod
         def get_message(cls, event, context):
             profile_type = event.get_data('profile_type')
             object_user = event.get_data('object_user')
             return _(f'profile of type "{profile_type}" created for user "{object_user}"')
     class UserProfileUpdate(EventTypeDefinition):
         name = 'user.profile.update'
         label = _('user profile update')
         @classmethod
         def record(cls, user, profile_type, object_user, api=False):
             data = {
                 'profile_type': profile_type.name or profile_type.slug,
                 'object_user': object_user.get_full_name(),
+            }
             super().record(user=user, data=data, api=api)
         @classmethod
         def get_message(cls, event, context):
             profile_type = event.get_data('profile_type')
             object_user = event.get_data('object_user')
             return _(f'profile of type "{profile_type}" updated for user "{object_user}"')
     class UserProfileDelete(EventTypeDefinition):
         name = 'user.profile.delete'
         label = _('user profile deletion')
         @classmethod
         def record(cls, user, profile_type, object_user, api=False):
             data = {
                 'profile_type': profile_type.name or profile_type.slug,
                 'object_user': object_user.get_full_name(),
+            }
             super().record(user=user, data=data, api=api)
         @classmethod
         def get_message(cls, event, context):
             profile_type = event.get_data('profile_type')
             object_user = event.get_data('object_user')
             return _(f'profile of type "{profile_type}" deleted for user "{object_user}"')

     from authentic2.a2_rbac.models import Role
     from authentic2.a2_rbac.utils import get_default_ou
     from authentic2.apps.journal.models import Event, _registry
     from authentic2.custom_user.models import User
     from authentic2.custom_user.models import ProfileType, User
     from authentic2.journal import journal
     from authentic2.models import Service
-...
         user = User.objects.create(
             username="user", email="user@example.com", ou=ou, uuid="1" * 32, first_name='Johnny', last_name='doe'
+        )
         profile_type = ProfileType.objects.create(name='One Type', slug='one-type')
         agent = User.objects.create(username="agent", email="agent@example.com", ou=ou, uuid="2" * 32)
         role_user = Role.objects.create(name="role1", ou=ou)
         role_agent = Role.objects.create(name="role2", ou=ou)
-...
         make("user.service.sso.refusal", user=user, session=session1, service=service)
         make("user.service.sso.denial", user=user, session=session1, service=service)
         make(
             'user.profile.add',
             user=agent,
             profile_type=profile_type,
             object_user=user,
+        )
         make(
             'user.profile.update',
             user=agent,
             profile_type=profile_type,
             object_user=user,
+        )
         make(
             'user.profile.delete',
             user=agent,
             profile_type=profile_type,
             object_user=user,
+        )
         # verify we created at least one event for each type
         assert set(Event.objects.values_list("type__name", flat=True)) == set(_registry)
-...
                 'type': 'user.service.sso.denial',
                 'user': 'Johnny doe',
             },
+            {
                 'timestamp': 'Jan. 2, 2020, 10 p.m.',
                 'type': 'user.profile.add',
                 'user': 'agent',
                 'message': 'profile of type "One Type" created for user "Johnny doe"',
             },
+            {
                 'timestamp': 'Jan. 2, 2020, 11 p.m.',
                 'type': 'user.profile.update',
                 'user': 'agent',
                 'message': 'profile of type "One Type" updated for user "Johnny doe"',
             },
+            {
                 'timestamp': 'Jan. 3, 2020, midnight',
                 'type': 'user.profile.delete',
                 'user': 'agent',
                 'message': 'profile of type "One Type" deleted for user "Johnny doe"',
             },
+        ]
         agent_page = response.click('agent', index=1)
-...
         table_content = [text_content(p) for p in response.pyquery('tbody td.journal-list--message-column')]
         assert table_content == [
             'profile of type "One Type" deleted for user "Johnny doe"',
             'profile of type "One Type" updated for user "Johnny doe"',
             'profile of type "One Type" created for user "Johnny doe"',
             'automatic activation of user "Johnny doe" because the associated LDAP account reappeared',
             'automatic deactivation of user "Johnny doe" because the associated LDAP source has been deleted',
             'automatic deactivation of user "Johnny doe" because the associated LDAP account does not exist'
-...
             'password reset request with email "user@example.com"',
             'user deletion',
             'profile edit (first name)',
             'password change',
+        ]
         response.form['event_type'].select(text='Role management')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0002-journal-add-user-profile-management-events-58554.patch