0001-misc-add-logo-and-text-color-for-service-and-OU.patch

Serghei Mihai (congés, retour 15/05), 31 mars 2022 14:40

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

Subject: [PATCH 1/2] misc: add logo and text color for service and OU

 .../migrations/0027_auto_20220329_1259.py     | 23 +++++++++++++++++++
 src/authentic2/a2_rbac/models.py              |  2 ++
 src/authentic2/manager/forms.py               |  3 +++
 .../migrations/0037_auto_20220329_1512.py     | 23 +++++++++++++++++++
 src/authentic2/models.py                      |  2 ++
 tests/idp_oidc/test_misc.py                   | 10 +++++---
 6 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 src/authentic2/a2_rbac/migrations/0027_auto_20220329_1259.py
 create mode 100644 src/authentic2/migrations/0037_auto_20220329_1512.py

     # Generated by Django 2.2.24 on 2022-03-10 10:59
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('a2_rbac', '0026_add_roleparenting_soft_delete'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='organizationalunit',
                 name='logo',
                 field=models.ImageField(blank=True, upload_to='services/logos', verbose_name='Logo'),
             ),
             migrations.AddField(
                 model_name='organizationalunit',
                 name='text_color',
                 field=models.CharField(blank=True, max_length=7, null=True, verbose_name='Colour'),
             ),
+        ]

             default=760,  # two years + 1 month
+        )
         home_url = models.URLField(verbose_name=_('Home URL'), max_length=256, null=True, blank=True)
         logo = models.ImageField(verbose_name=_('Logo'), blank=True, upload_to='services/logos')
         text_color = models.CharField(verbose_name=_('Colour'), null=True, blank=True, max_length=7)
         objects = managers.OrganizationalUnitManager()

         def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
             self.fields['name'].label = _('label').title()
             self.fields['text_color'].widget = forms.TextInput(attrs={'type': 'color'})
         class Meta:
             model = OrganizationalUnit
-...
                 'clean_unused_accounts_alert',
                 'clean_unused_accounts_deletion',
                 'home_url',
                 'logo',
                 'text_color',
+            )

     # Generated by Django 2.2.24 on 2022-03-29 13:12
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('authentic2', '0036_service_profile_types'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='service',
                 name='logo',
                 field=models.ImageField(blank=True, upload_to='services/logos', verbose_name='Logo'),
             ),
             migrations.AddField(
                 model_name='service',
                 name='text_color',
                 field=models.CharField(blank=True, max_length=7, null=True, verbose_name='Colour'),
             ),
+        ]

             verbose_name=_('callback url when unauthorized'), max_length=256, null=True, blank=True
+        )
         home_url = models.URLField(verbose_name=_('Home URL'), max_length=256, null=True, blank=True)
         logo = models.ImageField(verbose_name=_('Logo'), blank=True, upload_to='services/logos')
         text_color = models.CharField(verbose_name=_('Colour'), null=True, blank=True, max_length=7)
         profile_types = models.ManyToManyField(
             to='custom_user.ProfileType',

             'authorization_mode': OIDCClient.AUTHORIZATION_MODE_NONE,
         },
+        {
             'idtoken_duration': datetime.timedelta(hours=1),
             'idtoken_duration': '3600',
         },
+        {
             'authorization_flow': OIDCClient.FLOW_IMPLICIT,
             'idtoken_duration': datetime.timedelta(hours=1),
             'idtoken_duration': '3600',
             'post_logout_redirect_uris': 'https://example.com/',
             'home_url': 'https://example.com/',
         },
+        {
             'frontchannel_logout_uri': 'https://example.com/southpark/logout/',
-...
+        {
             'frontchannel_logout_uri': 'https://example.com/southpark/logout/',
             'frontchannel_timeout': 3000,
             'text_color': '#ff00ff',
         },
+        {
             'identifier_policy': OIDCClient.POLICY_PAIRWISE_REVERSIBLE,
-...
         exp_delta = (parse_timestamp(claims['exp']) - now()).total_seconds()
         assert exp_delta > 0
         if oidc_client.idtoken_duration:
             assert abs(exp_delta - oidc_client.idtoken_duration.total_seconds()) < 2
             assert (
                 abs(exp_delta - datetime.timedelta(seconds=int(oidc_client.idtoken_duration)).total_seconds()) < 2
+            )
         else:
             assert abs(exp_delta - 30) < 2
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-misc-add-logo-and-text-color-for-service-and-OU.patch