diff --git a/jslib b/jslib index 7f3bbd6e51..0735569479 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 7f3bbd6e514585750477f6b5f27e3d996c24902e +Subproject commit 07355694792999042e6373ebd1b3571329a969cc diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html index 7e13e7bb00..be974cbb60 100644 --- a/src/app/send/add-edit.component.html +++ b/src/app/send/add-edit.component.html @@ -5,6 +5,9 @@ {{'sendDisabledWarning' | i18n}} + + {{'sendOptionsPolicyInEffect' | i18n}} +
@@ -143,6 +146,15 @@ {{'sendNotesDesc' | i18n}}
+
+
+
+ + +
+
+
diff --git a/src/app/services.module.ts b/src/app/services.module.ts index a35970f656..31d5e13e43 100644 --- a/src/app/services.module.ts +++ b/src/app/services.module.ts @@ -38,6 +38,7 @@ import { CryptoService } from 'jslib/services/crypto.service'; import { EnvironmentService } from 'jslib/services/environment.service'; import { EventService } 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 { NotificationsService } from 'jslib/services/notifications.service'; import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service'; @@ -65,6 +66,7 @@ import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib import { EnvironmentService as EnvironmentServiceAbstraction } from 'jslib/abstractions/environment.service'; import { EventService as EventServiceAbstraction } 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 { LogService as LogServiceAbstraction } from 'jslib/abstractions/log.service'; @@ -103,6 +105,7 @@ const tokenService = new TokenService(storageService); const appIdService = new AppIdService(storageService); const apiService = new ApiService(tokenService, platformUtilsService, async (expired: boolean) => messagingService.send('logout', { expired: expired })); +const fileUploadService: FileUploadServiceAbstraction = new FileUploadService(logService, apiService); const userService = new UserService(tokenService, storageService); const settingsService = new SettingsService(userService, storageService); export let searchService: SearchService = null; @@ -112,7 +115,7 @@ const folderService = new FolderService(cryptoService, userService, apiService, i18nService, cipherService); const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService); searchService = new SearchService(cipherService, logService); -const sendService = new SendService(cryptoService, userService, apiService, storageService, +const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService, i18nService, cryptoFunctionService); const policyService = new PolicyService(userService, storageService); const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService, diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index 0b77f23725..49f6cbded9 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1656,5 +1656,11 @@ }, "webAuthnAuthenticate": { "message": "Authenticate WebAutn" + }, + "hideEmail": { + "message": "Hide my email address from recipients." + }, + "sendOptionsPolicyInEffect": { + "message": "One or more organization policies are affecting your Send options." } }