MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 14:53:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix asking for primary password when not enabled

Browse Source
This commit is contained in:
Natsumi
2021-08-15 15:52:42 +12:00
parent 50a637f06e
commit 4e47805f2f
1 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
html/src/app.js
View File

@@ -5582,38 +5582,61 @@ speechSynthesis.getVoices();
$app.methods.relogin = function (loginParmas) { $app.methods.relogin = function (loginParmas) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.checkPrimaryPassword(loginParmas) if (this.enablePrimaryPassword) {
.then((pwd) => { this.checkPrimaryPassword(loginParmas)
this.loginForm.loading = true; .then((pwd) => {
return API.getConfig() this.loginForm.loading = true;
.catch((err) => { return API.getConfig()
this.loginForm.loading = false; .catch((err) => {
reject(err); this.loginForm.loading = false;
}) reject(err);
.then(() => {
API.login({
username: loginParmas.username,
password: pwd,
cipher: loginParmas.password
}) })
.catch((err2) => { .then(() => {
this.loginForm.loading = false; API.login({
API.logout(); username: loginParmas.username,
reject(err2); password: pwd,
cipher: loginParmas.password
}) })
.then(() => { .catch((err2) => {
this.loginForm.loading = false; this.loginForm.loading = false;
resolve(); API.logout();
}); reject(err2);
})
.then(() => {
this.loginForm.loading = false;
resolve();
});
});
})
.catch((_) => {
this.$message({
message: 'Incorrect primary password',
type: 'error'
}); });
}) reject(_);
.catch((_) => {
this.$message({
message: 'Incorrect primary password',
type: 'error'
}); });
reject(_); } else {
}); API.getConfig()
.catch((err) => {
this.loginForm.loading = false;
reject(err);
})
.then(() => {
API.login({
username: loginParmas.username,
password: loginParmas.password
})
.catch((err2) => {
this.loginForm.loading = false;
API.logout();
reject(err2);
})
.then(() => {
this.loginForm.loading = false;
resolve();
});
});
}
}); });
}; };
@@ -5637,9 +5660,6 @@ speechSynthesis.getVoices();
}; };
API.$on('AUTOLOGIN', function () { API.$on('AUTOLOGIN', function () {
if ($app.enablePrimaryPassword) {
return;
}
var user = var user =
$app.loginForm.savedCredentials[$app.loginForm.lastUserLoggedIn]; $app.loginForm.savedCredentials[$app.loginForm.lastUserLoggedIn];
if (typeof user !== 'undefined') { if (typeof user !== 'undefined') {