From 6067c1610c583167fc1a2970fca5fbe65836f932 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Fri, 26 Mar 2021 16:54:13 -0500 Subject: [PATCH] Azure upload blobs (#875) * Include AzureStorageService in SendService * Provide DI for abstrace AzureStorageService * Use file upload service * Update jslib --- jslib | 2 +- src/app/services/services.module.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jslib b/jslib index f20af0cd7c..cfc7687815 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit f20af0cd7c90adc07783950bed197b5d47892d6f +Subproject commit cfc76878154c5b292b729e2909bec1848f5cc23c diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index e5c48fe956..e7fc177fde 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -37,6 +37,7 @@ import { CryptoService } from 'jslib/services/crypto.service'; import { EnvironmentService } from 'jslib/services/environment.service'; import { EventService as EventLoggingService } from 'jslib/services/event.service'; import { ExportService } from 'jslib/services/export.service'; +import { FileUploadService } from 'jslib/services/fileUpload.service'; import { FolderService } from 'jslib/services/folder.service'; import { ImportService } from 'jslib/services/import.service'; import { NotificationsService } from 'jslib/services/notifications.service'; @@ -64,6 +65,7 @@ import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib import { EnvironmentService as EnvironmentServiceAbstraction } from 'jslib/abstractions/environment.service'; import { EventService as EventLoggingServiceAbstraction } from 'jslib/abstractions/event.service'; import { ExportService as ExportServiceAbstraction } from 'jslib/abstractions/export.service'; +import { FileUploadService as FileUploadServiceAbstraction } from 'jslib/abstractions/fileUpload.service'; import { FolderService as FolderServiceAbstraction } from 'jslib/abstractions/folder.service'; import { I18nService as I18nServiceAbstraction } from 'jslib/abstractions/i18n.service'; import { ImportService as ImportServiceAbstraction } from 'jslib/abstractions/import.service'; @@ -113,7 +115,8 @@ const folderService = new FolderService(cryptoService, userService, apiService, const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService); searchService = new SearchService(cipherService, consoleLogService); const policyService = new PolicyService(userService, storageService); -const sendService = new SendService(cryptoService, userService, apiService, storageService, +const fileUploadService = new FileUploadService(consoleLogService, apiService); +const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService, i18nService, cryptoFunctionService); const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService, cryptoService, platformUtilsService, storageService, messagingService, searchService, userService, tokenService, @@ -213,6 +216,7 @@ export function initFactory(): Function { { provide: PlatformUtilsServiceAbstraction, useValue: platformUtilsService }, { provide: PasswordGenerationServiceAbstraction, useValue: passwordGenerationService }, { provide: ApiServiceAbstraction, useValue: apiService }, + { provide: FileUploadServiceAbstraction, useValue: fileUploadService }, { provide: SyncServiceAbstraction, useValue: syncService }, { provide: UserServiceAbstraction, useValue: userService }, { provide: MessagingServiceAbstraction, useValue: messagingService },