bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-13 06:54:07 +00:00
Code Issues Releases Wiki Activity

Added takewhile operator to only make calls when userId is present

Browse Source
This commit is contained in:
gbubemismith
2024-11-08 12:29:09 -05:00
parent c1a915c406
commit 8f25b65626
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/common/src/vault/services/folder/folder.service.ts
View File

@@ -1,4 +1,4 @@
import { Observable, firstValueFrom, map, of, shareReplay, switchMap } from "rxjs";
import { Observable, firstValueFrom, map, of, shareReplay, switchMap, takeWhile } from "rxjs";
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
@@ -28,6 +28,7 @@ export class FolderService implements InternalFolderServiceAbstraction {
folders$(userId$: Observable<UserId>): Observable<Folder[]> {
return userId$.pipe(
takeWhile((userId) => userId != null),
switchMap((userId) => this.encryptedFoldersState(userId).state$),
map((folders) => {
if (folders == null) {
@@ -39,8 +40,11 @@ export class FolderService implements InternalFolderServiceAbstraction {
);
}
folderViews$(userId$: Observable<UserId>) {
return userId$.pipe(switchMap((userId) => this.decryptedFoldersState(userId).state$));
folderViews$(userId$: Observable<UserId>): Observable<FolderView[]> {
return userId$.pipe(
takeWhile((userId) => userId != null),
switchMap((userId) => this.decryptedFoldersState(userId).state$),
);
}
async clearDecryptedFolderState(userId: UserId): Promise<void> {