From a5fe0857eea5f54acc04ec50205ef384c69739fd Mon Sep 17 00:00:00 2001 From: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com> Date: Tue, 25 Feb 2025 15:15:35 -0500 Subject: [PATCH] Fix for the issue where folders do not log when you have two accounts and you lock both then login to the second account (#13273) --- .../src/vault/vault-filter/services/vault-filter.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts index d175942c475..01fa3384b82 100644 --- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts +++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts @@ -1,7 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore import { Injectable } from "@angular/core"; -import { firstValueFrom, from, map, mergeMap, Observable, switchMap } from "rxjs"; +import { firstValueFrom, from, map, mergeMap, Observable, switchMap, take } from "rxjs"; import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; @@ -85,6 +85,7 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti }; return this.accountService.activeAccount$.pipe( + take(1), getUserId, switchMap((userId) => this.folderService