diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts index bc214a224ec..31ab06e5881 100644 --- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts +++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts @@ -129,9 +129,26 @@ export class VaultPopupItemsService { combineLatest([ this.cipherService .cipherListViews$(userId) - .pipe(filter((ciphers) => ciphers != null)), - this.cipherService.failedToDecryptCiphers$(userId), - this.restrictedItemTypesService.restricted$, + .pipe( + tap(() => { + console.log("[vault popup items service] fetched cipher list views"); + }), + filter((ciphers) => ciphers != null), + tap(() => { + console.log("[vault popup items service] cipher list views are not null"); + }) + ), + this.cipherService.failedToDecryptCiphers$(userId) + .pipe( + tap(() => { + console.log("[vault popup items service] fetched failed to decrypt ciphers"); + }) + ), + this.restrictedItemTypesService.restricted$.pipe( + tap(() => { + console.log("[vault popup items service] fetched restricted item types"); + }) + ), ]), ), tap(() => { diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts index 5aece5bc4ef..fdd05927b50 100644 --- a/libs/common/src/platform/sync/default-sync.service.ts +++ b/libs/common/src/platform/sync/default-sync.service.ts @@ -448,7 +448,7 @@ export class DefaultSyncService extends CoreSyncService { masterPasswordUnlockData, userId, ); - //await this.kdfConfigService.setKdfConfig(userId, masterPasswordUnlockData.kdf); + await this.kdfConfigService.setKdfConfig(userId, masterPasswordUnlockData.kdf); } } } diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts index d25aa62ea3a..9f978c0780f 100644 --- a/libs/common/src/vault/services/cipher.service.ts +++ b/libs/common/src/vault/services/cipher.service.ts @@ -150,16 +150,31 @@ export class CipherService implements CipherServiceAbstraction { } return combineLatest([ - this.encryptedCiphersState(userId).state$, - this.localData$(userId), - this.keyService.cipherDecryptionKeys$(userId, true), + this.encryptedCiphersState(userId).state$.pipe(tap(() => { + console.log("[cipher service] fetched encrypted ciphers"); + })), + this.localData$(userId).pipe(tap(() => { + console.log("[cipher service] fetched local data"); + })), + this.keyService.cipherDecryptionKeys$(userId, true).pipe(tap(() => { + console.log("[cipher service] fetched cipher decryption keys"); + })), ]).pipe( + tap(() => { + console.log("[cipher service] fetched all dependencies for decryption"); + }), filter(([cipherDataState, _, keys]) => cipherDataState != null && keys != null), + tap(() => { + console.log("[cipher service] dependencies are not null"); + }), map(([cipherDataState, localData]) => Object.values(cipherDataState).map( (cipherData) => new Cipher(cipherData, localData?.[cipherData.id as CipherId]), ), ), + tap(() => { + console.log("[cipher service] mapped cipher data to Cipher instances"); + }), tap(() => { decryptStartTime = performance.now(); }), @@ -171,6 +186,7 @@ export class CipherService implements CipherServiceAbstraction { return decrypted; }), tap((decrypted) => { + console.log("[cipher service] decryption complete"); this.logService.measure( decryptStartTime, "Vault",