fix(login): Enter submits the form; ProConnect button no longer acts as submit (#67)

Author: odelcroi

tchap/resources/templates/pages/login.html

@@ -12,35 +12,30 @@
 {% from "components/password_field.html" import password_field %}
 
 {% block content %}
-  <form method="POST" class="flex flex-col gap-10">
-    <header class="page-heading">
-      <!--
-      <div class="icon">
-        {{ icon.user_profile_solid() }}
+
+
+  <header class="page-heading">
+    {% if next and next.kind == "link_upstream" %}
+      <div class="header">
+        <h1 class="title">{{ _("mas.login.link.headline") }}</h1>
+        {% set name = provider.human_name or (provider.issuer | simplify_url(keep_path=True)) or provider.id %}
+        <p class="text">{{ _("mas.login.link.description", provider=name) }}</p>
       </div>
-      -->
-      {% if next and next.kind == "link_upstream" %}
-        <div class="header">
-          <h1 class="title">{{ _("mas.login.link.headline") }}</h1>
-          {% set name = provider.human_name or (provider.issuer | simplify_url(keep_path=True)) or provider.id %}
-          <p class="text">{{ _("mas.login.link.description", provider=name) }}</p>
-        </div>
-      {% else %}
-        <div class="header">
-          <h1 class="title">{{ _("mas.login.headline") }}</h1>
-          <!-- <p class="text">{{ _("mas.login.description") }}</p> -->
-        </div>
-      {% endif %}
-    </header>
+    {% else %}
+      <div class="header">
+        <h1 class="title">{{ _("mas.login.headline") }}</h1>
+        <!-- <p class="text">{{ _("mas.login.description") }}</p> -->
+      </div>
+    {% endif %}
+  </header>
 
-    <!-- #tchap# -->
-    {% set params = next["params"] | default({}) | to_params(prefix="?") %}
-    {% for provider in providers %}
+  {% set params = next["params"] | default({}) | to_params(prefix="?") %}
+  {% for provider in providers %}
     {% set name = provider.human_name or (provider.issuer | simplify_url(keep_path=True)) or provider.id %}
 
     <!-- #tchap# add .lasuite class to add lasuite fonts -->
     <div class="cpd-form-root lasuite">
-      <button class="proconnect-button" onclick="window.location.href = '{{ ('/upstream/authorize/' ~ provider.id ~ params) | prefix_url }}';return false;">
+      <button type="button" class="proconnect-button" onclick="window.location.href = '{{ ('/upstream/authorize/' ~ provider.id ~ params) | prefix_url }}'">
           <span class="proconnect-sr-only">S'identifier avec ProConnect</span>
         </button>
         <p>
@@ -55,26 +50,11 @@ <h1 class="title">{{ _("mas.login.headline") }}</h1>
         </a>
       </p>
     </div>
-    {% endfor %}
- <!-- #tchap# end -->
- <!--
-    {% if providers %}
-    {% set params = next["params"] | default({}) | to_params(prefix="?") %}
-    {% for provider in providers %}
-    {% set name = provider.human_name or (provider.issuer | simplify_url(keep_path=True)) or provider.id %}
-      
-      <a class="cpd-button {%- if provider.brand_name %} has-icon {%- endif %}" data-kind="secondary" data-size="lg" href="{{ ('/upstream/authorize/' ~ provider.id ~ params) | prefix_url }}">
-        {{ logo(provider.brand_name) }}
-        {{ _("mas.login.continue_with_provider", provider=name) }}
-      </a>
-      {% endfor %}
-      {% endif %}
-      --> 
-      
-  
-  {{ field.separator() }}
-
+  {% endfor %}
+  <!-- #tchap# end -->
 
+  {{ field.separator() }}
+  <form method="POST" class="flex flex-col gap-10">
     <div class="cpd-form-root">
       {% if form.errors is not empty %}
         {% for error in form.errors %}
@@ -111,10 +91,6 @@ <h1 class="title">{{ _("mas.login.headline") }}</h1>
       {% if features.password_login %}
         {{ button.button(text=_("action.continue")) }}
       {% endif %}
-
-
-
-     
     </div>
 
     {% if (not next or next.kind != "link_upstream") and features.password_registration %}

tchap/resources/translations/en.json

@@ -10,11 +10,11 @@
     },
     "continue": "Continue",
     "@continue": {
-      "context": "form_post.html:25:28-48, pages/consent.html:74:28-48, pages/device_consent.html:124:13-33, pages/device_link.html:40:26-46, pages/login.html:112:30-50, pages/reauth.html:32:28-48, pages/recovery/start.html:38:26-46, pages/register/password.html:80:26-46, pages/register/steps/display_name.html:45:28-48, pages/register/steps/registration_token.html:41:28-48, pages/register/steps/verify_email.html:51:26-46, pages/sso.html:37:28-48"
+      "context": "form_post.html:25:28-48, pages/consent.html:74:28-48, pages/device_consent.html:124:13-33, pages/device_link.html:40:26-46, pages/login.html:92:30-50, pages/reauth.html:32:28-48, pages/recovery/start.html:38:26-46, pages/register/password.html:80:26-46, pages/register/steps/display_name.html:45:28-48, pages/register/steps/registration_token.html:41:28-48, pages/register/steps/verify_email.html:51:26-46, pages/sso.html:37:28-48"
     },
     "create_account": "Create Account",
     "@create_account": {
-      "context": "pages/login.html:127:33-59, pages/register/index.html:20:29-55, pages/upstream_oauth2/do_register.html:197:26-52"
+      "context": "pages/login.html:103:33-59, pages/register/index.html:20:29-55, pages/upstream_oauth2/do_register.html:197:26-52"
     },
     "sign_in": "Sign in",
     "@sign_in": {
@@ -93,7 +93,7 @@
     },
     "password": "Password",
     "@password": {
-      "context": "pages/login.html:100:37-57, pages/reauth.html:28:35-55, pages/register/password.html:47:33-53"
+      "context": "pages/login.html:80:37-57, pages/reauth.html:28:35-55, pages/register/password.html:47:33-53"
     },
     "password_confirm": "Confirm password",
     "@password_confirm": {
@@ -103,7 +103,7 @@
     "@show": {},
     "username": "Username",
     "@username": {
-      "context": "pages/login.html:94:37-57, pages/register/index.html:59:35-55, pages/register/password.html:38:45-65, pages/upstream_oauth2/do_register.html:104:35-55, pages/upstream_oauth2/do_register.html:109:39-59"
+      "context": "pages/login.html:74:37-57, pages/register/index.html:59:35-55, pages/register/password.html:38:45-65, pages/upstream_oauth2/do_register.html:104:35-55, pages/upstream_oauth2/do_register.html:109:39-59"
     }
   },
   "create_account": "",
@@ -425,43 +425,43 @@
     "login": {
       "call_to_register": "Don't have an account yet?",
       "@call_to_register": {
-        "context": "pages/login.html:123:13-44"
+        "context": "pages/login.html:99:13-44"
       },
       "continue_with_provider": "Continue with %(provider)s",
       "@continue_with_provider": {
-        "context": "pages/login.html:68:11-63, pages/register/index.html:82:23-75",
+        "context": "pages/register/index.html:82:23-75",
         "description": "Button to log in with an upstream provider"
       },
       "description": "Please sign in to continue:",
       "@description": {
-        "context": "pages/login.html:31:34-60"
+        "context": "pages/login.html:27:32-58"
       },
       "forgot_password": "Forgot password?",
       "@forgot_password": {
-        "context": "pages/login.html:105:35-65",
+        "context": "pages/login.html:85:35-65",
         "description": "On the login page, link to the account recovery process"
       },
       "headline": "Sign in",
       "@headline": {
-        "context": "pages/login.html:30:31-54"
+        "context": "pages/login.html:26:29-52"
       },
       "link": {
         "description": "Linking your <span class=\"break-keep text-links\">%(provider)s</span> account",
         "@description": {
-          "context": "pages/login.html:26:29-75"
+          "context": "pages/login.html:22:27-73"
         },
         "headline": "Sign in to link",
         "@headline": {
-          "context": "pages/login.html:24:31-59"
+          "context": "pages/login.html:20:29-57"
         }
       },
       "no_login_methods": "No login methods available.",
       "@no_login_methods": {
-        "context": "pages/login.html:133:11-42"
+        "context": "pages/login.html:109:11-42"
       },
       "username_or_email": "Username or Email",
       "@username_or_email": {
-        "context": "pages/login.html:90:37-69"
+        "context": "pages/login.html:70:37-69"
       }
     },
     "navbar": {