Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-28 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Simplify AccountKeys json parsing

Browse Source
This commit is contained in:
Matt Gibson 2022-09-01 13:24:11 -04:00
parent 77bbd3a863
commit 5370cc463d
No known key found for this signature in database
GPG Key ID: A2275080D765C2D7
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libs/common/src/models/domain/account.ts
View File

@ -40,8 +40,8 @@ export class EncryptionPair<TEncrypted, TDecrypted> {
static fromJSON<TEncrypted, TDecrypted>(
obj: Jsonify<EncryptionPair<Jsonify<TEncrypted>, Jsonify<TDecrypted>>>,
decryptedFromJson?: (obj: Jsonify<TDecrypted>) => TDecrypted,
encryptedFromJson?: (obj: Jsonify<TEncrypted>) => TEncrypted
decryptedFromJson?: (decObj: Jsonify<TDecrypted>) => TDecrypted,
encryptedFromJson?: (encObj: Jsonify<TEncrypted>) => TEncrypted
) {
const pair = new EncryptionPair<TEncrypted, TDecrypted>();
if (obj?.encrypted) {
@ -137,32 +137,26 @@ export class AccountKeys {
SymmetricCryptoKey.fromJSON
),
},
{
organizationKeys: EncryptionPair.fromJSON(obj?.organizationKeys, (obj: any) => {
const map = new Map<string, SymmetricCryptoKey>();
for (const orgId in obj) {
map.set(orgId, SymmetricCryptoKey.fromJSON(obj[orgId]));
}
return map;
}),
},
{
providerKeys: EncryptionPair.fromJSON(obj?.providerKeys, (obj: any) => {
const map = new Map<string, SymmetricCryptoKey>();
for (const providerId in obj) {
map.set(providerId, SymmetricCryptoKey.fromJSON(obj[providerId]));
}
return map;
}),
},
{
privateKey: EncryptionPair.fromJSON(obj?.privateKey),
},
{ organizationKeys: AccountKeys.initMapEncryptionPairsFromJSON(obj?.organizationKeys) },
{ providerKeys: AccountKeys.initMapEncryptionPairsFromJSON(obj?.providerKeys) },
{ privateKey: EncryptionPair.fromJSON(obj?.privateKey) },
{
publicKey: Utils.fromByteStringToArray(obj?.publicKeySerialized)?.buffer,
}
);
}
// These `any` types are a result of Jsonify<Map<>> === {}
// Issue raised https://github.com/sindresorhus/type-fest/issues/457
static initMapEncryptionPairsFromJSON(obj: any) {
return EncryptionPair.fromJSON(obj, (decObj: any) => {
const map = new Map<string, SymmetricCryptoKey>();
for (const id in decObj) {
map.set(id, SymmetricCryptoKey.fromJSON(decObj[id]));
}
return map;
});
}
}
export class AccountProfile {