From 5f97f4c4a830c3d87a43ab5ce5d08a0454956d00 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Fri, 12 Apr 2024 10:21:19 -0400
Subject: [PATCH] Update Organization and Policy Services to allow the passing
 of a user id and to prevent hangs waiting on an active user (#8712)

* OrgSvc - add new observable returning getAll$ method which accepts a required user id

* OrgSvc - make user id optional

* PolicySvc - getAll$ should use the new OrgSvc.getAll$ method so that it doesn't hang if there isn't an active user yet but a user id was passed in.

* Fix policy service tests
---
 .../organization/organization.service.abstraction.ts       | 6 +++++-
 .../services/organization/organization.service.ts          | 4 ++++
 .../admin-console/services/policy/policy.service.spec.ts   | 7 ++++++-
 .../src/admin-console/services/policy/policy.service.ts    | 2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
index a1ae64a8858..fefcac3a57a 100644
--- a/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
@@ -121,7 +121,11 @@ export abstract class OrganizationService {
   get$: (id: string) => Observable<Organization | undefined>;
   get: (id: string) => Promise<Organization>;
   getAll: (userId?: string) => Promise<Organization[]>;
-  //
+
+  /**
+   * Publishes state for all organizations for the given user id or the active user.
+   */
+  getAll$: (userId?: UserId) => Observable<Organization[]>;
 }
 
 /**
diff --git a/libs/common/src/admin-console/services/organization/organization.service.ts b/libs/common/src/admin-console/services/organization/organization.service.ts
index 411850fe300..7013863c5cd 100644
--- a/libs/common/src/admin-console/services/organization/organization.service.ts
+++ b/libs/common/src/admin-console/services/organization/organization.service.ts
@@ -73,6 +73,10 @@ export class OrganizationService implements InternalOrganizationServiceAbstracti
     return this.organizations$.pipe(mapToSingleOrganization(id));
   }
 
+  getAll$(userId?: UserId): Observable<Organization[]> {
+    return this.getOrganizationsFromState$(userId);
+  }
+
   async getAll(userId?: string): Promise<Organization[]> {
     return await firstValueFrom(this.getOrganizationsFromState$(userId as UserId));
   }
diff --git a/libs/common/src/admin-console/services/policy/policy.service.spec.ts b/libs/common/src/admin-console/services/policy/policy.service.spec.ts
index b67ef4619f3..88264d1c3b7 100644
--- a/libs/common/src/admin-console/services/policy/policy.service.spec.ts
+++ b/libs/common/src/admin-console/services/policy/policy.service.spec.ts
@@ -32,7 +32,8 @@ describe("PolicyService", () => {
     organizationService = mock<OrganizationService>();
 
     activeUserState = stateProvider.activeUser.getFake(POLICIES);
-    organizationService.organizations$ = of([
+
+    const organizations$ = of([
       // User
       organization("org1", true, true, OrganizationUserStatusType.Confirmed, false),
       // Owner
@@ -54,6 +55,10 @@ describe("PolicyService", () => {
       organization("org6", true, true, OrganizationUserStatusType.Confirmed, true),
     ]);
 
+    organizationService.organizations$ = organizations$;
+
+    organizationService.getAll$.mockReturnValue(organizations$);
+
     policyService = new PolicyService(stateProvider, organizationService);
   });
 
diff --git a/libs/common/src/admin-console/services/policy/policy.service.ts b/libs/common/src/admin-console/services/policy/policy.service.ts
index a093dad61a9..e36902cbf94 100644
--- a/libs/common/src/admin-console/services/policy/policy.service.ts
+++ b/libs/common/src/admin-console/services/policy/policy.service.ts
@@ -51,7 +51,7 @@ export class PolicyService implements InternalPolicyServiceAbstraction {
       map((policies) => policies.filter((p) => p.type === policyType)),
     );
 
-    return combineLatest([filteredPolicies$, this.organizationService.organizations$]).pipe(
+    return combineLatest([filteredPolicies$, this.organizationService.getAll$(userId)]).pipe(
       map(([policies, organizations]) => this.enforcedPolicyFilter(policies, organizations)),
     );
   }