From 6f7861073c1694714990b28d6db23b37d4de2e26 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Fri, 28 Jan 2022 10:30:39 +0100
Subject: [PATCH] misc: use contextual variables for all user-info links
 (#61191)

It uses the new variables from the new hobo's user_urls context
processor, introduced in #61192.
---
 templates/includes/user-info.html                      | 10 +++++-----
 templates/portal-agent/combo/page_template.html        |  2 +-
 templates/variants/arles-2020/authentic2/accounts.html |  2 +-
 .../variants/bouches-du-rhone/authentic2/accounts.html |  2 +-
 .../variants/dordogne-cd24/authentic2/accounts.html    |  2 +-
 .../variants/grand-chambery/authentic2/accounts.html   |  2 +-
 .../variants/grandlyon-glc/includes/user-info.html     |  2 +-
 .../grandlyon-glc/registration/registration_form.html  |  2 +-
 .../haute-garonne-cd31/authentic2/accounts.html        |  2 +-
 .../hautes-pyrenees-cd65/authentic2/accounts.html      |  2 +-
 templates/variants/lille/authentic2/accounts.html      |  2 +-
 .../metz-metropole-2019/includes/user-info.html        |  8 ++++----
 .../variants/nancy-en-direct/authentic2/accounts.html  |  2 +-
 .../pre-saint-gervais/combo/page_template.html         |  4 ++--
 templates/variants/quimper/authentic2/accounts.html    |  2 +-
 .../roannais-icitoyen/authentic2/accounts.html         |  2 +-
 .../variants/sables-d-olonne-2022/includes/nav.html    |  7 +++----
 .../variants/strasbourg-2018/combo/page_template.html  |  6 +++---
 templates/variants/toodego/includes/nav.html           |  2 +-
 templates/variants/toodego/wcs/base.html               |  4 ++--
 .../variants/toulouse-metropole/includes/nav.html      | 10 +++++-----
 .../variants/villeneuve-dascq/includes/user-info.html  |  9 ++++-----
 templates/variants/villeurbanne-2018/user_info.html    |  8 ++++----
 23 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/templates/includes/user-info.html b/templates/includes/user-info.html
index 026bbfd0..83185bd4 100644
--- a/templates/includes/user-info.html
+++ b/templates/includes/user-info.html
@@ -6,13 +6,12 @@
 {% skeleton_extra_placeholder user-info %}
   {% if user.is_authenticated %}
   <span class="logged-in">
-    {% if idp_account_url %}<a class="account-link" href="{{idp_account_url}}">{% endif %}
-    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if idp_account_url %}</a>{% endif %}
-    <a accesskey="o" class="logout" href="{% url 'auth_logout' %}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
+      {% if account_url %}<a class="account-link" href="{{account_url}}">{% endif %}
+    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if account_url %}</a>{% endif %}
+    <a accesskey="o" class="logout" href="{{ logout_url }}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
   </span>
   {% else %}
-   {% firstof registration_url idp_registration_url as registration_url %}
-    <span class="login"><a accesskey="2" class="login-link" href="{% url 'auth_login' %}"
+      <span class="login"><a accesskey="2" class="login-link" href="{{ login_url }}"
       >{% block user-info-login-label %}Connexion{% endblock %}
       {% if registration_url and include_registration_link != False %}
       </a>
@@ -20,6 +19,7 @@
       <a class="registration" href="{{registration_url}}"
       >{% block user-info-registration-label %}Inscription{% endblock %}{% endif %}</a></span>
   {% endif %}
+  {% endwith %}
 {% end_skeleton_extra_placeholder %}
 {% endblock %}
 </div>
diff --git a/templates/portal-agent/combo/page_template.html b/templates/portal-agent/combo/page_template.html
index 0394c586..05c6fb95 100644
--- a/templates/portal-agent/combo/page_template.html
+++ b/templates/portal-agent/combo/page_template.html
@@ -20,7 +20,7 @@
 {% block page-title %}{% firstof site_title "Publik" %} - {{ page.title }}{% endblock %}
 {% block site-title %}{% firstof site_title "Publik" %}{% endblock %}
 {% block footer %}Combo — Copyright © Entr’ouvert{% endblock %}
-{% block logout-url %}{% url 'auth_logout' %}{% endblock %}
+{% block logout-url %}{{ logout_url }}{% endblock %}
 {% block bodyargs %}
 data-api-root="{{ site_base }}/api/"
 {% if check_badges %}data-check-badges="true"{% endif %}
diff --git a/templates/variants/arles-2020/authentic2/accounts.html b/templates/variants/arles-2020/authentic2/accounts.html
index 31b30def..40d52de3 100644
--- a/templates/variants/arles-2020/authentic2/accounts.html
+++ b/templates/variants/arles-2020/authentic2/accounts.html
@@ -1,5 +1,5 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/bouches-du-rhone/authentic2/accounts.html b/templates/variants/bouches-du-rhone/authentic2/accounts.html
index 889c25b5..234bcb62 100644
--- a/templates/variants/bouches-du-rhone/authentic2/accounts.html
+++ b/templates/variants/bouches-du-rhone/authentic2/accounts.html
@@ -1,5 +1,5 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/dordogne-cd24/authentic2/accounts.html b/templates/variants/dordogne-cd24/authentic2/accounts.html
index 32d1147f..60ed0eef 100644
--- a/templates/variants/dordogne-cd24/authentic2/accounts.html
+++ b/templates/variants/dordogne-cd24/authentic2/accounts.html
@@ -1,6 +1,6 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>
 {% endblock %}
 
diff --git a/templates/variants/grand-chambery/authentic2/accounts.html b/templates/variants/grand-chambery/authentic2/accounts.html
index 31b30def..40d52de3 100644
--- a/templates/variants/grand-chambery/authentic2/accounts.html
+++ b/templates/variants/grand-chambery/authentic2/accounts.html
@@ -1,5 +1,5 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/grandlyon-glc/includes/user-info.html b/templates/variants/grandlyon-glc/includes/user-info.html
index c7c85a64..dbbd4edf 100644
--- a/templates/variants/grandlyon-glc/includes/user-info.html
+++ b/templates/variants/grandlyon-glc/includes/user-info.html
@@ -5,7 +5,7 @@
   {% if user.is_authenticated %}
   <span class="logged-in">
     <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>
-    <a class="logout" href="{% url 'auth_logout' %}">D&eacute;connexion</a>
+    <a class="logout" href="{{ logout_url }}">D&eacute;connexion</a>
   </span>
   {% endif %}
 {% end_skeleton_extra_placeholder %}
diff --git a/templates/variants/grandlyon-glc/registration/registration_form.html b/templates/variants/grandlyon-glc/registration/registration_form.html
index 7179358e..91ad6ff7 100644
--- a/templates/variants/grandlyon-glc/registration/registration_form.html
+++ b/templates/variants/grandlyon-glc/registration/registration_form.html
@@ -20,7 +20,7 @@
 {% block registration-post %}
 <div id="login-footer">
   <h2>Vous avez déjà un compte</h2>
-  <p><a href="{% url 'auth_login' %}" class="button">Se connecter</a></p>
+  <p><a href="{{ login_url }}" class="button">Se connecter</a></p>
 </div>
 {% endblock %}
 
diff --git a/templates/variants/haute-garonne-cd31/authentic2/accounts.html b/templates/variants/haute-garonne-cd31/authentic2/accounts.html
index 889c25b5..234bcb62 100644
--- a/templates/variants/haute-garonne-cd31/authentic2/accounts.html
+++ b/templates/variants/haute-garonne-cd31/authentic2/accounts.html
@@ -1,5 +1,5 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/hautes-pyrenees-cd65/authentic2/accounts.html b/templates/variants/hautes-pyrenees-cd65/authentic2/accounts.html
index 31b30def..40d52de3 100644
--- a/templates/variants/hautes-pyrenees-cd65/authentic2/accounts.html
+++ b/templates/variants/hautes-pyrenees-cd65/authentic2/accounts.html
@@ -1,5 +1,5 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/lille/authentic2/accounts.html b/templates/variants/lille/authentic2/accounts.html
index 889c25b5..234bcb62 100644
--- a/templates/variants/lille/authentic2/accounts.html
+++ b/templates/variants/lille/authentic2/accounts.html
@@ -1,5 +1,5 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/metz-metropole-2019/includes/user-info.html b/templates/variants/metz-metropole-2019/includes/user-info.html
index 698af43c..12cd60aa 100644
--- a/templates/variants/metz-metropole-2019/includes/user-info.html
+++ b/templates/variants/metz-metropole-2019/includes/user-info.html
@@ -3,12 +3,12 @@
 {% block user-info %}
 {% skeleton_extra_placeholder user-info %}
   {% if user.is_authenticated %}
-  <a class="hello" href="{{idp_account_url}}"><span>Bonjour {{ user.first_name }}</span></a><span> -
-  </span><a accesskey="o" class="logout" href="{% url 'auth_logout' %}">Déconnexion</a>
+  <a class="hello" href="{{account_url}}"><span>Bonjour {{ user.first_name }}</span></a><span> -
+  </span><a accesskey="o" class="logout" href="{{ logout_url }}">Déconnexion</a>
   {% else %}
-  <a class="login" href="{% url 'auth_login' %}">Connexion</a>
+  <a class="login" href="{{ login_url }}">Connexion</a>
   <span class="sep"> - </span>
-  <a class="registration" href="{% firstof registration_url idp_registration_url %}">Inscription</a>
+  <a class="registration" href="{{ registration_url }}">Inscription</a>
   {% endif %}
   <a class="home" href="{{ portal_url }}">Accueil</a>
 {% end_skeleton_extra_placeholder %}
diff --git a/templates/variants/nancy-en-direct/authentic2/accounts.html b/templates/variants/nancy-en-direct/authentic2/accounts.html
index 889c25b5..234bcb62 100644
--- a/templates/variants/nancy-en-direct/authentic2/accounts.html
+++ b/templates/variants/nancy-en-direct/authentic2/accounts.html
@@ -1,5 +1,5 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/pre-saint-gervais/combo/page_template.html b/templates/variants/pre-saint-gervais/combo/page_template.html
index a10e0341..6d18b0bf 100644
--- a/templates/variants/pre-saint-gervais/combo/page_template.html
+++ b/templates/variants/pre-saint-gervais/combo/page_template.html
@@ -4,9 +4,9 @@
 {% block psg-mon-espace %}
 {% skeleton_extra_placeholder psg-user-info %}
   {% if user.is_authenticated %}
-  <a class="back-to-home" href="{% firstof espace_personnel_url portal_url %}">Accéder à mon espace</a><a class="logout" href="{% url 'auth_logout' %}">Me déconnecter</a>
+  <a class="back-to-home" href="{% firstof espace_personnel_url portal_url %}">Accéder à mon espace</a><a class="logout" href="{{ logout_url }}">Me déconnecter</a>
   {% else %}
-  <a class="login" href="{% url 'auth_login' %}">Connexion à mon espace</a>
+  <a class="login" href="{{ login_url }}">Connexion à mon espace</a>
   {% endif %}
 {% end_skeleton_extra_placeholder %}
 {% endblock %}
diff --git a/templates/variants/quimper/authentic2/accounts.html b/templates/variants/quimper/authentic2/accounts.html
index 889c25b5..234bcb62 100644
--- a/templates/variants/quimper/authentic2/accounts.html
+++ b/templates/variants/quimper/authentic2/accounts.html
@@ -1,5 +1,5 @@
 {% extends "authentic2/accounts.html" %}
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/roannais-icitoyen/authentic2/accounts.html b/templates/variants/roannais-icitoyen/authentic2/accounts.html
index bc472e9f..da7dff93 100644
--- a/templates/variants/roannais-icitoyen/authentic2/accounts.html
+++ b/templates/variants/roannais-icitoyen/authentic2/accounts.html
@@ -6,5 +6,5 @@
 
 
 {% block account-management-bottom-actions %}
-<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>
+<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>
 {% endblock %}
diff --git a/templates/variants/sables-d-olonne-2022/includes/nav.html b/templates/variants/sables-d-olonne-2022/includes/nav.html
index ec9fa80f..a82693fd 100644
--- a/templates/variants/sables-d-olonne-2022/includes/nav.html
+++ b/templates/variants/sables-d-olonne-2022/includes/nav.html
@@ -5,11 +5,10 @@
 {{ block.super }}
 {% skeleton_extra_placeholder user-info %}
 {% if user.is_authenticated %}
-<li><a class="account-link" href="{{idp_account_url}}">{{user.first_name}} {{user.last_name}}</a></li>
-<li><a accesskey="o" class="logout" href="{% url 'auth_logout' %}">Déconnexion</a></li>
+<li><a class="account-link" href="{{account_url}}">{{user.first_name}} {{user.last_name}}</a></li>
+<li><a accesskey="o" class="logout" href="{{ logout_url }}">Déconnexion</a></li>
 {% else %}
-{% firstof registration_url idp_registration_url as registration_url %}
-<li><a accesskey="2" class="login-link" href="{% url 'auth_login' %}">Se connecter</a></li>
+<li><a accesskey="2" class="login-link" href="{{ login_url }}">Se connecter</a></li>
 {% if registration_url and include_registration_link != False %}
 <li><a class="registration" href="{{registration_url}}">Créer un compte</a></li>
 {% endif %}
diff --git a/templates/variants/strasbourg-2018/combo/page_template.html b/templates/variants/strasbourg-2018/combo/page_template.html
index 4f284a45..6318671c 100644
--- a/templates/variants/strasbourg-2018/combo/page_template.html
+++ b/templates/variants/strasbourg-2018/combo/page_template.html
@@ -37,20 +37,20 @@ if ($('#user-files').length) {
 {% block account %}
 {% skeleton_extra_placeholder account %}
         {% if user.is_authenticated %}
-        <a href="{{ idp_account_url}}" class="nav-account nav-btn" title="Mon compte">
+        <a href="{{ account_url}}" class="nav-account nav-btn" title="Mon compte">
             <span class="flexbox">
                 <span class="picto"></span>
                 <span class="text">{{user.first_name}} {{user.last_name|slice:":1"}}.</span>
             </span>
         </a>
-        <button title="Se déconnecter" class="nav-btn nav-logout" onclick="window.location = '{% url 'auth_logout' %}'">
+        <button title="Se déconnecter" class="nav-btn nav-logout" onclick="window.location = '{{ logout_url }}'">
             <span class="flexbox">
                 <span class="picto"></span>
             </span>
         </button>
         {% endif %}
         {% if not user.is_authenticated %}
-        <a href="{% url 'auth_login' %}" class="nav-account nav-btn login-button" title="Mon compte">
+        <a href="{{ login_url }}" class="nav-account nav-btn login-button" title="Mon compte">
             <span class="flexbox">
                 <span class="picto"></span>
                 <span class="text">Connexion</span>
diff --git a/templates/variants/toodego/includes/nav.html b/templates/variants/toodego/includes/nav.html
index 63b418d6..787f377d 100644
--- a/templates/variants/toodego/includes/nav.html
+++ b/templates/variants/toodego/includes/nav.html
@@ -15,7 +15,7 @@
         {% skeleton_extra_placeholder "user-nav-link" %}{% if user.is_authenticated %}<a href="{{portal_url}}mon-compte/"><span>{{user.first_name}}</span></a>
         <ul>
                 <li><a href="{{portal_url}}mon-compte/">Mon compte</a></li>
-                <li><a href="{% url 'auth_logout' %}">Me déconnecter</a></li>
+                <li><a href="{{ logout_url }}">Me déconnecter</a></li>
         </ul>
         {% else %}<a href="/login"><span>Se connecter</span></a>{% endif %}{% end_skeleton_extra_placeholder %}{% endif %}</li>
    {% endif %}
diff --git a/templates/variants/toodego/wcs/base.html b/templates/variants/toodego/wcs/base.html
index b775b34d..916d1a24 100644
--- a/templates/variants/toodego/wcs/base.html
+++ b/templates/variants/toodego/wcs/base.html
@@ -17,8 +17,8 @@
 {% block user-info %}
   {% if session_user %}
   <span class="logged-in">
-    {% if idp_account_url %}<a href="{{idp_account_url}}">{% endif %}
-    <span class="connected-user">{{session_user_display_name}}</span>{% if idp_account_url %}</a>{% endif %}
+    {% if account_url %}<a href="{{account_url}}">{% endif %}
+    <span class="connected-user">{{session_user_display_name}}</span>{% if account_url %}</a>{% endif %}
     <a accesskey="o" class="logout" href="{{root_url}}logout">D&eacute;connexion</a>
   </span>
   {% else %}
diff --git a/templates/variants/toulouse-metropole/includes/nav.html b/templates/variants/toulouse-metropole/includes/nav.html
index f4728ad5..b8626503 100644
--- a/templates/variants/toulouse-metropole/includes/nav.html
+++ b/templates/variants/toulouse-metropole/includes/nav.html
@@ -6,13 +6,13 @@
 {% skeleton_extra_placeholder user-info %}
           {% if user.is_authenticated %}
           <span class="logged-in">
-            {% if idp_account_url %}<a href="{{idp_account_url}}">{% endif %}
-            <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>{% if idp_account_url %}</a>{% endif %}
-            <a accesskey="o" class="logout pk-button" href="{% url 'auth_logout' %}">D&eacute;connexion</a>
+            {% if account_url %}<a href="{{account_url}}">{% endif %}
+            <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>{% if account_url %}</a>{% endif %}
+            <a accesskey="o" class="logout pk-button" href="{{ logout_url }}">D&eacute;connexion</a>
           </span>
           {% else %}
-            <a class="login pk-button" accesskey="2" href="{% url 'auth_login' %}">Connexion</a>
-            <span class="registration">Pas de compte ? <a href="{% firstof registration_url idp_registration_url %}">S'inscrire</a></span>
+            <a class="login pk-button" accesskey="2" href="{{ login_url }}?next={{ request.get_full_path|urlencode}}">Connexion</a>
+            <span class="registration">Pas de compte ? <a href="{{ registration_url }}">S'inscrire</a></span>
           {% endif %}
 {% end_skeleton_extra_placeholder %}
 </div>
diff --git a/templates/variants/villeneuve-dascq/includes/user-info.html b/templates/variants/villeneuve-dascq/includes/user-info.html
index 85ae5c5f..27e629c9 100644
--- a/templates/variants/villeneuve-dascq/includes/user-info.html
+++ b/templates/variants/villeneuve-dascq/includes/user-info.html
@@ -8,13 +8,12 @@
   {% skeleton_extra_placeholder user-info %}
   {% if user.is_authenticated %}
   <span class="logged-in">
-    {% if idp_account_url %}<a class="account-link" href="{{idp_account_url}}">{% endif %}
-    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if idp_account_url %}</a>{% endif %}
-    <a accesskey="o" class="logout" href="{% url 'auth_logout' %}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
+    {% if account_url %}<a class="account-link" href="{{account_url}}">{% endif %}
+    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if account_url %}</a>{% endif %}
+    <a accesskey="o" class="logout" href="{{ logout_url }}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
   </span>
   {% else %}
-  {% firstof registration_url idp_registration_url as registration_url %}
-  <span class="login"><a accesskey="2" class="login-link" href="{% url 'auth_login' %}"
+  <span class="login"><a accesskey="2" class="login-link" href="{{ login_url }}"
     >{% block user-info-login-label %}Connexion{% endblock %}
     {% if registration_url and include_registration_link != False %}</a>{% endif %}
     <span class="sep">/</span>
diff --git a/templates/variants/villeurbanne-2018/user_info.html b/templates/variants/villeurbanne-2018/user_info.html
index 7dfcc4ff..8ea12d09 100644
--- a/templates/variants/villeurbanne-2018/user_info.html
+++ b/templates/variants/villeurbanne-2018/user_info.html
@@ -1,10 +1,10 @@
 {% if user.is_authenticated %}
-  {% if idp_account_url %}<a href="{{idp_account_url}}" role="button" class="btn-account">{% endif %}
-  Mon compte{% if idp_account_url %}</a>{% endif %}
-  <a accesskey="o" class="logout btn-logout" href="{% url 'auth_logout' %}" data-placement="bottom">
+  {% if account_url %}<a href="{{account_url}}" role="button" class="btn-account">{% endif %}
+  Mon compte{% if account_url %}</a>{% endif %}
+  <a accesskey="o" class="logout btn-logout" href="{{ logout_url }}" data-placement="bottom">
     <span class="fa fa-sign-out" aria-hidden="true"></span>
     <span class="text-logout">Se déconnecter</span>
   </a>
   {% else %}
-  <a accesskey="2" href="{% url 'auth_login' %}" role="button">Se connecter</a>
+  <a accesskey="2" href="{{ login_url }}" role="button">Se connecter</a>
 {% endif %}
-- 
2.34.1