From 1051e6d9a419362732f0bd056b2f7c2d8bf9ef4b Mon Sep 17 00:00:00 2001 From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com> Date: Thu, 24 Apr 2025 15:34:04 -0500 Subject: [PATCH] remove dependency on cipher decryption keys (#14408) - It was not being used in the observable pipeline and causing multiple decryptions --- libs/common/src/vault/services/cipher.service.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts index c192876c83e..97acc3469b8 100644 --- a/libs/common/src/vault/services/cipher.service.ts +++ b/libs/common/src/vault/services/cipher.service.ts @@ -124,12 +124,8 @@ export class CipherService implements CipherServiceAbstraction { * decryption is in progress. The latest decrypted ciphers will be emitted once decryption is complete. */ cipherViews$ = perUserCache$((userId: UserId): Observable => { - return combineLatest([ - this.encryptedCiphersState(userId).state$, - this.localData$(userId), - this.keyService.cipherDecryptionKeys$(userId, true), - ]).pipe( - filter(([ciphers, keys]) => ciphers != null && keys != null), // Skip if ciphers haven't been loaded yor synced yet + return combineLatest([this.encryptedCiphersState(userId).state$, this.localData$(userId)]).pipe( + filter(([ciphers]) => ciphers != null), // Skip if ciphers haven't been loaded yor synced yet switchMap(() => this.getAllDecrypted(userId)), ); }, this.clearCipherViewsForUser$);