MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 22:46:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Logout instead of retry login with Primary Password

Browse Source
This commit is contained in:
Natsumi
2022-02-11 12:23:26 +13:00
parent bccfd2fd0c
commit d10f2c3882
2 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+1 -34
View File
@@ -5971,38 +5971,7 @@ speechSynthesis.getVoices();
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.enablePrimaryPassword) { if (this.enablePrimaryPassword) {
this.checkPrimaryPassword(loginParmas) API.logout();
.then((pwd) => {
this.loginForm.loading = true;
return API.getConfig()
.catch((err) => {
this.loginForm.loading = false;
reject(err);
})
.then(() => {
API.login({
username: loginParmas.username,
password: pwd,
cipher: loginParmas.password
})
.catch((err2) => {
this.loginForm.loading = false;
API.logout();
reject(err2);
})
.then(() => {
this.loginForm.loading = false;
resolve();
});
});
})
.catch((_) => {
this.$message({
message: 'Incorrect primary password',
type: 'error'
});
reject(_);
});
} else { } else {
API.getConfig() API.getConfig()
.catch((err) => { .catch((err) => {
@@ -6017,11 +5986,9 @@ speechSynthesis.getVoices();
.catch((err2) => { .catch((err2) => {
this.loginForm.loading = false; this.loginForm.loading = false;
API.logout(); API.logout();
reject(err2);
}) })
.then(() => { .then(() => {
this.loginForm.loading = false; this.loginForm.loading = false;
resolve();
}); });
}); });
} }
html/src/index.pug
+1 -1
View File
@@ -1132,7 +1132,7 @@ html
div.options-container div.options-container
span.header Application span.header Application
div.options-container-item div.options-container-item
span.name Use a Primary Password span.name(style="min-width:236px") Encrypt password (disables auto login)
el-switch(v-model="enablePrimaryPassword" @change="enablePrimaryPasswordChange" :disabled="!loginForm.savedCredentials[API.currentUser.username]") el-switch(v-model="enablePrimaryPassword" @change="enablePrimaryPasswordChange" :disabled="!loginForm.savedCredentials[API.currentUser.username]")
div.options-container-item div.options-container-item
span.name Start at Windows startup span.name Start at Windows startup