0002-display-service-logo-and-name-on-login-and-registrat.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 2/2] display service logo and name on login and registration
 pages

 src/authentic2/context_processors.py          |  9 +++-
 .../templates/authentic2/login.html           |  3 ++
 .../authentic2/service_info_fragment.html     | 25 ++++++++++
 .../registration/registration_form.html       |  2 +
 tests/idp_oidc/test_misc.py                   | 49 ++++++++++++++++++-
 5 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 src/authentic2/templates/authentic2/service_info_fragment.html

             variables['USER_SWITCHED'] = constants.SWITCH_USER_SESSION_KEY in request.session
             if 'service_pk' in request.session:
                 try:
                     variables['service'] = Service.objects.get(pk=request.session['service_pk'])
                     service = Service.objects.get(pk=request.session['service_pk'])
                     variables['service'] = service
                     if service.logo:
                         variables['service_logo_url'] = service.logo.url
                     if service.ou.logo:
                         variables['service_ou_logo_url'] = service.ou.logo.url
                     variables['service_text_color'] = service.text_color
                     variables['service_ou_text_color'] = service.ou.text_color
                 except Service.DoesNotExist:
                     pass
         return variables

     {% endblock %}
     {% block content %}
     {% include "authentic2/service_info_fragment.html" %}
       <div id="a2-login-forms">
         {% for id, login_block in blocks.items %}
             <span id="css-tab{{ forloop.counter }}"></span>

     {% load i18n %}
     {% if service %}
     {% firstof service_text_color service_ou_text_color as text_color %}
     {% firstof service.home_url service.ou.home_url as home_url %}
     {% if home_url %}
     <div id="service-message">
       {% block service-logo %}
       {% firstof service_logo_url service_ou_logo_url as logo_url %}
       {% if logo_url %}
       <picture>
         <img src="{{ logo_url }}" alt="{% firstof service.name service.ou.name %}" class="service--logo" />
       </picture>
       {% endif %}
       {% endblock %}
       <h2>
         <a href="{{ home_url }}"{% if text_color %} style="color: {{ text_color }}"{% endif %} class="service--link">
           {% block service-name-pre %}{% endblock %}
           {% block service-name %}{% firstof service.name service.ou.name %}{% endblock %}
           {% block service-name-post %}{% endblock %}
         </a>
       </h2>
     </div>
     {% endif %}
     {% endif %}

     <h2>{{ view.title }}</h2>
     {% include "authentic2/service_info_fragment.html" %}
     {% for id, block in frontends.items %}
       <div class="registration_frontend">
         <h2>{{ block.name }}</h2>

     from django.contrib.auth import get_user_model
     from django.core.exceptions import ValidationError
     from django.core.files import File
     from django.core.files.uploadedfile import SimpleUploadedFile
     from django.http import QueryDict
     from django.test.utils import override_settings
     from django.urls import reverse
-...
             'idtoken_duration': '3600',
             'post_logout_redirect_uris': 'https://example.com/',
             'home_url': 'https://example.com/',
             'text_color': '#ff00ff',
         },
+        {
             '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,
-...
         assert OIDCClient.objects.count() == 1
     def test_login_from_client_with_home_url(oidc_client, app):
         redirect_uri = oidc_client.redirect_uris.split()[0]
         params = {
             'client_id': oidc_client.client_id,
             'scope': 'openid profile email',
             'redirect_uri': redirect_uri,
             'state': 'xxx',
             'nonce': 'yyy',
             'login_hint': 'backoffice john@example.com',
             'response_type': 'code',
+        }
         authorize_url = make_url('oidc-authorize', params=params)
         response = app.get(authorize_url).follow()
         assert not response.pyquery.find('#service-message')
         ou = oidc_client.ou
         ou.home_url = 'https://ou.example.net'
         ou.text_color = '#8c00ec'
         ou.logo = SimpleUploadedFile(name='200x200.jpg', content=open('tests/200x200.jpg', 'rb').read())
         ou.save()
         response = app.get(authorize_url).follow()
         assert response.pyquery.find('#service-message')
         assert response.pyquery.find('a.service--link')
         link = response.pyquery.find('a.service--link')[0]
         assert link.attrib['href'] == 'https://ou.example.net'
         assert link.attrib['style'] == 'color: #8c00ec'
         assert response.pyquery.find('img.service--logo')[0].attrib['src'] == '/media/services/logos/200x200.jpg'
         oidc_client.home_url = 'https://service.example.net'
         oidc_client.text_color = '#ec008c'
         oidc_client.logo = SimpleUploadedFile(name='201x201.jpg', content=open('tests/201x201.jpg', 'rb').read())
         oidc_client.save()
         response = app.get(authorize_url).follow()
         link = response.pyquery.find('a.service--link')[0]
         assert link.attrib['href'] == 'https://service.example.net'
         assert link.attrib['style'] == 'color: #ec008c'
         assert response.pyquery.find('img.service--logo')[0].attrib['src'] == '/media/services/logos/201x201.jpg'
         # check registration page
         response = response.click('Register!')
         assert link.attrib['href'] == 'https://service.example.net'
         assert link.attrib['style'] == 'color: #ec008c'
         assert response.pyquery.find('img.service--logo')[0].attrib['src'] == '/media/services/logos/201x201.jpg'
     @pytest.mark.parametrize('oidc_client', OIDC_CLIENT_PARAMS, indirect=True)
     @pytest.mark.parametrize('do_not_ask_again', [(True,), (False,)])
     @pytest.mark.parametrize('login_first', [(True,), (False,)])
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0002-display-service-logo-and-name-on-login-and-registrat.patch