bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-13 06:43:35 +00:00
Code Issues Releases Wiki Activity

resolving this contexts

Browse Source
This commit is contained in:
Kyle Spearrin
2017-12-06 22:28:33 -05:00
parent b1880c5305
commit 81c01de641
2 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ export default class MainBackground {
this.cryptoService = new CryptoService(); this.cryptoService = new CryptoService();
this.tokenService = new TokenService(); this.tokenService = new TokenService();
this.appIdService = new AppIdService(); this.appIdService = new AppIdService();
this.apiService = new ApiService(this.tokenService, this.logout); this.apiService = new ApiService(this.tokenService, (expired: boolean) => this.logout(expired));
this.environmentService = new EnvironmentService(this.apiService); this.environmentService = new EnvironmentService(this.apiService);
this.userService = new UserService(this.tokenService); this.userService = new UserService(this.tokenService);
this.settingsService = new SettingsService(this.userService); this.settingsService = new SettingsService(this.userService);
@@ -74,9 +74,10 @@ export default class MainBackground {
this.apiService); this.apiService);
this.collectionService = new CollectionService(this.cryptoService, this.userService); this.collectionService = new CollectionService(this.cryptoService, this.userService);
this.lockService = new LockService(this.cipherService, this.folderService, this.collectionService, this.lockService = new LockService(this.cipherService, this.folderService, this.collectionService,
this.cryptoService, this.utilsService, this.setIcon, this.refreshBadgeAndMenu); this.cryptoService, this.utilsService, () => this.setIcon(), () => this.refreshBadgeAndMenu());
this.syncService = new SyncService(this.userService, this.apiService, this.settingsService, this.syncService = new SyncService(this.userService, this.apiService, this.settingsService,
this.folderService, this.cipherService, this.cryptoService, this.collectionService, this.logout); this.folderService, this.cipherService, this.cryptoService, this.collectionService,
(expired: boolean) => this.logout(expired));
this.passwordGenerationService = new PasswordGenerationService(this.cryptoService); this.passwordGenerationService = new PasswordGenerationService(this.cryptoService);
this.totpService = new TotpService(); this.totpService = new TotpService();
this.autofillService = new AutofillService(this.cipherService, this.tokenService, this.autofillService = new AutofillService(this.cipherService, this.tokenService,
@@ -118,43 +119,43 @@ export default class MainBackground {
}); });
} }
chrome.runtime.onMessage.addListener((msg: any, sender: any, sendResponse: any) => { chrome.runtime.onMessage.addListener(async (msg: any, sender: any, sendResponse: any) => {
if (msg.command === 'loggedIn' || msg.command === 'unlocked' || msg.command === 'locked') { if (msg.command === 'loggedIn' || msg.command === 'unlocked' || msg.command === 'locked') {
this.setIcon(); await this.setIcon();
this.refreshBadgeAndMenu(); await this.refreshBadgeAndMenu();
} else if (msg.command === 'logout') { } else if (msg.command === 'logout') {
this.logout(msg.expired); await this.logout(msg.expired);
} else if (msg.command === 'syncCompleted' && msg.successfully) { } else if (msg.command === 'syncCompleted' && msg.successfully) {
setTimeout(async () => await this.refreshBadgeAndMenu(), 2000); setTimeout(async () => await this.refreshBadgeAndMenu(), 2000);
} else if (msg.command === 'bgOpenOverlayPopup') { } else if (msg.command === 'bgOpenOverlayPopup') {
this.currentTabSendMessage('openOverlayPopup', msg.data); await this.currentTabSendMessage('openOverlayPopup', msg.data);
} else if (msg.command === 'bgCloseOverlayPopup') { } else if (msg.command === 'bgCloseOverlayPopup') {
this.currentTabSendMessage('closeOverlayPopup'); await this.currentTabSendMessage('closeOverlayPopup');
} else if (msg.command === 'bgOpenNotificationBar') { } else if (msg.command === 'bgOpenNotificationBar') {
this.tabSendMessage(sender.tab.id, 'openNotificationBar', msg.data); await this.tabSendMessage(sender.tab.id, 'openNotificationBar', msg.data);
} else if (msg.command === 'bgCloseNotificationBar') { } else if (msg.command === 'bgCloseNotificationBar') {
this.tabSendMessage(sender.tab.id, 'closeNotificationBar'); await this.tabSendMessage(sender.tab.id, 'closeNotificationBar');
} else if (msg.command === 'bgAdjustNotificationBar') { } else if (msg.command === 'bgAdjustNotificationBar') {
this.tabSendMessage(sender.tab.id, 'adjustNotificationBar', msg.data); await this.tabSendMessage(sender.tab.id, 'adjustNotificationBar', msg.data);
} else if (msg.command === 'bgCollectPageDetails') { } else if (msg.command === 'bgCollectPageDetails') {
this.collectPageDetailsForContentScript(sender.tab, msg.sender, sender.frameId); this.collectPageDetailsForContentScript(sender.tab, msg.sender, sender.frameId);
} else if (msg.command === 'bgAddLogin') { } else if (msg.command === 'bgAddLogin') {
this.addLogin(msg.login, sender.tab); await this.addLogin(msg.login, sender.tab);
} else if (msg.command === 'bgAddClose') { } else if (msg.command === 'bgAddClose') {
this.removeAddLogin(sender.tab); this.removeAddLogin(sender.tab);
} else if (msg.command === 'bgAddSave') { } else if (msg.command === 'bgAddSave') {
this.saveAddLogin(sender.tab); await this.saveAddLogin(sender.tab);
} else if (msg.command === 'bgNeverSave') { } else if (msg.command === 'bgNeverSave') {
this.saveNever(sender.tab); await this.saveNever(sender.tab);
} else if (msg.command === 'collectPageDetailsResponse') { } else if (msg.command === 'collectPageDetailsResponse') {
if (msg.sender === 'notificationBar') { if (msg.sender === 'notificationBar') {
const forms = this.autofillService.getFormsWithPasswordFields(msg.details); const forms = this.autofillService.getFormsWithPasswordFields(msg.details);
this.tabSendMessage(msg.tab.id, 'notificationBarPageDetails', { await this.tabSendMessage(msg.tab.id, 'notificationBarPageDetails', {
details: msg.details, details: msg.details,
forms: forms, forms: forms,
}); });
} else if (msg.sender === 'autofiller' || msg.sender === 'autofill_cmd') { } else if (msg.sender === 'autofiller' || msg.sender === 'autofill_cmd') {
this.autofillService.doAutoFillForLastUsedLogin([{ await this.autofillService.doAutoFillForLastUsedLogin([{
frameId: sender.frameId, frameId: sender.frameId,
tab: msg.tab, tab: msg.tab,
details: msg.details, details: msg.details,
@@ -165,7 +166,7 @@ export default class MainBackground {
this.autofillTimeout = setTimeout(async () => await this.autofillPage(), 300); this.autofillTimeout = setTimeout(async () => await this.autofillPage(), 300);
} }
} else if (msg.command === 'bgUpdateContextMenu') { } else if (msg.command === 'bgUpdateContextMenu') {
this.refreshBadgeAndMenu(); await this.refreshBadgeAndMenu();
} }
}); });
@@ -182,50 +183,49 @@ export default class MainBackground {
}); });
} }
chrome.tabs.onActivated.addListener((activeInfo: any) => { chrome.tabs.onActivated.addListener(async (activeInfo: any) => {
this.refreshBadgeAndMenu(); await this.refreshBadgeAndMenu();
}); });
chrome.tabs.onReplaced.addListener((addedTabId: any, removedTabId: any) => { chrome.tabs.onReplaced.addListener(async (addedTabId: any, removedTabId: any) => {
if (this.onReplacedRan) { if (this.onReplacedRan) {
return; return;
} }
this.onReplacedRan = true; this.onReplacedRan = true;
this.checkLoginsToAdd(); await this.checkLoginsToAdd();
this.refreshBadgeAndMenu(); await this.refreshBadgeAndMenu();
}); });
chrome.tabs.onUpdated.addListener((tabId: any, changeInfo: any, tab: any) => { chrome.tabs.onUpdated.addListener(async (tabId: any, changeInfo: any, tab: any) => {
if (this.onUpdatedRan) { if (this.onUpdatedRan) {
return; return;
} }
this.onUpdatedRan = true; this.onUpdatedRan = true;
this.checkLoginsToAdd(); await this.checkLoginsToAdd();
this.refreshBadgeAndMenu(); await this.refreshBadgeAndMenu();
}); });
if (chrome.windows) { if (chrome.windows) {
chrome.windows.onFocusChanged.addListener((windowId: any) => { chrome.windows.onFocusChanged.addListener(async (windowId: any) => {
if (windowId === null || windowId < 0) { if (windowId === null || windowId < 0) {
return; return;
} }
this.refreshBadgeAndMenu(); await this.refreshBadgeAndMenu();
}); });
} }
if (chrome.contextMenus) { if (chrome.contextMenus) {
chrome.contextMenus.onClicked.addListener((info: any, tab: any) => { chrome.contextMenus.onClicked.addListener(async (info: any, tab: any) => {
if (info.menuItemId === 'generate-password') { if (info.menuItemId === 'generate-password') {
(window as any).ga('send', { (window as any).ga('send', {
hitType: 'event', hitType: 'event',
eventAction: 'Generated Password From Context Menu', eventAction: 'Generated Password From Context Menu',
}); });
this.passwordGenerationService.getOptions().then((options) => { const options = await this.passwordGenerationService.getOptions();
const password = PasswordGenerationService.generatePassword(options); const password = PasswordGenerationService.generatePassword(options);
UtilsService.copyToClipboard(password); UtilsService.copyToClipboard(password);
this.passwordGenerationService.addHistory(password); await this.passwordGenerationService.addHistory(password);
});
} else if (info.parentMenuItemId === 'autofill' || info.parentMenuItemId === 'copy-username' || } else if (info.parentMenuItemId === 'autofill' || info.parentMenuItemId === 'copy-username' ||
info.parentMenuItemId === 'copy-password') { info.parentMenuItemId === 'copy-password') {
const id = info.menuItemId.split('_')[1]; const id = info.menuItemId.split('_')[1];
@@ -236,7 +236,7 @@ export default class MainBackground {
return; return;
} }
this.cipherService.getAllDecrypted().then((ciphers) => { const ciphers = await this.cipherService.getAllDecrypted();
for (let i = 0; i < ciphers.length; i++) { for (let i = 0; i < ciphers.length; i++) {
const cipher = ciphers[i]; const cipher = ciphers[i];
if (cipher.id !== id) { if (cipher.id !== id) {
@@ -248,7 +248,7 @@ export default class MainBackground {
hitType: 'event', hitType: 'event',
eventAction: 'Autofilled From Context Menu', eventAction: 'Autofilled From Context Menu',
}); });
this.startAutofillPage(cipher); await this.startAutofillPage(cipher);
} else if (info.parentMenuItemId === 'copy-username') { } else if (info.parentMenuItemId === 'copy-username') {
(window as any).ga('send', { (window as any).ga('send', {
hitType: 'event', hitType: 'event',
@@ -265,7 +265,6 @@ export default class MainBackground {
break; break;
} }
});
} }
}); });
} }
@@ -274,9 +273,9 @@ export default class MainBackground {
await this.webRequestBackground.init(); await this.webRequestBackground.init();
await this.environmentService.setUrlsFromStorage(); await this.environmentService.setUrlsFromStorage();
this.setIcon(); await this.setIcon();
this.cleanupLoginsToAdd(); this.cleanupLoginsToAdd();
this.fullSync(true); await this.fullSync(true);
} }
private async buildContextMenu() { private async buildContextMenu() {

4
src/services/lock.service.ts
View File

@@ -66,13 +66,13 @@ export default class LockService {
this.cryptoService.clearOrgKeys(true), this.cryptoService.clearOrgKeys(true),
this.cryptoService.clearPrivateKey(true), this.cryptoService.clearPrivateKey(true),
this.cryptoService.clearEncKey(true), this.cryptoService.clearEncKey(true),
this.setIcon(),
this.refreshBadgeAndMenu(),
]); ]);
this.setIcon();
this.folderService.clearCache(); this.folderService.clearCache();
this.cipherService.clearCache(); this.cipherService.clearCache();
this.collectionService.clearCache(); this.collectionService.clearCache();
this.refreshBadgeAndMenu();
} }
// Helpers // Helpers