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

Remove saved account on incorrect password

Browse Source
This commit is contained in:
Natsumi
2026-01-23 01:27:17 +13:00
committed by pa
parent 3b38a4ae61
commit 0a0af0db75
4 changed files with 55 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/dialogs/SendBoopDialog.vue
View File

@@ -33,7 +33,7 @@
style="
display: grid;
grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
gap: 15px;
gap: 5px;
margin-top: 10px;
max-height: 600px;
overflow-y: auto;

2
src/components/dialogs/WorldDialog/WorldDialog.vue
View File

@@ -23,7 +23,7 @@
currentUser.$homeLocation &&
currentUser.$homeLocation.worldId === worldDialog.id
"
style="margin-right: 5px" />
class="inline-block" />
{{ worldDialog.ref.name }}
</span>
</div>

83
src/stores/auth.js
View File

@@ -447,59 +447,40 @@ export const useAuthStore = defineStore('Auth', () => {
AppDebug.endpointDomain = AppDebug.endpointDomainVrchat;
AppDebug.websocketDomain = AppDebug.websocketDomainVrchat;
}
return new Promise((resolve, reject) => {
loginForm.value.loading = true;
loginForm.value.loading = true;
try {
let password = loginParams.password;
if (advancedSettingsStore.enablePrimaryPassword) {
checkPrimaryPassword(loginParams)
.then((pwd) => {
return authRequest
.getConfig()
.catch((err) => {
reject(err);
})
.then(() => {
authLogin({
username: loginParams.username,
password: pwd,
cipher: loginParams.password,
endpoint: loginParams.endpoint,
websocket: loginParams.websocket
})
.catch((err2) => {
reject(err2);
})
.then(() => {
resolve();
});
});
})
.catch((_) => {
toast.error('Incorrect primary password');
reject(_);
});
} else {
authRequest
.getConfig()
.catch((err) => {
reject(err);
})
.then(() => {
authLogin({
username: loginParams.username,
password: loginParams.password,
endpoint: loginParams.endpoint,
websocket: loginParams.websocket
})
.catch((err2) => {
handleLogoutEvent();
reject(err2);
})
.then(() => {
resolve();
});
});
try {
password = await checkPrimaryPassword(loginParams);
} catch (err) {
toast.error('Incorrect primary password');
throw err;
}
}
}).finally(() => (loginForm.value.loading = false));
await authRequest.getConfig();
try {
await authLogin({
username: loginParams.username,
password,
endpoint: loginParams.endpoint,
websocket: loginParams.websocket
});
} catch (err) {
await handleLogoutEvent();
throw err;
}
} catch (err) {
if (err.message.includes('Invalid Username/Email or Password')) {
toast.error('Saved credentials are no longer valid.');
await deleteSavedLogin(user.user.id);
}
throw err;
} finally {
loginForm.value.loading = false;
}
}
async function deleteSavedLogin(userId) {

33
src/views/Login/Login.vue
View File

@@ -1,17 +1,17 @@
<template>
<div style="float: left; margin: 5px">
<TooltipWrapper v-if="!noUpdater" side="top" :content="t('view.login.updater')">
<Button class="rounded-full mr-2 text-xs" size="icon-sm" variant="ghost" @click="showVRCXUpdateDialog"
><CircleArrowDown
/></Button>
</TooltipWrapper>
<TooltipWrapper side="top" :content="t('view.login.proxy_settings')">
<Button class="rounded-full text-xs" size="icon-sm" variant="ghost" @click="promptProxySettings"
><Route
/></Button>
</TooltipWrapper>
</div>
<div class="x-login-container">
<div style="position: absolute; top: 0; left: 0; margin: 5px">
<TooltipWrapper v-if="!noUpdater" side="top" :content="t('view.login.updater')">
<Button class="rounded-full mr-2 text-xs" size="icon-sm" variant="ghost" @click="showVRCXUpdateDialog"
><CircleArrowDown
/></Button>
</TooltipWrapper>
<TooltipWrapper side="top" :content="t('view.login.proxy_settings')">
<Button class="rounded-full text-xs" size="icon-sm" variant="ghost" @click="promptProxySettings"
><Route
/></Button>
</TooltipWrapper>
</div>
<div class="x-login">
<div class="x-login-form-container">
<div>
@@ -285,6 +285,15 @@
}
);
watch(
() => loginForm.value.loading,
(loading) => {
if (!loading) {
updateSavedCredentials();
}
}
);
onBeforeMount(async () => {
updateSavedCredentials();
});