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

Merge pull request #193 from Hinton/hotfix/update-jslib

Browse Source 
Update jslib (PR 185)
This commit is contained in:
Chad Scharf 2020-11-23 16:09:09 -05:00 committed by GitHub
commit 74f0480942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 85faee21eec7602eecc3a5368be4c8fb7bab1e67 Subproject commit 0a73b6fca83b33573cf6ea0a41899ead34c23c46

8
src/bw.ts
View File

@ -30,6 +30,7 @@ import { NoopMessagingService } from 'jslib/services/noopMessaging.service';
import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service';
import { PolicyService } from 'jslib/services/policy.service'; import { PolicyService } from 'jslib/services/policy.service';
import { SearchService } from 'jslib/services/search.service'; import { SearchService } from 'jslib/services/search.service';
import { SendService } from 'jslib/services/send.service';
import { SettingsService } from 'jslib/services/settings.service'; import { SettingsService } from 'jslib/services/settings.service';
import { SyncService } from 'jslib/services/sync.service'; import { SyncService } from 'jslib/services/sync.service';
import { TokenService } from 'jslib/services/token.service'; import { TokenService } from 'jslib/services/token.service';
@ -76,6 +77,7 @@ export class Main {
policyService: PolicyService; policyService: PolicyService;
program: Program; program: Program;
logService: ConsoleLogService; logService: ConsoleLogService;
sendService: SendService;
constructor() { constructor() {
let p = null; let p = null;
@ -102,7 +104,7 @@ export class Main {
this.storageService = new LowdbStorageService(this.logService, null, p, true); this.storageService = new LowdbStorageService(this.logService, null, p, true);
this.secureStorageService = new NodeEnvSecureStorageService(this.storageService, () => this.cryptoService); this.secureStorageService = new NodeEnvSecureStorageService(this.storageService, () => this.cryptoService);
this.cryptoService = new CryptoService(this.storageService, this.secureStorageService, this.cryptoService = new CryptoService(this.storageService, this.secureStorageService,
this.cryptoFunctionService); this.cryptoFunctionService, this.platformUtilsService);
this.appIdService = new AppIdService(this.storageService); this.appIdService = new AppIdService(this.storageService);
this.tokenService = new TokenService(this.storageService); this.tokenService = new TokenService(this.storageService);
this.messagingService = new NoopMessagingService(); this.messagingService = new NoopMessagingService();
@ -122,12 +124,14 @@ export class Main {
this.i18nService); this.i18nService);
this.searchService = new SearchService(this.cipherService); this.searchService = new SearchService(this.cipherService);
this.policyService = new PolicyService(this.userService, this.storageService); this.policyService = new PolicyService(this.userService, this.storageService);
this.sendService = new SendService(this.cryptoService, this.userService, this.apiService, this.storageService,
this.i18nService, this.cryptoFunctionService);
this.vaultTimeoutService = new VaultTimeoutService(this.cipherService, this.folderService, this.vaultTimeoutService = new VaultTimeoutService(this.cipherService, this.folderService,
this.collectionService, this.cryptoService, this.platformUtilsService, this.storageService, this.collectionService, this.cryptoService, this.platformUtilsService, this.storageService,
this.messagingService, this.searchService, this.userService, this.tokenService, null, null); this.messagingService, this.searchService, this.userService, this.tokenService, null, null);
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.folderService, this.cipherService, this.cryptoService, this.collectionService,
this.storageService, this.messagingService, this.policyService, this.storageService, this.messagingService, this.policyService, this.sendService,
async (expired: boolean) => await this.logout()); async (expired: boolean) => await this.logout());
this.passwordGenerationService = new PasswordGenerationService(this.cryptoService, this.storageService, this.passwordGenerationService = new PasswordGenerationService(this.cryptoService, this.storageService,
this.policyService); this.policyService);