@icure/api 8.0.64 → 8.0.66

package/test/icc-x-api/crypto/exchange-data-manager-test.js

@@ -19,7 +19,6 @@ const FakeDataOwnerApi_1 = require("../../utils/FakeDataOwnerApi");
 const TestCryptoStrategies_1 = require("../../utils/TestCryptoStrategies");
 const icc_x_api_1 = require("../../../icc-x-api");
 const FakeEncryptionKeysManager_1 = require("../../utils/FakeEncryptionKeysManager");
-const FakeSignatureKeysManager_1 = require("../../utils/FakeSignatureKeysManager");
 const AccessControlSecretUtils_1 = require("../../../icc-x-api/crypto/AccessControlSecretUtils");
 const ExchangeData_1 = require("../../../icc-api/model/internal/ExchangeData");
 const chai_1 = require("chai");
@@ -51,7 +50,6 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
         let baseExchangeData;
         let exchangeData;
         let encryptionKeysManager;
-        let signatureKeysManager;
         function initialiseComponents(allowFullExchangeDataLoad, optionalParameters = {}) {
             return __awaiter(this, void 0, void 0, function* () {
                 const dataOwnerType = allowFullExchangeDataLoad ? DataOwnerTypeEnum_1.DataOwnerTypeEnum.Patient : DataOwnerTypeEnum_1.DataOwnerTypeEnum.Hcp;
@@ -83,10 +81,9 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 ]);
                 const cryptoStrategies = new TestCryptoStrategies_1.TestCryptoStrategies(undefined, undefined, optionalParameters.verifiedDelegateKeys);
                 exchangeDataApi = new FakeExchangeDataApi_1.FakeExchangeDataApi();
-                baseExchangeData = new BaseExchangeDataManager_1.BaseExchangeDataManager(exchangeDataApi, dataOwnerApi, primitives, allowFullExchangeDataLoad);
+                baseExchangeData = new BaseExchangeDataManager_1.BaseExchangeDataManager(exchangeDataApi, dataOwnerApi, primitives, allowFullExchangeDataLoad, false);
                 encryptionKeysManager = yield FakeEncryptionKeysManager_1.FakeEncryptionKeysManager.create(primitives, [selfKeypair]);
-                signatureKeysManager = new FakeSignatureKeysManager_1.FakeSignatureKeysManager(primitives);
-                exchangeData = yield (0, ExchangeDataManager_1.initialiseExchangeDataManagerForCurrentDataOwner)(baseExchangeData, encryptionKeysManager, signatureKeysManager, accessControlSecretUtils, cryptoStrategies, dataOwnerApi, primitives, true, optionalParameters);
+                exchangeData = yield (0, ExchangeDataManager_1.initialiseExchangeDataManagerForCurrentDataOwner)(baseExchangeData, encryptionKeysManager, accessControlSecretUtils, cryptoStrategies, dataOwnerApi, primitives, true, optionalParameters);
             });
         }
         function checkDataEqual(actual, expected) {
@@ -109,7 +106,7 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
             return __awaiter(this, void 0, void 0, function* () {
                 const encryptionKey = yield primitives.RSA.generateKeyPair(icc_x_api_1.ShaVersion.Sha256);
                 const encryptionFp = (0, icc_x_api_1.ua2hex)(yield primitives.RSA.exportKey(encryptionKey.publicKey, 'spki')).slice(-32);
-                const signatureKey = yield primitives.RSA.generateSignatureKeyPair();
+                const signatureKey = yield primitives.RSA.generateKeyPair(icc_x_api_1.ShaVersion.Sha1);
                 const signatureFp = (0, icc_x_api_1.ua2hex)(yield primitives.RSA.exportKey(signatureKey.publicKey, 'spki')).slice(-32);
                 const created = yield baseExchangeData.createExchangeData(selfId, { [signatureFp]: signatureKey.privateKey }, { [encryptionFp]: encryptionKey.publicKey, [selfKeyFpV1]: selfKeypair.publicKey });
                 const modified = yield exchangeDataApi.modifyExchangeData(new ExchangeData_1.ExchangeData(Object.assign(Object.assign({}, created.exchangeData), { delegator: primitives.randomUuid() })));
@@ -183,14 +180,14 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                         yield initialiseComponents(allowFullExchangeDataLoad);
                         const sfk = primitives.randomUuid();
                         const initialisedCount = exchangeDataApi.callCount;
-                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
-                        const retrievedCachedData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
+                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
+                        const retrievedCachedData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         exchangeDataApi.compareCallCountFromBaseline(initialisedCount, {
                             createExchangeData: 1,
                             // If we could fully preload we already know whether the exchange key already exists or not, otherwise we have to request from the api
                             getExchangeDataByDelegatorDelegate: allowFullExchangeDataLoad ? 0 : 1,
                             modifyExchangeData: 0,
-                            getExchangeDataById: 0,
+                            getExchangeDataByIds: 0,
                             getExchangeDataByParticipant: 0,
                         });
                         yield checkDataEqual(retrievedCachedData, createdData);
@@ -217,7 +214,7 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function doTest(allowFullExchangeDataLoad) {
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
-                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(selfId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [primitives.randomUuid()], false);
+                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(selfId, false);
                         (0, chai_1.expect)(createdData.exchangeData.delegator).to.equal(selfId);
                         (0, chai_1.expect)(createdData.exchangeData.delegate).to.equal(selfId);
                         (0, chai_1.expect)(Object.keys(createdData.exchangeData.delegatorSignature)).to.have.length(1);
@@ -250,7 +247,7 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                             yield dataOwnerApi.addPublicKeyForOwner(selfId, keyData.pair);
                             yield encryptionKeysManager.addOrUpdateKey(primitives, keyData.pair, false);
                         }
-                        const created = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [primitives.randomUuid()], false);
+                        const created = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         (0, chai_1.expect)((0, collection_utils_1.setEquals)(new Set(Object.keys(created.exchangeData.exchangeKey)), new Set(Object.keys(created.exchangeData.accessControlSecret))), 'Keys used for encryption of exchange key and access control secret must be the same.').to.be.true;
                         (0, chai_1.expect)((0, collection_utils_1.setEquals)(new Set(Object.keys(created.exchangeData.exchangeKey)), new Set([...delegateVerifiedKeys.map((x) => x.fingerprintV2), ...extraDelegatorVerifiedKeys.map((x) => x.fingerprintV2), selfKeyFpV2])), 'Only verified keys of delegate and delegator should be used for encryption of exchange key and access control secret.').to.be.true;
                         for (const keyData of [{ pair: selfKeypair, fingerprintV2: selfKeyFpV1 }, ...extraDelegatorVerifiedKeys, ...delegateVerifiedKeys]) {
@@ -269,15 +266,15 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function doTest(allowFullExchangeDataLoad) {
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
-                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         yield exchangeData.clearOrRepopulateCache();
                         const countAfterCacheClear = exchangeDataApi.callCount;
-                        const reloadedData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                        const reloadedData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         exchangeDataApi.compareCallCountFromBaseline(countAfterCacheClear, {
                             createExchangeData: 0,
                             getExchangeDataByDelegatorDelegate: allowFullExchangeDataLoad ? 0 : 1,
                             modifyExchangeData: 0,
-                            getExchangeDataById: 0,
+                            getExchangeDataByIds: 0,
                             getExchangeDataByParticipant: 0,
                         });
                         yield checkDataEqual(reloadedData, createdData);
@@ -292,17 +289,16 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function doTest(allowFullExchangeDataLoad) {
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
-                        const sfk = primitives.randomUuid();
-                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
-                        signatureKeysManager.clearKeys();
+                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
+                        yield encryptionKeysManager.unverifyExistingKeysAndCreateNewVerified(primitives);
                         yield exchangeData.clearOrRepopulateCache();
                         const countAfterCacheClear = exchangeDataApi.callCount;
-                        const newData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
+                        const newData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         exchangeDataApi.compareCallCountFromBaseline(countAfterCacheClear, {
                             createExchangeData: 1,
                             getExchangeDataByDelegatorDelegate: allowFullExchangeDataLoad ? 0 : 1,
                             modifyExchangeData: 0,
-                            getExchangeDataById: 0,
+                            getExchangeDataByIds: 0,
                             getExchangeDataByParticipant: 0,
                         });
                         (0, chai_1.expect)(_.isEqual(_.omit(createdData.exchangeData, ['rev']), _.omit(newData.exchangeData, ['rev']))).to.equal(false, 'Exchange data manager should have created new exchange data for encryption');
@@ -320,23 +316,23 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
                         const sfk = primitives.randomUuid();
-                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
+                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         // Tamper with exchange data
                         yield exchangeDataApi.modifyExchangeData(yield tamper(createdData.exchangeData, selfKeypair, selfKeyFpV2));
                         yield exchangeData.clearOrRepopulateCache();
                         const countAfterCacheClear = exchangeDataApi.callCount;
-                        const newData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
+                        const newData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         exchangeDataApi.compareCallCountFromBaseline(countAfterCacheClear, {
                             createExchangeData: 1,
                             getExchangeDataByDelegatorDelegate: allowFullExchangeDataLoad ? 0 : 1,
                             modifyExchangeData: 0,
-                            getExchangeDataById: 0,
+                            getExchangeDataByIds: 0,
                             getExchangeDataByParticipant: 0,
                         });
                         (0, chai_1.expect)(createdData.exchangeData.id).not.to.equal(newData.exchangeData.id, 'Exchange data manager should have created new exchange data for encryption');
                         (0, chai_1.expect)((0, icc_x_api_1.ua2hex)(yield primitives.AES.exportKey(createdData.exchangeKey, 'raw'))).to.not.equal((0, icc_x_api_1.ua2hex)(yield primitives.AES.exportKey(newData.exchangeKey, 'raw')));
                         (0, chai_1.expect)(createdData.accessControlSecret).to.not.equal(newData.accessControlSecret);
-                        const updatedUnverifiedOldData = yield exchangeData.getDecryptionDataKeyById(createdData.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], true);
+                        const updatedUnverifiedOldData = (yield exchangeData.getDecryptionDataKeyByIds([createdData.exchangeData.id], true))[createdData.exchangeData.id];
                         (0, chai_1.expect)(updatedUnverifiedOldData).to.not.be.undefined;
                     });
                 }
@@ -368,19 +364,18 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function doTest(allowFullExchangeDataLoad) {
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
-                        const sfk = primitives.randomUuid();
-                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
+                        const createdData = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         // Tamper with exchange data
                         yield exchangeDataApi.modifyExchangeData(Object.assign(Object.assign({}, createdData.exchangeData), { delegate: delegate2Id }));
                         yield exchangeData.clearOrRepopulateCache();
                         const countAfterCacheClear = exchangeDataApi.callCount;
-                        const newDataToDelegate = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
-                        const newDataToDelegate2 = yield exchangeData.getOrCreateEncryptionDataTo(delegate2Id, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
+                        const newDataToDelegate = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
+                        const newDataToDelegate2 = yield exchangeData.getOrCreateEncryptionDataTo(delegate2Id, false);
                         exchangeDataApi.compareCallCountFromBaseline(countAfterCacheClear, {
                             createExchangeData: 2,
                             getExchangeDataByDelegatorDelegate: allowFullExchangeDataLoad ? 0 : 2,
                             modifyExchangeData: 0,
-                            getExchangeDataById: 0,
+                            getExchangeDataByIds: 0,
                             getExchangeDataByParticipant: 0,
                         });
                         (0, chai_1.expect)(createdData.exchangeData.id).to.not.equal(newDataToDelegate.exchangeData.id, 'Exchange data manager should have created new exchange data for encryption to delegate');
@@ -389,7 +384,7 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                         (0, chai_1.expect)((0, icc_x_api_1.ua2hex)(yield primitives.AES.exportKey(createdData.exchangeKey, 'raw'))).to.not.equal((0, icc_x_api_1.ua2hex)(yield primitives.AES.exportKey(newDataToDelegate2.exchangeKey, 'raw')));
                         (0, chai_1.expect)(createdData.accessControlSecret).to.not.equal(newDataToDelegate.accessControlSecret);
                         (0, chai_1.expect)(createdData.accessControlSecret).to.not.equal(newDataToDelegate2.accessControlSecret);
-                        const updatedUnverifiedOldData = yield exchangeData.getDecryptionDataKeyById(createdData.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], true);
+                        const updatedUnverifiedOldData = (yield exchangeData.getDecryptionDataKeyByIds([createdData.exchangeData.id], true))[createdData.exchangeData.id];
                         (0, chai_1.expect)(updatedUnverifiedOldData).to.not.be.undefined;
                         (0, chai_1.expect)((0, icc_x_api_1.ua2hex)(yield primitives.AES.exportKey(updatedUnverifiedOldData.exchangeKey, 'raw'))).to.equal((0, icc_x_api_1.ua2hex)(yield primitives.AES.exportKey(createdData.exchangeKey, 'raw')));
                         (0, chai_1.expect)(updatedUnverifiedOldData.accessControlSecret).to.equal(createdData.accessControlSecret);
@@ -404,51 +399,38 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function doTest(allowFullExchangeDataLoad) {
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
-                        const sfk = primitives.randomUuid();
-                        const createdData1 = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], false);
+                        const createdData1 = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                         const createdData2 = yield createDataFromRandomToSelf();
-                        signatureKeysManager.clearKeys();
+                        yield encryptionKeysManager.unverifyExistingKeysAndCreateNewVerified(primitives);
                         yield exchangeData.clearOrRepopulateCache();
-                        yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(createdData1.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], true), createdData1);
-                        yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(createdData2.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Contact, [sfk], true), createdData2);
+                        yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([createdData1.exchangeData.id], true))[createdData1.exchangeData.id], createdData1);
+                        yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([createdData2.exchangeData.id], true))[createdData2.exchangeData.id], createdData2);
                     });
                 }
                 yield doTest(true);
                 yield doTest(false);
             });
         });
-        it('newly created data or data retrieved by id should be cached and retrievable by hash for the provided sfks and entity type', function () {
+        it('newly created data or data retrieved by id should be cached and retrievable by hash', function () {
             return __awaiter(this, void 0, void 0, function* () {
                 function doTest(allowFullExchangeDataLoad) {
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
-                        const sfk1 = primitives.randomUuid();
-                        const sfk2 = primitives.randomUuid();
-                        const createdData1 = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
-                        const hashes1 = [
-                            yield accessControlSecretUtils.secureDelegationKeyFor(createdData1.accessControlSecret, icc_x_api_1.EntityWithDelegationTypeName.Patient, undefined),
-                        ];
-                        const createdData2 = yield createDataFromRandomToSelf();
-                        const hashes2 = yield accessControlSecretUtils.secureDelegationKeysFor(createdData2.accessControlSecret, icc_x_api_1.EntityWithDelegationTypeName.HealthElement, [sfk1, sfk2]);
-                        yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(createdData2.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.HealthElement, [sfk1, sfk2], true), createdData2);
-                        const retrievedKeys = yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash([...hashes1, ...hashes2], icc_x_api_1.EntityWithDelegationTypeName.Message, []); // Entity type and entity sfk should be irrelevant in this case
-                        (0, chai_1.expect)(Object.keys(retrievedKeys)).to.have.length(hashes1.length + hashes2.length);
+                        const createdData1 = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
+                        const hashes1 = yield accessControlSecretUtils.allSecureDelegationKeysFor(createdData1.accessControlSecret);
+                        const retrievedKeys1 = yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash(hashes1);
                         for (const hash of hashes1) {
-                            yield checkDataEqual(retrievedKeys[hash], createdData1);
+                            yield checkDataEqual(retrievedKeys1[hash], createdData1);
                         }
-                        for (const hash of hashes2) {
-                            yield checkDataEqual(retrievedKeys[hash], createdData2);
+                        if (!allowFullExchangeDataLoad) {
+                            const createdData2 = yield createDataFromRandomToSelf();
+                            const hashes2 = yield accessControlSecretUtils.allSecureDelegationKeysFor(createdData2.accessControlSecret);
+                            yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([createdData2.exchangeData.id], true))[createdData2.exchangeData.id], createdData2);
+                            const retrievedKeys2 = yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash([...hashes1, ...hashes2]);
+                            for (const hash of hashes2) {
+                                yield checkDataEqual(retrievedKeys2[hash], createdData2);
+                            }
                         }
-                        const unknownAccessControlSecret = primitives.randomUuid();
-                        const unknownHashes = [
-                            yield accessControlSecretUtils.secureDelegationKeyFor(unknownAccessControlSecret, icc_x_api_1.EntityWithDelegationTypeName.Patient, undefined),
-                            yield accessControlSecretUtils.secureDelegationKeyFor(unknownAccessControlSecret, icc_x_api_1.EntityWithDelegationTypeName.HealthElement, sfk1),
-                            yield accessControlSecretUtils.secureDelegationKeyFor(unknownAccessControlSecret, icc_x_api_1.EntityWithDelegationTypeName.HealthElement, sfk2),
-                        ];
-                        (0, chai_1.expect)(Object.keys(yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash(unknownHashes, icc_x_api_1.EntityWithDelegationTypeName.Patient, []))).to.have.length(0);
-                        const uncachedHash = yield accessControlSecretUtils.secureDelegationKeyFor(createdData1.accessControlSecret, icc_x_api_1.EntityWithDelegationTypeName.Document, sfk1);
-                        const retrievedByAutomaticallyCachedHash = yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash([uncachedHash], icc_x_api_1.EntityWithDelegationTypeName.Document, [sfk1]);
-                        (0, chai_1.expect)(Object.keys(retrievedByAutomaticallyCachedHash)).to.have.length(1);
                     });
                 }
                 yield doTest(true);
@@ -460,7 +442,7 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function doTest(allowFullExchangeDataLoad) {
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
-                        const createdBySelf = yield exchangeData.getOrCreateEncryptionDataTo(selfId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                        const createdBySelf = yield exchangeData.getOrCreateEncryptionDataTo(selfId, false);
                         const createdByOther = yield createDataFromRandomToSelf();
                         const newKey = yield primitives.RSA.generateKeyPair(icc_x_api_1.ShaVersion.Sha256);
                         yield dataOwnerApi.addPublicKeyForOwner(selfId, newKey);
@@ -468,11 +450,11 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                         encryptionKeysManager.deleteKey(selfKeyFpV1);
                         yield encryptionKeysManager.addOrUpdateKey(primitives, newKey, true);
                         yield exchangeData.clearOrRepopulateCache();
-                        yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(createdBySelf.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], true), {
+                        yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([createdBySelf.exchangeData.id], true))[createdBySelf.exchangeData.id], {
                             exchangeData: createdBySelf.exchangeData,
                             exchangeKey: undefined,
                         });
-                        yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(createdByOther.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], true), {
+                        yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([createdByOther.exchangeData.id], true))[createdByOther.exchangeData.id], {
                             exchangeData: createdByOther.exchangeData,
                             exchangeKey: undefined,
                         });
@@ -487,12 +469,12 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function doTest(allowFullExchangeDataLoad) {
                     return __awaiter(this, void 0, void 0, function* () {
                         yield initialiseComponents(allowFullExchangeDataLoad);
-                        const createdBySelf = yield exchangeData.getOrCreateEncryptionDataTo(selfId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                        const createdBySelf = yield exchangeData.getOrCreateEncryptionDataTo(selfId, false);
                         const createdByOther = yield createDataFromRandomToSelf();
                         yield encryptionKeysManager.addOrUpdateKey(primitives, selfKeypair, false);
                         yield exchangeData.clearOrRepopulateCache();
-                        yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(createdBySelf.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], true), createdBySelf);
-                        yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(createdByOther.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], true), createdByOther);
+                        yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([createdBySelf.exchangeData.id], true))[createdBySelf.exchangeData.id], createdBySelf);
+                        yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([createdByOther.exchangeData.id], true))[createdByOther.exchangeData.id], createdByOther);
                     });
                 }
                 yield doTest(true);
@@ -507,16 +489,16 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function verifyCached(data) {
                     return __awaiter(this, void 0, void 0, function* () {
                         const apiCallsBaseline = exchangeDataApi.callCount;
-                        const hashes = yield accessControlSecretUtils.secureDelegationKeysFor(data.accessControlSecret, entityType, sfks);
+                        const hashes = yield accessControlSecretUtils.allSecureDelegationKeysFor(data.accessControlSecret);
                         for (const hash of hashes) {
-                            yield checkDataEqual((yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash([hash], entityType, sfks))[hash], data);
+                            yield checkDataEqual((yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash([hash]))[hash], data);
                         }
                         if (data.exchangeData.delegator === selfId) {
-                            yield checkDataEqual(yield exchangeData.getOrCreateEncryptionDataTo(data.exchangeData.delegate, entityType, sfks, false), data);
+                            yield checkDataEqual(yield exchangeData.getOrCreateEncryptionDataTo(data.exchangeData.delegate, false), data);
                         }
-                        yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(data.exchangeData.id, entityType, sfks, true), data);
+                        yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([data.exchangeData.id], true))[data.exchangeData.id], data);
                         exchangeDataApi.compareCallCountFromBaseline(apiCallsBaseline, {
-                            getExchangeDataById: 0,
+                            getExchangeDataByIds: 0,
                             createExchangeData: 0,
                             modifyExchangeData: 0,
                             getExchangeDataByParticipant: 0,
@@ -527,14 +509,14 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                 function verifyNotCachedThenCache(data) {
                     return __awaiter(this, void 0, void 0, function* () {
                         const apiCallsBaseline = exchangeDataApi.callCount;
-                        const hashes = yield accessControlSecretUtils.secureDelegationKeysFor(data.accessControlSecret, entityType, sfks);
+                        const hashes = [yield accessControlSecretUtils.secureDelegationKeyFor(data.accessControlSecret, entityType)];
                         for (const hash of hashes) {
-                            (0, chai_1.expect)(Object.keys(yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash([hash], entityType, sfks))).to.have.length(0);
+                            (0, chai_1.expect)(Object.keys(yield exchangeData.getCachedDecryptionDataKeyByAccessControlHash([hash]))).to.have.length(0);
                         }
                         if (data.exchangeData.delegator === selfId) {
-                            yield checkDataEqual(yield exchangeData.getOrCreateEncryptionDataTo(data.exchangeData.delegate, entityType, sfks, false), data);
+                            yield checkDataEqual(yield exchangeData.getOrCreateEncryptionDataTo(data.exchangeData.delegate, false), data);
                             exchangeDataApi.compareCallCountFromBaseline(apiCallsBaseline, {
-                                getExchangeDataById: 0,
+                                getExchangeDataByIds: 0,
                                 createExchangeData: 0,
                                 modifyExchangeData: 0,
                                 getExchangeDataByParticipant: 0,
@@ -542,9 +524,9 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                             });
                         }
                         else {
-                            yield checkDataEqual(yield exchangeData.getDecryptionDataKeyById(data.exchangeData.id, entityType, sfks, true), data);
+                            yield checkDataEqual((yield exchangeData.getDecryptionDataKeyByIds([data.exchangeData.id], true))[data.exchangeData.id], data);
                             exchangeDataApi.compareCallCountFromBaseline(apiCallsBaseline, {
-                                getExchangeDataById: 1,
+                                getExchangeDataByIds: 1,
                                 createExchangeData: 0,
                                 modifyExchangeData: 0,
                                 getExchangeDataByParticipant: 0,
@@ -553,8 +535,8 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
                         }
                     });
                 }
-                const createdBySelf1 = yield exchangeData.getOrCreateEncryptionDataTo(selfId, entityType, sfks, false);
-                const createdBySelf2 = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, entityType, sfks, false);
+                const createdBySelf1 = yield exchangeData.getOrCreateEncryptionDataTo(selfId, false);
+                const createdBySelf2 = yield exchangeData.getOrCreateEncryptionDataTo(delegateId, false);
                 const createdByOther1 = yield createDataFromRandomToSelf(); // Not automatically cached: created by someone else
                 const createdByOther2 = yield createDataFromRandomToSelf(); // Not automatically cached: created by someone else
                 // noinspection DuplicatedCode
@@ -590,14 +572,14 @@ const IccExchangeDataApi_1 = require("../../../icc-api/api/internal/IccExchangeD
         it('implementation with unlimited cache should preload all existing exchange data on creation', function () {
             return __awaiter(this, void 0, void 0, function* () {
                 yield initialiseComponents(true);
-                const createdBySelf = yield exchangeData.getOrCreateEncryptionDataTo(selfId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                const createdBySelf = yield exchangeData.getOrCreateEncryptionDataTo(selfId, false);
                 const createdByOther = yield createDataFromRandomToSelf();
-                const recreatedExchangeData = yield (0, ExchangeDataManager_1.initialiseExchangeDataManagerForCurrentDataOwner)(baseExchangeData, encryptionKeysManager, signatureKeysManager, accessControlSecretUtils, new TestCryptoStrategies_1.TestCryptoStrategies(), dataOwnerApi, primitives, true);
+                const recreatedExchangeData = yield (0, ExchangeDataManager_1.initialiseExchangeDataManagerForCurrentDataOwner)(baseExchangeData, encryptionKeysManager, accessControlSecretUtils, new TestCryptoStrategies_1.TestCryptoStrategies(), dataOwnerApi, primitives, true);
                 const apiCallsAfterCreation = exchangeDataApi.callCount;
-                yield checkDataEqual(yield recreatedExchangeData.getDecryptionDataKeyById(createdBySelf.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false), createdBySelf);
-                yield checkDataEqual(yield recreatedExchangeData.getDecryptionDataKeyById(createdByOther.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false), createdByOther);
+                yield checkDataEqual((yield recreatedExchangeData.getDecryptionDataKeyByIds([createdBySelf.exchangeData.id], false))[createdBySelf.exchangeData.id], createdBySelf);
+                yield checkDataEqual((yield recreatedExchangeData.getDecryptionDataKeyByIds([createdByOther.exchangeData.id], false))[createdByOther.exchangeData.id], createdByOther);
                 exchangeDataApi.compareCallCountFromBaseline(apiCallsAfterCreation, {
-                    getExchangeDataById: 0,
+                    getExchangeDataByIds: 0,
                     createExchangeData: 0,
                     modifyExchangeData: 0,
                     getExchangeDataByParticipant: 0,
@@ -621,8 +603,8 @@ let env;
             return __awaiter(this, void 0, void 0, function* () {
                 const hcp1Details = yield (0, test_utils_1.createNewHcpApi)(env);
                 const hcp2Details = yield (0, test_utils_1.createNewHcpApi)(env);
-                const ed1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp2Details.credentials.dataOwnerId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
-                const ed2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp1Details.credentials.dataOwnerId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                const ed1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp2Details.credentials.dataOwnerId, false);
+                const ed2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp1Details.credentials.dataOwnerId, false);
                 yield hcp1Details.api.cryptoApi.exchangeData.clearOrRepopulateCache();
                 yield hcp2Details.api.cryptoApi.exchangeData.clearOrRepopulateCache();
                 const newKeyPair = yield hcp1Details.api.cryptoApi.primitives.RSA.generateKeyPair(icc_x_api_1.ShaVersion.Sha256);
@@ -632,8 +614,8 @@ let env;
                 yield hcp1Details.api.cryptoApi.exchangeData.giveAccessBackTo(hcp2Details.credentials.dataOwnerId, exportedPub);
                 yield hcp1Details.api.cryptoApi.exchangeData.clearOrRepopulateCache();
                 yield hcp2Details.api.cryptoApi.exchangeData.clearOrRepopulateCache();
-                const updatedEd1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp2Details.credentials.dataOwnerId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
-                const updatedEd2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp1Details.credentials.dataOwnerId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                const updatedEd1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp2Details.credentials.dataOwnerId, false);
+                const updatedEd2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp1Details.credentials.dataOwnerId, false);
                 (0, chai_1.expect)(updatedEd1to2.exchangeData.id).to.equal(ed1to2.exchangeData.id);
                 (0, chai_1.expect)(Object.keys(updatedEd2to1.exchangeData.exchangeKey).length).to.be.greaterThan(Object.keys(ed2to1.exchangeData.exchangeKey).length);
                 (0, chai_1.expect)(Object.keys(updatedEd2to1.exchangeData.exchangeKey).length).to.equal(Object.keys(updatedEd2to1.exchangeData.accessControlSecret).length);
@@ -648,8 +630,8 @@ let env;
             return __awaiter(this, void 0, void 0, function* () {
                 const hcp1Details = yield (0, test_utils_1.createNewHcpApi)(env);
                 const hcp2Details = yield (0, test_utils_1.createNewHcpApi)(env);
-                const ed1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp2Details.credentials.dataOwnerId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
-                const ed2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp1Details.credentials.dataOwnerId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                const ed1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp2Details.credentials.dataOwnerId, false);
+                const ed2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp1Details.credentials.dataOwnerId, false);
                 yield hcp1Details.api.cryptoApi.exchangeData.clearOrRepopulateCache();
                 yield hcp2Details.api.cryptoApi.exchangeData.clearOrRepopulateCache();
                 const exchangeDataApi = new IccExchangeDataApi_1.IccExchangeDataApi(env.iCureUrl, {}, hcp1Details.api.authApi.authenticationProvider, fetch);
@@ -671,15 +653,15 @@ let env;
                 yield hcp1Details.api.cryptoApi.exchangeData.giveAccessBackTo(hcp2Details.credentials.dataOwnerId, exportedPub);
                 yield hcp1Details.api.cryptoApi.exchangeData.clearOrRepopulateCache();
                 yield hcp2Details.api.cryptoApi.exchangeData.clearOrRepopulateCache();
-                const updatedEd1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp2Details.credentials.dataOwnerId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
-                const updatedEd2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp1Details.credentials.dataOwnerId, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], false);
+                const updatedEd1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp2Details.credentials.dataOwnerId, false);
+                const updatedEd2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getOrCreateEncryptionDataTo(hcp1Details.credentials.dataOwnerId, false);
                 (0, chai_1.expect)(updatedEd1to2.exchangeData.id).to.not.equal(ed1to2.exchangeData.id);
                 (0, chai_1.expect)(updatedEd2to1.exchangeData.id).to.not.equal(ed2to1.exchangeData.id);
-                const decData1to2 = yield hcp1Details.api.cryptoApi.exchangeData.getDecryptionDataKeyById(ed1to2.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], true);
+                const decData1to2 = (yield hcp1Details.api.cryptoApi.exchangeData.getDecryptionDataKeyByIds([ed1to2.exchangeData.id], true))[ed1to2.exchangeData.id];
                 (0, chai_1.expect)(decData1to2).to.not.be.undefined;
                 (0, chai_1.expect)(decData1to2.exchangeKey).to.not.be.undefined;
                 (0, chai_1.expect)(decData1to2.accessControlSecret).to.not.be.undefined;
-                const decData2to1 = yield hcp2Details.api.cryptoApi.exchangeData.getDecryptionDataKeyById(ed2to1.exchangeData.id, icc_x_api_1.EntityWithDelegationTypeName.Patient, [], true);
+                const decData2to1 = (yield hcp2Details.api.cryptoApi.exchangeData.getDecryptionDataKeyByIds([ed2to1.exchangeData.id], true))[ed2to1.exchangeData.id];
                 (0, chai_1.expect)(decData2to1).to.not.be.undefined;
                 (0, chai_1.expect)(decData2to1.exchangeKey).to.not.be.undefined;
                 (0, chai_1.expect)(decData2to1.accessControlSecret).to.not.be.undefined;