[PM-5111] Reduce calls to config endpoint (#7069)

* Removed second active account observable and added distinctUntilChanged. * Updated comment.
bitwarden · Dec 6, 2023 · 299a880 · 299a880
1 parent 0aca876
commit 299a880
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/libs/common/src/platform/services/environment.service.ts b/libs/common/src/platform/services/environment.service.ts
@@ -1,4 +1,4 @@
-import { concatMap, Observable, ReplaySubject } from "rxjs";
+import { concatMap, distinctUntilChanged, Observable, ReplaySubject } from "rxjs";
 
 import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
 import {
@@ -52,6 +52,8 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
   constructor(private stateService: StateService) {
     this.stateService.activeAccount$
       .pipe(
+        // Use == here to not trigger on undefined -> null transition
+        distinctUntilChanged((oldUserId: string, newUserId: string) => oldUserId == newUserId),
         concatMap(async () => {
           if (!this.initialized) {
             return;

diff --git a/libs/common/src/platform/services/state.service.ts b/libs/common/src/platform/services/state.service.ts
@@ -224,7 +224,6 @@ export class StateService<
       email: account.profile.email,
     });
     await this.setActiveUser(account.profile.userId);
-    this.activeAccountSubject.next(account.profile.userId);
   }
 
   async setActiveUser(userId: string): Promise<void> {