1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-28 18:43:26 +00:00
This commit is contained in:
Bernd Schoolmann
2026-01-12 11:44:33 +01:00
parent da093a733f
commit bc3824c566
3 changed files with 40 additions and 7 deletions

View File

@@ -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(() => {

View File

@@ -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);
}
}
}

View File

@@ -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",