@icure/api 6.0.4 → 6.2.0

package/icc-x-api/icc-crypto-x-api.js

@@ -18,31 +18,6 @@ const models_1 = require("../icc-api/model/models");
 const binary_utils_1 = require("./utils/binary-utils");
 const utils_1 = require("./utils");
 class IccCryptoXApi {
-    constructor(host, headers, hcpartyBaseApi, //Init with a hcparty x api for better performances
-    patientBaseApi, deviceBaseApi, crypto = typeof window !== 'undefined' ? window.crypto : typeof self !== 'undefined' ? self.crypto : {}, storage, keyStorage) {
-        this.hcPartyKeysCache = {};
-        //[delegateId][delegatorId] = delegateEncryptedHcPartyKey
-        //for each delegate, it stores the list of delegators and the corresponding delegateEncryptedHcPartyKey (shared HcPartyKey, from delegator to delegate, encrypted with the RSA key of the delegate)
-        this.hcPartyKeysRequestsCache = {};
-        this.cacheLastDeletionTimestamp = undefined;
-        this.dataOwnerCache = {};
-        this.keychainLocalStoreIdPrefix = 'org.taktik.icure.ehealth.keychain.';
-        this.keychainValidityDateLocalStoreIdPrefix = 'org.taktik.icure.ehealth.keychain-date.';
-        this.hcpPreferenceKeyEhealthCert = 'eHealthCRTCrypt';
-        this.hcpPreferenceKeyEhealthCertDate = 'eHealthCRTDate';
-        this.rsaLocalStoreIdPrefix = 'org.taktik.icure.rsa.';
-        this.rsaKeyPairs = {};
-        this.hcpartyBaseApi = hcpartyBaseApi;
-        this.patientBaseApi = patientBaseApi;
-        this.deviceBaseApi = deviceBaseApi;
-        this._crypto = crypto;
-        this.generateKeyConcurrencyMap = {};
-        this._AES = new AES_1.AESUtils(crypto);
-        this._RSA = new RSA_1.RSAUtils(crypto);
-        this._shamir = new shamir_1.ShamirClass(crypto);
-        this._storage = storage;
-        this._keyStorage = keyStorage;
-    }
     get crypto() {
         return this._crypto;
     }
@@ -83,6 +58,31 @@ class IccCryptoXApi {
             this.deviceBaseApi.getDeviceAesExchangeKeysForDelegate(delegateHcPartyId).catch(() => { }),
         ]).then(([a, b, c]) => (Object.assign(Object.assign(Object.assign({}, a), b), c)));
     }
+    constructor(host, headers, hcpartyBaseApi, //Init with a hcparty x api for better performances
+    patientBaseApi, deviceBaseApi, crypto = typeof window !== 'undefined' ? window.crypto : typeof self !== 'undefined' ? self.crypto : {}, storage, keyStorage) {
+        this.hcPartyKeysCache = {};
+        //[delegateId][delegatorId] = delegateEncryptedHcPartyKey
+        //for each delegate, it stores the list of delegators and the corresponding delegateEncryptedHcPartyKey (shared HcPartyKey, from delegator to delegate, encrypted with the RSA key of the delegate)
+        this.hcPartyKeysRequestsCache = {};
+        this.cacheLastDeletionTimestamp = undefined;
+        this.dataOwnerCache = {};
+        this.keychainLocalStoreIdPrefix = 'org.taktik.icure.ehealth.keychain.';
+        this.keychainValidityDateLocalStoreIdPrefix = 'org.taktik.icure.ehealth.keychain-date.';
+        this.hcpPreferenceKeyEhealthCert = 'eHealthCRTCrypt';
+        this.hcpPreferenceKeyEhealthCertDate = 'eHealthCRTDate';
+        this.rsaLocalStoreIdPrefix = 'org.taktik.icure.rsa.';
+        this.rsaKeyPairs = {};
+        this.hcpartyBaseApi = hcpartyBaseApi;
+        this.patientBaseApi = patientBaseApi;
+        this.deviceBaseApi = deviceBaseApi;
+        this._crypto = crypto;
+        this.generateKeyConcurrencyMap = {};
+        this._AES = new AES_1.AESUtils(crypto);
+        this._RSA = new RSA_1.RSAUtils(crypto);
+        this._shamir = new shamir_1.ShamirClass(crypto);
+        this._storage = storage;
+        this._keyStorage = keyStorage;
+    }
     loadAllKeysFromLocalStorage(dataOwnerId) {
         return __awaiter(this, void 0, void 0, function* () {
             const pubKeys = yield this.getDataOwnerHexPublicKeys((yield this.getDataOwner(dataOwnerId)).dataOwner);
@@ -226,7 +226,7 @@ class IccCryptoXApi {
                 return res;
             }
             const result = yield publicKeys.reduce((res, pk) => __awaiter(this, void 0, void 0, function* () {
-                var _b, _c;
+                var _b, _c, _d;
                 const delegatorAndKeys = yield res;
                 if (delegatorAndKeys) {
                     return delegatorAndKeys;
@@ -236,10 +236,11 @@ class IccCryptoXApi {
                 if (!keyPair) {
                     return;
                 }
-                let encryptedHcPartyKey = encryptedHcPartyKeys[fingerprint];
+                // Due to past bugs the encryptedHcPartyKeys may contain the full key instead of just the fingerprint.
+                let encryptedHcPartyKey = (_c = encryptedHcPartyKeys[fingerprint]) !== null && _c !== void 0 ? _c : encryptedHcPartyKeys[pk];
                 if (!encryptedHcPartyKey) {
                     const delegate = yield this.getDataOwner(delegateHcPartyId, false); //it is faster to just try to decrypt if not in cache
-                    if (!(delegate === null || delegate === void 0 ? void 0 : delegate.dataOwner) || ((_c = delegate.dataOwner.publicKey) === null || _c === void 0 ? void 0 : _c.endsWith(fingerprint))) {
+                    if (!(delegate === null || delegate === void 0 ? void 0 : delegate.dataOwner) || ((_d = delegate.dataOwner.publicKey) === null || _d === void 0 ? void 0 : _d.endsWith(fingerprint))) {
                         encryptedHcPartyKey = encryptedHcPartyKeys[''];
                     }
                     else {
@@ -270,11 +271,11 @@ class IccCryptoXApi {
                     .filter(([_, k]) => !publicKeys.some((apk) => apk.slice(-32) === k.slice(-32)));
                 if (candidates.length) {
                     const newPublicKeys = yield candidates.reduce((p, [decryptionKeyFingerprint, privateKeyFingerprint, encryptedPrivateKey]) => __awaiter(this, void 0, void 0, function* () {
-                        var _d, _e;
+                        var _e, _f;
                         const newKeys = yield p;
-                        const aesExchangeKeys = (_d = Object.entries(hcp.dataOwner.aesExchangeKeys).find(([fp, _]) => fp.slice(-32) === privateKeyFingerprint.slice(-32))) === null || _d === void 0 ? void 0 : _d[1][loggedHcPartyId];
+                        const aesExchangeKeys = (_e = Object.entries(hcp.dataOwner.aesExchangeKeys).find(([fp, _]) => fp.slice(-32) === privateKeyFingerprint.slice(-32))) === null || _e === void 0 ? void 0 : _e[1][loggedHcPartyId];
                         if (aesExchangeKeys) {
-                            const encryptedAesExchangeKey = (_e = Object.entries(aesExchangeKeys).find(([fp, _]) => fp.slice(-32) === decryptionKeyFingerprint.slice(-32))) === null || _e === void 0 ? void 0 : _e[1];
+                            const encryptedAesExchangeKey = (_f = Object.entries(aesExchangeKeys).find(([fp, _]) => fp.slice(-32) === decryptionKeyFingerprint.slice(-32))) === null || _f === void 0 ? void 0 : _f[1];
                             if (encryptedAesExchangeKey) {
                                 const keyPair = this.rsaKeyPairs[decryptionKeyFingerprint.slice(-32)];
                                 if (!keyPair) {
@@ -1575,7 +1576,7 @@ class IccCryptoXApi {
                 ];
                 ownerCombinedAesExchangeKeys = Object.assign({ [ownerLegacyPublicKey]: Object.entries((_d = owner.hcPartyKeys) !== null && _d !== void 0 ? _d : {}).reduce((map, [hcpId, keys]) => {
                         var _a, _b;
-                        return (Object.assign(Object.assign(Object.assign({}, map), { [hcpId]: { [ownerLegacyPublicKey]: keys[0], [(_b = (_a = counterParts.find((x) => x.id === hcpId)) === null || _a === void 0 ? void 0 : _a.publicKey) !== null && _b !== void 0 ? _b : '']: keys[1] } }), {}));
+                        return (Object.assign(Object.assign(Object.assign({}, map), { [hcpId]: { [ownerLegacyPublicKey.slice(-32)]: keys[0], [(_b = (_a = counterParts.find((x) => x.id === hcpId)) === null || _a === void 0 ? void 0 : _a.publicKey) !== null && _b !== void 0 ? _b : '']: keys[1] } }), {}));
                     }, {}) }, ownerCombinedAesExchangeKeys);
             }
             const delegatePublicKeys = [delegate.publicKey, ...Object.keys((_e = delegate.aesExchangeKeys) !== null && _e !== void 0 ? _e : {}).filter((x) => x !== delegate.publicKey)].filter((x) => !!x);
@@ -1591,7 +1592,7 @@ class IccCryptoXApi {
                 if (delegate.publicKey && ownerLegacyPublicKey && isOwnerLegacyPublicKeyAvailable) {
                     owner.hcPartyKeys[delegateId] = [encryptedAesKeys[ownerLegacyPublicKey.slice(-32)], encryptedAesKeys[delegate.publicKey.slice(-32)]];
                 }
-                owner.aesExchangeKeys = Object.assign(Object.assign({}, (ownerCombinedAesExchangeKeys !== null && ownerCombinedAesExchangeKeys !== void 0 ? ownerCombinedAesExchangeKeys : {})), { [selectedPublicKey]: Object.assign(Object.assign({}, ((_g = (_f = owner.aesExchangeKeys) === null || _f === void 0 ? void 0 : _f[selectedPublicKey]) !== null && _g !== void 0 ? _g : {})), { [delegateId]: encryptedAesKeys }) });
+                owner.aesExchangeKeys = this.fixAesExchangeKeyEntriesToFingerprints(Object.assign(Object.assign({}, (ownerCombinedAesExchangeKeys !== null && ownerCombinedAesExchangeKeys !== void 0 ? ownerCombinedAesExchangeKeys : {})), { [selectedPublicKey]: Object.assign(Object.assign({}, ((_g = (_f = owner.aesExchangeKeys) === null || _f === void 0 ? void 0 : _f[selectedPublicKey]) !== null && _g !== void 0 ? _g : {})), { [delegateId]: encryptedAesKeys }) }));
                 return new Promise((resolve, reject) => {
                     ownerType === 'hcp'
                         ? (this.dataOwnerCache[owner.id] = this.hcpartyBaseApi
@@ -1722,6 +1723,18 @@ class IccCryptoXApi {
     storeKeyPair(id, keyPair) {
         this._storage.setItem(this.rsaLocalStoreIdPrefix + id, JSON.stringify(keyPair));
     }
+    fixAesExchangeKeyEntriesToFingerprints(aesExchangeKeys) {
+        return Object.fromEntries(Object.entries(aesExchangeKeys).map(([delegatorPubKey, allDelegates]) => [
+            delegatorPubKey,
+            Object.fromEntries(Object.entries(allDelegates).map(([delegateId, keyEntries]) => [
+                delegateId,
+                Object.fromEntries(Object.entries(keyEntries).map(([publicKey, encryptedValue]) => [
+                    publicKey.slice(-32),
+                    encryptedValue
+                ]))
+            ]))
+        ]));
+    }
 }
 exports.IccCryptoXApi = IccCryptoXApi;
 //# sourceMappingURL=icc-crypto-x-api.js.map