[fix] Force send attachment to always download and never open (#2908)

* [refactor] Introduce a file download service

* [refactor] Point platformUtilsService.saveFile() callers to fileDownloadService.download() instead

* [refactor] Remove platformUtilsService.saveFile()

* [fix] Force send attachments to always download and never open

* [fix] Remove the window property from FileDownloadRequest

* [fix] Move FileDownloadRequest to /abstractions/fileDownload

* [fix] Simplify FileDownloadRequest to a type

* [fix] Move BrowserApi.saveFile logic into BrowserFileDownloadService

* [fix] Use proper blob types for file downloads

* [fix] forceDownload -> downloadMethod on FileDownloadRequest

* [fix] Remove fileType from FileDownloadRequest

* [fix] Make fileType private

apps/desktop/src/app/services/desktopFileDownloadService.ts

@@ -0,0 +1,18 @@
+import { Injectable } from "@angular/core";
+
+import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
+import { FileDownloadBuilder } from "@bitwarden/common/abstractions/fileDownload/fileDownloadBuilder";
+import { FileDownloadRequest } from "@bitwarden/common/abstractions/fileDownload/fileDownloadRequest";
+
+@Injectable()
+export class DesktopFileDownloadService implements FileDownloadService {
+  download(request: FileDownloadRequest): void {
+    const a = window.document.createElement("a");
+    a.href = URL.createObjectURL(new FileDownloadBuilder(request).blob);
+    a.download = request.fileName;
+    a.style.position = "fixed";
+    window.document.body.appendChild(a);
+    a.click();
+    window.document.body.removeChild(a);
+  }
+}

apps/desktop/src/app/services/services.module.ts

@@ -15,6 +15,7 @@ import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractE
 import { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service";
+import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import {
   LogService,
@@ -48,6 +49,7 @@ import { LoginGuard } from "../guards/login.guard";
 import { SearchBarService } from "../layout/search/search-bar.service";
 
 import { DesktopThemingService } from "./desktop-theming.service";
+import { DesktopFileDownloadService } from "./desktopFileDownloadService";
 import { InitService } from "./init.service";
 
 const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK");
@@ -137,6 +139,10 @@ const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK");
         STATE_SERVICE_USE_CACHE,
       ],
     },
+    {
+      provide: FileDownloadService,
+      useClass: DesktopFileDownloadService,
+    },
     {
       provide: AbstractThemingService,
       useClass: DesktopThemingService,

apps/desktop/src/app/vault/attachments.component.ts

@@ -4,6 +4,7 @@ import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/ang
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
+import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -21,7 +22,8 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
     platformUtilsService: PlatformUtilsService,
     apiService: ApiService,
     logService: LogService,
-    stateService: StateService
+    stateService: StateService,
+    fileDownloadService: FileDownloadService
   ) {
     super(
       cipherService,
@@ -31,7 +33,8 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
       apiService,
       window,
       logService,
-      stateService
+      stateService,
+      fileDownloadService
     );
   }
 }

apps/desktop/src/app/vault/export.component.ts

@@ -8,6 +8,7 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EventService } from "@bitwarden/common/abstractions/event.service";
 import { ExportService } from "@bitwarden/common/abstractions/export.service";
+import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -31,7 +32,8 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
     userVerificationService: UserVerificationService,
     formBuilder: FormBuilder,
     private broadcasterService: BroadcasterService,
-    logService: LogService
+    logService: LogService,
+    fileDownloadService: FileDownloadService
   ) {
     super(
       cryptoService,
@@ -43,7 +45,8 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
       window,
       logService,
       userVerificationService,
-      formBuilder
+      formBuilder,
+      fileDownloadService
     );
   }
 

apps/desktop/src/app/vault/view.component.ts

@@ -14,6 +14,7 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
@@ -49,7 +50,8 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
     private messagingService: MessagingService,
     passwordRepromptService: PasswordRepromptService,
     logService: LogService,
-    stateService: StateService
+    stateService: StateService,
+    fileDownloadService: FileDownloadService
   ) {
     super(
       cipherService,
@@ -67,7 +69,8 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
       apiService,
       passwordRepromptService,
       logService,
-      stateService
+      stateService,
+      fileDownloadService
     );
   }
   ngOnInit() {