Merge branch 'develop' into feat/setup-eslint-rules

app/javascript/v3/views/login/Index.vue

@@ -105,11 +105,6 @@ export default {
       useAlert(this.loginApi.message);
     },
     submitLogin() {
-      if (this.v$.credentials.email.$invalid && !this.email) {
-        this.showAlertMessage(this.$t('LOGIN.EMAIL.ERROR'));
-        return;
-      }
-
       this.loginApi.hasErrored = false;
       this.loginApi.showLoading = true;
 
@@ -138,6 +133,14 @@ export default {
           );
         });
     },
+    submitFormLogin() {
+      if (this.v$.credentials.email.$invalid && !this.email) {
+        this.showAlertMessage(this.$t('LOGIN.EMAIL.ERROR'));
+        return;
+      }
+
+      this.submitLogin();
+    },
   },
 };
 </script>
@@ -184,7 +187,7 @@ export default {
     >
       <div v-if="!email">
         <GoogleOAuthButton v-if="showGoogleOAuth" />
-        <form class="space-y-5" @submit.prevent="submitLogin">
+        <form class="space-y-5" @submit.prevent="submitFormLogin">
           <FormInput
             v-model.trim="credentials.email"
             name="email_address"