Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-28 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Use Multi-Messaging Service (#4304)" (#4374)

Browse Source 
This reverts commit b1ee65dca8.
This commit is contained in:
Daniel James Smith 2023-01-03 20:13:54 +01:00 committed by GitHub
parent 491fac405e
commit d3c780e079
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/browser/src/background/main.background.ts
View File

@ -214,25 +214,9 @@ export default class MainBackground {
const logoutCallback = async (expired: boolean, userId?: string) =>
await this.logout(expired, userId);
const messagingServices: MessagingServiceAbstraction[] = [];
if (!isPrivateMode) {
// Sent to detached background
messagingServices.push(new BrowserMessagingService());
}
if (this.popupOnlyContext) {
// Sent to popup
messagingServices.push(new BrowserMessagingPrivateModeBackgroundService());
}
this.messagingService = new (class extends MessagingServiceAbstraction {
// AuthService should send the messages to the background not popup.
send = (subscriber: string, arg: any = {}) => {
for (const messagingService of messagingServices) {
messagingService.send(subscriber, arg);
}
};
})();
this.messagingService = this.popupOnlyContext
? new BrowserMessagingPrivateModeBackgroundService()
: new BrowserMessagingService();
this.logService = new ConsoleLogService(false);
this.cryptoFunctionService = new WebCryptoFunctionService(window);
this.storageService = new BrowserLocalStorageService();
@ -368,13 +352,22 @@ export default class MainBackground {
this.twoFactorService = new TwoFactorService(this.i18nService, this.platformUtilsService);
// eslint-disable-next-line
const that = this;
const backgroundMessagingService = new (class extends MessagingServiceAbstraction {
// AuthService should send the messages to the background not popup.
send = (subscriber: string, arg: any = {}) => {
const message = Object.assign({}, { command: subscriber }, arg);
that.runtimeBackground.processMessage(message, that, null);
};
})();
this.authService = new AuthService(
this.cryptoService,
this.apiService,
this.tokenService,
this.appIdService,
this.platformUtilsService,
this.messagingService,
backgroundMessagingService,
this.logService,
this.keyConnectorService,
this.environmentService,