bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-06 11:43:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'km/decrypt-obj' of github.com:bitwarden/clients into km/decrypt-obj

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-12-17 10:55:42 +01:00
parent 29661f0b87 3813462915
commit fd75b8a8ba
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/common/src/platform/models/domain/domain-base.ts
View File

@@ -1,6 +1,6 @@
import { ConditionalExcept, ConditionalKeys } from "type-fest";
import { EncString } from "../../../key-management/crypto/models/enc-string";
import { DECRYPT_ERROR, EncString } from "../../../key-management/crypto/models/enc-string";
import { View } from "../../../models/view/view";
import { Utils } from "../../misc/utils";
@@ -81,16 +81,19 @@ export default class Domain {
const encryptService = Utils.getContainerService().getEncryptService();
for (const prop of props) {
if (domain[prop] == null) {
viewModel[prop] = null;
continue;
}
try {
viewModel[prop] = await encryptService.decryptString(domain[prop]!, key!);
viewModel[prop] = await encryptService.decryptString(domain[prop]!, key);
} catch (e) {
throw new Error(
// eslint-disable-next-line no-console
console.error(
`Failed to decrypt property '${String(
prop,
)}' of domain. Context: ${objectContext}. Error: ${"message" in e ? e.message : String(e)}`, // In case the SDK maps to a non-Error type, this is defensive
);
viewModel[prop] = DECRYPT_ERROR;
}
}
return viewModel as V;