bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 00:33:44 +00:00
Code Issues Releases Wiki Activity

feature/18-import (#19)

Browse Source 
* fix #18

* Add locked check
This commit is contained in:
Brandon Davis
2018-08-06 09:38:17 -04:00
committed by Kyle Spearrin
parent e0ff13e193
commit 47b5b9f950
8 changed files with 133 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bw.ts
View File

@@ -17,6 +17,7 @@ import { CryptoService } from 'jslib/services/crypto.service';
import { EnvironmentService } from 'jslib/services/environment.service';
import { ExportService } from 'jslib/services/export.service';
import { FolderService } from 'jslib/services/folder.service';
import { ImportService } from 'jslib/services/import.service';
import { LockService } from 'jslib/services/lock.service';
import { LowdbStorageService } from 'jslib/services/lowdbStorage.service';
import { NodeApiService } from 'jslib/services/nodeApi.service';
@@ -53,6 +54,7 @@ export class Main {
totpService: TotpService;
containerService: ContainerService;
auditService: AuditService;
importService: ImportService;
exportService: ExportService;
cryptoFunctionService: NodeCryptoFunctionService;
authService: AuthService;
@@ -99,6 +101,8 @@ export class Main {
this.storageService, this.messagingService, async (expired: boolean) => await this.logout());
this.passwordGenerationService = new PasswordGenerationService(this.cryptoService, this.storageService);
this.totpService = new TotpService(this.storageService, this.cryptoFunctionService);
this.importService = new ImportService(this.cipherService, this.folderService, this.apiService,
this.i18nService);
this.exportService = new ExportService(this.folderService, this.cipherService, this.apiService);
this.authService = new AuthService(this.cryptoService, this.apiService, this.userService, this.tokenService,
this.appIdService, this.i18nService, this.platformUtilsService, this.messagingService, true);