1
0
mirror of https://github.com/bitwarden/directory-connector synced 2026-01-06 02:23:35 +00:00

Merge branch 'master' into update-jslib-sso

merge lastest from master into jslib update branch
This commit is contained in:
Chad Scharf
2020-12-02 14:27:55 -05:00
2 changed files with 3 additions and 2 deletions

View File

@@ -67,7 +67,8 @@ const storageService: StorageServiceAbstraction = new ElectronStorageService(rem
const platformUtilsService = new ElectronPlatformUtilsService(i18nService, messagingService, false, storageService);
const secureStorageService: StorageServiceAbstraction = new ElectronRendererSecureStorageService();
const cryptoFunctionService: CryptoFunctionServiceAbstraction = new NodeCryptoFunctionService();
const cryptoService = new CryptoService(storageService, secureStorageService, cryptoFunctionService);
const cryptoService = new CryptoService(storageService, secureStorageService, cryptoFunctionService,
platformUtilsService);
const appIdService = new AppIdService(storageService);
const tokenService = new TokenService(storageService);
const apiService = new ApiService(tokenService, platformUtilsService,

View File

@@ -84,7 +84,7 @@ export class Main {
this.secureStorageService = plaintextSecrets ?
this.storageService : new KeytarSecureStorageService(applicationName);
this.cryptoService = new CryptoService(this.storageService, this.secureStorageService,
this.cryptoFunctionService);
this.cryptoFunctionService, this.platformUtilsService);
this.appIdService = new AppIdService(this.storageService);
this.tokenService = new TokenService(this.storageService);
this.messagingService = new NoopMessagingService();