0002-csv_import-allow-setting-user-password-and-sending-m.patch

Valentin Deniaud, 25 novembre 2019 14:57

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

Subject: [PATCH 2/2] csv_import: allow setting user password and sending mail
 (#35774)

 src/authentic2/csv_import.py | 39 ++++++++++++++++++++++++++++++--
 tests/test_csv_import.py     | 44 +++++++++++++++++++++++++++++++++++-
 2 files changed, 80 insertions(+), 3 deletions(-)

     from authentic2.a2_rbac.utils import get_default_ou
     from authentic2.custom_user.models import User
     from authentic2.forms.profile import modelform_factory, BaseUserForm
     from authentic2.models import Attribute, AttributeValue, UserExternalId
     from authentic2.models import Attribute, AttributeValue, UserExternalId, PasswordReset
     from authentic2.utils import (send_password_reset_mail, generate_password,
                                   send_templated_mail)
     Role = get_role_model()
-...
     SOURCE_COLUMNS = set([SOURCE_NAME, SOURCE_ID])
     ROLE_NAME = '_role_name'
     ROLE_SLUG = '_role_slug'
     SPECIAL_COLUMNS = SOURCE_COLUMNS | {ROLE_NAME, ROLE_SLUG}
     REGISTRATION = '@registration'
     REGISTRATION_RESET_EMAIL = 'send-set-password-link'
     REGISTRATION_PASSWORD_EMAIL = 'send-password'
     SPECIAL_COLUMNS = SOURCE_COLUMNS | {ROLE_NAME, ROLE_SLUG, REGISTRATION}
     class ImportUserForm(BaseUserForm):
-...
         locals()[ROLE_SLUG] = forms.CharField(
             label=_('Role slug'),
             required=False)
         choices = [
             (REGISTRATION_RESET_EMAIL, _('Email user so they can set a password')),
             (REGISTRATION_PASSWORD_EMAIL, _('Email user with a password they will have to change')),
+        ]
         locals()[REGISTRATION] = forms.ChoiceField(
             choices,
             label=_('Registration option'),
             required=False)
         def clean(self):
             super(BaseUserForm, self).clean()
-...
             if not user:
                 user = User(ou=self.ou)
                 user.set_password(generate_password())
             for cell in row.cells:
                 if not cell.header.field:
-...
                     continue
                 if cell.header.name in {ROLE_NAME, ROLE_SLUG}:
                     success &= self.add_role(cell, user, do_clear=True)
                 elif cell.header.name == REGISTRATION and row.action == 'create':
                     success &= self.registration_option(cell, user)
             setattr(self, row.action + 'd', getattr(self, row.action + 'd') + 1)
             return success
-...
                 user.roles.add(role)
             cell.action = 'updated'
             return True
         def registration_option(self, cell, user):
             if cell.value == REGISTRATION_RESET_EMAIL:
                 send_password_reset_mail(
                     user,
                     template_names=['authentic2/manager/user_create_registration_email',
                                     'authentic2/password_reset'],
                     next_url='/accounts/',
                     context={'user': user})
             elif cell.value == REGISTRATION_PASSWORD_EMAIL:
                 new_password = generate_password()
                 user.set_password(new_password)
                 user.save()
                 PasswordReset.objects.get_or_create(user=user)
                 send_templated_mail(
                     user,
                     'authentic2/manager/new-account-notification',
                     context={'new_password': new_password, 'user': user})
             return True

     import io
     from django.core import mail
     from django_rbac.utils import get_role_model
     from authentic2.custom_user.models import User
     from authentic2.models import Attribute
     from authentic2.models import Attribute, PasswordReset
     from authentic2.a2_rbac.utils import get_default_ou
     from authentic2.csv_import import CsvImporter, UserCsvImporter, CsvHeader, Error, LineError
-...
         assert thomas.last_name == 'Noël'
         assert thomas.attributes.last_name == 'Noël'
         assert thomas.attributes.phone == '1234'
         assert thomas.password
         fpeters = User.objects.get(email='fpeters@entrouvert.com')
         assert fpeters.ou == get_default_ou()
-...
         assert not importer.run()
         assert importer.has_errors
         assert importer.errors[0].code == 'invalid-role-column'
     def test_csv_registration_options(profile, user_csv_importer_factory):
         content = '''email key,first_name,last_name,@registration
     tnoel@entrouvert.com,Thomas,Noël,'''
         importer = user_csv_importer_factory(content + 'send-password')
         assert importer.run()
         thomas = User.objects.get(email='tnoel@entrouvert.com')
         assert len(mail.outbox) == 1
         assert PasswordReset.objects.get(user=thomas)
         del mail.outbox[0]
         password = thomas.password
         importer = user_csv_importer_factory(content + 'send-password')
         assert importer.run()
         thomas.refresh_from_db()
         assert thomas.password == password
         assert not mail.outbox
         thomas.delete()
         assert not mail.outbox
         importer = user_csv_importer_factory(content + 'send-set-password-link')
         assert importer.run()
         thomas = User.objects.get(email='tnoel@entrouvert.com')
         assert len(mail.outbox) == 1
         password = thomas.password
         del mail.outbox[0]
         importer = user_csv_importer_factory(content + 'send-set-password-link')
         assert importer.run()
         thomas.refresh_from_db()
         assert thomas.password == password
         assert not mail.outbox
         importer = user_csv_importer_factory(content + 'invalid-option')
         assert importer.run()
         assert importer.has_errors
         assert importer.rows[0].cells[-1].errors[0].code == 'data-error'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0002-csv_import-allow-setting-user-password-and-sending-m.patch