bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-06 00:13:28 +00:00
Code Issues Releases Wiki Activity

[PM-25503] Use org export api on encrypted and unencrypted org exports (#16290)

Browse Source 
* Introduce a new vault-export-api.service to replace the existing getOrganizationExport method in apiService

* Use new vault-export-api.service instead of the ApiService to retrieve organizational export data

* Remove unused method from apiService

* Register VaultExportApiService on browser

* Fxi linting issue by executing `npm run prettier`

* Rename abstraction and implementation of VaultExportApiService

* Use undefined instead of null

* Rename file of default impl of vault-export-api-service

* Fix test broken with 1bcdd80eea

* Define type for exportPromises

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
Daniel James Smith
2025-09-17 22:22:12 +02:00
committed by GitHub
parent 200fc71c5c
commit ba817f0389
11 changed files with 159 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/cli/src/service-container/service-container.ts
View File

@@ -179,10 +179,12 @@ import { SerializedMemoryStorageService } from "@bitwarden/storage-core";
import {
IndividualVaultExportService,
IndividualVaultExportServiceAbstraction,
VaultExportApiService,
OrganizationVaultExportService,
OrganizationVaultExportServiceAbstraction,
VaultExportService,
VaultExportServiceAbstraction,
DefaultVaultExportApiService,
} from "@bitwarden/vault-export-core";
import { CliBiometricsService } from "../key-management/cli-biometrics-service";
@@ -241,6 +243,7 @@ export class ServiceContainer {
importService: ImportServiceAbstraction;
importApiService: ImportApiServiceAbstraction;
exportService: VaultExportServiceAbstraction;
vaultExportApiService: VaultExportApiService;
individualExportService: IndividualVaultExportServiceAbstraction;
organizationExportService: OrganizationVaultExportServiceAbstraction;
searchService: SearchService;
@@ -844,9 +847,11 @@ export class ServiceContainer {
this.restrictedItemTypesService,
);
this.vaultExportApiService = new DefaultVaultExportApiService(this.apiService);
this.organizationExportService = new OrganizationVaultExportService(
this.cipherService,
this.apiService,
this.vaultExportApiService,
this.pinService,
this.keyService,
this.encryptService,