sup39/firefish
1
0
Fork 0
forked from naskya/firefish
Code Issues Pull requests Activity

fix(frontend): show 2fa code field in login only if 2fa is enabled

Browse source
This commit is contained in:
TrojanerHD 2024-02-24 02:22:47 +01:00 committed by naskya
parent 437d02ef5d
commit 0a270ca31a
Signed by: naskya
GPG key ID: 712D413B3A9FED5C
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
packages/client/src/components/MkSignin.vue
View file

@ -79,10 +79,10 @@
{{ i18n.ts.retry }} {{ i18n.ts.retry }}
</MkButton> </MkButton>
</div> </div>
<div v-if="user && user.securityKeys" class="or-hr"> <div v-if="user && user.securityKeys && user.twoFactorEnabled" class="or-hr">
<p class="or-msg">{{ i18n.ts.or }}</p> <p class="or-msg">{{ i18n.ts.or }}</p>
</div> </div>
<div class="twofa-group totp-group"> <div v-if="user.twoFactorEnabled" class="twofa-group totp-group">
<p style="margin-bottom: 0"> <p style="margin-bottom: 0">
{{ i18n.ts.twoStepAuthentication }} {{ i18n.ts.twoStepAuthentication }}
</p> </p>
@ -247,25 +247,23 @@ function queryKey() {
function onSubmit() { function onSubmit() {
signing.value = true; signing.value = true;
console.log("submit"); console.log("submit");
if (!totpLogin.value && user.value && user.value.twoFactorEnabled) { if (window.PublicKeyCredential && user.value.securityKeys) {
if (window.PublicKeyCredential && user.value.securityKeys) { os.api("signin", {
os.api("signin", { username: username.value,
username: username.value, password: password.value,
password: password.value, "hcaptcha-response": hCaptchaResponse.value,
"hcaptcha-response": hCaptchaResponse.value, "g-recaptcha-response": reCaptchaResponse.value,
"g-recaptcha-response": reCaptchaResponse.value, })
.then((res) => {
totpLogin.value = true;
signing.value = false;
challengeData.value = res;
return queryKey();
}) })
.then((res) => { .catch(loginFailed);
totpLogin.value = true; } else if (!totpLogin.value && user.value && user.value.twoFactorEnabled) {
signing.value = false; totpLogin.value = true;
challengeData.value = res; signing.value = false;
return queryKey();
})
.catch(loginFailed);
} else {
totpLogin.value = true;
signing.value = false;
}
} else { } else {
os.api("signin", { os.api("signin", {
username: username.value, username: username.value,