From e7d4886a4f8f717b3d5dceff455844630c940c7b Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Tue, 24 Nov 2020 14:01:34 -0600 Subject: [PATCH 1/3] Use logService for console messages --- src/app/services.module.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/services.module.ts b/src/app/services.module.ts index e6733a7cc3..22566ed6d7 100644 --- a/src/app/services.module.ts +++ b/src/app/services.module.ts @@ -97,7 +97,8 @@ const platformUtilsService = new ElectronPlatformUtilsService(i18nService, messa const secureStorageService: StorageServiceAbstraction = new ElectronRendererSecureStorageService(); const cryptoFunctionService: CryptoFunctionServiceAbstraction = new WebCryptoFunctionService(window, platformUtilsService); -const cryptoService = new CryptoService(storageService, secureStorageService, cryptoFunctionService, platformUtilsService); +const cryptoService = new CryptoService(storageService, secureStorageService, cryptoFunctionService, + platformUtilsService, logService); const tokenService = new TokenService(storageService); const appIdService = new AppIdService(storageService); const apiService = new ApiService(tokenService, platformUtilsService, @@ -110,7 +111,7 @@ const cipherService = new CipherService(cryptoService, userService, settingsServ const folderService = new FolderService(cryptoService, userService, apiService, storageService, i18nService, cipherService); const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService); -searchService = new SearchService(cipherService); +searchService = new SearchService(cipherService, logService); const sendService = new SendService(cryptoService, userService, apiService, storageService, i18nService, cryptoFunctionService); const policyService = new PolicyService(userService, storageService); @@ -124,11 +125,11 @@ const passwordGenerationService = new PasswordGenerationService(cryptoService, s const totpService = new TotpService(storageService, cryptoFunctionService); const containerService = new ContainerService(cryptoService); const authService = new AuthService(cryptoService, apiService, userService, tokenService, appIdService, - i18nService, platformUtilsService, messagingService, vaultTimeoutService); + i18nService, platformUtilsService, messagingService, vaultTimeoutService, logService); const exportService = new ExportService(folderService, cipherService, apiService); const auditService = new AuditService(cryptoFunctionService, apiService); const notificationsService = new NotificationsService(userService, syncService, appIdService, - apiService, vaultTimeoutService, async () => messagingService.send('logout', { expired: true })); + apiService, vaultTimeoutService, async () => messagingService.send('logout', { expired: true }), logService); const environmentService = new EnvironmentService(apiService, storageService, notificationsService); const eventService = new EventService(storageService, apiService, userService, cipherService); const systemService = new SystemService(storageService, vaultTimeoutService, messagingService, platformUtilsService, From de45dc77a036d942ce163cb235744bdcb54801ca Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Fri, 11 Dec 2020 10:42:23 -0600 Subject: [PATCH 2/3] Include new jslib dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 6014cb126d..64b8f16281 100644 --- a/package.json +++ b/package.json @@ -303,6 +303,7 @@ "angular2-toaster": "8.0.0", "angulartics2": "9.1.0", "big-integer": "1.6.36", + "browser-process-hrtime": "1.0.0", "core-js": "2.6.2", "desktop-idle": "1.1.2", "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git", From dce4c83cfedb1b5b521608da8f599daf0ae6fb69 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Fri, 11 Dec 2020 10:47:23 -0600 Subject: [PATCH 3/3] Update jslib --- jslib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jslib b/jslib index 63fe38b3f4..2c414ce27a 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 63fe38b3f4dddd701b1a8da8a89e70c9d7fbc706 +Subproject commit 2c414ce27a5c14f6cd7f86cfd07096a192d058ca