[PM-1071] Display import-details-dialog on successful import (#4817)

* Prefer callback over error-flow to prompt for password

Remove error-flow to request file password
Prefer callback, which has to be provided when retrieving/creating an instance.
Delete ImportError
Call BitwardenPasswordProtector for all Bitwarden json imports, as it extends BitwardenJsonImporter
Throw errors instead of returning
Return ImportResult
Fix and extend tests import.service
Replace "@fluffy-spoon/substitute" with "jest-mock-extended"

* Fix up test cases

Delete bitwarden-json-importer.spec.ts
Add test case to ensure bitwarden-json-importer.ts is called given unencrypted or account-protected files

* Move file-password-prompt into dialog-folder

* Add import success dialog

* Fix typo

* Only list the type when at least one got imported

* update copy based on design feedback

* Remove unnecessary /index import

* Remove promptForPassword_callback from interface

PR feedback from @MGibson1 that giving every importer the ability to request a password is unnecessary. Instead, we can pass the callback into the constructor for every importer that needs this functionality

* Remove unneeded import of BitwardenJsonImporter

* Fix spec constructor

* Fixed organizational import

Added an else statement, or else we'd import into an org and then also import into an individual vault

apps/cli/src/tools/import.command.ts

@@ -2,7 +2,7 @@ import * as program from "commander";
 import * as inquirer from "inquirer";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { ImportServiceAbstraction, Importer, ImportType } from "@bitwarden/importer";
+import { ImportServiceAbstraction, ImportType } from "@bitwarden/importer";
 
 import { Response } from "../models/response";
 import { MessageResponse } from "../models/response/message.response";
@@ -50,8 +50,14 @@ export class ImportCommand {
     if (filepath == null || filepath === "") {
       return Response.badRequest("`filepath` was not provided.");
     }
-
-    const importer = await this.importService.getImporter(format, organizationId);
+    const promptForPassword_callback = async () => {
+      return await this.promptPassword();
+    };
+    const importer = await this.importService.getImporter(
+      format,
+      promptForPassword_callback,
+      organizationId
+    );
     if (importer === null) {
       return Response.badRequest("Proper importer type required.");
     }
@@ -68,12 +74,14 @@ export class ImportCommand {
         return Response.badRequest("Import file was empty.");
       }
 
-      const response = await this.doImport(importer, contents, organizationId);
+      const response = await this.importService.import(importer, contents, organizationId);
       if (response.success) {
-        response.data = new MessageResponse("Imported " + filepath, null);
+        return Response.success(new MessageResponse("Imported " + filepath, null));
       }
-      return response;
     } catch (err) {
+      if (err.message) {
+        return Response.badRequest(err.message);
+      }
       return Response.badRequest(err);
     }
   }
@@ -91,27 +99,6 @@ export class ImportCommand {
     return Response.success(res);
   }
 
-  private async doImport(
-    importer: Importer,
-    contents: string,
-    organizationId?: string
-  ): Promise<Response> {
-    const err = await this.importService.import(importer, contents, organizationId);
-    if (err != null) {
-      if (err.passwordRequired) {
-        importer = this.importService.getImporter(
-          "bitwardenpasswordprotected",
-          organizationId,
-          await this.promptPassword()
-        );
-        return this.doImport(importer, contents, organizationId);
-      }
-      return Response.badRequest(err.message);
-    }
-
-    return Response.success();
-  }
-
   private async promptPassword() {
     const answer: inquirer.Answers = await inquirer.createPromptModule({
       output: process.stderr,

apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts

@@ -8,6 +8,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { DialogService } from "@bitwarden/components";
 import { ImportServiceAbstraction } from "@bitwarden/importer";
 
 import { ImportComponent } from "../../../../tools/import-export/import.component";
@@ -30,7 +31,8 @@ export class OrganizationImportComponent extends ImportComponent {
     private organizationService: OrganizationService,
     logService: LogService,
     modalService: ModalService,
-    syncService: SyncService
+    syncService: SyncService,
+    dialogService: DialogService
   ) {
     super(
       i18nService,
@@ -40,7 +42,8 @@ export class OrganizationImportComponent extends ImportComponent {
       policyService,
       logService,
       modalService,
-      syncService
+      syncService,
+      dialogService
     );
   }
 

apps/web/src/app/tools/import-export/dialog/import-success-dialog.component.html

@@ -0,0 +1,32 @@
+<bit-dialog dialogSize="small">
+  <span bitDialogTitle>
+    {{ "importSuccess" | i18n }}
+  </span>
+
+  <div bitDialogContent>
+    <span>{{ "importSuccessNumberOfItems" | i18n : this.data.ciphers.length }}</span>
+    <bit-table [dataSource]="dataSource">
+      <ng-container header>
+        <tr>
+          <th bitCell>{{ "type" | i18n }}</th>
+          <th bitCell>{{ "total" | i18n }}</th>
+        </tr>
+      </ng-container>
+      <ng-template body let-rows$>
+        <tr bitRow *ngFor="let r of rows$ | async">
+          <td bitCell>
+            <i class="bwi bwi-fw bwi-{{ r.icon }}" aria-hidden="true"></i>
+            {{ r.type | i18n }}
+          </td>
+          <td bitCell>{{ r.count }}</td>
+        </tr>
+      </ng-template>
+    </bit-table>
+  </div>
+
+  <div bitDialogFooter>
+    <button bitButton bitDialogClose buttonType="primary" type="button">
+      {{ "ok" | i18n }}
+    </button>
+  </div>
+</bit-dialog>

apps/web/src/app/tools/import-export/dialog/import-success-dialog.component.ts

@@ -0,0 +1,78 @@
+import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog";
+import { Component, Inject, OnInit } from "@angular/core";
+
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { TableDataSource } from "@bitwarden/components";
+import { ImportResult } from "@bitwarden/importer";
+
+export interface ResultList {
+  icon: string;
+  type: string;
+  count: number;
+}
+
+@Component({
+  selector: "app-import-success-dialog",
+  templateUrl: "./import-success-dialog.component.html",
+})
+export class ImportSuccessDialogComponent implements OnInit {
+  protected dataSource = new TableDataSource<ResultList>();
+
+  constructor(public dialogRef: DialogRef, @Inject(DIALOG_DATA) public data: ImportResult) {}
+
+  ngOnInit(): void {
+    if (this.data != null) {
+      this.dataSource.data = this.buildResultList();
+    }
+  }
+
+  private buildResultList(): ResultList[] {
+    let logins = 0;
+    let cards = 0;
+    let identities = 0;
+    let secureNotes = 0;
+    this.data.ciphers.map((c) => {
+      switch (c.type) {
+        case CipherType.Login:
+          logins++;
+          break;
+        case CipherType.Card:
+          cards++;
+          break;
+        case CipherType.SecureNote:
+          secureNotes++;
+          break;
+        case CipherType.Identity:
+          identities++;
+          break;
+        default:
+          break;
+      }
+    });
+
+    const list: ResultList[] = [];
+    if (logins > 0) {
+      list.push({ icon: "globe", type: "typeLogin", count: logins });
+    }
+    if (cards > 0) {
+      list.push({ icon: "credit-card", type: "typeCard", count: cards });
+    }
+    if (identities > 0) {
+      list.push({ icon: "id-card", type: "typeIdentity", count: identities });
+    }
+    if (secureNotes > 0) {
+      list.push({ icon: "sticky-note", type: "typeSecureNote", count: secureNotes });
+    }
+    if (this.data.folders.length > 0) {
+      list.push({ icon: "folder", type: "folders", count: this.data.folders.length });
+    }
+    if (this.data.collections.length > 0) {
+      list.push({
+        icon: "collection",
+        type: "collections",
+        count: this.data.collections.length,
+      });
+    }
+    return list;
+  }
+}

apps/web/src/app/tools/import-export/dialog/index.ts

@@ -0,0 +1,2 @@
+export * from "./import-success-dialog.component";
+export * from "./file-password-prompt.component";

apps/web/src/app/tools/import-export/import-export.module.ts

@@ -15,14 +15,19 @@ import {
 
 import { LooseComponentsModule, SharedModule } from "../../shared";
 
+import { ImportSuccessDialogComponent, FilePasswordPromptComponent } from "./dialog";
 import { ExportComponent } from "./export.component";
-import { FilePasswordPromptComponent } from "./file-password-prompt.component";
 import { ImportExportRoutingModule } from "./import-export-routing.module";
 import { ImportComponent } from "./import.component";
 
 @NgModule({
   imports: [SharedModule, LooseComponentsModule, ImportExportRoutingModule],
-  declarations: [ImportComponent, ExportComponent, FilePasswordPromptComponent],
+  declarations: [
+    ImportComponent,
+    ExportComponent,
+    FilePasswordPromptComponent,
+    ImportSuccessDialogComponent,
+  ],
   providers: [
     {
       provide: ImportApiServiceAbstraction,

apps/web/src/app/tools/import-export/import.component.ts

@@ -11,14 +11,15 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { DialogService } from "@bitwarden/components";
 import {
   ImportOption,
   ImportType,
-  ImportError,
+  ImportResult,
   ImportServiceAbstraction,
 } from "@bitwarden/importer";
 
-import { FilePasswordPromptComponent } from "./file-password-prompt.component";
+import { ImportSuccessDialogComponent, FilePasswordPromptComponent } from "./dialog";
 
 @Component({
   selector: "app-import",
@@ -30,7 +31,6 @@ export class ImportComponent implements OnInit {
   format: ImportType = null;
   fileContents: string;
   fileSelected: File;
-  formPromise: Promise<ImportError>;
   loading = false;
   importBlockedByPolicy = false;
 
@@ -45,7 +45,8 @@ export class ImportComponent implements OnInit {
     protected policyService: PolicyService,
     private logService: LogService,
     protected modalService: ModalService,
-    protected syncService: SyncService
+    protected syncService: SyncService,
+    protected dialogService: DialogService
   ) {}
 
   async ngOnInit() {
@@ -68,7 +69,15 @@ export class ImportComponent implements OnInit {
 
     this.loading = true;
 
-    const importer = this.importService.getImporter(this.format, this.organizationId);
+    const promptForPassword_callback = async () => {
+      return await this.getFilePassword();
+    };
+
+    const importer = this.importService.getImporter(
+      this.format,
+      promptForPassword_callback,
+      this.organizationId
+    );
     if (importer === null) {
       this.platformUtilsService.showToast(
         "error",
@@ -117,30 +126,17 @@ export class ImportComponent implements OnInit {
     }
 
     try {
-      this.formPromise = this.importService.import(importer, fileContents, this.organizationId);
-      let error = await this.formPromise;
-
-      if (error?.passwordRequired) {
-        const filePassword = await this.getFilePassword();
-        if (filePassword == null) {
-          this.loading = false;
-          return;
-        }
-
-        error = await this.doPasswordProtectedImport(filePassword, fileContents);
-      }
-
-      if (error != null) {
-        this.error(error);
-        this.loading = false;
-        return;
-      }
+      const result = await this.importService.import(importer, fileContents, this.organizationId);
 
       //No errors, display success message
-      this.platformUtilsService.showToast("success", null, this.i18nService.t("importSuccess"));
+      this.dialogService.open<unknown, ImportResult>(ImportSuccessDialogComponent, {
+        data: result,
+      });
+
       this.syncService.fullSync(true);
       this.router.navigate(this.successNavigate);
     } catch (e) {
+      this.error(e);
       this.logService.error(e);
     }
 
@@ -268,17 +264,4 @@ export class ImportComponent implements OnInit {
 
     return await ref.onClosedPromise();
   }
-
-  async doPasswordProtectedImport(
-    filePassword: string,
-    fileContents: string
-  ): Promise<ImportError> {
-    const passwordProtectedImporter = this.importService.getImporter(
-      "bitwardenpasswordprotected",
-      this.organizationId,
-      filePassword
-    );
-
-    return this.importService.import(passwordProtectedImporter, fileContents, this.organizationId);
-  }
 }

apps/web/src/locales/en/messages.json

@@ -1256,6 +1256,15 @@
   "importSuccess": {
     "message": "Data successfully imported"
   },
+  "importSuccessNumberOfItems": {
+    "message": "A total of $AMOUNT$ items were imported.",
+    "placeholders": {
+      "amount": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },    
   "dataExportSuccess": {
     "message": "Data successfully exported"
   },

libs/importer/spec/bitwarden-json-importer.spec.ts

@@ -1,33 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
-
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-
-import { BitwardenJsonImporter } from "../src/importers";
-
-import { data as passwordProtectedData } from "./test-data/bitwarden-json/password-protected.json";
-
-describe("bitwarden json importer", () => {
-  let sut: BitwardenJsonImporter;
-  let cryptoService: SubstituteOf<CryptoService>;
-  let i18nService: SubstituteOf<I18nService>;
-
-  beforeEach(() => {
-    cryptoService = Substitute.for<CryptoService>();
-    i18nService = Substitute.for<I18nService>();
-
-    sut = new BitwardenJsonImporter(cryptoService, i18nService);
-  });
-
-  it("should fail if password is needed", async () => {
-    expect((await sut.parse(passwordProtectedData)).success).toBe(false);
-  });
-
-  it("should return password needed error message", async () => {
-    const expected = "Password required error message";
-    i18nService.t("importPasswordRequired").returns(expected);
-
-    expect((await sut.parse(passwordProtectedData)).errorMessage).toEqual(expected);
-  });
-});

libs/importer/spec/bitwarden-password-protected-importer.spec.ts

@@ -1,22 +1,61 @@
-// eslint-disable-next-line no-restricted-imports
-import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute";
+import { mock, MockProxy } from "jest-mock-extended";
 
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { KdfType } from "@bitwarden/common/enums";
 import { Utils } from "@bitwarden/common/misc/utils";
 
-import { BitwardenPasswordProtectedImporter } from "../src/importers";
-import { ImportResult } from "../src/models/import-result";
+import {
+  BitwardenPasswordProtectedImporter,
+  BitwardenJsonImporter,
+} from "../src/importers/bitwarden";
 
-import { data as emptyDecryptedData } from "./test-data/bitwarden-json/empty.json";
+import { emptyAccountEncrypted } from "./test-data/bitwarden-json/account-encrypted.json";
+import { emptyUnencryptedExport } from "./test-data/bitwarden-json/unencrypted.json";
 
 describe("BitwardenPasswordProtectedImporter", () => {
   let importer: BitwardenPasswordProtectedImporter;
-  let cryptoService: SubstituteOf<CryptoService>;
-  let i18nService: SubstituteOf<I18nService>;
+  let cryptoService: MockProxy<CryptoService>;
+  let i18nService: MockProxy<I18nService>;
   const password = Utils.newGuid();
-  const result = new ImportResult();
+  const promptForPassword_callback = async () => {
+    return password;
+  };
+
+  beforeEach(() => {
+    cryptoService = mock<CryptoService>();
+    i18nService = mock<I18nService>();
+
+    importer = new BitwardenPasswordProtectedImporter(
+      cryptoService,
+      i18nService,
+      promptForPassword_callback
+    );
+  });
+
+  describe("Unencrypted", () => {
+    beforeAll(() => {
+      jest.spyOn(BitwardenJsonImporter.prototype, "parse");
+    });
+
+    it("Should call BitwardenJsonImporter", async () => {
+      expect((await importer.parse(emptyUnencryptedExport)).success).toEqual(true);
+      expect(BitwardenJsonImporter.prototype.parse).toHaveBeenCalledWith(emptyUnencryptedExport);
+    });
+  });
+
+  describe("Account encrypted", () => {
+    beforeAll(() => {
+      jest.spyOn(BitwardenJsonImporter.prototype, "parse");
+    });
+
+    it("Should call BitwardenJsonImporter", async () => {
+      expect((await importer.parse(emptyAccountEncrypted)).success).toEqual(true);
+      expect(BitwardenJsonImporter.prototype.parse).toHaveBeenCalledWith(emptyAccountEncrypted);
+    });
+  });
+
+  describe("Password protected", () => {
     let jDoc: {
       encrypted?: boolean;
       passwordProtected?: boolean;
@@ -28,9 +67,6 @@ describe("BitwardenPasswordProtectedImporter", () => {
     };
 
     beforeEach(() => {
-    cryptoService = Substitute.for<CryptoService>();
-    i18nService = Substitute.for<I18nService>();
-
       jDoc = {
         encrypted: true,
         passwordProtected: true,
@@ -40,38 +76,14 @@ describe("BitwardenPasswordProtectedImporter", () => {
         encKeyValidation_DO_NOT_EDIT: Utils.newGuid(),
         data: Utils.newGuid(),
       };
-
-    result.success = true;
-    importer = new BitwardenPasswordProtectedImporter(cryptoService, i18nService, password);
     });
 
-  describe("Required Json Data", () => {
     it("succeeds with default jdoc", async () => {
-      cryptoService.decryptToUtf8(Arg.any(), Arg.any()).resolves(emptyDecryptedData);
+      cryptoService.decryptToUtf8.mockReturnValue(Promise.resolve(emptyUnencryptedExport));
 
       expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(true);
     });
 
-    it("fails if encrypted === false", async () => {
-      jDoc.encrypted = false;
-      expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
-    });
-
-    it("fails if encrypted === null", async () => {
-      jDoc.encrypted = null;
-      expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
-    });
-
-    it("fails if passwordProtected === false", async () => {
-      jDoc.passwordProtected = false;
-      expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
-    });
-
-    it("fails if passwordProtected === null", async () => {
-      jDoc.passwordProtected = null;
-      expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
-    });
-
     it("fails if salt === null", async () => {
       jDoc.salt = null;
       expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);

libs/importer/spec/test-data/bitwarden-json/account-encrypted.json.ts

@@ -0,0 +1,6 @@
+export const emptyAccountEncrypted = `{
+  "encrypted": true,
+  "encKeyValidation_DO_NOT_EDIT": "",
+  "folders": [],
+  "items": []
+}`;

libs/importer/spec/test-data/bitwarden-json/empty.json.ts

@@ -1 +0,0 @@
-export const data = '{"encrypted":false,"folders":[],"items":[]}';

libs/importer/spec/test-data/bitwarden-json/password-protected.json.ts

@@ -1,9 +1,10 @@
-export const data = `{
-  "encrypted": true,
-  "passwordProtected": true,
-  "salt": "Oy0xcgVRzxQ+9NpB5GLehw==",
-  "kdfIterations": 100000,
-  "kdfType": 0,
-  "encKeyValidation_DO_NOT_EDIT": "2.sZs4Jc1HW9rhABzRRYR/gQ==|8kTDaDxafulnybpWoqVX8RAybhVRTr+dffNjms271Y7amQmIE1VSMwLbk+b2vxZb|IqOo6oXQtmv/Xb/GHDi42XG9c9ILePYtP5qq584VWcg=",
-  "data": "2.D0AXAf7G/XIwq6EC7A0Suw==|4w+m0wHRo25y1T1Syh5wdAUyF8voqEy54waMEsbnK0Nzee959w54ru5D1NntvxZL4HFqkQLyR6jCFkn5g40f+MGJgihS/wvf4NcJJfLiiFo6MEDOQNBkxw7ZBGuHiKfVuBO5u36JgzQtZ8lyFaduGxFszuF5c+URiE9PDh9jY0//poVgHKwuLZuYFIW+f7h6T+shUWK0ya11lcHn/B/CA2xiI+YiKdNZreJrwN0yslpJ/f+MrOzagvftRjt0GNkwveCtwcYUw/zFvqvibUpKeHcRiXs8SaGoHJ5RTm69FbJ7C5tnLwoVT89Af156uvRAXV7yAC4oPcbU/3TGb6hqYosvi1QNyaqG3M9gxS6+AK0C4yWuNbMLDEr+MWiw0SWLVMKQEkCZ4oM+oTCx52otW3+2V9I8Pv3KmmhkvVvE4wBdweOJeRX53Tf5ySkmpIhCfzj6JMmxO+nmTXIhWnJChr4hPVh+ixv1GQK5thIPTCMXmAtXoTIFUx1KWjS6LjOdi2hKQueVI+XZjf0qnY2vTMxRg0ZsLBA2znQTx+DSEqumORb5T/lV73pWZiCNePSAE2msOm7tep+lm4O/VCViCfXjITAY196syhOK0XnhxJvPALchZY8sYRAfuw6hHoDiVr+JUieRoI7eUrhXBp+D6Py9TL/dS/rHe+C2Zhx+xwx2NfGt+xEp8ZAOOCxgZ0UTeSA/abm0Oz7tJIK1n26acQrgbr7rMeBymAX+5L5OWlwI1hGgEBfj6W0rrbSXf3VMfaFXZ5UsXi1VhzQmU3LyWENoDeImXFQj6zMbUSfcVwLsG5Fg8Ee/kO/wJPfG5BO51+/vFqQj6AkaMEcwg5xNrObHYfQ/DMhIn7YDM2zdzbNTdhnobGkz6YRKFPCgFe3EmIEPEpeh9S3eKE9C7MQsrR8jVSiseR/FipJLsN+W7iOwzeXdwxUFlC/0a98bTKvdrbMgNi6ZVXykHY/t2UyEGpxZGTHoZwhX01kiQrwzC4/+v/676ldxPluO9GY7MtrLveCDsiyBz15u43IGHayDEBNT0rqrOKLYmfzwCWoahRLZQrSmepe/FXqgPqRfyWc/Ro+w3sT9dXUkx3B5xxWgSyABowPV48yBUSJuefhKTpqgzkU+LzhNnWHjnxJzzQ2/|IhlRjnyhIoDM85qHX/bY2zaIU5YaRO/iFVTQDd3uFDo="
-}`;
+export const data = {
+  encrypted: true,
+  passwordProtected: true,
+  salt: "Oy0xcgVRzxQ+9NpB5GLehw==",
+  kdfIterations: 100000,
+  kdfType: 0,
+  encKeyValidation_DO_NOT_EDIT:
+    "2.sZs4Jc1HW9rhABzRRYR/gQ==|8kTDaDxafulnybpWoqVX8RAybhVRTr+dffNjms271Y7amQmIE1VSMwLbk+b2vxZb|IqOo6oXQtmv/Xb/GHDi42XG9c9ILePYtP5qq584VWcg=",
+  data: "2.D0AXAf7G/XIwq6EC7A0Suw==|4w+m0wHRo25y1T1Syh5wdAUyF8voqEy54waMEsbnK0Nzee959w54ru5D1NntvxZL4HFqkQLyR6jCFkn5g40f+MGJgihS/wvf4NcJJfLiiFo6MEDOQNBkxw7ZBGuHiKfVuBO5u36JgzQtZ8lyFaduGxFszuF5c+URiE9PDh9jY0//poVgHKwuLZuYFIW+f7h6T+shUWK0ya11lcHn/B/CA2xiI+YiKdNZreJrwN0yslpJ/f+MrOzagvftRjt0GNkwveCtwcYUw/zFvqvibUpKeHcRiXs8SaGoHJ5RTm69FbJ7C5tnLwoVT89Af156uvRAXV7yAC4oPcbU/3TGb6hqYosvi1QNyaqG3M9gxS6+AK0C4yWuNbMLDEr+MWiw0SWLVMKQEkCZ4oM+oTCx52otW3+2V9I8Pv3KmmhkvVvE4wBdweOJeRX53Tf5ySkmpIhCfzj6JMmxO+nmTXIhWnJChr4hPVh+ixv1GQK5thIPTCMXmAtXoTIFUx1KWjS6LjOdi2hKQueVI+XZjf0qnY2vTMxRg0ZsLBA2znQTx+DSEqumORb5T/lV73pWZiCNePSAE2msOm7tep+lm4O/VCViCfXjITAY196syhOK0XnhxJvPALchZY8sYRAfuw6hHoDiVr+JUieRoI7eUrhXBp+D6Py9TL/dS/rHe+C2Zhx+xwx2NfGt+xEp8ZAOOCxgZ0UTeSA/abm0Oz7tJIK1n26acQrgbr7rMeBymAX+5L5OWlwI1hGgEBfj6W0rrbSXf3VMfaFXZ5UsXi1VhzQmU3LyWENoDeImXFQj6zMbUSfcVwLsG5Fg8Ee/kO/wJPfG5BO51+/vFqQj6AkaMEcwg5xNrObHYfQ/DMhIn7YDM2zdzbNTdhnobGkz6YRKFPCgFe3EmIEPEpeh9S3eKE9C7MQsrR8jVSiseR/FipJLsN+W7iOwzeXdwxUFlC/0a98bTKvdrbMgNi6ZVXykHY/t2UyEGpxZGTHoZwhX01kiQrwzC4/+v/676ldxPluO9GY7MtrLveCDsiyBz15u43IGHayDEBNT0rqrOKLYmfzwCWoahRLZQrSmepe/FXqgPqRfyWc/Ro+w3sT9dXUkx3B5xxWgSyABowPV48yBUSJuefhKTpqgzkU+LzhNnWHjnxJzzQ2/|IhlRjnyhIoDM85qHX/bY2zaIU5YaRO/iFVTQDd3uFDo=",
+};

libs/importer/spec/test-data/bitwarden-json/unencrypted.json.ts

@@ -0,0 +1 @@
+export const emptyUnencryptedExport = `{ "encrypted": false,  "folders": [],  "items": [] }`;

libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts

@@ -13,7 +13,10 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
   private results: any;
   private result: ImportResult;
 
-  constructor(protected cryptoService: CryptoService, protected i18nService: I18nService) {
+  protected constructor(
+    protected cryptoService: CryptoService,
+    protected i18nService: I18nService
+  ) {
     super();
   }
 
@@ -21,13 +24,6 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
     this.result = new ImportResult();
     this.results = JSON.parse(data);
     if (this.results == null || this.results.items == null) {
-      if (this.results?.passwordProtected) {
-        this.result.success = false;
-        this.result.missingPassword = true;
-        this.result.errorMessage = this.i18nService.t("importPasswordRequired");
-        return this.result;
-      }
-
       this.result.success = false;
       return this.result;
     }

libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts

@@ -13,19 +13,41 @@ import { BitwardenPasswordProtectedFileFormat } from "./bitwarden-password-prote
 export class BitwardenPasswordProtectedImporter extends BitwardenJsonImporter implements Importer {
   private key: SymmetricCryptoKey;
 
-  constructor(cryptoService: CryptoService, i18nService: I18nService, private password: string) {
+  constructor(
+    cryptoService: CryptoService,
+    i18nService: I18nService,
+    private promptForPassword_callback: () => Promise<string>
+  ) {
     super(cryptoService, i18nService);
   }
 
   async parse(data: string): Promise<ImportResult> {
     const result = new ImportResult();
-    const parsedData = JSON.parse(data);
+    const parsedData: BitwardenPasswordProtectedFileFormat = JSON.parse(data);
+
+    if (!parsedData) {
+      result.success = false;
+      return result;
+    }
+
+    // File is unencrypted
+    if (!parsedData?.encrypted) {
+      return await super.parse(data);
+    }
+
+    // File is account-encrypted
+    if (!parsedData?.passwordProtected) {
+      return await super.parse(data);
+    }
+
     if (this.cannotParseFile(parsedData)) {
       result.success = false;
       return result;
     }
 
-    if (!(await this.checkPassword(parsedData))) {
+    // File is password-protected
+    const password = await this.promptForPassword_callback();
+    if (!(await this.checkPassword(parsedData, password))) {
       result.success = false;
       result.errorMessage = this.i18nService.t("invalidFilePassword");
       return result;
@@ -36,9 +58,12 @@ export class BitwardenPasswordProtectedImporter extends BitwardenJsonImporter im
     return await super.parse(clearTextData);
   }
 
-  private async checkPassword(jdoc: BitwardenPasswordProtectedFileFormat): Promise<boolean> {
+  private async checkPassword(
+    jdoc: BitwardenPasswordProtectedFileFormat,
+    password: string
+  ): Promise<boolean> {
     this.key = await this.cryptoService.makePinKey(
-      this.password,
+      password,
       jdoc.salt,
       jdoc.kdfType,
       new KdfConfig(jdoc.kdfIterations, jdoc.kdfMemory, jdoc.kdfParallelism)

libs/importer/src/index.ts

@@ -1,6 +1,6 @@
 export { ImportType, ImportOption } from "./models/import-options";
 
-export { ImportError } from "./models/import-error";
+export { ImportResult } from "./models/import-result";
 
 export { ImportApiServiceAbstraction } from "./services/import-api.service.abstraction";
 export { ImportApiService } from "./services/import-api.service";

libs/importer/src/models/import-error.ts

@@ -1,5 +0,0 @@
-export class ImportError extends Error {
-  constructor(message?: string, public passwordRequired: boolean = false) {
-    super(message);
-  }
-}

libs/importer/src/models/import-result.ts

@@ -4,7 +4,6 @@ import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 export class ImportResult {
   success = false;
-  missingPassword = false;
   errorMessage: string;
   ciphers: CipherView[] = [];
   folders: FolderView[] = [];

libs/importer/src/services/import.service.abstraction.ts

@@ -1,6 +1,6 @@
 import { Importer } from "../importers/importer";
-import { ImportError } from "../models/import-error";
 import { ImportOption, ImportType } from "../models/import-options";
+import { ImportResult } from "../models/import-result";
 
 export abstract class ImportServiceAbstraction {
   featuredImportOptions: readonly ImportOption[];
@@ -10,10 +10,10 @@ export abstract class ImportServiceAbstraction {
     importer: Importer,
     fileContents: string,
     organizationId?: string
-  ) => Promise<ImportError>;
+  ) => Promise<ImportResult>;
   getImporter: (
     format: ImportType | "bitwardenpasswordprotected",
-    organizationId: string,
-    password?: string
+    promptForPassword_callback: () => Promise<string>,
+    organizationId: string
   ) => Importer;
 }

libs/importer/src/services/import.service.spec.ts

@@ -1,5 +1,4 @@
-// eslint-disable-next-line no-restricted-imports
-import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
+import { mock, MockProxy } from "jest-mock-extended";
 
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -16,20 +15,20 @@ import { ImportService } from "./import.service";
 
 describe("ImportService", () => {
   let importService: ImportService;
-  let cipherService: SubstituteOf<CipherService>;
-  let folderService: SubstituteOf<FolderService>;
-  let importApiService: SubstituteOf<ImportApiServiceAbstraction>;
-  let i18nService: SubstituteOf<I18nService>;
-  let collectionService: SubstituteOf<CollectionService>;
-  let cryptoService: SubstituteOf<CryptoService>;
+  let cipherService: MockProxy<CipherService>;
+  let folderService: MockProxy<FolderService>;
+  let importApiService: MockProxy<ImportApiServiceAbstraction>;
+  let i18nService: MockProxy<I18nService>;
+  let collectionService: MockProxy<CollectionService>;
+  let cryptoService: MockProxy<CryptoService>;
 
   beforeEach(() => {
-    cipherService = Substitute.for<CipherService>();
-    folderService = Substitute.for<FolderService>();
-    importApiService = Substitute.for<ImportApiServiceAbstraction>();
-    i18nService = Substitute.for<I18nService>();
-    collectionService = Substitute.for<CollectionService>();
-    cryptoService = Substitute.for<CryptoService>();
+    cipherService = mock<CipherService>();
+    folderService = mock<FolderService>();
+    importApiService = mock<ImportApiServiceAbstraction>();
+    i18nService = mock<I18nService>();
+    collectionService = mock<CollectionService>();
+    cryptoService = mock<CryptoService>();
 
     importService = new ImportService(
       cipherService,
@@ -46,12 +45,15 @@ describe("ImportService", () => {
       let importer: Importer;
       const organizationId = Utils.newGuid();
       const password = Utils.newGuid();
+      const promptForPassword_callback = async () => {
+        return password;
+      };
 
       beforeEach(() => {
         importer = importService.getImporter(
           "bitwardenpasswordprotected",
-          organizationId,
-          password
+          promptForPassword_callback,
+          organizationId
         );
       });
 
@@ -59,13 +61,14 @@ describe("ImportService", () => {
         expect(importer).toBeInstanceOf(BitwardenPasswordProtectedImporter);
       });
 
+      it("has the promptForPassword_callback set", async () => {
+        expect(importer.promptForPassword_callback).not.toBeNull();
+        expect(await importer.promptForPassword_callback()).toEqual(password);
+      });
+
       it("has the appropriate organization Id", () => {
         expect(importer.organizationId).toEqual(organizationId);
       });
-
-      it("has the appropriate password", () => {
-        expect(Object.entries(importer)).toEqual(expect.arrayContaining([["password", password]]));
-      });
     });
   });
 });

libs/importer/src/services/import.service.ts

@@ -20,7 +20,6 @@ import {
   AvastJsonImporter,
   AviraCsvImporter,
   BitwardenCsvImporter,
-  BitwardenJsonImporter,
   BitwardenPasswordProtectedImporter,
   BlackBerryCsvImporter,
   BlurCsvImporter,
@@ -76,7 +75,6 @@ import {
   ZohoVaultCsvImporter,
 } from "../importers";
 import { Importer } from "../importers/importer";
-import { ImportError } from "../models/import-error";
 import {
   featuredImportOptions,
   ImportOption,
@@ -109,12 +107,20 @@ export class ImportService implements ImportServiceAbstraction {
     importer: Importer,
     fileContents: string,
     organizationId: string = null
-  ): Promise<ImportError> {
+  ): Promise<ImportResult> {
     const importResult = await importer.parse(fileContents);
-    if (importResult.success) {
+    if (!importResult.success) {
+      if (!Utils.isNullOrWhitespace(importResult.errorMessage)) {
+        throw new Error(importResult.errorMessage);
+      }
+      throw new Error(this.i18nService.t("importFormatError"));
+    }
+
     if (importResult.folders.length === 0 && importResult.ciphers.length === 0) {
-        return new ImportError(this.i18nService.t("importNothingError"));
-      } else if (importResult.ciphers.length > 0) {
+      throw new Error(this.i18nService.t("importNothingError"));
+    }
+
+    if (importResult.ciphers.length > 0) {
       const halfway = Math.floor(importResult.ciphers.length / 2);
       const last = importResult.ciphers.length - 1;
 
@@ -123,34 +129,33 @@ export class ImportService implements ImportServiceAbstraction {
         this.badData(importResult.ciphers[halfway]) &&
         this.badData(importResult.ciphers[last])
       ) {
-          return new ImportError(this.i18nService.t("importFormatError"));
+        throw new Error(this.i18nService.t("importFormatError"));
       }
     }
+
     try {
-        await this.postImport(importResult, organizationId);
+      if (organizationId != null) {
+        await this.handleOrganizationalImport(importResult, organizationId);
+      } else {
+        await this.handleIndividualImport(importResult);
+      }
     } catch (error) {
       const errorResponse = new ErrorResponse(error, 400);
-        return this.handleServerError(errorResponse, importResult);
-      }
-      return null;
-    } else {
-      if (!Utils.isNullOrWhitespace(importResult.errorMessage)) {
-        return new ImportError(importResult.errorMessage, importResult.missingPassword);
-      } else {
-        return new ImportError(
-          this.i18nService.t("importFormatError"),
-          importResult.missingPassword
-        );
-      }
+      throw this.handleServerError(errorResponse, importResult);
     }
+    return importResult;
   }
 
   getImporter(
     format: ImportType | "bitwardenpasswordprotected",
-    organizationId: string = null,
-    password: string = null
+    promptForPassword_callback: () => Promise<string>,
+    organizationId: string = null
   ): Importer {
-    const importer = this.getImporterInstance(format, password);
+    if (promptForPassword_callback == null) {
+      return null;
+    }
+
+    const importer = this.getImporterInstance(format, promptForPassword_callback);
     if (importer == null) {
       return null;
     }
@@ -158,7 +163,10 @@ export class ImportService implements ImportServiceAbstraction {
     return importer;
   }
 
-  private getImporterInstance(format: ImportType | "bitwardenpasswordprotected", password: string) {
+  private getImporterInstance(
+    format: ImportType | "bitwardenpasswordprotected",
+    promptForPassword_callback: () => Promise<string>
+  ) {
     if (format == null) {
       return null;
     }
@@ -167,12 +175,11 @@ export class ImportService implements ImportServiceAbstraction {
       case "bitwardencsv":
         return new BitwardenCsvImporter();
       case "bitwardenjson":
-        return new BitwardenJsonImporter(this.cryptoService, this.i18nService);
       case "bitwardenpasswordprotected":
         return new BitwardenPasswordProtectedImporter(
           this.cryptoService,
           this.i18nService,
-          password
+          promptForPassword_callback
         );
       case "lastpasscsv":
       case "passboltcsv":
@@ -294,8 +301,7 @@ export class ImportService implements ImportServiceAbstraction {
     }
   }
 
-  private async postImport(importResult: ImportResult, organizationId: string = null) {
-    if (organizationId == null) {
+  private async handleIndividualImport(importResult: ImportResult) {
     const request = new ImportCiphersRequest();
     for (let i = 0; i < importResult.ciphers.length; i++) {
       const c = await this.cipherService.encrypt(importResult.ciphers[i]);
@@ -313,7 +319,9 @@ export class ImportService implements ImportServiceAbstraction {
       );
     }
     return await this.importApiService.postImportCiphers(request);
-    } else {
+  }
+
+  private async handleOrganizationalImport(importResult: ImportResult, organizationId: string) {
     const request = new ImportOrganizationCiphersRequest();
     for (let i = 0; i < importResult.ciphers.length; i++) {
       importResult.ciphers[i].organizationId = organizationId;
@@ -334,7 +342,6 @@ export class ImportService implements ImportServiceAbstraction {
     }
     return await this.importApiService.postImportOrganizationCiphers(organizationId, request);
   }
-  }
 
   private badData(c: CipherView) {
     return (
@@ -345,9 +352,9 @@ export class ImportService implements ImportServiceAbstraction {
     );
   }
 
-  private handleServerError(errorResponse: ErrorResponse, importResult: ImportResult): ImportError {
+  private handleServerError(errorResponse: ErrorResponse, importResult: ImportResult): Error {
     if (errorResponse.validationErrors == null) {
-      return new ImportError(errorResponse.message);
+      return new Error(errorResponse.message);
     }
 
     let errorMessage = "";
@@ -385,6 +392,6 @@ export class ImportService implements ImportServiceAbstraction {
       errorMessage += "[" + itemType + '] "' + item.name + '": ' + value;
     });
 
-    return new ImportError(errorMessage);
+    return new Error(errorMessage);
   }
 }