diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 6161e186a38..fc6a84c19a6 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -244,8 +244,8 @@ import { IndividualVaultExportServiceAbstraction, OrganizationVaultExportService, OrganizationVaultExportServiceAbstraction, + DefaultVaultExportApiService, VaultExportApiService, - VaultExportApiServiceAbstraction, VaultExportService, VaultExportServiceAbstraction, } from "@bitwarden/vault-export-core"; @@ -349,7 +349,7 @@ export default class MainBackground { loginEmailService: LoginEmailServiceAbstraction; importApiService: ImportApiServiceAbstraction; importService: ImportServiceAbstraction; - exportApiService: VaultExportApiServiceAbstraction; + exportApiService: VaultExportApiService; exportService: VaultExportServiceAbstraction; searchService: SearchServiceAbstraction; serverNotificationsService: ServerNotificationsService; @@ -1087,7 +1087,7 @@ export default class MainBackground { this.restrictedItemTypesService, ); - this.exportApiService = new VaultExportApiService(this.apiService); + this.exportApiService = new DefaultVaultExportApiService(this.apiService); this.organizationVaultExportService = new OrganizationVaultExportService( this.cipherService, diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts index 93d16c54a71..d829d20b905 100644 --- a/apps/cli/src/service-container/service-container.ts +++ b/apps/cli/src/service-container/service-container.ts @@ -184,6 +184,7 @@ import { OrganizationVaultExportServiceAbstraction, VaultExportService, VaultExportServiceAbstraction, + DefaultVaultExportApiService, } from "@bitwarden/vault-export-core"; import { CliBiometricsService } from "../key-management/cli-biometrics-service"; @@ -846,7 +847,7 @@ export class ServiceContainer { this.restrictedItemTypesService, ); - this.vaultExportApiService = new VaultExportApiService(this.apiService); + this.vaultExportApiService = new DefaultVaultExportApiService(this.apiService); this.organizationExportService = new OrganizationVaultExportService( this.cipherService, diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index eee7cab383f..5c6ab770c1e 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -342,8 +342,8 @@ import { PasswordRepromptService } from "@bitwarden/vault"; import { IndividualVaultExportService, IndividualVaultExportServiceAbstraction, + DefaultVaultExportApiService, VaultExportApiService, - VaultExportApiServiceAbstraction, OrganizationVaultExportService, OrganizationVaultExportServiceAbstraction, VaultExportService, @@ -889,8 +889,8 @@ const safeProviders: SafeProvider[] = [ ], }), safeProvider({ - provide: VaultExportApiServiceAbstraction, - useClass: VaultExportApiService, + provide: VaultExportApiService, + useClass: DefaultVaultExportApiService, deps: [ApiServiceAbstraction], }), safeProvider({ @@ -898,7 +898,7 @@ const safeProviders: SafeProvider[] = [ useClass: OrganizationVaultExportService, deps: [ CipherServiceAbstraction, - VaultExportApiServiceAbstraction, + VaultExportApiService, PinServiceAbstraction, KeyService, EncryptService, diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.abstraction.ts b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.abstraction.ts index ef27e903891..40756dea29b 100644 --- a/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.abstraction.ts +++ b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.abstraction.ts @@ -1,7 +1,7 @@ import { OrganizationExportResponse } from "@bitwarden/common/admin-console/models/response/organization-export.response"; import { OrganizationId } from "@bitwarden/common/types/guid"; -export abstract class VaultExportApiServiceAbstraction { +export abstract class VaultExportApiService { /** * Retrieves the export data for a specific organization. * @param organizationId The ID of the organization to export. diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.spec.ts b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.spec.ts index 4399fc5f804..2f9f5659c4c 100644 --- a/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.spec.ts +++ b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.spec.ts @@ -3,7 +3,8 @@ import { mock, MockProxy } from "jest-mock-extended"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationId } from "@bitwarden/common/types/guid"; -import { VaultExportApiService } from "./vault-export-api.service"; +import { DefaultVaultExportApiService } from "./vault-export-api.service"; +import { VaultExportApiService } from "./vault-export-api.service.abstraction"; describe("VaultExportApiService", () => { let apiServiceMock: MockProxy; @@ -11,7 +12,7 @@ describe("VaultExportApiService", () => { beforeEach(() => { apiServiceMock = mock(); - sut = new VaultExportApiService(apiServiceMock); + sut = new DefaultVaultExportApiService(apiServiceMock); }); it("should call apiService.send with correct parameters", async () => { diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.ts b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.ts index fbfd125819d..c124b971553 100644 --- a/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.ts +++ b/libs/tools/export/vault-export/vault-export-core/src/services/api/vault-export-api.service.ts @@ -2,13 +2,13 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationExportResponse } from "@bitwarden/common/admin-console/models/response/organization-export.response"; import { OrganizationId } from "@bitwarden/common/types/guid"; -import { VaultExportApiServiceAbstraction } from "./vault-export-api.service.abstraction"; +import { VaultExportApiService } from "./vault-export-api.service.abstraction"; /** * Service for handling vault export API interactions. * @param apiService - An instance of {@link ApiService} used to make HTTP requests. */ -export class VaultExportApiService implements VaultExportApiServiceAbstraction { +export class DefaultVaultExportApiService implements VaultExportApiService { constructor(private apiService: ApiService) {} async getOrganizationExport(organizationId: OrganizationId): Promise { diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts b/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts index 78f0ff36392..e6d3ad605b9 100644 --- a/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts +++ b/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts @@ -33,7 +33,7 @@ import { ExportedVaultAsString, } from "../types"; -import { VaultExportApiServiceAbstraction } from "./api/vault-export-api.service.abstraction"; +import { VaultExportApiService } from "./api/vault-export-api.service.abstraction"; import { BaseVaultExportService } from "./base-vault-export.service"; import { ExportHelper } from "./export-helper"; import { OrganizationVaultExportServiceAbstraction } from "./org-vault-export.service.abstraction"; @@ -45,7 +45,7 @@ export class OrganizationVaultExportService { constructor( private cipherService: CipherService, - private vaultExportApiService: VaultExportApiServiceAbstraction, + private vaultExportApiService: VaultExportApiService, pinService: PinServiceAbstraction, private keyService: KeyService, encryptService: EncryptService,