Corrige login-wizard para exibir mensagens e deixar padrão o botão ENTRAR

Author: fernandolordao

components/login-wizard/script.js

@@ -88,7 +88,6 @@ app.component('login-wizard', {
             };
 
             return await api.POST($MAPAS.baseURL + "autenticacao/verify", dataPost).then(response => response.json().then(dataReturn => {
-                console.log(dataReturn.result)
                 if (dataReturn.error) {
                     this.throwErrors(dataReturn.data);
                 } else {
@@ -189,7 +188,7 @@ app.component('login-wizard', {
         throwErrors(errors) {
             const messages = useMessages();
 
-            if (this.recaptchaResponse !== '') {
+            if (this.recaptchaShown && this.recaptchaResponse !== '') {
                 grecaptcha.reset();
                 this.expiredCaptcha();
             }

components/login-wizard/template.php

@@ -55,7 +55,7 @@
 
                     <div class="login__buttons">
                         <button v-if="!showPassword && !passwordResetRequired && !userNotFound" class="button button--primary button--large button--md" type="submit"> <?= i::__('Próximo') ?> </button>
-                        <button v-if="showPassword && !passwordResetRequired" class="button button--primary button--large button--md" type="button" @click="doLogin"> <?= i::__('Entrar') ?> </button>
+                        <button v-if="showPassword && !passwordResetRequired" class="button button--primary button--large button--md" type="submit" @click="doLogin"> <?= i::__('Entrar') ?> </button>
                         <button v-if="passwordResetRequired" class="button button--primary button--large button--md" @click="recoveryRequest = true"> <?= i::__('Gerar nova senha') ?> </button>
                         <button  v-if="passwordResetRequired || showPassword" class="button button--secondary button--large button--md" @click="resetLoginState"> <?= i::__('Voltar') ?> </button>
                     </div>
@@ -137,4 +137,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

views/auth/multiple-local.php

@@ -12,24 +12,15 @@
     $this->jsObject['recoveryMode']['token'] = $_GET['t']; 
 }
 
-$flag = 'login';
-
-$templates = [
-    'login' => function () use ($configs) {
-        return "<login config='$configs'></login>";
-    },
-
-    'login-wizard' => function () use ($configs) {
-        return "<login-wizard config='$configs'></login-wizard>";
+$loginMode = 'login';
+if (isset($config['wizard'])) {
+    if ($config['wizard'] == 'true') {
+        $loginMode = 'login-wizard';
     }
-];
-
-if ($config['wizard'] == true){
-    $flag = 'login-wizard';
 }
 
-$this->import($flag);
+$this->import($loginMode);
 
-echo $templates[$flag]();
-?>
+echo "<$loginMode config='$configs'></$loginMode>"
 
+?>