[AC-1492] Split export service (#7462)

* Split export service into vault and org export service

* Changed CLI logic to use split export logic

* correct unit tests

* Created individual export service, export service making the calls for org and ind vault

* Improved code readability

* Merged PasswordProtectedExport with Export methods to simplify calls

* Some small refactor

* [AC-1492] Managed collections export (#7556)

* Added managed collections export method
Added logic to show orgs on export that the user can export from

* Merge branch 'tools/AC-1492/split-export-services' into tools/AC-1492/export-flexible-collections

# Conflicts:
#	apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts
#	apps/web/src/app/tools/vault-export/export.component.ts

* Change export to use new organization.flexiblecollection flag

* Little refactor changing parameter names and reduzing the size of export.component.ts ngOnInit

* Removed unused service from export constructor and removed unnecessary default value from org export service parameter

* Simplified organizations selection for vault export to only verify if it has flexiblecollections

* removed unecessary services from ExportComponent constructor on popup

* Fixed possible race condition on managed export

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

@@ -1,7 +1,6 @@
 import { Component } from "@angular/core";
 import { UntypedFormBuilder } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
-import { map, switchMap } from "rxjs";
 
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -62,20 +61,15 @@ export class OrganizationVaultExportComponent extends ExportComponent {
       this.organizationId = params.organizationId;
     });
 
-    this.flexibleCollectionsEnabled$ = this.route.parent.parent.params.pipe(
-      switchMap((params) => this.organizationService.get$(params.organizationId)),
-      map((organization) => organization.flexibleCollections),
-    );
-
     await super.ngOnInit();
   }
 
   getExportData() {
-    if (this.isFileEncryptedExport) {
-      return this.exportService.getPasswordProtectedExport(this.filePassword, this.organizationId);
-    } else {
-      return this.exportService.getOrganizationExport(this.organizationId, this.format);
-    }
+    return this.exportService.getOrganizationExport(
+      this.organizationId,
+      this.format,
+      this.filePassword,
+    );
   }
 
   getFileName() {

apps/web/src/app/tools/vault-export/export.component.html

@@ -15,18 +15,20 @@
     *ngIf="!disabledByPolicy"
   ></app-export-scope-callout>
 
-  <bit-form-field *ngIf="flexibleCollectionsEnabled$ | async">
-    <bit-label>{{ "exportFrom" | i18n }}</bit-label>
-    <bit-select formControlName="vaultSelector">
-      <bit-option [label]="'myVault' | i18n" value="myVault" icon="bwi-user" />
-      <bit-option
-        *ngFor="let o of organizations$ | async"
-        [value]="o.id"
-        [label]="o.name"
-        icon="bwi-business"
-      />
-    </bit-select>
-  </bit-form-field>
+  <ng-container *ngIf="organizations$ | async as organizations">
+    <bit-form-field *ngIf="organizations.length > 0">
+      <bit-label>{{ "exportFrom" | i18n }}</bit-label>
+      <bit-select formControlName="vaultSelector">
+        <bit-option [label]="'myVault' | i18n" value="myVault" icon="bwi-user" />
+        <bit-option
+          *ngFor="let o of organizations$ | async"
+          [value]="o.id"
+          [label]="o.name"
+          icon="bwi-business"
+        />
+      </bit-select>
+    </bit-form-field>
+  </ng-container>
 
   <bit-form-field>
     <bit-label>{{ "fileFormat" | i18n }}</bit-label>

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

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 import { UntypedFormBuilder } from "@angular/forms";
-import { Observable, firstValueFrom } from "rxjs";
+import { firstValueFrom } from "rxjs";
 
 import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/tools/export/components/export.component";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
@@ -25,9 +25,6 @@ export class ExportComponent extends BaseExportComponent {
   encryptedExportType = EncryptedExportType;
   protected showFilePassword: boolean;
 
-  // Used in the OrganizationVaultExport subclass
-  protected flexibleCollectionsEnabled$ = new Observable<boolean>();
-
   constructor(
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,