@icure/api 5.0.11 → 5.0.14

package/icc-api/model/AuthenticationResponse.d.ts

@@ -11,6 +11,9 @@
  */
 export declare class AuthenticationResponse {
     constructor(json: JSON | any);
+    groupId?: string;
+    userId?: string;
+    dataOwnerId?: string;
     healthcarePartyId?: string;
     reason?: string;
     successful?: boolean;

package/icc-api/model/AuthenticationResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthenticationResponse.js","sourceRoot":"","sources":["../../../icc-api/model/AuthenticationResponse.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAEH,MAAa,sBAAsB;IACjC,YAAY,IAAgB;QAC1B,MAAM,CAAC,MAAM,CAAC,IAA8B,EAAE,IAAI,CAAC,CAAA;IACrD,CAAC;CAMF;AATD,wDASC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\n\nexport class AuthenticationResponse {\n  constructor(json: JSON | any) {\n    Object.assign(this as AuthenticationResponse, json)\n  }\n\n  healthcarePartyId?: string\n  reason?: string\n  successful?: boolean\n  username?: string\n}\n"]}
+{"version":3,"file":"AuthenticationResponse.js","sourceRoot":"","sources":["../../../icc-api/model/AuthenticationResponse.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAEH,MAAa,sBAAsB;IACjC,YAAY,IAAgB;QAC1B,MAAM,CAAC,MAAM,CAAC,IAA8B,EAAE,IAAI,CAAC,CAAA;IACrD,CAAC;CASF;AAZD,wDAYC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\n\nexport class AuthenticationResponse {\n  constructor(json: JSON | any) {\n    Object.assign(this as AuthenticationResponse, json)\n  }\n\n  groupId?: string\n  userId?: string\n  dataOwnerId?: string\n  healthcarePartyId?: string\n  reason?: string\n  successful?: boolean\n  username?: string\n}\n"]}

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;
             }