vaultwarden/bitwarden-estensione-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2024-12-12 01:08:06 +01:00
Code Issues 1 Releases Wiki Activity

fix sdk calls

Browse Source
This commit is contained in:
Thomas Avery 2024-10-31 17:18:06 -05:00
parent 04b78e9f06
commit 654ae056b3
No known key found for this signature in database
GPG Key ID: 44A02A0410B0F429
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts
View File

@ -1,4 +1,4 @@
import { firstValueFrom } from "rxjs";
import { firstValueFrom, map } from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@ -33,11 +33,16 @@ export class DefaultUserAsymmetricKeysRegenerationService
this.apiService.getUserPublicKey(userId),
]);
const sdk = await firstValueFrom(this.sdkService.userClient$(userId));
const verificationResponse = sdk.crypto().verify_asymmetric_keys({
userPublicKey: publicKeyResponse.publicKey,
userKeyEncryptedPrivateKey: userKeyEncryptedPrivateKey,
});
const verificationResponse = await firstValueFrom(
this.sdkService.userClient$(userId).pipe(
map((sdk) =>
sdk.crypto().verify_asymmetric_keys({
userPublicKey: publicKeyResponse.publicKey,
userKeyEncryptedPrivateKey: userKeyEncryptedPrivateKey,
}),
),
),
);
if (verificationResponse.privateKeyDecryptable && verificationResponse.validPrivateKey) {
// Private key is decryptable and valid. Should not regenerate.
@ -67,13 +72,14 @@ export class DefaultUserAsymmetricKeysRegenerationService
}
async regenerateUserAsymmetricKeys(userId: UserId): Promise<void> {
const sdk = await firstValueFrom(this.sdkService.userClient$(userId));
const response = sdk.crypto().make_key_pair();
const makeKeyPairResponse = await firstValueFrom(
this.sdkService.userClient$(userId).pipe(map((sdk) => sdk.crypto().make_key_pair())),
);
try {
await this.regenerateUserAsymmetricKeysApiService.regenerateUserAsymmetricKeys(
response.userPublicKey,
new EncString(response.userKeyEncryptedPrivateKey),
makeKeyPairResponse.userPublicKey,
new EncString(makeKeyPairResponse.userKeyEncryptedPrivateKey),
);
} catch (error) {
this.logService.error(
@ -83,7 +89,7 @@ export class DefaultUserAsymmetricKeysRegenerationService
return;
}
await this.keyService.setPrivateKey(response.userKeyEncryptedPrivateKey, userId);
await this.keyService.setPrivateKey(makeKeyPairResponse.userKeyEncryptedPrivateKey, userId);
}
private async userKeyCanDecrypt(userKey: UserKey): Promise<boolean> {