[PM-12048] Wire up vNextCollectionService (#14871)

* remove derived state, add cache in service. Fix ts strict errors

* cleanup

* promote vNextCollectionService

* wip

* replace callers in web WIP

* refactor tests for web

* update callers to use vNextCollectionServcie methods in CLI

* WIP make decryptMany public again, fix callers, imports

* wip cli

* wip desktop

* update callers in browser, fix tests

* remove in service cache

* cleanup

* fix test

* clean up

* address cr feedback

* remove duplicate userId

* clean up

* remove unused import

* fix vault-settings-import-nudge.service

* fix caching issue

* clean up

* refactor decryption, cleanup, update callers

* clean up

* Use in-memory statedefinition

* Ac/pm 12048 v next collection service pairing (#15239)

* Draft from pairing with Gibson

* Add todos

* Add comment

* wip

* refactor upsert

---------

Co-authored-by: Brandon <btreston@bitwarden.com>

* clean up

* fix state definitions

* fix linter error

* cleanup

* add test, fix shareReplay

* fix item-more-options component

* fix desktop build

* refactor state to account for null as an initial value, remove caching

* add proper cache, add unit test, update callers

* clean up

* fix routing when deleting collections

* cleanup

* use combineLatest

* fix ts-strict errors, fix error handling

* refactor Collection and CollectionView properties for ts-strict

* Revert "refactor Collection and CollectionView properties for ts-strict"

This reverts commit a5c63aab76.

---------

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

apps/web/src/app/admin-console/organizations/collections/vault.component.ts

@@ -29,6 +29,7 @@ import {
 import {
   CollectionAdminService,
   CollectionAdminView,
+  CollectionService,
   CollectionView,
   Unassigned,
 } from "@bitwarden/admin-console/common";
@@ -264,6 +265,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     private accountService: AccountService,
     private billingNotificationService: BillingNotificationService,
     private organizationWarningsService: OrganizationWarningsService,
+    private collectionService: CollectionService,
   ) {}
 
   async ngOnInit() {
@@ -1133,6 +1135,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     }
     try {
       await this.apiService.deleteCollection(this.organization?.id, collection.id);
+      await this.collectionService.delete([collection.id as CollectionId], this.userId);
       this.toastService.showToast({
         variant: "success",
         title: null,

apps/web/src/app/admin-console/organizations/manage/groups.component.ts

@@ -11,6 +11,7 @@ import {
   from,
   lastValueFrom,
   map,
+  Observable,
   switchMap,
   tap,
 } from "rxjs";
@@ -25,10 +26,13 @@ import {
   CollectionView,
 } from "@bitwarden/admin-console/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { DialogService, TableDataSource, ToastService } from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
 
 import { GroupDetailsView, InternalGroupApiService as GroupService } from "../core";
 
@@ -100,6 +104,8 @@ export class GroupsComponent {
     private logService: LogService,
     private collectionService: CollectionService,
     private toastService: ToastService,
+    private keyService: KeyService,
+    private accountService: AccountService,
   ) {
     this.route.params
       .pipe(
@@ -244,16 +250,22 @@ export class GroupsComponent {
     this.dataSource.data = this.dataSource.data.filter((g) => g !== groupRow);
   }
 
-  private async toCollectionMap(response: ListResponse<CollectionResponse>) {
+  private toCollectionMap(
+    response: ListResponse<CollectionResponse>,
+  ): Observable<Record<string, CollectionView>> {
     const collections = response.data.map(
       (r) => new Collection(new CollectionData(r as CollectionDetailsResponse)),
     );
-    const decryptedCollections = await this.collectionService.decryptMany(collections);
 
-    // Convert to an object using collection Ids as keys for faster name lookups
-    const collectionMap: Record<string, CollectionView> = {};
-    decryptedCollections.forEach((c) => (collectionMap[c.id] = c));
-
-    return collectionMap;
+    return this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) => this.keyService.orgKeys$(userId)),
+      switchMap((orgKeys) => this.collectionService.decryptMany$(collections, orgKeys)),
+      map((collections) => {
+        const collectionMap: Record<string, CollectionView> = {};
+        collections.forEach((c) => (collectionMap[c.id] = c));
+        return collectionMap;
+      }),
+    );
   }
 }

apps/web/src/app/admin-console/organizations/members/members.component.ts

@@ -13,6 +13,7 @@ import {
   Observable,
   shareReplay,
   switchMap,
+  withLatestFrom,
   tap,
 } from "rxjs";
 
@@ -307,17 +308,27 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
    * Retrieve a map of all collection IDs <-> names for the organization.
    */
   async getCollectionNameMap() {
-    const collectionMap = new Map<string, string>();
-    const response = await this.apiService.getCollections(this.organization.id);
-
-    const collections = response.data.map(
-      (r) => new Collection(new CollectionData(r as CollectionDetailsResponse)),
+    const response = from(this.apiService.getCollections(this.organization.id)).pipe(
+      map((res) =>
+        res.data.map((r) => new Collection(new CollectionData(r as CollectionDetailsResponse))),
+      ),
     );
-    const decryptedCollections = await this.collectionService.decryptMany(collections);
 
-    decryptedCollections.forEach((c) => collectionMap.set(c.id, c.name));
+    const decryptedCollections$ = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) => this.keyService.orgKeys$(userId)),
+      withLatestFrom(response),
+      switchMap(([orgKeys, collections]) =>
+        this.collectionService.decryptMany$(collections, orgKeys),
+      ),
+      map((collections) => {
+        const collectionMap = new Map<string, string>();
+        collections.forEach((c) => collectionMap.set(c.id, c.name));
+        return collectionMap;
+      }),
+    );
 
-    return collectionMap;
+    return await firstValueFrom(decryptedCollections$);
   }
 
   removeUser(id: string): Promise<void> {

apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts

@@ -26,7 +26,6 @@ import {
   CollectionResponse,
   CollectionView,
   CollectionService,
-  Collection,
 } from "@bitwarden/admin-console/common";
 import {
   getOrganizationById,
@@ -38,6 +37,7 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { getById } from "@bitwarden/common/platform/misc";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
   DIALOG_DATA,
@@ -141,7 +141,6 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
   protected PermissionMode = PermissionMode;
   protected showDeleteButton = false;
   protected showAddAccessWarning = false;
-  protected collections: Collection[];
   protected buttonDisplayName: ButtonType = ButtonType.Save;
   private orgExceedingCollectionLimit!: Organization;
 
@@ -166,14 +165,12 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
 
   async ngOnInit() {
     // Opened from the individual vault
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.id)));
     if (this.params.showOrgSelector) {
       this.showOrgSelector = true;
       this.formGroup.controls.selectedOrg.valueChanges
         .pipe(takeUntil(this.destroy$))
         .subscribe((id) => this.loadOrg(id));
-      const userId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-      );
       this.organizations$ = this.organizationService.organizations$(userId).pipe(
         first(),
         map((orgs) =>
@@ -195,9 +192,14 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
     );
 
     if (isBreadcrumbEventLogsEnabled) {
-      this.collections = await this.collectionService.getAll();
       this.organizationSelected.setAsyncValidators(
-        freeOrgCollectionLimitValidator(this.organizations$, this.collections, this.i18nService),
+        freeOrgCollectionLimitValidator(
+          this.organizations$,
+          this.collectionService
+            .encryptedCollections$(userId)
+            .pipe(map((collections) => collections ?? [])),
+          this.i18nService,
+        ),
       );
       this.formGroup.updateValueAndValidity();
     }
@@ -212,7 +214,7 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
           }
         }),
         filter(() => this.organizationSelected.errors?.cannotCreateCollections),
-        switchMap((value) => this.findOrganizationById(value)),
+        switchMap((organizationId) => this.organizations$.pipe(getById(organizationId))),
         takeUntil(this.destroy$),
       )
       .subscribe((org) => {
@@ -222,11 +224,6 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
       });
   }
 
-  async findOrganizationById(orgId: string): Promise<Organization | undefined> {
-    const organizations = await firstValueFrom(this.organizations$);
-    return organizations.find((org) => org.id === orgId);
-  }
-
   async loadOrg(orgId: string) {
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
     const organization$ = this.organizationService
@@ -413,7 +410,8 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
       collectionView.name = this.formGroup.controls.name.value;
     }
 
-    const savedCollection = await this.collectionAdminService.save(collectionView);
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const savedCollection = await this.collectionAdminService.save(collectionView, userId);
 
     this.toastService.showToast({
       variant: "success",

apps/web/src/app/admin-console/organizations/shared/validators/free-org-collection-limit.validator.spec.ts

@@ -18,7 +18,7 @@ describe("freeOrgCollectionLimitValidator", () => {
 
   it("returns null if organization is not found", async () => {
     const orgs: Organization[] = [];
-    const validator = freeOrgCollectionLimitValidator(of(orgs), [], i18nService);
+    const validator = freeOrgCollectionLimitValidator(of(orgs), of([]), i18nService);
     const control = new FormControl("org-id");
 
     const result: Observable<ValidationErrors> = validator(control) as Observable<ValidationErrors>;
@@ -28,7 +28,7 @@ describe("freeOrgCollectionLimitValidator", () => {
   });
 
   it("returns null if control is not an instance of FormControl", async () => {
-    const validator = freeOrgCollectionLimitValidator(of([]), [], i18nService);
+    const validator = freeOrgCollectionLimitValidator(of([]), of([]), i18nService);
     const control = {} as AbstractControl;
 
     const result: Observable<ValidationErrors | null> = validator(
@@ -40,7 +40,7 @@ describe("freeOrgCollectionLimitValidator", () => {
   });
 
   it("returns null if control is not provided", async () => {
-    const validator = freeOrgCollectionLimitValidator(of([]), [], i18nService);
+    const validator = freeOrgCollectionLimitValidator(of([]), of([]), i18nService);
 
     const result: Observable<ValidationErrors | null> = validator(
       undefined as any,
@@ -53,7 +53,7 @@ describe("freeOrgCollectionLimitValidator", () => {
   it("returns null if organization has not reached collection limit (Observable)", async () => {
     const org = { id: "org-id", maxCollections: 2 } as Organization;
     const collections = [{ organizationId: "org-id" } as Collection];
-    const validator = freeOrgCollectionLimitValidator(of([org]), collections, i18nService);
+    const validator = freeOrgCollectionLimitValidator(of([org]), of(collections), i18nService);
     const control = new FormControl("org-id");
 
     const result$ = validator(control) as Observable<ValidationErrors | null>;
@@ -65,7 +65,7 @@ describe("freeOrgCollectionLimitValidator", () => {
   it("returns error if organization has reached collection limit (Observable)", async () => {
     const org = { id: "org-id", maxCollections: 1 } as Organization;
     const collections = [{ organizationId: "org-id" } as Collection];
-    const validator = freeOrgCollectionLimitValidator(of([org]), collections, i18nService);
+    const validator = freeOrgCollectionLimitValidator(of([org]), of(collections), i18nService);
     const control = new FormControl("org-id");
 
     const result$ = validator(control) as Observable<ValidationErrors | null>;

apps/web/src/app/admin-console/organizations/shared/validators/free-org-collection-limit.validator.ts

@@ -1,13 +1,14 @@
 import { AbstractControl, AsyncValidatorFn, FormControl, ValidationErrors } from "@angular/forms";
-import { map, Observable, of } from "rxjs";
+import { combineLatest, map, Observable, of } from "rxjs";
 
 import { Collection } from "@bitwarden/admin-console/common";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { getById } from "@bitwarden/common/platform/misc";
 
 export function freeOrgCollectionLimitValidator(
-  orgs: Observable<Organization[]>,
-  collections: Collection[],
+  organizations$: Observable<Organization[]>,
+  collections$: Observable<Collection[]>,
   i18nService: I18nService,
 ): AsyncValidatorFn {
   return (control: AbstractControl): Observable<ValidationErrors | null> => {
@@ -21,15 +22,16 @@ export function freeOrgCollectionLimitValidator(
       return of(null);
     }
 
-    return orgs.pipe(
-      map((organizations) => organizations.find((org) => org.id === orgId)),
-      map((org) => {
-        if (!org) {
+    return combineLatest([organizations$.pipe(getById(orgId)), collections$]).pipe(
+      map(([organization, collections]) => {
+        if (!organization) {
           return null;
         }
 
-        const orgCollections = collections.filter((c) => c.organizationId === org.id);
-        const hasReachedLimit = org.maxCollections === orgCollections.length;
+        const orgCollections = collections.filter(
+          (collection: Collection) => collection.organizationId === organization.id,
+        );
+        const hasReachedLimit = organization.maxCollections === orgCollections.length;
 
         if (hasReachedLimit) {
           return {