butter/keanu-weblite
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch '551-next-on-getlink-requires-two-taps-to-proceed' into 'dev'

Browse source 
Resolve ""Next" on GetLink requires two taps to proceed"

See merge request keanuapp/keanuapp-weblite!255
This commit is contained in:
N Pex 2023-10-25 21:22:42 +00:00
commit 78b17814f9
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/GetLink.vue
View file

@ -17,7 +17,7 @@
<interactive-auth ref="interactiveAuth" />
<v-btn id="btn-login" :disabled="!isValid || loading || loadingLoginFlows" color="primary" depressed block
<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>
@ -143,7 +143,9 @@ export default {
this.loading = true;
this.$store.dispatch("createUser", { user, registrationFlowHandler: this.$refs.interactiveAuth.registrationFlowHandler }).then(
this.onUsernameBlur().then(() =>
this.$store.dispatch("createUser", { user, registrationFlowHandler: this.$refs.interactiveAuth.registrationFlowHandler }))
.then(
(ignoreduser) => {
this.$matrix.setUserDisplayName(userDisplayName);
},
@ -195,7 +197,7 @@ export default {
this.loadingLoginFlows = true;
const matrixClient = sdk.createClient({ baseUrl: server });
matrixClient.loginFlows().then((response) => {
return matrixClient.loginFlows().then((response) => {
console.log("FLOWS", response.flows);
this.loginFlows = response.flows.filter(this.supportedLoginFlow);
this.loadingLoginFlows = false;
@ -207,6 +209,8 @@ export default {
this.hasError = false;
}
});
} else {
return Promise.resolve();
}
},
supportedLoginFlow(flow) {