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

Nuke cookies when TOTP/OTP fails

Browse Source
This commit is contained in:
Natsumi
2025-02-28 10:52:35 +13:00
parent 137608b705
commit b50b4490b4
2 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app.js
+58 -20
View File
@@ -1542,6 +1542,10 @@ console.log(`isLinux: ${LINUX}`);
for (var userId of this.currentUser.friends) { for (var userId of this.currentUser.friends) {
if (!friends.some((x) => x.id === userId)) { if (!friends.some((x) => x.id === userId)) {
try { try {
if (!API.isLoggedIn) {
console.error(`User isn't logged in`);
return friends;
}
console.log('Fetching remaining friend', userId); console.log('Fetching remaining friend', userId);
var args = await this.getUser({ userId }); var args = await this.getUser({ userId });
friends.push(args.json); friends.push(args.json);
@@ -3908,6 +3912,21 @@ console.log(`isLinux: ${LINUX}`);
$app.twoFactorAuthDialogVisible = false; $app.twoFactorAuthDialogVisible = false;
}); });
$app.methods.clearCookiesTryLogin = async function () {
await webApiService.clearCookies();
if (this.loginForm.lastUserLoggedIn) {
var user =
this.loginForm.savedCredentials[
this.loginForm.lastUserLoggedIn
];
if (typeof user !== 'undefined') {
delete user.cookies;
await this.relogin(user);
return;
}
}
};
$app.methods.resendEmail2fa = async function () { $app.methods.resendEmail2fa = async function () {
if (this.loginForm.lastUserLoggedIn) { if (this.loginForm.lastUserLoggedIn) {
var user = var user =
@@ -3930,7 +3949,6 @@ console.log(`isLinux: ${LINUX}`);
type: 'error', type: 'error',
text: 'Cannot send 2FA email without saved credentials. Please login again.' text: 'Cannot send 2FA email without saved credentials. Please login again.'
}).show(); }).show();
this.promptEmailOTP();
}; };
$app.data.exportFriendsListDialog = false; $app.data.exportFriendsListDialog = false;
@@ -18602,19 +18620,21 @@ console.log(`isLinux: ${LINUX}`);
$app.data.printQueueWorker = undefined; $app.data.printQueueWorker = undefined;
$app.methods.queueSavePrintToFile = function (printId) { $app.methods.queueSavePrintToFile = function (printId) {
if ($app.printCache.includes(printId)) return; if (this.printCache.includes(printId)) {
$app.printCache.push(printId); return;
if ($app.printCache.length > 100) { }
$app.printCache.shift(); this.printCache.push(printId);
if (this.printCache.length > 100) {
this.printCache.shift();
} }
$app.printQueue.push(printId); this.printQueue.push(printId);
if (!$app.printQueueWorker) { if (!this.printQueueWorker) {
$app.printQueueWorker = workerTimers.setInterval(() => { this.printQueueWorker = workerTimers.setInterval(() => {
let printId = $app.printQueue.shift(); let printId = this.printQueue.shift();
if (printId) { if (printId) {
$app.trySavePrintToFile(printId); this.trySavePrintToFile(printId);
} }
}, 2_500); }, 2_500);
} }
@@ -18627,9 +18647,18 @@ console.log(`isLinux: ${LINUX}`);
console.error('Print image URL is missing', args); console.error('Print image URL is missing', args);
return; return;
} }
var createdAt = this.getPrintLocalDate(args.json); var print = args.json;
var createdAt = this.getPrintLocalDate(print);
try {
var owner = await API.getCachedUser({ userId: print.ownerId });
console.log(
`Print spawned by ${owner.displayName} id:${print.id} note:${print.note} authorName:${print.authorName} at:${new Date().toISOString()}`
);
} catch (err) {
console.error(err);
}
var monthFolder = createdAt.toISOString().slice(0, 7); var monthFolder = createdAt.toISOString().slice(0, 7);
var fileName = this.getPrintFileName(args.json); var fileName = this.getPrintFileName(print);
var filePath = await AppApi.SavePrintToFile( var filePath = await AppApi.SavePrintToFile(
imageUrl, imageUrl,
this.ugcFolderPath, this.ugcFolderPath,
@@ -18638,7 +18667,6 @@ console.log(`isLinux: ${LINUX}`);
); );
if (filePath) { if (filePath) {
console.log(`Print saved to file: ${monthFolder}\\${fileName}`); console.log(`Print saved to file: ${monthFolder}\\${fileName}`);
if (this.cropInstancePrints) { if (this.cropInstancePrints) {
if (!(await AppApi.CropPrintImage(filePath))) { if (!(await AppApi.CropPrintImage(filePath))) {
console.error('Failed to crop print image'); console.error('Failed to crop print image');
@@ -18646,9 +18674,9 @@ console.log(`isLinux: ${LINUX}`);
} }
} }
if ($app.printQueue.length == 0) { if (this.printQueue.length == 0) {
workerTimers.clearInterval($app.printQueueWorker); workerTimers.clearInterval(this.printQueueWorker);
$app.printQueueWorker = undefined; this.printQueueWorker = undefined;
} }
}; };
@@ -19133,7 +19161,7 @@ console.log(`isLinux: ${LINUX}`);
$app.data.ipcEnabled = false; $app.data.ipcEnabled = false;
$app.methods.ipcEvent = function (json) { $app.methods.ipcEvent = function (json) {
if (!this.friendLogInitStatus) { if (!API.isLoggedIn) {
return; return;
} }
try { try {
@@ -19392,7 +19420,7 @@ console.log(`isLinux: ${LINUX}`);
console.log('LaunchCommand:', input); console.log('LaunchCommand:', input);
var args = input.split('/'); var args = input.split('/');
var command = args[0]; var command = args[0];
var commandArg = args[1]; var commandArg = args[1]?.trim();
var shouldFocusWindow = true; var shouldFocusWindow = true;
switch (command) { switch (command) {
case 'world': case 'world':
@@ -19420,12 +19448,22 @@ console.log(`isLinux: ${LINUX}`);
this.addAvatarProvider(input.replace('addavatardb/', '')); this.addAvatarProvider(input.replace('addavatardb/', ''));
break; break;
case 'switchavatar': case 'switchavatar':
var avatarId = commandArg;
var regexAvatarId =
/avtr_[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}/g;
if (!avatarId.match(regexAvatarId) || avatarId.length !== 41) {
this.$message({
message: 'Invalid Avatar ID',
type: 'error'
});
break;
}
if (this.showConfirmationOnSwitchAvatar) { if (this.showConfirmationOnSwitchAvatar) {
this.selectAvatarWithConfirmation(commandArg); this.selectAvatarWithConfirmation(avatarId);
// Makes sure the window is focused // Makes sure the window is focused
shouldFocusWindow = true; shouldFocusWindow = true;
} else { } else {
this.selectAvatarWithoutConfirmation(commandArg); this.selectAvatarWithoutConfirmation(avatarId);
shouldFocusWindow = false; shouldFocusWindow = false;
} }
break; break;
src/classes/prompts.js
+2 -2
View File
@@ -31,7 +31,7 @@ export default class extends baseClass {
code: instance.inputValue.trim() code: instance.inputValue.trim()
}) })
.catch((err) => { .catch((err) => {
this.promptTOTP(); $app.clearCookiesTryLogin();
throw err; throw err;
}) })
.then((args) => { .then((args) => {
@@ -71,7 +71,7 @@ export default class extends baseClass {
code: instance.inputValue.trim() code: instance.inputValue.trim()
}) })
.catch((err) => { .catch((err) => {
this.promptOTP(); $app.clearCookiesTryLogin();
throw err; throw err;
}) })
.then((args) => { .then((args) => {