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

Bug fixes

Browse Source
This commit is contained in:
Natsumi
2022-02-13 19:07:35 +13:00
parent bf365ff63c
commit c680e4c0b8
2 changed files with 69 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
html/src/app.js
View File

@@ -5976,16 +5976,48 @@ speechSynthesis.getVoices();
} else {
API.endpointDomain = API.endpointDomainVrchat;
}
if (this.enablePrimaryPassword) {
API.logout();
} else {
API.getConfig()
.catch((err) => {
this.loginForm.loading = false;
throw err;
})
.then(() => {
API.login({
return new Promise((resolve, reject) => {
if (this.enablePrimaryPassword) {
this.checkPrimaryPassword(loginParmas)
.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 {
API.getConfig()
.catch((err) => {
this.loginForm.loading = false;
reject(err);
})
.then(() => {
API.login({
username: loginParmas.username,
password: loginParmas.password,
endpoint: loginParmas.endpoint
@@ -5993,12 +6025,14 @@ speechSynthesis.getVoices();
.catch(() => {
this.loginForm.loading = false;
API.logout();
})
.then(() => {
this.loginForm.loading = false;
});
});
}
})
.then(() => {
this.loginForm.loading = false;
resolve();
});
});
}
});
};
$app.methods.deleteSavedLogin = function (username) {
@@ -6024,12 +6058,16 @@ speechSynthesis.getVoices();
var user =
$app.loginForm.savedCredentials[$app.loginForm.lastUserLoggedIn];
if (typeof user !== 'undefined') {
$app.relogin(user).then(() => {
new Noty({
type: 'success',
text: 'Automatically logged in.'
}).show();
});
if ($app.enablePrimaryPassword) {
this.logout();
} else {
$app.relogin(user).then(() => {
new Noty({
type: 'success',
text: 'Automatically logged in.'
}).show();
});
}
}
});