[PS-2320] Import API service refactor

apps/cli/src/bw.ts

@@ -5,6 +5,7 @@ import * as program from "commander";
 import * as jsdom from "jsdom";
 
 import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { ClientType } from "@bitwarden/common/enums/clientType";
@@ -27,7 +28,8 @@ import { ExportService } from "@bitwarden/common/services/export.service";
 import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
 import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service";
 import { FolderService } from "@bitwarden/common/services/folder/folder.service";
-import { ImportService } from "@bitwarden/common/services/import.service";
+import { ImportApiService } from "@bitwarden/common/services/import/import-api.service";
+import { ImportService } from "@bitwarden/common/services/import/import.service";
 import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service";
@@ -94,6 +96,7 @@ export class Main {
   containerService: ContainerService;
   auditService: AuditService;
   importService: ImportService;
+  importApiService: ImportApiServiceAbstraction;
   exportService: ExportService;
   searchService: SearchService;
   cryptoFunctionService: NodeCryptoFunctionService;
@@ -339,10 +342,12 @@ export class Main {
 
     this.totpService = new TotpService(this.cryptoFunctionService, this.logService);
 
+    this.importApiService = new ImportApiService(this.apiService);
+
     this.importService = new ImportService(
       this.cipherService,
       this.folderService,
-      this.apiService,
+      this.importApiService,
       this.i18nService,
       this.collectionService,
       this.cryptoService

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

@@ -1,7 +1,7 @@
 import * as program from "commander";
 import * as inquirer from "inquirer";
 
-import { ImportService } from "@bitwarden/common/abstractions/import.service";
+import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { ImportType } from "@bitwarden/common/enums/importOptions";
 import { Importer } from "@bitwarden/common/importers/importer";

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

@@ -6,8 +6,10 @@ import { CollectionService } from "@bitwarden/common/abstractions/collection.ser
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import.service";
-import { ImportService } from "@bitwarden/common/services/import.service";
+import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
+import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import/import.service.abstraction";
+import { ImportApiService } from "@bitwarden/common/services/import/import-api.service";
+import { ImportService } from "@bitwarden/common/services/import/import.service";
 
 import { LooseComponentsModule, SharedModule } from "../../../shared";
 
@@ -19,13 +21,18 @@ import { OrganizationImportComponent } from "./org-import.component";
   imports: [SharedModule, LooseComponentsModule, OrganizationImportExportRoutingModule],
   declarations: [OrganizationImportComponent, OrganizationExportComponent],
   providers: [
+    {
+      provide: ImportApiServiceAbstraction,
+      useClass: ImportApiService,
+      deps: [ApiService],
+    },
     {
       provide: ImportServiceAbstraction,
       useClass: ImportService,
       deps: [
         CipherService,
         FolderService,
-        ApiService,
+        ImportApiServiceAbstraction,
         I18nService,
         CollectionService,
         CryptoService,

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

@@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportService } from "@bitwarden/common/abstractions/import.service";
+import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";

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

@@ -6,8 +6,10 @@ import { CollectionService } from "@bitwarden/common/abstractions/collection.ser
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import.service";
-import { ImportService } from "@bitwarden/common/services/import.service";
+import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
+import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import/import.service.abstraction";
+import { ImportApiService } from "@bitwarden/common/services/import/import-api.service";
+import { ImportService } from "@bitwarden/common/services/import/import.service";
 
 import { LooseComponentsModule, SharedModule } from "../../shared";
 
@@ -20,13 +22,18 @@ import { ImportComponent } from "./import.component";
   imports: [SharedModule, LooseComponentsModule, ImportExportRoutingModule],
   declarations: [ImportComponent, ExportComponent, FilePasswordPromptComponent],
   providers: [
+    {
+      provide: ImportApiServiceAbstraction,
+      useClass: ImportApiService,
+      deps: [ApiService],
+    },
     {
       provide: ImportServiceAbstraction,
       useClass: ImportService,
       deps: [
         CipherService,
         FolderService,
-        ApiService,
+        ImportApiServiceAbstraction,
         I18nService,
         CollectionService,
         CryptoService,

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

@@ -6,7 +6,7 @@ import Swal, { SweetAlertIcon } from "sweetalert2";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportService } from "@bitwarden/common/abstractions/import.service";
+import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";

libs/common/spec/services/import.service.spec.ts

@@ -1,38 +1,38 @@
 // eslint-disable-next-line no-restricted-imports
 import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
 import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwarden-password-protected-importer";
 import { Importer } from "@bitwarden/common/importers/importer";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { ImportService } from "@bitwarden/common/services/import.service";
+import { ImportService } from "@bitwarden/common/services/import/import.service";
 
 describe("ImportService", () => {
   let importService: ImportService;
   let cipherService: SubstituteOf<CipherService>;
   let folderService: SubstituteOf<FolderService>;
-  let apiService: SubstituteOf<ApiService>;
+  let importApiService: SubstituteOf<ImportApiServiceAbstraction>;
   let i18nService: SubstituteOf<I18nService>;
   let collectionService: SubstituteOf<CollectionService>;
   let cryptoService: SubstituteOf<CryptoService>;
 
   beforeEach(() => {
     cipherService = Substitute.for<CipherService>();
     folderService = Substitute.for<FolderService>();
-    apiService = Substitute.for<ApiService>();
+    importApiService = Substitute.for<ImportApiServiceAbstraction>();
     i18nService = Substitute.for<I18nService>();
     collectionService = Substitute.for<CollectionService>();
     cryptoService = Substitute.for<CryptoService>();
 
     importService = new ImportService(
       cipherService,
       folderService,
-      apiService,
+      importApiService,
       i18nService,
       collectionService,
       cryptoService

libs/common/src/abstractions/api.service.ts

@@ -27,8 +27,6 @@ import { IapCheckRequest } from "../models/request/iap-check.request";
 import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request";
 import { SsoTokenRequest } from "../models/request/identity-token/sso-token.request";
 import { UserApiTokenRequest } from "../models/request/identity-token/user-api-token.request";
-import { ImportCiphersRequest } from "../models/request/import-ciphers.request";
-import { ImportOrganizationCiphersRequest } from "../models/request/import-organization-ciphers.request";
 import { KdfRequest } from "../models/request/kdf.request";
 import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user-key.request";
 import { KeysRequest } from "../models/request/keys.request";
@@ -260,11 +258,6 @@ export abstract class ApiService {
   putCipherCollections: (id: string, request: CipherCollectionsRequest) => Promise<any>;
   putCipherCollectionsAdmin: (id: string, request: CipherCollectionsRequest) => Promise<any>;
   postPurgeCiphers: (request: SecretVerificationRequest, organizationId?: string) => Promise<any>;
-  postImportCiphers: (request: ImportCiphersRequest) => Promise<any>;
-  postImportOrganizationCiphers: (
-    organizationId: string,
-    request: ImportOrganizationCiphersRequest
-  ) => Promise<any>;
   putDeleteCipher: (id: string) => Promise<any>;
   putDeleteCipherAdmin: (id: string) => Promise<any>;
   putDeleteManyCiphers: (request: CipherBulkDeleteRequest) => Promise<any>;

libs/common/src/abstractions/import/import-api.service.abstraction.ts

@@ -0,0 +1,10 @@
+import { ImportCiphersRequest } from "../../models/request/import-ciphers.request";
+import { ImportOrganizationCiphersRequest } from "../../models/request/import-organization-ciphers.request";
+
+export abstract class ImportApiServiceAbstraction {
+  postImportCiphers: (request: ImportCiphersRequest) => Promise<any>;
+  postImportOrganizationCiphers: (
+    organizationId: string,
+    request: ImportOrganizationCiphersRequest
+  ) => Promise<any>;
+}

libs/common/src/abstractions/import.service.ts → libs/common/src/abstractions/import/import.service.abstraction.ts

@@ -1,6 +1,6 @@
-import { ImportOption, ImportType } from "../enums/importOptions";
-import { ImportError } from "../importers/import-error";
-import { Importer } from "../importers/importer";
+import { ImportOption, ImportType } from "../../enums/importOptions";
+import { ImportError } from "../../importers/import-error";
+import { Importer } from "../../importers/importer";
 
 export abstract class ImportService {
   featuredImportOptions: readonly ImportOption[];

libs/common/src/services/api.service.ts

@@ -35,8 +35,6 @@ import { PasswordTokenRequest } from "../models/request/identity-token/password-
 import { SsoTokenRequest } from "../models/request/identity-token/sso-token.request";
 import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request";
 import { UserApiTokenRequest } from "../models/request/identity-token/user-api-token.request";
-import { ImportCiphersRequest } from "../models/request/import-ciphers.request";
-import { ImportOrganizationCiphersRequest } from "../models/request/import-organization-ciphers.request";
 import { KdfRequest } from "../models/request/kdf.request";
 import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user-key.request";
 import { KeysRequest } from "../models/request/keys.request";
@@ -662,23 +660,6 @@ export class ApiService implements ApiServiceAbstraction {
     return this.send("POST", path, request, true, false);
   }
 
-  postImportCiphers(request: ImportCiphersRequest): Promise<any> {
-    return this.send("POST", "/ciphers/import", request, true, false);
-  }
-
-  postImportOrganizationCiphers(
-    organizationId: string,
-    request: ImportOrganizationCiphersRequest
-  ): Promise<any> {
-    return this.send(
-      "POST",
-      "/ciphers/import-organization?organizationId=" + organizationId,
-      request,
-      true,
-      false
-    );
-  }
-
   putDeleteCipher(id: string): Promise<any> {
     return this.send("PUT", "/ciphers/" + id + "/delete", null, true, false);
   }

libs/common/src/services/import/import-api.service.ts

@@ -0,0 +1,25 @@
+import { ApiService } from "../../abstractions/api.service";
+import { ImportApiServiceAbstraction } from "../../abstractions/import/import-api.service.abstraction";
+import { ImportCiphersRequest } from "../../models/request/import-ciphers.request";
+import { ImportOrganizationCiphersRequest } from "../../models/request/import-organization-ciphers.request";
+
+export class ImportApiService implements ImportApiServiceAbstraction {
+  constructor(private apiService: ApiService) {}
+
+  async postImportCiphers(request: ImportCiphersRequest): Promise<any> {
+    return await this.apiService.send("POST", "/ciphers/import", request, true, false);
+  }
+
+  async postImportOrganizationCiphers(
+    organizationId: string,
+    request: ImportOrganizationCiphersRequest
+  ): Promise<any> {
+    return await this.apiService.send(
+      "POST",
+      "/ciphers/import-organization?organizationId=" + organizationId,
+      request,
+      true,
+      false
+    );
+  }
+}