Skip to content

Commit 2980cd4

Browse files
Revert "remove dependency on cipher decryption keys (#14408)"
This reverts commit 1051e6d.
1 parent 1051e6d commit 2980cd4

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

libs/common/src/vault/services/cipher.service.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,12 @@ export class CipherService implements CipherServiceAbstraction {
124124
* decryption is in progress. The latest decrypted ciphers will be emitted once decryption is complete.
125125
*/
126126
cipherViews$ = perUserCache$((userId: UserId): Observable<CipherView[] | null> => {
127-
return combineLatest([this.encryptedCiphersState(userId).state$, this.localData$(userId)]).pipe(
128-
filter(([ciphers]) => ciphers != null), // Skip if ciphers haven't been loaded yor synced yet
127+
return combineLatest([
128+
this.encryptedCiphersState(userId).state$,
129+
this.localData$(userId),
130+
this.keyService.cipherDecryptionKeys$(userId, true),
131+
]).pipe(
132+
filter(([ciphers, keys]) => ciphers != null && keys != null), // Skip if ciphers haven't been loaded yor synced yet
129133
switchMap(() => this.getAllDecrypted(userId)),
130134
);
131135
}, this.clearCipherViewsForUser$);

0 commit comments

Comments
 (0)