redirect login-signin link to members:login instead of openid_connect…

…:authorize
gip-inclusion · Nov 7, 2024 · a581fcb · a581fcb
1 parent 14393f8
commit a581fcb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/lacommunaute/pages/tests/__snapshots__/test_homepage.ambr b/lacommunaute/pages/tests/__snapshots__/test_homepage.ambr
@@ -166,8 +166,8 @@
                               </li>
 
                                   <li>
-                                      <a class="btn" href="/pro_connect/authorize" rel="nofollow">Se connecter | S'inscrire</a>
-                                  </li>
+  <a class="btn btn-outline-primary btn-ico btn-block" href="/members/login/?next=/" rel="nofollow">Login  | Sign in</a>
+  </li>
 
                           </ul>
                       </nav>

diff --git a/lacommunaute/surveys/tests/test_views.py b/lacommunaute/surveys/tests/test_views.py
@@ -23,7 +23,7 @@
 location_field_list = ["location", "city_code"]
 
 form_html = '<form method="post">'
-login_with_next_url = reverse("openid_connect:authorize") + "?next=" + reverse("surveys:dsp_create")
+login_with_next_url = reverse("members:login") + "?next=" + reverse("surveys:dsp_create")
 
 
 class TestDSPCreateView:

diff --git a/lacommunaute/templates/partials/header.html b/lacommunaute/templates/partials/header.html
@@ -110,9 +110,7 @@
                                     </div>
                                 </li>
                             {% else %}
-                                <li>
-                                    <a href="{% url 'openid_connect:authorize' %}" rel="nofollow" class="btn">Se connecter | S'inscrire</a>
-                                </li>
+                                <li>{% include "registration/includes/login_signin_link.html" %}</li>
                             {% endif %}
                         </ul>
                     </nav>

diff --git a/lacommunaute/templates/registration/includes/login_signin_link.html b/lacommunaute/templates/registration/includes/login_signin_link.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+<a href="{% url 'members:login' %}?next={{ request.path }}" rel="nofollow" class="btn btn-outline-primary btn-ico btn-block">{% trans "Login  | Sign in" %}</a>
diff --git a/lacommunaute/templates/surveys/dsp_form.html b/lacommunaute/templates/surveys/dsp_form.html
@@ -66,9 +66,7 @@ <h1 class="s-title-01__title h1">Diagnostic Parcours IAE</h1>
                         <div class="c-box mb-5">
                             <div class="row">
                                 <div class="col-lg col-12 mb-3">Je me connecte pour accéder à l'aide au diagnostic pour le parcours IAE</div>
-                                <div class="col-lg-auto col-12">
-                                    <a href="{% url 'openid_connect:authorize' %}?next={% url 'surveys:dsp_create' %}" rel="nofollow" class="btn btn-outline-primary btn-ico btn-block">Me connecter</a>
-                                </div>
+                                <div class="col-lg-auto col-12">{% include "registration/includes/login_signin_link.html" %}</div>
                             </div>
                         </div>
                     </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,8 +166,8 @@ @@
                                   </li>
                                       <li>
-                                          <a class="btn" href="/pro_connect/authorize" rel="nofollow">Se connecter | S'inscrire</a>
-                                      </li>
+      <a class="btn btn-outline-primary btn-ico btn-block" href="/members/login/?next=/" rel="nofollow">Login  | Sign in</a>
+      </li>
                               </ul>
                           </nav>
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% load i18n %}
		<a href="{% url 'members:login' %}?next={{ request.path }}" rel="nofollow" class="btn btn-outline-primary btn-ico btn-block">{% trans "Login \| Sign in" %}</a>