@icure/api 5.0.10 → 5.0.13

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

@@ -56,7 +56,6 @@ class IccCryptoXApi {
     emptyHcpCache(hcpartyId) {
         delete this.hcPartyKeysRequestsCache[hcpartyId];
         delete this.dataOwnerCache[hcpartyId];
-        delete this.dataOwnerCache[hcpartyId];
     }
     /**
      * Gets all delegate encrypted HcParty keys of the delegate with the given `delegateHcPartyId`, and for each key the delegator id
@@ -574,7 +573,10 @@ class IccCryptoXApi {
                 const [publicKeyFingerprint, encryptedAesExchangeKey] = candidates[candidates.findIndex(([k, v]) => publicKeys.some((pk) => pk.endsWith(k)))];
                 return Object.assign(Object.assign({}, map), { [e[0]]: { [publicKeyFingerprint]: encryptedAesExchangeKey } });
             }, {});
-            return !owner.publicKey || mapOfAesExchangeKeys[owner.publicKey] || !((_b = owner.hcPartyKeys) === null || _b === void 0 ? void 0 : _b[delegateId]) || (publicKeys.find((p) => p == owner.publicKey) == undefined)
+            return !owner.publicKey ||
+                mapOfAesExchangeKeys[owner.publicKey] ||
+                !((_b = owner.hcPartyKeys) === null || _b === void 0 ? void 0 : _b[delegateId]) ||
+                publicKeys.find((p) => p == owner.publicKey) == undefined
                 ? mapOfAesExchangeKeys
                 : Object.assign(Object.assign({}, mapOfAesExchangeKeys), { [owner.publicKey]: { [owner.publicKey.slice(-32)]: owner.hcPartyKeys[delegateId][0] } });
         });
@@ -703,9 +705,9 @@ class IccCryptoXApi {
         this.throwDetailedExceptionForInvalidParameter('child.id', child.id, 'addDelegationsAndEncryptionKeys', arguments);
         return (secretDelegationKey
             ? this.extendedDelegationsAndCryptedForeignKeys(child, parent, ownerId, delegateId, secretDelegationKey)
-            : Promise.resolve({ delegations: {}, cryptedForeignKeys: {} }))
+            : Promise.resolve({ modifiedObject: child, delegations: {}, cryptedForeignKeys: {}, secretId: null }))
             .then((extendedChildObjectSPKsAndCFKs) => secretEncryptionKey
-            ? this.appendEncryptionKeys(child, ownerId, delegateId, secretEncryptionKey).then(
+            ? this.appendEncryptionKeys(extendedChildObjectSPKsAndCFKs.modifiedObject, ownerId, delegateId, secretEncryptionKey).then(
             //TODO: extendedDelegationsAndCryptedForeignKeys and appendEncryptionKeys can be done in parallel
             (extendedChildObjectEKs) => ({
                 extendedSPKsAndCFKs: extendedChildObjectSPKsAndCFKs,
@@ -716,7 +718,7 @@ class IccCryptoXApi {
                 extendedEKs: { encryptionKeys: {} },
             }))
             .then(({ extendedSPKsAndCFKs: extendedChildObjectSPKsAndCFKs, extendedEKs: extendedChildObjectEKs }) => {
-            return _.assign(child, {
+            return _.assign(extendedChildObjectSPKsAndCFKs.modifiedObject, {
                 // Conservative version ... We might want to be more aggressive with the deduplication of keys
                 // For each delegate, we are going to concatenate to the src (the new delegations), the object in dest (the current delegations)
                 // for which we do not find an equivalent delegation (same delegator, same delegate)
@@ -1361,7 +1363,7 @@ class IccCryptoXApi {
             if (!selectedPublicKey) {
                 throw new Error(`Invalid owner, no public key, keypairs have not be set for ${ownerId}`);
             }
-            if ((owner.hcPartyKeys || {})[delegateId] ||
+            if (((owner.hcPartyKeys || {})[delegateId] && owner.publicKey && availablePublicKeysFingerprints.includes(owner.publicKey.slice(-32))) ||
                 Object.values(owner.aesExchangeKeys || {}).some((x) => x[delegateId] && Object.keys(x[delegateId]).some((k) => availablePublicKeysFingerprints.includes(k)))) {
                 return owner;
             }