0001-custom_user-set-email-verification-sources-66053.patch

Paul Marillonnet, 08 juin 2022 15:30

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

Subject: [PATCH] custom_user: set email verification sources (#66053)

 src/authentic2/csv_import.py                  |  2 +-
 .../0032_user_email_verified_sources.py       | 24 ++++++++++++++
 src/authentic2/custom_user/models.py          | 30 ++++++++++++------
 src/authentic2/forms/registration.py          |  2 +-
 src/authentic2/views.py                       |  4 +--
 src/authentic2_auth_oidc/backends.py          |  2 +-
 tests/test_custom_user.py                     | 31 +++++++++++++++++++
 7 files changed, 81 insertions(+), 14 deletions(-)
 create mode 100644 src/authentic2/custom_user/migrations/0032_user_email_verified_sources.py

                     if getattr(user, cell.header.name) != cell.value:
                         setattr(user, cell.header.name, cell.value)
                         if cell.header.name == 'email' and cell.header.verified:
                             user.set_email_verified(True)
                             user.set_email_verified(True, source='csv')
                         cell.action = 'updated'
                         continue
                 cell.action = 'nothing'

     # Generated by Django 2.2.26 on 2022-06-08 12:33
     import django.contrib.postgres.fields
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('custom_user', '0031_profile_email'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='user',
                 name='email_verified_sources',
                 field=django.contrib.postgres.fields.ArrayField(
                     base_field=models.CharField(max_length=63),
                     default=list,
                     size=None,
                     verbose_name='email verification sources',
                 ),
             ),
+        ]

     import os
     import uuid
     from django.contrib.postgres.fields import ArrayField
     from django.core.exceptions import MultipleObjectsReturned, ValidationError
     from django.core.mail import send_mail
     from django.db import models, transaction
-...
         email_verified_date = models.DateTimeField(
             default=None, blank=True, null=True, verbose_name=_('email verified date')
+        )
         email_verified_sources = ArrayField(
             verbose_name=_('email verification sources'),
             base_field=models.CharField(max_length=63),
             default=list,
+        )
         is_staff = models.BooleanField(
             _('staff status'),
             default=False,
-...
         def get_absolute_url(self):
             return reverse('a2-manager-user-detail', kwargs={'pk': self.pk})
         def set_email_verified(self, value):
             if isinstance(value, datetime.datetime):
                 self.email_verified = True
                 self.email_verified_date = value
             elif bool(value):
                 self.email_verified = True
                 self.email_verified_date = timezone.now()
         def set_email_verified(self, value, source=None):
             if bool(value):
                 if isinstance(value, datetime.datetime):
                     self.email_verified = True
                     self.email_verified_date = value
                 else:
                     self.email_verified = True
                     self.email_verified_date = timezone.now()
                 if source and source not in self.email_verified_sources:
                     self.email_verified_sources.append(source)
             else:
                 self.email_verified = False
                 self.email_verified_date = None
                 if source and source in self.email_verified_sources:
                     self.email_verified_sources.remove(source)
                 if not source or not self.email_verified_sources:
                     self.email_verified = False
                     self.email_verified_date = None
     class DeletedUser(models.Model):

                 return BaseUserManager.normalize_email(email)
         def save(self, commit=True):
             self.instance.set_email_verified(True)
             self.instance.set_email_verified(True, source='registration')
             self.instance.is_active = True
             user = super().save(commit=commit)
             if commit and app_settings.A2_REGISTRATION_GROUPS:

                         raise ValidationError(_('This email is already used by another account.'))
                     old_email = user.email
                     user.email = email
                     user.set_email_verified(True)
                     user.set_email_verified(True, source='user')
                     user.save()
                     messages.info(
                         request, _('your request for changing your email for {0} is successful').format(email)
-...
         def form_valid(self, form):
             # Changing password by mail validate the email
             form.user.set_email_verified(True)
             form.user.set_email_verified(True, source='user')
             form.save()
             hooks.call_hooks('event', name='password-reset-confirm', user=form.user, token=self.token, form=form)
             logger.info('password reset for user %s with token %r', self.user, self.token.uuid)

                     logger.info('auth_oidc: set user %s attribute %s to value %s', user, attribute, value)
                     setattr(user, attribute, value)
                     if attribute == 'email':
                         user.set_email_verified(verified)
                         user.set_email_verified(verified, source='oidc')
                     save_user = True
             if user.ou != user_ou:

         ServiceProfileType.objects.create(service=service, profile_type=pft)
         assert list(service.profile_types.all()) == [pft]
         assert list(pft.services.all()) == [service]
     def test_user_email_verified(app, simple_user, superuser_or_admin):
         simple_user.set_email_verified(True, source='tests')
         simple_user.save()
         user = User.objects.get(id=simple_user.id)
         assert user.email_verified
         assert user.email_verified_sources == ['tests']
         simple_user.set_email_verified(True, source='other')
         simple_user.save()
         user = User.objects.get(id=simple_user.id)
         assert user.email_verified
         assert user.email_verified_sources == ['tests', 'other']
         simple_user.set_email_verified(False, source='tests')
         simple_user.save()
         user = User.objects.get(id=simple_user.id)
         assert user.email_verified
         assert user.email_verified_sources == ['other']
         simple_user.set_email_verified(True, source='other')
         simple_user.save()
         user = User.objects.get(id=simple_user.id)
         assert user.email_verified
         assert user.email_verified_sources == ['other']
         simple_user.set_email_verified(False, source='other')
         user = User.objects.get(id=simple_user.id)
         assert not user.email_verified
         assert user.email_verified_sources == []
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-custom_user-set-email-verification-sources-66053.patch