rename sign_in / sign_out to login/logout in urls/code

The UI now says Log in/Log out so the code and urls should be somewhat consistant with that.

Author: MatMoore

manage_breast_screening/auth/demo_views.py

@@ -18,7 +18,7 @@ def persona_login(request):
     else:
         return render(
             request,
-            "auth/persona_sign_in.jinja",
+            "auth/persona_login.jinja",
             context={
                 "users": users,
                 "page_title": "Personas",

…screening/auth/jinja2/auth/sign_in.jinja …t_screening/auth/jinja2/auth/login.jinjamanage_breast_screening/auth/jinja2/auth/sign_in.jinja renamed to manage_breast_screening/auth/jinja2/auth/login.jinja manage_breast_screening/auth/jinja2/auth/sign_in.jinja renamed to manage_breast_screening/auth/jinja2/auth/login.jinja

@@ -5,7 +5,7 @@
   <div class="nhsuk-grid-column-two-thirds">
     <h1 class="nhsuk-heading-l">Log in</h1>
 
-    <a class="nhsuk-button nhsuk-button--secondary" href="{{ url('auth:cis2_sign_in') }}">
+    <a class="nhsuk-button nhsuk-button--secondary" href="{{ url('auth:cis2_login') }}">
       Log in with CIS2
     </a>
   </div>

…g/auth/jinja2/auth/persona_sign_in.jinja …ing/auth/jinja2/auth/persona_login.jinjamanage_breast_screening/auth/jinja2/auth/persona_sign_in.jinja renamed to manage_breast_screening/auth/jinja2/auth/persona_login.jinja manage_breast_screening/auth/jinja2/auth/persona_sign_in.jinja renamed to manage_breast_screening/auth/jinja2/auth/persona_login.jinja

@@ -6,10 +6,10 @@
 app_name = "auth"
 
 urlpatterns = [
-    path("sign-in/", views.sign_in, name="sign_in"),
-    path("sign-out/", views.sign_out, name="sign_out"),
+    path("log-in/", views.login, name="login"),
+    path("log-out/", views.logout, name="logout"),
     # CIS2 OpenID Connect
-    path("cis2/sign-in/", views.cis2_sign_in, name="cis2_sign_in"),
+    path("cis2/log-in/", views.cis2_login, name="cis2_login"),
     path("cis2/callback/", views.cis2_callback, name="cis2_callback"),
     # JWKS endpoint for private_key_jwt
     path("cis2/jwks_uri", views.jwks, name="jwks"),

manage_breast_screening/auth/urls.py

@@ -10,25 +10,25 @@
 
 
 @login_not_required
-def sign_in(request):
+def login(request):
     """Entry point for authentication with CIS2"""
     return render(
         request,
-        "auth/sign_in.jinja",
+        "auth/login.jinja",
         {
             "page_title": "Log in",
-            "navActive": "sign_in",
+            "navActive": "login",
         },
     )
 
 
-def sign_out(request):
+def logout(request):
     auth_logout(request)
     return redirect(reverse("home"))
 
 
 @login_not_required
-def cis2_sign_in(request):
+def cis2_login(request):
     """Start the CIS2 OAuth2/OIDC authorization flow."""
     client = get_cis2_client()
     redirect_uri = request.build_absolute_uri(reverse("auth:cis2_callback")).rstrip("/")

manage_breast_screening/auth/views.py

@@ -255,7 +255,7 @@ def boolean_env(key, default=None):
 if PERSONAS_ENABLED:
     LOGIN_URL = "auth:persona_login"
 else:
-    LOGIN_URL = "auth:sign_in"
+    LOGIN_URL = "auth:login"
 
 # CIS2 / Authlib configuration
 # These settings configure Authlib's Django client to use CIS2 via private_key_jwt

manage_breast_screening/config/settings.py

@@ -18,7 +18,7 @@
   {% endif %}
 
   {% do account_items.append({
-      "href": url('auth:sign_out') if request and request.user.is_authenticated else url('auth:sign_in'),
+      "href": url('auth:logout') if request and request.user.is_authenticated else url('auth:login'),
       "text": "Log out" if request and request.user.is_authenticated else "Log in",
   }) %}
 

manage_breast_screening/core/jinja2/layout-app.jinja

@@ -41,16 +41,16 @@ def userinfo(self, token=None):
             lambda: FakeCIS2Client(),
         )
 
-    def test_sign_in_and_sign_out_via_cis2(self):
-        self.given_i_am_on_the_log_in_page()
+    def test_log_in_and_log_out_via_cis2(self):
+        self.given_i_am_on_the_login_page()
         self.when_i_log_in_via_cis2()
         self.then_i_am_redirected_to_home()
         self.then_header_shows_log_out()
         self.when_i_click_log_out()
         self.then_header_shows_log_in()
 
-    def given_i_am_on_the_log_in_page(self):
-        self.page.goto(self.live_server_url + reverse("auth:sign_in"))
+    def given_i_am_on_the_login_page(self):
+        self.page.goto(self.live_server_url + reverse("auth:login"))
 
     def when_i_log_in_via_cis2(self):
         self.page.get_by_text("Log in with CIS2").click()