From d80cefd05d691b6031015e198c4cabd42291535f Mon Sep 17 00:00:00 2001
From: N-Pex <npexdev@gmail.com>
Date: Tue, 31 Oct 2023 13:01:53 +0100
Subject: [PATCH] Fix getLink "next" button logic

Now, don't use the "onBlur" event, always load loginFlown from handleLogin.
---
 src/components/GetLink.vue | 93 +++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/components/GetLink.vue b/src/components/GetLink.vue
index df8e4f0..7a2175b 100644
--- a/src/components/GetLink.vue
+++ b/src/components/GetLink.vue
@@ -5,20 +5,19 @@
       <div class="getlink-title">{{ $t("getlink.title") }}</div>
       <div class="getlink-info">{{ $t("getlink.info") }}</div>
       <div color="rgba(255,255,255,0.1)" class="text-center">
-        <v-form v-model="isValid">
+        <v-form v-model="isValid" ref="form">
           <v-text-field v-model="user.user_id" :label="$t('getlink.username')" color="black" background-color="white" solo
             :rules="[(v) => !!v || $t('login.username_required')]" :error="userErrorMessage != null"
-            :error-messages="userErrorMessage" required v-on:keyup.enter="onUsernameEnter" v-on:keydown="hasError = false"
-            v-on:blur="onUsernameBlur"></v-text-field>
+            :error-messages="userErrorMessage" required v-on:keyup.enter="onUsernameEnter" v-on:keydown="hasError = false"></v-text-field>
 
-          <div class="error--text" v-if="loadingLoginFlows">Loading login flows...</div>
+          <!-- <div class="error--text" v-if="loadingLoginFlows">Loading login flows...</div> -->
 
           <div class="error--text" v-if="hasError">{{ this.message }}</div>
 
           <interactive-auth ref="interactiveAuth" />
 
-          <v-btn id="btn-login" :disabled="!isValid || loading" color="primary" depressed block
-            @click.stop="handleLogin" :loading="loading" class="filled-button mt-4">{{ $t("getlink.next") }}</v-btn>
+          <v-btn id="btn-login" :disabled="!isValid || loading" color="primary" depressed block @click.stop="handleLogin"
+            :loading="loading" class="filled-button mt-4">{{ $t("getlink.next") }}</v-btn>
           <v-btn color="black" depressed text block @click.stop="goToLoginPage" class="text-button">{{ $t("menu.login")
           }}</v-btn>
         </v-form>
@@ -30,12 +29,12 @@
       <div class="getlink-subtitle">{{ $t("getlink.ready_to_share") }}</div>
       <copy-link ref="qr" :locationLink="directMessageLink" i18nQrPopupTitleKey="getlink.scan_title"
         v-on:long-tap="copyQRImage">
-          <template v-slot:share>
-            <div v-if="shareSupported" class="clickable getlink-share" @click="shareLink">
-              <div>{{ $t("getlink.share_qr") }}</div>
-              <v-img src="@/assets/icons/ic_share.svg" />
-            </div>
-          </template>
+        <template v-slot:share>
+          <div v-if="shareSupported" class="clickable getlink-share" @click="shareLink">
+            <div>{{ $t("getlink.share_qr") }}</div>
+            <v-img src="@/assets/icons/ic_share.svg" />
+          </div>
+        </template>
       </copy-link>
       <div class="getlink-buttons">
         <v-btn color="black" depressed @click.stop="goHome" class="outlined-button">{{ $t("getlink.continue") }}</v-btn>
@@ -113,6 +112,7 @@ export default {
         // Reset
         const obj = this.defaultData();
         Object.keys(obj).forEach(k => this[k] = obj[k]);
+        this.$refs.form.reset();
       })
     },
     goToLoginPage() {
@@ -143,40 +143,41 @@ export default {
 
         this.loading = true;
 
-        this.onUsernameBlur().then(() =>
-          this.$store.dispatch("createUser", { user, registrationFlowHandler: this.$refs.interactiveAuth.registrationFlowHandler }))
+        this.loadLoginFlows().then(() => {
+          return this.$store.dispatch("createUser", { user, registrationFlowHandler: this.$refs.interactiveAuth.registrationFlowHandler })
+        })
           .then(
-          (ignoreduser) => {
-            this.$matrix.setUserDisplayName(userDisplayName);
-          },
-          (error) => {
-            this.message =
-              (error.data && error.data.error) ||
-              error.message ||
-              error.toString();
-            if (error.data && error.data.errcode === 'M_FORBIDDEN') {
-              this.message = this.$i18n.messages[this.$i18n.locale].login.invalid_message;
-              this.hasError = true;
-            } else if (error.data && error.data.errcode === 'M_USER_IN_USE') {
-              // Try again with (other/new) random chars appended
-              user.user_id = utils.randomUser(prefix);
-              return this.$store.dispatch("createUser", { user, registrationFlowHandler: this.$refs.interactiveAuth.registrationFlowHandler }).then(
-                (ignoreduser) => {
-                  this.$matrix.setUserDisplayName(userDisplayName);
-                },
-                (error) => {
-                  this.message =
-                    (error.data && error.data.error) ||
-                    error.message ||
-                    error.toString();
-                  if (error.data && error.data.errcode === 'M_FORBIDDEN') {
-                    this.message = this.$i18n.messages[this.$i18n.locale].login.invalid_message;
-                    this.hasError = true;
+            (ignoreduser) => {
+              this.$matrix.setUserDisplayName(userDisplayName);
+            },
+            (error) => {
+              this.message =
+                (error.data && error.data.error) ||
+                error.message ||
+                error.toString();
+              if (error.data && error.data.errcode === 'M_FORBIDDEN') {
+                this.message = this.$i18n.messages[this.$i18n.locale].login.invalid_message;
+                this.hasError = true;
+              } else if (error.data && error.data.errcode === 'M_USER_IN_USE') {
+                // Try again with (other/new) random chars appended
+                user.user_id = utils.randomUser(prefix);
+                return this.$store.dispatch("createUser", { user, registrationFlowHandler: this.$refs.interactiveAuth.registrationFlowHandler }).then(
+                  (ignoreduser) => {
+                    this.$matrix.setUserDisplayName(userDisplayName);
+                  },
+                  (error) => {
+                    this.message =
+                      (error.data && error.data.error) ||
+                      error.message ||
+                      error.toString();
+                    if (error.data && error.data.errcode === 'M_FORBIDDEN') {
+                      this.message = this.$i18n.messages[this.$i18n.locale].login.invalid_message;
+                      this.hasError = true;
+                    }
                   }
-                }
-              );
-            }
-          })
+                );
+              }
+            })
           .finally(() => {
             this.loading = false;
           })
@@ -186,9 +187,9 @@ export default {
       this.$navigation.push({ name: "CreateRoom" });
     },
     onUsernameEnter() {
-      this.onUsernameBlur();
+      this.handleLogin();
     },
-    onUsernameBlur() {
+    loadLoginFlows() {
       var user = Object.assign({}, this.user);
       user.normalize();
       const server = user.home_server || this.$config.defaultServer;