Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-01 18:08:19 +01:00
Code Issues Projects Releases Wiki Activity

Wait for user to log in before trying to save credentials

Browse Source
This commit is contained in:
Daniel James Smith 2021-09-30 16:43:10 +02:00
parent 5c175e2201
commit 838bfe9454
No known key found for this signature in database
GPG Key ID: 03E4BD365FF06726
3 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/background/main.background.ts
View File

@ -127,6 +127,7 @@ export default class MainBackground {
onReplacedRan: boolean;
loginToAutoFill: any = null;
notificationQueue: any[] = [];
retryQueue: any[] = [];
private commandsBackground: CommandsBackground;
private contextMenusBackground: ContextMenusBackground;

40
src/background/runtime.background.ts
View File

@ -71,6 +71,18 @@ export default class RuntimeBackground {
await this.main.refreshBadgeAndMenu(false);
this.notificationsService.updateConnection(msg.command === 'unlocked');
this.systemService.cancelProcessReload();
if (this.main.retryQueue.length > 0) {
const retryItem = this.main.retryQueue.pop();
await this.processMessage(retryItem.msg, retryItem.sender, null);
}
break;
case 'addToRetryQueue':
const retryMessage = {
msg: msg.retryItem,
sender: sender,
};
this.main.retryQueue.push(retryMessage);
break;
case 'logout':
await this.main.logout(msg.expired);
@ -224,10 +236,6 @@ export default class RuntimeBackground {
}
private async saveAddLogin(tab: any, folderId: string) {
console.log('saveAddLogin triggered');
if (await this.vaultTimeoutService.isLocked()) {
return;
}
for (let i = this.main.notificationQueue.length - 1; i >= 0; i--) {
const queueMessage = this.main.notificationQueue[i];
@ -268,10 +276,6 @@ export default class RuntimeBackground {
}
private async saveChangePassword(tab: any) {
console.log('saveChangePassword triggered');
if (await this.vaultTimeoutService.isLocked()) {
return;
}
for (let i = this.main.notificationQueue.length - 1; i >= 0; i--) {
const queueMessage = this.main.notificationQueue[i];
@ -361,20 +365,20 @@ export default class RuntimeBackground {
}
private async pushAddLoginToQueue(loginDomain: string, loginInfo: any, tab: any, isVaultLocked: boolean = false) {
// remove any old messages for this tab
this.removeTabFromNotificationQueue(tab);
// remove any old messages for this tab
this.removeTabFromNotificationQueue(tab);
const message: addLoginQueueMessage = {
type: 'addLogin',
username: loginInfo.username,
password: loginInfo.password,
domain: loginDomain,
uri: loginInfo.url,
tabId: tab.id,
expires: new Date((new Date()).getTime() + 30 * 60000), // 30 minutes
type: 'addLogin',
username: loginInfo.username,
password: loginInfo.password,
domain: loginDomain,
uri: loginInfo.url,
tabId: tab.id,
expires: new Date((new Date()).getTime() + 30 * 60000), // 30 minutes
wasVaultLocked: isVaultLocked,
};
this.main.notificationQueue.push(message);
await this.main.checkNotificationQueue(tab);
await this.main.checkNotificationQueue(tab);
}
private async changedPassword(changeData: any, tab: any) {

12
src/notification/bar.js
View File

@ -73,6 +73,12 @@ document.addEventListener('DOMContentLoaded', () => {
sendPlatformMessage({
command: 'openPopout'
});
sendPlatformMessage({
command: 'addToRetryQueue',
retryItem: bgAddSaveMessage
});
return;
}
sendPlatformMessage(bgAddSaveMessage);
@ -111,6 +117,12 @@ document.addEventListener('DOMContentLoaded', () => {
sendPlatformMessage({
command: 'openPopout'
});
sendPlatformMessage({
command: 'addToRetryQueue',
retryItem: bgChangeSaveMessage,
});
return;
}
sendPlatformMessage(bgChangeSaveMessage);
});