[SG 623] Send Service Refactor (#4327)

* Split out api methods into sendApiService

* Move SendService and abstraction

* Libs updates

* Web updates

* CLI updates

* Desktop updates

* libs send service fixes

* browser factory additions

* Browser updates

* Fix service injection for CLI SendReceiveCommand

* Deprecate directly calling send state service methods

* SendService observables updates

* Update components to use new observables

* Modify CLI to use state service instead of observables

* Remove unnecessary await on get()

* Move delete() to InternalSendService

* SendService unit tests

* Split fileUploadService by send and cipher

* send and cipher service factory updates

* Add file upload methods to get around circular dependency issues

* Move api methods from sendService to sendApiService

* Update cipherService to use fileApi methods

* libs service injection and component changes

* browser service injection and component changes

* Desktop component changes

* Web component changes

* cipher service test fix

* Fix file capitalization

* CLI service import and command updates

* Remove extra abstract fileUploadService

* WIP: Condense callbacks for file upload

Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>

* Send callbacks for file upload

* Fix circular service dependencies

* Fix response return on upload

* Fix function definitions

* Service injection fixes and bug fixes

* Fix folder casing

* Service injection cleanup

* Remove deleted file from capital letters whitelist

* Create new SendApiService for popup

* Move cipherFileUploadService to vault

* Move SendFileUploadService methods into SendApiService

* Rename methods to remove 'WithServer'

* Properly subscribe to sendViews

* Fix Send serialization

* Implement fromJSON on sendFile and sendText

* [PM-1347] Fix send key serialization (#4989)

* Properly serialize key on send fromJSON

* Remove call that nulled out decrypted sends

* Fix null checks in fromJSON methods for models

* lint fixes

---------

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>

apps/browser/src/background/main.background.ts

@@ -8,14 +8,15 @@ import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service";
-import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service";
+import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/file-upload/file-upload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
-import { SendService as SendServiceAbstraction } from "@bitwarden/common/abstractions/send.service";
+import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/abstractions/send/send-api.service.abstraction";
+import { InternalSendService as InternalSendServiceAbstraction } from "@bitwarden/common/abstractions/send/send.service.abstraction";
 import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service";
 import {
   AbstractMemoryStorageService,
@@ -58,11 +59,11 @@ import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/servi
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { ExportService } from "@bitwarden/common/services/export.service";
-import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
+import { FileUploadService } from "@bitwarden/common/services/file-upload/file-upload.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
-import { SendService } from "@bitwarden/common/services/send.service";
+import { SendApiService } from "@bitwarden/common/services/send/send-api.service";
 import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
 import { SystemService } from "@bitwarden/common/services/system.service";
 import { TotpService } from "@bitwarden/common/services/totp.service";
@@ -77,12 +78,14 @@ import {
   UsernameGenerationServiceAbstraction,
 } from "@bitwarden/common/tools/generator/username";
 import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction";
 import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
+import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
 import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
@@ -105,6 +108,7 @@ import { Account } from "../models/account";
 import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service";
 import { BrowserEnvironmentService } from "../services/browser-environment.service";
 import { BrowserI18nService } from "../services/browser-i18n.service";
+import { BrowserSendService } from "../services/browser-send.service";
 import { BrowserSettingsService } from "../services/browser-settings.service";
 import { BrowserStateService } from "../services/browser-state.service";
 import { BrowserCryptoService } from "../services/browserCrypto.service";
@@ -160,8 +164,9 @@ export default class MainBackground {
   eventCollectionService: EventCollectionServiceAbstraction;
   eventUploadService: EventUploadServiceAbstraction;
   policyService: InternalPolicyServiceAbstraction;
-  sendService: SendServiceAbstraction;
+  sendService: InternalSendServiceAbstraction;
   fileUploadService: FileUploadServiceAbstraction;
+  cipherFileUploadService: CipherFileUploadServiceAbstraction;
   organizationService: InternalOrganizationServiceAbstraction;
   providerService: ProviderServiceAbstraction;
   keyConnectorService: KeyConnectorServiceAbstraction;
@@ -172,6 +177,7 @@ export default class MainBackground {
   encryptService: EncryptService;
   folderApiService: FolderApiServiceAbstraction;
   policyApiService: PolicyApiServiceAbstraction;
+  sendApiService: SendApiServiceAbstraction;
   userVerificationApiService: UserVerificationApiServiceAbstraction;
   syncNotifierService: SyncNotifierServiceAbstraction;
   avatarUpdateService: AvatarUpdateServiceAbstraction;
@@ -292,17 +298,21 @@ export default class MainBackground {
       (expired: boolean) => this.logout(expired)
     );
     this.settingsService = new BrowserSettingsService(this.stateService);
-    this.fileUploadService = new FileUploadService(this.logService, this.apiService);
+    this.fileUploadService = new FileUploadService(this.logService);
+    this.cipherFileUploadService = new CipherFileUploadService(
+      this.apiService,
+      this.fileUploadService
+    );
     this.cipherService = new CipherService(
       this.cryptoService,
       this.settingsService,
       this.apiService,
-      this.fileUploadService,
       this.i18nService,
       () => this.searchService,
       this.logService,
       this.stateService,
-      this.encryptService
+      this.encryptService,
+      this.cipherFileUploadService
     );
     this.folderService = new BrowserFolderService(
       this.cryptoService,
@@ -317,14 +327,6 @@ export default class MainBackground {
       this.stateService
     );
     this.searchService = new SearchService(this.cipherService, this.logService, this.i18nService);
-    this.sendService = new SendService(
-      this.cryptoService,
-      this.apiService,
-      this.fileUploadService,
-      this.i18nService,
-      this.cryptoFunctionService,
-      this.stateService
-    );
     this.syncNotifierService = new SyncNotifierService();
     this.organizationService = new BrowserOrganizationService(this.stateService);
     this.policyService = new BrowserPolicyService(this.stateService, this.organizationService);
@@ -401,7 +403,18 @@ export default class MainBackground {
       lockedCallback,
       logoutCallback
     );
-
+    this.containerService = new ContainerService(this.cryptoService, this.encryptService);
+    this.sendService = new BrowserSendService(
+      this.cryptoService,
+      this.i18nService,
+      this.cryptoFunctionService,
+      this.stateService
+    );
+    this.sendApiService = new SendApiService(
+      this.apiService,
+      this.fileUploadService,
+      this.sendService
+    );
     this.providerService = new ProviderService(this.stateService);
     this.syncService = new SyncService(
       this.apiService,
@@ -419,6 +432,7 @@ export default class MainBackground {
       this.providerService,
       this.folderApiService,
       this.organizationService,
+      this.sendApiService,
       logoutCallback
     );
     this.eventUploadService = new EventUploadService(
@@ -446,7 +460,6 @@ export default class MainBackground {
       this.logService,
       this.settingsService
     );
-    this.containerService = new ContainerService(this.cryptoService, this.encryptService);
     this.auditService = new AuditService(this.cryptoFunctionService, this.apiService);
     this.exportService = new ExportService(
       this.folderService,

apps/browser/src/background/service_factories/cipher-file-upload-service.factory.ts

@@ -0,0 +1,31 @@
+import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
+import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
+
+import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
+import { FactoryOptions, CachedServices, factory } from "./factory-options";
+import {
+  fileUploadServiceFactory,
+  FileUploadServiceInitOptions,
+} from "./file-upload-service.factory";
+
+type CipherFileUploadServiceFactoyOptions = FactoryOptions;
+
+export type CipherFileUploadServiceInitOptions = CipherFileUploadServiceFactoyOptions &
+  ApiServiceInitOptions &
+  FileUploadServiceInitOptions;
+
+export function cipherFileUploadServiceFactory(
+  cache: { cipherFileUploadService?: CipherFileUploadServiceAbstraction } & CachedServices,
+  opts: CipherFileUploadServiceInitOptions
+): Promise<CipherFileUploadServiceAbstraction> {
+  return factory(
+    cache,
+    "cipherFileUploadService",
+    opts,
+    async () =>
+      new CipherFileUploadService(
+        await apiServiceFactory(cache, opts),
+        await fileUploadServiceFactory(cache, opts)
+      )
+  );
+}

apps/browser/src/background/service_factories/cipher-file-upload.service.factory.ts

@@ -0,0 +1,31 @@
+import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
+import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
+
+import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
+import { FactoryOptions, CachedServices, factory } from "./factory-options";
+import {
+  fileUploadServiceFactory,
+  FileUploadServiceInitOptions,
+} from "./file-upload-service.factory";
+
+type CipherFileUploadServiceFactoyOptions = FactoryOptions;
+
+export type CipherFileUploadServiceInitOptions = CipherFileUploadServiceFactoyOptions &
+  ApiServiceInitOptions &
+  FileUploadServiceInitOptions;
+
+export function cipherFileUploadServiceFactory(
+  cache: { cipherFileUploadService?: CipherFileUploadServiceAbstraction } & CachedServices,
+  opts: CipherFileUploadServiceInitOptions
+): Promise<CipherFileUploadServiceAbstraction> {
+  return factory(
+    cache,
+    "cipherFileUploadService",
+    opts,
+    async () =>
+      new CipherFileUploadService(
+        await apiServiceFactory(cache, opts),
+        await fileUploadServiceFactory(cache, opts)
+      )
+  );
+}

apps/browser/src/background/service_factories/file-upload-service.factory.ts

@@ -1,28 +1,21 @@
-import { FileUploadService as AbstractFileUploadService } from "@bitwarden/common/abstractions/fileUpload.service";
-import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
+import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/file-upload/file-upload.service";
+import { FileUploadService } from "@bitwarden/common/services/file-upload/file-upload.service";
 
-import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
 import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
 
-type FileUploadServiceFactoyOptions = FactoryOptions;
+type FileUploadServiceFactoryOptions = FactoryOptions;
 
-export type FileUploadServiceInitOptions = FileUploadServiceFactoyOptions &
-  LogServiceInitOptions &
-  ApiServiceInitOptions;
+export type FileUploadServiceInitOptions = FileUploadServiceFactoryOptions & LogServiceInitOptions;
 
 export function fileUploadServiceFactory(
-  cache: { fileUploadService?: AbstractFileUploadService } & CachedServices,
+  cache: { fileUploadService?: FileUploadServiceAbstraction } & CachedServices,
   opts: FileUploadServiceInitOptions
-): Promise<AbstractFileUploadService> {
+): Promise<FileUploadServiceAbstraction> {
   return factory(
     cache,
     "fileUploadService",
     opts,
-    async () =>
-      new FileUploadService(
-        await logServiceFactory(cache, opts),
-        await apiServiceFactory(cache, opts)
-      )
+    async () => new FileUploadService(await logServiceFactory(cache, opts))
   );
 }

apps/browser/src/background/service_factories/send-service.factory.ts

@@ -0,0 +1,34 @@
+import { InternalSendService } from "@bitwarden/common/abstractions/send/send.service.abstraction";
+
+import { BrowserSendService } from "../../services/browser-send.service";
+
+import { cryptoFunctionServiceFactory } from "./crypto-function-service.factory";
+import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
+import { FactoryOptions, CachedServices, factory } from "./factory-options";
+import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory";
+import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
+
+type SendServiceFactoryOptions = FactoryOptions;
+
+export type SendServiceInitOptions = SendServiceFactoryOptions &
+  CryptoServiceInitOptions &
+  I18nServiceInitOptions &
+  StateServiceInitOptions;
+
+export function sendServiceFactory(
+  cache: { sendService?: InternalSendService } & CachedServices,
+  opts: SendServiceInitOptions
+): Promise<InternalSendService> {
+  return factory(
+    cache,
+    "sendService",
+    opts,
+    async () =>
+      new BrowserSendService(
+        await cryptoServiceFactory(cache, opts),
+        await i18nServiceFactory(cache, opts),
+        await cryptoFunctionServiceFactory(cache, opts),
+        await stateServiceFactory(cache, opts)
+      )
+  );
+}

apps/browser/src/popup/send/send-add-edit.component.ts

@@ -9,7 +9,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { SendService } from "@bitwarden/common/abstractions/send.service";
+import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction";
+import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 
 import { BrowserStateService } from "../../services/abstractions/browser-state.service";
@@ -43,7 +44,8 @@ export class SendAddEditComponent extends BaseAddEditComponent {
     private router: Router,
     private location: Location,
     private popupUtilsService: PopupUtilsService,
-    logService: LogService
+    logService: LogService,
+    sendApiService: SendApiService
   ) {
     super(
       i18nService,
@@ -54,7 +56,8 @@ export class SendAddEditComponent extends BaseAddEditComponent {
       messagingService,
       policyService,
       logService,
-      stateService
+      stateService,
+      sendApiService
     );
   }
 

apps/browser/src/popup/send/send-groupings.component.ts

@@ -8,7 +8,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { SendService } from "@bitwarden/common/abstractions/send.service";
+import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction";
+import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { SendType } from "@bitwarden/common/enums/sendType";
 import { SendView } from "@bitwarden/common/models/view/send.view";
@@ -47,7 +48,8 @@ export class SendGroupingsComponent extends BaseSendComponent {
     private syncService: SyncService,
     private changeDetectorRef: ChangeDetectorRef,
     private broadcasterService: BroadcasterService,
-    logService: LogService
+    logService: LogService,
+    sendApiService: SendApiService
   ) {
     super(
       sendService,
@@ -57,7 +59,8 @@ export class SendGroupingsComponent extends BaseSendComponent {
       ngZone,
       searchService,
       policyService,
-      logService
+      logService,
+      sendApiService
     );
     super.onSuccessfulLoad = async () => {
       this.calculateTypeCounts();

apps/browser/src/popup/send/send-type.component.ts

@@ -10,7 +10,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { SendService } from "@bitwarden/common/abstractions/send.service";
+import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction";
+import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { SendType } from "@bitwarden/common/enums/sendType";
 import { SendView } from "@bitwarden/common/models/view/send.view";
@@ -47,7 +48,8 @@ export class SendTypeComponent extends BaseSendComponent {
     private changeDetectorRef: ChangeDetectorRef,
     private broadcasterService: BroadcasterService,
     private router: Router,
-    logService: LogService
+    logService: LogService,
+    sendApiService: SendApiService
   ) {
     super(
       sendService,
@@ -57,7 +59,8 @@ export class SendTypeComponent extends BaseSendComponent {
       ngZone,
       searchService,
       policyService,
-      logService
+      logService,
+      sendApiService
     );
     super.onSuccessfulLoad = async () => {
       this.selectType(this.type);

apps/browser/src/popup/services/services.module.ts

@@ -18,15 +18,19 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { ExportService } from "@bitwarden/common/abstractions/export.service";
+import { FileUploadService } from "@bitwarden/common/abstractions/file-upload/file-upload.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
-import { FileUploadService } from "@bitwarden/common/abstractions/fileUpload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
-import { SendService } from "@bitwarden/common/abstractions/send.service";
+import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/abstractions/send/send-api.service.abstraction";
+import {
+  InternalSendService as InternalSendServiceAbstraction,
+  SendService,
+} from "@bitwarden/common/abstractions/send/send.service.abstraction";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
 import {
   StateService as BaseStateServiceAbstraction,
@@ -62,9 +66,11 @@ import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
+import { SendApiService } from "@bitwarden/common/services/send/send-api.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherFileUploadService } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import {
   FolderService,
@@ -85,6 +91,7 @@ import { BrowserStateService as StateServiceAbstraction } from "../../services/a
 import { BrowserConfigService } from "../../services/browser-config.service";
 import { BrowserEnvironmentService } from "../../services/browser-environment.service";
 import { BrowserI18nService } from "../../services/browser-i18n.service";
+import { BrowserSendService } from "../../services/browser-send.service";
 import { BrowserSettingsService } from "../../services/browser-settings.service";
 import { BrowserStateService } from "../../services/browser-state.service";
 import { BrowserFileDownloadService } from "../../services/browserFileDownloadService";
@@ -173,8 +180,8 @@ function getBgService<T>(service: keyof MainBackground) {
     },
     { provide: AuditService, useFactory: getBgService<AuditService>("auditService"), deps: [] },
     {
-      provide: FileUploadService,
-      useFactory: getBgService<FileUploadService>("fileUploadService"),
+      provide: CipherFileUploadService,
+      useFactory: getBgService<CipherFileUploadService>("cipherFileUploadService"),
       deps: [],
     },
     { provide: CipherService, useFactory: getBgService<CipherService>("cipherService"), deps: [] },
@@ -183,6 +190,10 @@ function getBgService<T>(service: keyof MainBackground) {
       useFactory: getBgService<CryptoFunctionService>("cryptoFunctionService"),
       deps: [],
     },
+    {
+      provide: FileUploadService,
+      useFactory: getBgService<FileUploadService>("fileUploadService"),
+    },
     {
       provide: FolderService,
       useFactory: (
@@ -285,6 +296,38 @@ function getBgService<T>(service: keyof MainBackground) {
       deps: [],
     },
     { provide: ApiService, useFactory: getBgService<ApiService>("apiService"), deps: [] },
+    {
+      provide: SendService,
+      useFactory: (
+        cryptoService: CryptoService,
+        i18nService: I18nServiceAbstraction,
+        cryptoFunctionService: CryptoFunctionService,
+        stateServiceAbstraction: StateServiceAbstraction
+      ) => {
+        return new BrowserSendService(
+          cryptoService,
+          i18nService,
+          cryptoFunctionService,
+          stateServiceAbstraction
+        );
+      },
+      deps: [CryptoService, I18nServiceAbstraction, CryptoFunctionService, StateServiceAbstraction],
+    },
+    {
+      provide: InternalSendServiceAbstraction,
+      useExisting: SendService,
+    },
+    {
+      provide: SendApiServiceAbstraction,
+      useFactory: (
+        apiService: ApiService,
+        fileUploadService: FileUploadService,
+        sendService: InternalSendServiceAbstraction
+      ) => {
+        return new SendApiService(apiService, fileUploadService, sendService);
+      },
+      deps: [ApiService, FileUploadService, InternalSendServiceAbstraction],
+    },
     { provide: SyncService, useFactory: getBgService<SyncService>("syncService"), deps: [] },
     {
       provide: SettingsService,
@@ -305,7 +348,6 @@ function getBgService<T>(service: keyof MainBackground) {
       deps: [],
     },
     { provide: ExportService, useFactory: getBgService<ExportService>("exportService"), deps: [] },
-    { provide: SendService, useFactory: getBgService<SendService>("sendService"), deps: [] },
     {
       provide: KeyConnectorService,
       useFactory: getBgService<KeyConnectorService>("keyConnectorService"),

apps/browser/src/services/browser-send.service.ts

@@ -0,0 +1,15 @@
+import { BehaviorSubject } from "rxjs";
+
+import { Send } from "@bitwarden/common/models/domain/send";
+import { SendView } from "@bitwarden/common/models/view/send.view";
+import { SendService } from "@bitwarden/common/services/send/send.service";
+
+import { browserSession, sessionSync } from "../decorators/session-sync-observable";
+
+@browserSession
+export class BrowserSendService extends SendService {
+  @sessionSync({ initializer: Send.fromJSON, initializeAs: "array" })
+  protected _sends: BehaviorSubject<Send[]>;
+  @sessionSync({ initializer: SendView.fromJSON, initializeAs: "array" })
+  protected _sendViews: BehaviorSubject<SendView[]>;
+}

apps/browser/src/vault/background/service_factories/cipher-service.factory.ts

@@ -6,6 +6,10 @@ import {
   apiServiceFactory,
   ApiServiceInitOptions,
 } from "../../../background/service_factories/api-service.factory";
+import {
+  CipherFileUploadServiceInitOptions,
+  cipherFileUploadServiceFactory,
+} from "../../../background/service_factories/cipher-file-upload-service.factory";
 import {
   cryptoServiceFactory,
   CryptoServiceInitOptions,
@@ -19,10 +23,6 @@ import {
   factory,
   FactoryOptions,
 } from "../../../background/service_factories/factory-options";
-import {
-  FileUploadServiceInitOptions,
-  fileUploadServiceFactory,
-} from "../../../background/service_factories/file-upload-service.factory";
 import {
   i18nServiceFactory,
   I18nServiceInitOptions,
@@ -50,7 +50,7 @@ export type CipherServiceInitOptions = CipherServiceFactoryOptions &
   CryptoServiceInitOptions &
   SettingsServiceInitOptions &
   ApiServiceInitOptions &
-  FileUploadServiceInitOptions &
+  CipherFileUploadServiceInitOptions &
   I18nServiceInitOptions &
   LogServiceInitOptions &
   StateServiceInitOptions &
@@ -69,14 +69,14 @@ export function cipherServiceFactory(
         await cryptoServiceFactory(cache, opts),
         await settingsServiceFactory(cache, opts),
         await apiServiceFactory(cache, opts),
-        await fileUploadServiceFactory(cache, opts),
         await i18nServiceFactory(cache, opts),
         opts.cipherServiceOptions?.searchServiceFactory === undefined
           ? () => cache.searchService as SearchService
           : opts.cipherServiceOptions.searchServiceFactory,
         await logServiceFactory(cache, opts),
         await stateServiceFactory(cache, opts),
-        await encryptServiceFactory(cache, opts)
+        await encryptServiceFactory(cache, opts),
+        await cipherFileUploadServiceFactory(cache, opts)
       )
   );
 }

apps/browser/src/vault/popup/components/vault/add-edit.component.ts

@@ -10,6 +10,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -51,7 +52,8 @@ export class AddEditComponent extends BaseAddEditComponent {
     private popupUtilsService: PopupUtilsService,
     organizationService: OrganizationService,
     passwordRepromptService: PasswordRepromptService,
-    logService: LogService
+    logService: LogService,
+    sendApiService: SendApiService
   ) {
     super(
       cipherService,
@@ -66,7 +68,8 @@ export class AddEditComponent extends BaseAddEditComponent {
       policyService,
       logService,
       passwordRepromptService,
-      organizationService
+      organizationService,
+      sendApiService
     );
   }