@icure/api 6.4.0 → 7.0.0-beta.1

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

@@ -15,10 +15,10 @@ const _ = require("lodash");
 const models = require("../icc-api/model/models");
 const models_1 = require("../icc-api/model/models");
 const ModelHelper_1 = require("../icc-api/model/ModelHelper");
-const binary_utils_1 = require("./utils/binary-utils");
 const person_util_1 = require("./utils/person-util");
 const utils_1 = require("./utils");
 const AuthenticationProvider_1 = require("./auth/AuthenticationProvider");
+const ShareMetadataBehaviour_1 = require("./crypto/ShareMetadataBehaviour");
 // noinspection JSUnusedGlobalSymbols
 class IccPatientXApi extends icc_api_1.IccPatientApi {
     constructor(host, headers, crypto, contactApi, formApi, helementApi, invoiceApi, documentApi, hcpartyApi, classificationApi, dataOwnerApi, calendarItemaApi, encryptedKeys = ['note'], authenticationProvider = new AuthenticationProvider_1.NoAuthenticationProvider(), fetchImpl = typeof window !== 'undefined'
@@ -39,19 +39,42 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         this.dataOwnerApi = dataOwnerApi;
         this.encryptedKeys = encryptedKeys;
     }
-    // noinspection JSUnusedGlobalSymbols
-    newInstance(user, p = {}, delegates = []) {
-        const patient = _.extend({
-            id: this.crypto.randomUuid(),
-            _type: 'org.taktik.icure.entities.Patient',
-            created: new Date().getTime(),
-            modified: new Date().getTime(),
-            responsible: this.dataOwnerApi.getDataOwnerOf(user),
-            author: user.id,
-            codes: [],
-            tags: [],
-        }, p || {});
-        return this.initDelegationsAndEncryptionKeys(patient, user, undefined, delegates);
+    /**
+     * Creates a new instance of patient with initialised encryption metadata (not in the database).
+     * @param user the current user.
+     * @param p initialised data for the patient. Metadata such as id, creation data, etc. will be automatically initialised, but you can specify
+     * other kinds of data or overwrite generated metadata with this. You can't specify encryption metadata.
+     * @param options optional parameters:
+     * - additionalDelegates: delegates which will have access to the entity in addition to the current data owner and delegates from the
+     * auto-delegations. Must be an object which associates each data owner id with the access level to give to that data owner. May overlap with
+     * auto-delegations, in such case the access level specified here will be used. Currently only WRITE access is supported, but in future also read
+     * access will be possible.
+     * @return a new instance of patient.
+     */
+    newInstance(user, p = {}, options = {}) {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function* () {
+            const patient = _.extend({
+                id: this.crypto.primitives.randomUuid(),
+                _type: 'org.taktik.icure.entities.Patient',
+                created: new Date().getTime(),
+                modified: new Date().getTime(),
+                responsible: this.dataOwnerApi.getDataOwnerIdOf(user),
+                author: user.id,
+                codes: [],
+                tags: [],
+            }, p || {});
+            const ownerId = this.dataOwnerApi.getDataOwnerIdOf(user);
+            if (ownerId !== (yield this.dataOwnerApi.getCurrentDataOwnerId()))
+                throw new Error('Can only initialise entities as current data owner.');
+            const extraDelegations = [
+                ...Object.keys((_a = options.additionalDelegates) !== null && _a !== void 0 ? _a : {}),
+                ...((_c = (_b = user.autoDelegations) === null || _b === void 0 ? void 0 : _b.all) !== null && _c !== void 0 ? _c : []),
+                ...((_e = (_d = user.autoDelegations) === null || _d === void 0 ? void 0 : _d.medicalInformation) !== null && _e !== void 0 ? _e : []),
+            ];
+            const initialisationInfo = yield this.crypto.entities.entityWithInitialisedEncryptedMetadata(patient, undefined, undefined, true, extraDelegations);
+            return new models.Patient(initialisationInfo.updatedEntity);
+        });
     }
     completeNames(patient) {
         var _a;
@@ -77,57 +100,29 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         }
         return finalPatient;
     }
-    initDelegationsAndEncryptionKeys(patient, user, secretForeignKey = undefined, delegates = []) {
+    /**
+     * @deprecated replace with {@link initConfidentialSecretId}
+     */
+    initConfidentialDelegation(patient, user) {
         return __awaiter(this, void 0, void 0, function* () {
-            function updatePatientWithDataOwnerIfSame(dataOwner) {
-                if (dataOwner.id === patient.id) {
-                    _.extend(patient, {
-                        rev: dataOwner.rev,
-                        publicKey: dataOwner.publicKey,
-                        aesExchangeKeys: dataOwner.aesExchangeKeys,
-                        hcPartyKeys: dataOwner.hcPartyKeys
-                    });
-                }
-            }
-            const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-            const dels = yield this.crypto.initObjectDelegations(patient, null, dataOwnerId, null);
-            updatePatientWithDataOwnerIfSame(dels.owner);
-            const eks = yield this.crypto.initEncryptionKeys(patient, dataOwnerId);
-            updatePatientWithDataOwnerIfSame(eks.modifiedOwner);
-            patient.delegations = dels.delegations;
-            patient.encryptionKeys = eks.encryptionKeys;
-            let promise = Promise.resolve(patient);
-            _.uniq(delegates.concat(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : [])).forEach((delegateId) => (promise = promise.then((patient) => this.crypto.addDelegationsAndEncryptionKeys(null, patient, dataOwnerId, delegateId, dels.secretId, eks.secretId).catch((e) => {
-                console.log(e);
-                return patient;
-            }))));
-            (user.autoDelegations && user.autoDelegations.anonymousMedicalInformation ? user.autoDelegations.anonymousMedicalInformation : []).forEach((delegateId) => (promise = promise.then((patient) => this.crypto.addDelegationsAndEncryptionKeys(null, patient, dataOwnerId, delegateId, null, eks.secretId).catch((e) => {
-                console.log(e);
-                return patient;
-            }))));
-            return promise;
+            return this.initConfidentialSecretId(patient, user);
         });
     }
-    initConfidentialDelegation(patient, user) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        return this.crypto.extractPreferredSfk(patient, dataOwnerId, true).then((k) => {
-            if (!k) {
-                const secretId = this.crypto.randomUuid();
-                return this.crypto
-                    .decryptAndImportAesHcPartyKeysForDelegators([dataOwnerId], dataOwnerId)
-                    .then((hcPartyKeys) => {
-                    return this.crypto.AES.encrypt(hcPartyKeys[0].key, (0, binary_utils_1.string2ua)(patient.id + ':' + secretId).buffer);
-                })
-                    .then((newDelegation) => {
-                    ;
-                    (patient.delegations[dataOwnerId] || (patient.delegations[dataOwnerId] = [])).push(new models_1.Delegation({
-                        owner: dataOwnerId,
-                        delegatedTo: dataOwnerId,
-                        tag: 'confidential',
-                        key: (0, binary_utils_1.ua2hex)(newDelegation),
-                    }));
-                    return patient.rev ? this.modifyPatientWithUser(user, patient) : this.createPatientWithUser(user, patient);
-                });
+    /**
+     * Ensures that the current data owner has some confidential secret ids for the provided patient. If not creates them and updates the patient in the
+     * database.
+     * @param patient the patient for which you want to initialise the confidential secret id.
+     * @param user the current user.
+     * @return the updated patient or the original patient if no change was necessary.
+     */
+    initConfidentialSecretId(patient, user) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dataOwnerId = this.dataOwnerApi.getDataOwnerIdOf(user);
+            if (dataOwnerId !== (yield this.dataOwnerApi.getCurrentDataOwnerId()))
+                throw new Error('You can initialise confidential delegations only for the current data owner');
+            const initialised = yield this.crypto.confidential.entityWithInitialisedConfidentialSecretId(patient);
+            if (initialised) {
+                return initialised.rev ? this.modifyPatientWithUser(user, initialised) : this.createPatientWithUser(user, initialised);
             }
             else {
                 return patient;
@@ -193,14 +188,14 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     getPatientWithUser(user, patientId) {
         return super
             .getPatient(patientId)
-            .then((p) => this.tryDecryptOrReturnOriginal(user, [p], false))
-            .then((pats) => pats[0].patient);
+            .then((p) => this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), [p], false))
+            .then((pats) => pats[0].entity);
     }
     getPotentiallyEncryptedPatientWithUser(user, patientId) {
         return super
             .getPatient(patientId)
-            .then((p) => this.tryDecryptOrReturnOriginal(user, [p], false))
-            .then((pats) => pats[0]);
+            .then((p) => this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), [p], false))
+            .then((pats) => ({ patient: pats[0].entity, decrypted: pats[0].decrypted }));
     }
     getPatients(body) {
         throw new Error('Cannot call a method that returns contacts without providing a user for de/encryption');
@@ -276,16 +271,13 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         return super.modifyPatient(body);
     }
     modifyPatientWithUser(user, body) {
-        return body
-            ? this.tryEncrypt(user, [_.cloneDeep(this.completeNames(body))], false)
-                .then((pats) => super.modifyPatient(pats[0]))
-                .then((p) => this.decrypt(user, [p]))
-                .then((pats) => {
-                var _a;
-                ((_a = pats[0]) === null || _a === void 0 ? void 0 : _a.id) && this.crypto.emptyHcpCache(pats[0].id);
-                return pats[0];
-            })
-            : Promise.resolve(null);
+        return body ? this.modifyAs(this.dataOwnerApi.getDataOwnerIdOf(user), body) : Promise.resolve(null);
+    }
+    modifyAs(dataOwner, body) {
+        return this.encryptAs(dataOwner, [_.cloneDeep(this.completeNames(body))])
+            .then((pats) => super.modifyPatient(pats[0]))
+            .then((p) => this.tryDecryptOrReturnOriginal(dataOwner, [p]))
+            .then((pats) => pats[0].entity);
     }
     modifyPatientReferral(patientId, referralId, start, end) {
         throw new Error('Cannot call a method that returns contacts without providing a user for de/encryption');
@@ -294,134 +286,48 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         return super
             .modifyPatientReferral(patientId, referralId, start, end)
             .then((p) => this.decrypt(user, [p]))
-            .then((pats) => {
-            var _a;
-            ((_a = pats[0]) === null || _a === void 0 ? void 0 : _a.id) && this.crypto.emptyHcpCache(pats[0].id);
-            return pats[0];
-        });
+            .then((pats) => pats[0]);
     }
     encrypt(user, pats) {
-        return this.tryEncrypt(user, pats, true);
-    }
-    tryEncrypt(user, pats, requireAccessibleKey) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        return Promise.all(pats.map((p) => __awaiter(this, void 0, void 0, function* () {
-            const patientWithInitialisedEks = (p.encryptionKeys && Object.values(p.encryptionKeys).some((v) => !!v.length)
-                ? p
-                : yield this.initEncryptionKeys(user, p));
-            const seks = yield this.crypto.extractKeysFromDelegationsForHcpHierarchy(dataOwnerId, patientWithInitialisedEks.id, patientWithInitialisedEks.encryptionKeys).catch((e) => { console.error(e); throw e; });
-            if (seks.extractedKeys.length) {
-                const key = yield this.crypto.AES.importKey('raw', (0, binary_utils_1.hex2ua)(seks.extractedKeys[0].replace(/-/g, '')));
-                return (0, utils_1.crypt)(patientWithInitialisedEks, (obj) => this.crypto.AES.encrypt(key, (0, binary_utils_1.utf8_2ua)(JSON.stringify(obj, (k, v) => {
-                    return v instanceof ArrayBuffer || v instanceof Uint8Array
-                        ? (0, binary_utils_1.b2a)(new Uint8Array(v).reduce((d, b) => d + String.fromCharCode(b), ''))
-                        : v;
-                }))), this.encryptedKeys);
-            }
-            else if (requireAccessibleKey) {
-                throw new Error(`Current data owner can't access any key of patient ${p.id}.`);
-            }
-            else {
-                const cryptedCopyWithRandomKey = yield (0, utils_1.crypt)(_.cloneDeep(patientWithInitialisedEks), (obj) => __awaiter(this, void 0, void 0, function* () { return Promise.resolve(new ArrayBuffer(1)); }), this.encryptedKeys);
-                if (!_.isEqual(_.omitBy(Object.assign(Object.assign({}, cryptedCopyWithRandomKey), { encryptedSelf: undefined }), _.isNil), _.omitBy(Object.assign(Object.assign({}, patientWithInitialisedEks), { encryptedSelf: undefined }), _.isNil))) {
-                    throw Error("You can't modify encrypted data of a patient if you don't have access to his encryption key.");
-                }
-                return patientWithInitialisedEks;
-            }
-        })));
+        return this.encryptAs(this.dataOwnerApi.getDataOwnerIdOf(user), pats);
+    }
+    encryptAs(dataOwnerId, pats) {
+        return Promise.all(pats.map((p) => this.crypto.entities.tryEncryptEntity(p, dataOwnerId, this.encryptedKeys, true, false, (x) => new models.Patient(x))));
     }
     // If patient can't be decrypted returns patient with encrypted data.
     decrypt(user, patients, fillDelegations = true) {
-        return this.tryDecryptOrReturnOriginal(user, patients, fillDelegations).then((ps) => ps.map((p) => p.patient));
-    }
-    tryDecryptOrReturnOriginal(user, patients, fillDelegations = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-            const ids = yield (user.healthcarePartyId ? this.hcpartyApi.getHealthcarePartyHierarchyIds(user.healthcarePartyId) : Promise.resolve([dataOwnerId]));
-            //First check that we have no dangling delegation
-            const patsWithMissingDelegations = patients.filter((p) => p.delegations &&
-                ids.some((id) => p.delegations[id] && !p.delegations[id].length) &&
-                !Object.values(p.delegations).some((d) => d.length > 0));
-            const acc = fillDelegations
-                ? yield patsWithMissingDelegations.reduce((acc, p) => __awaiter(this, void 0, void 0, function* () {
-                    const pats = yield acc;
-                    const pat = yield this.initDelegationsAndEncryptionKeys(p, user);
-                    const mp = yield this.modifyPatientWithUser(user, pat);
-                    return Object.assign(Object.assign({}, pats), { [pat.id]: mp || pat });
-                }), Promise.resolve({}))
-                : {};
-            return Promise.all(patients
-                .map((p) => acc[p.id] || p)
-                .map((p) => __awaiter(this, void 0, void 0, function* () {
-                const decryptedPatient = yield ids.reduce((decP, hcpId) => __awaiter(this, void 0, void 0, function* () {
-                    var _a;
-                    return ((_a = (yield decP)) !== null && _a !== void 0 ? _a : (p.encryptedSelf
-                        ? yield this.crypto
-                            .extractKeysFromDelegationsForHcpHierarchy(hcpId, p.id, _.size(p.encryptionKeys) ? p.encryptionKeys : p.delegations)
-                            .then(({ extractedKeys: sfks }) => {
-                            if (!sfks || !sfks.length) {
-                                return Promise.resolve(undefined);
-                            }
-                            return this.crypto.AES.importKey('raw', (0, binary_utils_1.hex2ua)(sfks[0].replace(/-/g, ''))).then((key) => (0, utils_1.decrypt)(p, (ec) => this.crypto.AES.decrypt(key, ec)
-                                .then((dec) => {
-                                const jsonContent = dec && (0, binary_utils_1.ua2utf8)(dec);
-                                try {
-                                    return JSON.parse(jsonContent);
-                                }
-                                catch (e) {
-                                    console.log('Cannot parse patient', p.id, jsonContent || 'Invalid content');
-                                    return Promise.resolve(undefined);
-                                }
-                            })
-                                .catch((err) => {
-                                console.log('Cannot decrypt patient', p.id, err);
-                                return Promise.resolve(undefined);
-                            })).then((p) => {
-                                if (p.picture && !(p.picture instanceof ArrayBuffer)) {
-                                    p.picture = (0, ModelHelper_1.b64_2ab)(p.picture);
-                                }
-                                return p;
-                            }));
-                        })
-                        : p));
-                }), Promise.resolve(undefined));
-                return decryptedPatient ? { patient: decryptedPatient, decrypted: true } : { patient: p, decrypted: false };
-            })));
-        });
-    }
-    /** By default, an encryptionKey will be added for every hcp in the autoDelegations of the provided user.
-     * In optional field additionalDelegateIds, you can ask the method to create encryptionKeys for additional hcps */
-    initEncryptionKeys(user, pat, additionalDelegateIds) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        const userAutoDelegations = user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : [];
-        return this.crypto.initEncryptionKeys(pat, dataOwnerId).then((eks) => {
-            let promise = Promise.resolve(_.extend(pat.id === eks.modifiedOwner.id ? eks.modifiedOwner : pat, {
-                encryptionKeys: eks.encryptionKeys,
-            }));
-            new Set([...userAutoDelegations, ...(additionalDelegateIds || [])]).forEach((delegateId) => (promise = promise.then((patient) => this.crypto
-                .appendEncryptionKeys(patient, dataOwnerId, delegateId, eks.secretId)
-                .then((extraEks) => {
-                return _.extend(extraEks.modifiedObject, {
-                    encryptionKeys: extraEks.encryptionKeys,
-                });
-            })
-                .catch((e) => {
-                console.log(e.message);
-                return patient;
-            }))));
-            return promise;
-        });
+        return this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), patients, fillDelegations).then((ps) => ps.map((p) => p.entity));
+    }
+    tryDecryptOrReturnOriginal(dataOwnerId, patients, fillDelegations = true) {
+        return Promise.all(patients.map((p) => __awaiter(this, void 0, void 0, function* () {
+            return yield this.crypto.entities
+                .decryptEntity(p, dataOwnerId, (x) => new models.Patient(x))
+                .then((p) => {
+                if (p.entity.picture && !(p.entity.picture instanceof ArrayBuffer)) {
+                    return {
+                        entity: new models.Patient(Object.assign(Object.assign({}, p.entity), { picture: (0, ModelHelper_1.b64_2ab)(p.entity.picture) })),
+                        decrypted: p.decrypted,
+                    };
+                }
+                else
+                    return p;
+            });
+        })));
     }
     share(user, patId, ownerId, delegateIds, delegationTags, usingPost = false) {
         const addDelegationsAndKeys = (dtos, markerPromise, delegateId, patient) => {
-            return dtos.reduce((p, x) => p.then(() => Promise.all([this.crypto.extractDelegationsSFKs(x, ownerId), this.crypto.extractEncryptionsSKs(x, ownerId)]).then(([sfks, eks]) => {
-                //console.log(`share ${x.id} to ${delegateId}`)
-                return this.crypto
-                    .addDelegationsAndEncryptionKeys(patient, x, ownerId, delegateId, sfks.extractedKeys[0], eks.extractedKeys[0])
+            return dtos.reduce((p, x) => p.then(() => __awaiter(this, void 0, void 0, function* () {
+                const secretIds = yield this.crypto.entities.secretIdsOf(x, ownerId);
+                const encryptionKeys = yield this.crypto.entities.encryptionKeysOf(x, ownerId);
+                const parentIds = yield this.crypto.entities.owningEntityIdsOf(x, ownerId);
+                const updatedX = yield this.crypto.entities
+                    .entityWithExtendedEncryptedMetadata(x, delegateId, secretIds, encryptionKeys, parentIds, [])
                     .catch((e) => {
                     console.log(e);
                     return x;
                 });
+                _.assign(x, updatedX);
+                return x;
             })), markerPromise);
         };
         const allTags = _.uniq(_.flatMap(Object.values(delegationTags)));
@@ -474,8 +380,10 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             return (0, utils_1.retry)(() => this.getPatientWithUser(user, patId))
                 .then((patient) => patient.encryptionKeys && Object.keys(patient.encryptionKeys || {}).length
                 ? Promise.resolve(patient)
-                : this.initEncryptionKeys(user, patient).then((patient) => this.modifyPatientWithUser(user, patient)))
-                .then((patient) => {
+                : this.crypto.entities
+                    .ensureEncryptionKeysInitialised(patient)
+                    .then((patient) => this.modifyPatientWithUser(user, patient)))
+                .then((patient) => __awaiter(this, void 0, void 0, function* () {
                 if (!patient) {
                     status.patient = {
                         success: false,
@@ -483,253 +391,234 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                     };
                     return Promise.resolve({ patient: patient, statuses: status });
                 }
-                return this.crypto.extractDelegationsSFKsAndEncryptionSKs(patient, ownerId).then(([delSfks, ecKeys]) => {
-                    return delSfks.length
-                        ? Promise.all([
-                            (0, utils_1.retry)(() => (usingPost ? this.helementApi
-                                .findHealthElementsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(ownerId, _.uniq(delSfks)) : this.helementApi
-                                .findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(',')))
-                                .then((hes) => parentId
-                                ? (usingPost ? this.helementApi
-                                    .findHealthElementsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(parentId, _.uniq(delSfks)) : this.helementApi
-                                    .findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreHes) => _.uniqBy(hes.concat(moreHes), 'id'))
-                                : hes)),
-                            (0, utils_1.retry)(() => (usingPost ? this.formApi
-                                .findFormsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(ownerId, _.uniq(delSfks)) : this.formApi
-                                .findFormsDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((frms) => parentId
-                                ? (usingPost ? this.formApi
-                                    .findFormsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(parentId, _.uniq(delSfks)) : this.formApi
-                                    .findFormsDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreFrms) => _.uniqBy(frms.concat(moreFrms), 'id'))
-                                : frms)),
-                            (0, utils_1.retry)(() => (usingPost ? this.contactApi
-                                .findByHCPartyPatientSecretFKeysUsingPost(ownerId, undefined, undefined, _.uniq(delSfks)) : this.contactApi
-                                .findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))).then((ctcs) => parentId
-                                ? (usingPost ? this.contactApi
-                                    .findByHCPartyPatientSecretFKeysUsingPost(parentId, undefined, undefined, _.uniq(delSfks)) : this.contactApi
-                                    .findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))).then((moreCtcs) => _.uniqBy(ctcs.concat(moreCtcs), 'id'))
-                                : ctcs)),
-                            (0, utils_1.retry)(() => (usingPost ? this.invoiceApi
-                                .findInvoicesDelegationsStubsByHCPartyPatientForeignKeysUsingPost(ownerId, _.uniq(delSfks)) : this.invoiceApi
-                                .findInvoicesDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((ivs) => parentId
-                                ? this.invoiceApi
-                                    .findInvoicesDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
-                                    .then((moreIvs) => _.uniqBy(ivs.concat(moreIvs), 'id'))
-                                : ivs)),
-                            (0, utils_1.retry)(() => this.classificationApi
-                                .findClassificationsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
-                                .then((cls) => parentId
-                                ? this.classificationApi
-                                    .findClassificationsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
-                                    .then((moreCls) => _.uniqBy(cls.concat(moreCls), 'id'))
-                                : cls)),
-                            (0, utils_1.retry)(() => (usingPost ? this.calendarItemApi
-                                .findByHCPartyPatientSecretFKeysArray(ownerId, _.uniq(delSfks)) : this.calendarItemApi
-                                .findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))).then((cls) => parentId
-                                ? (usingPost ? this.calendarItemApi
-                                    .findByHCPartyPatientSecretFKeysArray(parentId, _.uniq(delSfks)) : this.calendarItemApi
-                                    .findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))).then((moreCls) => _.uniqBy(cls.concat(moreCls), 'id'))
-                                : cls)),
-                        ]).then(([hes, frms, ctcs, ivs, cls, cis]) => {
-                            const cloneKeysAndDelegations = function (x) {
-                                return {
-                                    delegations: shareDelegations ? _.clone(x.delegations) : undefined,
-                                    cryptedForeignKeys: shareCryptedForeignKeys ? _.clone(x.cryptedForeignKeys) : undefined,
-                                    encryptionKeys: shareEncryptionKeys ? _.clone(x.encryptionKeys) : undefined,
-                                };
+                const delSfks = yield this.crypto.entities.secretIdsOf(patient, ownerId);
+                const ecKeys = yield this.crypto.entities.encryptionKeysOf(patient, ownerId);
+                return delSfks.length
+                    ? Promise.all([
+                        (0, utils_1.retry)(() => (usingPost
+                            ? this.helementApi.findHealthElementsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(ownerId, _.uniq(delSfks))
+                            : this.helementApi.findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((hes) => parentId
+                            ? (usingPost
+                                ? this.helementApi.findHealthElementsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(parentId, _.uniq(delSfks))
+                                : this.helementApi.findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreHes) => _.uniqBy(hes.concat(moreHes), 'id'))
+                            : hes)),
+                        (0, utils_1.retry)(() => (usingPost
+                            ? this.formApi.findFormsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(ownerId, _.uniq(delSfks))
+                            : this.formApi.findFormsDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((frms) => parentId
+                            ? (usingPost
+                                ? this.formApi.findFormsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(parentId, _.uniq(delSfks))
+                                : this.formApi.findFormsDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreFrms) => _.uniqBy(frms.concat(moreFrms), 'id'))
+                            : frms)),
+                        (0, utils_1.retry)(() => (usingPost
+                            ? this.contactApi.findByHCPartyPatientSecretFKeysUsingPost(ownerId, undefined, undefined, _.uniq(delSfks))
+                            : this.contactApi.findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))).then((ctcs) => parentId
+                            ? (usingPost
+                                ? this.contactApi.findByHCPartyPatientSecretFKeysUsingPost(parentId, undefined, undefined, _.uniq(delSfks))
+                                : this.contactApi.findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))).then((moreCtcs) => _.uniqBy(ctcs.concat(moreCtcs), 'id'))
+                            : ctcs)),
+                        (0, utils_1.retry)(() => (usingPost
+                            ? this.invoiceApi.findInvoicesDelegationsStubsByHCPartyPatientForeignKeysUsingPost(ownerId, _.uniq(delSfks))
+                            : this.invoiceApi.findInvoicesDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((ivs) => parentId
+                            ? this.invoiceApi
+                                .findInvoicesDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
+                                .then((moreIvs) => _.uniqBy(ivs.concat(moreIvs), 'id'))
+                            : ivs)),
+                        (0, utils_1.retry)(() => this.classificationApi
+                            .findClassificationsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
+                            .then((cls) => parentId
+                            ? this.classificationApi
+                                .findClassificationsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
+                                .then((moreCls) => _.uniqBy(cls.concat(moreCls), 'id'))
+                            : cls)),
+                        (0, utils_1.retry)(() => (usingPost
+                            ? this.calendarItemApi.findByHCPartyPatientSecretFKeysArray(ownerId, _.uniq(delSfks))
+                            : this.calendarItemApi.findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))).then((cls) => parentId
+                            ? (usingPost
+                                ? this.calendarItemApi.findByHCPartyPatientSecretFKeysArray(parentId, _.uniq(delSfks))
+                                : this.calendarItemApi.findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))).then((moreCls) => _.uniqBy(cls.concat(moreCls), 'id'))
+                            : cls)),
+                    ]).then(([hes, frms, ctcs, ivs, cls, cis]) => {
+                        const cloneKeysAndDelegations = function (x) {
+                            return {
+                                delegations: shareDelegations ? _.clone(x.delegations) : undefined,
+                                cryptedForeignKeys: shareCryptedForeignKeys ? _.clone(x.cryptedForeignKeys) : undefined,
+                                encryptionKeys: shareEncryptionKeys ? _.clone(x.encryptionKeys) : undefined,
                             };
-                            const ctcsStubs = ctcs.map((c) => (Object.assign({ id: c.id, rev: c.rev }, cloneKeysAndDelegations(c))));
-                            const oHes = hes.map((x) => _.assign(new models_1.IcureStub({}), x, cloneKeysAndDelegations(x)));
-                            const oFrms = frms.map((x) => _.assign(new models_1.IcureStub({}), x, cloneKeysAndDelegations(x)));
-                            const oCtcsStubs = ctcsStubs.map((x) => _.assign({}, x, cloneKeysAndDelegations(x)));
-                            const oIvs = ivs.map((x) => _.assign(new models_1.Invoice({}), x, cloneKeysAndDelegations(x)));
-                            const oCls = cls.map((x) => _.assign(new models_1.Classification({}), x, cloneKeysAndDelegations(x)));
-                            const oCis = cis.map((x) => _.assign(new models_1.CalendarItem({}), x, cloneKeysAndDelegations(x)));
-                            const docIds = {};
-                            ctcs.forEach((c) => c.services &&
-                                c.services.forEach((s) => s.content && Object.values(s.content).forEach((c) => c && c.documentId && (docIds[c.documentId] = 1))));
-                            return (0, utils_1.retry)(() => this.documentApi.getDocuments(new models_1.ListOfIds({ ids: Object.keys(docIds) }))).then((docs) => {
-                                const oDocs = docs.map((x) => _.assign({}, x, cloneKeysAndDelegations(x)));
-                                let markerPromise = Promise.resolve(null);
-                                delegateIds.forEach((delegateId) => {
-                                    const tags = delegationTags[delegateId];
-                                    markerPromise = markerPromise.then(() => {
-                                        //Share patient
-                                        //console.log(`share ${patient.id} to ${delegateId}`)
-                                        return shareAnonymously
-                                            ? patient
-                                            : this.crypto
-                                                .addDelegationsAndEncryptionKeys(null, patient, ownerId, delegateId, delSfks[0], ecKeys[0])
-                                                .then((patient) => __awaiter(this, void 0, void 0, function* () {
-                                                if (delSfks.length > 1) {
-                                                    return delSfks.slice(1).reduce((patientPromise, delSfk) => __awaiter(this, void 0, void 0, function* () {
-                                                        const patient = yield patientPromise;
-                                                        return shareAnonymously
-                                                            ? patient
-                                                            : this.crypto
-                                                                .addDelegationsAndEncryptionKeys(null, patient, ownerId, delegateId, delSfk, null)
-                                                                .catch((e) => {
-                                                                console.log(e);
-                                                                return patient;
-                                                            });
-                                                    }), Promise.resolve(patient));
-                                                }
-                                                return patient;
-                                            }))
-                                                .catch((e) => {
-                                                console.log(e);
-                                                return patient;
-                                            });
+                        };
+                        const ctcsStubs = ctcs.map((c) => (Object.assign({ id: c.id, rev: c.rev }, cloneKeysAndDelegations(c))));
+                        const oHes = hes.map((x) => _.assign(new models_1.IcureStub({}), x, cloneKeysAndDelegations(x)));
+                        const oFrms = frms.map((x) => _.assign(new models_1.IcureStub({}), x, cloneKeysAndDelegations(x)));
+                        const oCtcsStubs = ctcsStubs.map((x) => _.assign({}, x, cloneKeysAndDelegations(x)));
+                        const oIvs = ivs.map((x) => _.assign(new models_1.Invoice({}), x, cloneKeysAndDelegations(x)));
+                        const oCls = cls.map((x) => _.assign(new models_1.Classification({}), x, cloneKeysAndDelegations(x)));
+                        const oCis = cis.map((x) => _.assign(new models_1.CalendarItem({}), x, cloneKeysAndDelegations(x)));
+                        const docIds = {};
+                        ctcs.forEach((c) => c.services &&
+                            c.services.forEach((s) => s.content && Object.values(s.content).forEach((c) => c && c.documentId && (docIds[c.documentId] = 1))));
+                        return (0, utils_1.retry)(() => this.documentApi.getDocuments(new models_1.ListOfIds({ ids: Object.keys(docIds) }))).then((docs) => {
+                            const oDocs = docs.map((x) => _.assign({}, x, cloneKeysAndDelegations(x)));
+                            let markerPromise = Promise.resolve(null);
+                            delegateIds.forEach((delegateId) => {
+                                const tags = delegationTags[delegateId];
+                                markerPromise = markerPromise.then(() => __awaiter(this, void 0, void 0, function* () {
+                                    //Share patient
+                                    const updatedPatient = yield this.crypto.entities
+                                        .entityWithExtendedEncryptedMetadata(patient, delegateId, delSfks, ecKeys, [], [])
+                                        .catch((e) => {
+                                        console.log(e);
+                                        return patient;
                                     });
-                                    (tags.includes('medicalInformation') || tags.includes('anonymousMedicalInformation') || tags.includes('all')) &&
-                                        (markerPromise = addDelegationsAndKeys(hes, markerPromise, delegateId, patient));
-                                    (tags.includes('medicalInformation') || tags.includes('all')) &&
-                                        (markerPromise = addDelegationsAndKeys(frms, markerPromise, delegateId, patient));
-                                    (tags.includes('medicalInformation') || tags.includes('anonymousMedicalInformation') || tags.includes('all')) &&
-                                        (markerPromise = addDelegationsAndKeys(ctcsStubs, markerPromise, delegateId, patient));
-                                    (tags.includes('medicalInformation') || tags.includes('all')) &&
-                                        (markerPromise = addDelegationsAndKeys(cls, markerPromise, delegateId, patient));
-                                    (tags.includes('medicalInformation') || tags.includes('all')) &&
-                                        (markerPromise = addDelegationsAndKeys(cis, markerPromise, delegateId, patient));
-                                    (tags.includes('financialInformation') || tags.includes('all')) &&
-                                        (markerPromise = addDelegationsAndKeys(ivs, markerPromise, delegateId, patient));
-                                    (tags.includes('medicalInformation') || tags.includes('all')) &&
-                                        (markerPromise = addDelegationsAndKeys(docs, markerPromise, delegateId, null));
-                                });
-                                return markerPromise
-                                    .then(() => {
-                                    //console.log("scd")
-                                    return (((allTags.includes('medicalInformation') || allTags.includes('anonymousMedicalInformation') || allTags.includes('all')) &&
-                                        ctcsStubs &&
-                                        ctcsStubs.length &&
-                                        !_.isEqual(oCtcsStubs, ctcsStubs) &&
-                                        this.contactApi
-                                            .setContactsDelegations(ctcsStubs)
-                                            .then(() => {
-                                            status.contacts.success = true;
-                                            status.contacts.modified += ctcsStubs.length;
-                                        })
-                                            .catch((e) => (status.contacts.error = e))) ||
-                                        Promise.resolve((status.contacts.success = true)));
-                                })
-                                    .then(() => {
-                                    //console.log("shed")
-                                    return (((allTags.includes('medicalInformation') || allTags.includes('anonymousMedicalInformation') || allTags.includes('all')) &&
-                                        hes &&
-                                        hes.length &&
-                                        !_.isEqual(oHes, hes) &&
-                                        this.helementApi
-                                            .setHealthElementsDelegations(hes)
-                                            .then(() => {
-                                            status.healthElements.success = true;
-                                            status.healthElements.modified += hes.length;
-                                        })
-                                            .catch((e) => (status.healthElements.error = e))) ||
-                                        Promise.resolve((status.healthElements.success = true)));
-                                })
-                                    .then(() => {
-                                    //console.log("sfd")
-                                    return (((allTags.includes('medicalInformation') || allTags.includes('all')) &&
-                                        frms &&
-                                        frms.length &&
-                                        !_.isEqual(oFrms, frms) &&
-                                        this.formApi
-                                            .setFormsDelegations(frms)
-                                            .then(() => {
-                                            status.forms.success = true;
-                                            status.forms.modified += frms.length;
-                                        })
-                                            .catch((e) => (status.forms.error = e))) ||
-                                        Promise.resolve((status.forms.success = true)));
-                                })
-                                    .then(() => {
-                                    //console.log("sid")
-                                    return (((allTags.includes('financialInformation') || allTags.includes('all')) &&
-                                        ivs &&
-                                        ivs.length &&
-                                        !_.isEqual(oIvs, ivs) &&
-                                        this.invoiceApi
-                                            .setInvoicesDelegations(ivs)
-                                            .then(() => {
-                                            status.invoices.success = true;
-                                            status.invoices.modified += ivs.length;
-                                        })
-                                            .catch((e) => (status.invoices.error = e))) ||
-                                        Promise.resolve((status.invoices.success = true)));
-                                })
-                                    .then(() => {
-                                    //console.log("sdd")
-                                    return (((allTags.includes('medicalInformation') || allTags.includes('all')) &&
-                                        docs &&
-                                        docs.length &&
-                                        !_.isEqual(oDocs, docs) &&
-                                        this.documentApi
-                                            .setDocumentsDelegations(docs)
-                                            .then(() => {
-                                            status.documents.success = true;
-                                            status.documents.modified += docs.length;
-                                        })
-                                            .catch((e) => (status.documents.error = e))) ||
-                                        Promise.resolve((status.documents.success = true)));
-                                })
-                                    .then(() => {
-                                    //console.log("scld")
-                                    return (((allTags.includes('medicalInformation') || allTags.includes('all')) &&
-                                        cls &&
-                                        cls.length &&
-                                        !_.isEqual(oCls, cls) &&
-                                        this.classificationApi
-                                            .setClassificationsDelegations(cls)
-                                            .then(() => {
-                                            status.classifications.success = true;
-                                            status.classifications.modified += cls.length;
-                                        })
-                                            .catch((e) => (status.classifications.error = e))) ||
-                                        Promise.resolve((status.classifications.success = true)));
-                                })
-                                    .then(() => {
-                                    //console.log("scid")
-                                    return (((allTags.includes('medicalInformation') || allTags.includes('all')) &&
-                                        cis &&
-                                        cis.length &&
-                                        !_.isEqual(oCis, cis) &&
-                                        this.calendarItemApi
-                                            .setCalendarItemsDelegations(cis)
-                                            .then(() => {
-                                            status.calendarItems.success = true;
-                                            status.calendarItems.modified += cis.length;
-                                        })
-                                            .catch((e) => (status.calendarItems.error = e))) ||
-                                        Promise.resolve((status.calendarItems.success = true)));
-                                })
-                                    .then(() => this.modifyPatientWithUser(user, patient))
-                                    .then((p) => {
-                                    status.patient.success = true;
-                                    console.log(`c: ${status.contacts.modified}, he: ${status.healthElements.modified}, docs: ${status.documents.modified}, frms: ${status.forms.modified}, ivs: ${status.invoices.modified}, cis: ${status.calendarItems.modified}, cls: ${status.classifications.modified}`);
-                                    return { patient: p, statuses: status };
-                                })
-                                    .catch((e) => {
-                                    status.patient.error = e;
-                                    return { patient: patient, statuses: status };
-                                });
+                                    return _.assign(patient, updatedPatient);
+                                }));
+                                (tags.includes('medicalInformation') || tags.includes('anonymousMedicalInformation') || tags.includes('all')) &&
+                                    (markerPromise = addDelegationsAndKeys(hes, markerPromise, delegateId, patient));
+                                (tags.includes('medicalInformation') || tags.includes('all')) &&
+                                    (markerPromise = addDelegationsAndKeys(frms, markerPromise, delegateId, patient));
+                                (tags.includes('medicalInformation') || tags.includes('anonymousMedicalInformation') || tags.includes('all')) &&
+                                    (markerPromise = addDelegationsAndKeys(ctcsStubs, markerPromise, delegateId, patient));
+                                (tags.includes('medicalInformation') || tags.includes('all')) &&
+                                    (markerPromise = addDelegationsAndKeys(cls, markerPromise, delegateId, patient));
+                                (tags.includes('medicalInformation') || tags.includes('all')) &&
+                                    (markerPromise = addDelegationsAndKeys(cis, markerPromise, delegateId, patient));
+                                (tags.includes('financialInformation') || tags.includes('all')) &&
+                                    (markerPromise = addDelegationsAndKeys(ivs, markerPromise, delegateId, patient));
+                                (tags.includes('medicalInformation') || tags.includes('all')) &&
+                                    (markerPromise = addDelegationsAndKeys(docs, markerPromise, delegateId, null));
+                            });
+                            return markerPromise
+                                .then(() => {
+                                //console.log("scd")
+                                return (((allTags.includes('medicalInformation') || allTags.includes('anonymousMedicalInformation') || allTags.includes('all')) &&
+                                    ctcsStubs &&
+                                    ctcsStubs.length &&
+                                    !_.isEqual(oCtcsStubs, ctcsStubs) &&
+                                    this.contactApi
+                                        .setContactsDelegations(ctcsStubs)
+                                        .then(() => {
+                                        status.contacts.success = true;
+                                        status.contacts.modified += ctcsStubs.length;
+                                    })
+                                        .catch((e) => (status.contacts.error = e))) ||
+                                    Promise.resolve((status.contacts.success = true)));
+                            })
+                                .then(() => {
+                                //console.log("shed")
+                                return (((allTags.includes('medicalInformation') || allTags.includes('anonymousMedicalInformation') || allTags.includes('all')) &&
+                                    hes &&
+                                    hes.length &&
+                                    !_.isEqual(oHes, hes) &&
+                                    this.helementApi
+                                        .setHealthElementsDelegations(hes)
+                                        .then(() => {
+                                        status.healthElements.success = true;
+                                        status.healthElements.modified += hes.length;
+                                    })
+                                        .catch((e) => (status.healthElements.error = e))) ||
+                                    Promise.resolve((status.healthElements.success = true)));
+                            })
+                                .then(() => {
+                                //console.log("sfd")
+                                return (((allTags.includes('medicalInformation') || allTags.includes('all')) &&
+                                    frms &&
+                                    frms.length &&
+                                    !_.isEqual(oFrms, frms) &&
+                                    this.formApi
+                                        .setFormsDelegations(frms)
+                                        .then(() => {
+                                        status.forms.success = true;
+                                        status.forms.modified += frms.length;
+                                    })
+                                        .catch((e) => (status.forms.error = e))) ||
+                                    Promise.resolve((status.forms.success = true)));
+                            })
+                                .then(() => {
+                                //console.log("sid")
+                                return (((allTags.includes('financialInformation') || allTags.includes('all')) &&
+                                    ivs &&
+                                    ivs.length &&
+                                    !_.isEqual(oIvs, ivs) &&
+                                    this.invoiceApi
+                                        .setInvoicesDelegations(ivs)
+                                        .then(() => {
+                                        status.invoices.success = true;
+                                        status.invoices.modified += ivs.length;
+                                    })
+                                        .catch((e) => (status.invoices.error = e))) ||
+                                    Promise.resolve((status.invoices.success = true)));
+                            })
+                                .then(() => {
+                                //console.log("sdd")
+                                return (((allTags.includes('medicalInformation') || allTags.includes('all')) &&
+                                    docs &&
+                                    docs.length &&
+                                    !_.isEqual(oDocs, docs) &&
+                                    this.documentApi
+                                        .setDocumentsDelegations(docs)
+                                        .then(() => {
+                                        status.documents.success = true;
+                                        status.documents.modified += docs.length;
+                                    })
+                                        .catch((e) => (status.documents.error = e))) ||
+                                    Promise.resolve((status.documents.success = true)));
+                            })
+                                .then(() => {
+                                //console.log("scld")
+                                return (((allTags.includes('medicalInformation') || allTags.includes('all')) &&
+                                    cls &&
+                                    cls.length &&
+                                    !_.isEqual(oCls, cls) &&
+                                    this.classificationApi
+                                        .setClassificationsDelegations(cls)
+                                        .then(() => {
+                                        status.classifications.success = true;
+                                        status.classifications.modified += cls.length;
+                                    })
+                                        .catch((e) => (status.classifications.error = e))) ||
+                                    Promise.resolve((status.classifications.success = true)));
+                            })
+                                .then(() => {
+                                //console.log("scid")
+                                return (((allTags.includes('medicalInformation') || allTags.includes('all')) &&
+                                    cis &&
+                                    cis.length &&
+                                    !_.isEqual(oCis, cis) &&
+                                    this.calendarItemApi
+                                        .setCalendarItemsDelegations(cis)
+                                        .then(() => {
+                                        status.calendarItems.success = true;
+                                        status.calendarItems.modified += cis.length;
+                                    })
+                                        .catch((e) => (status.calendarItems.error = e))) ||
+                                    Promise.resolve((status.calendarItems.success = true)));
+                            })
+                                .then(() => this.modifyPatientWithUser(user, patient))
+                                .then((p) => {
+                                status.patient.success = true;
+                                console.log(`c: ${status.contacts.modified}, he: ${status.healthElements.modified}, docs: ${status.documents.modified}, frms: ${status.forms.modified}, ivs: ${status.invoices.modified}, cis: ${status.calendarItems.modified}, cls: ${status.classifications.modified}`);
+                                return { patient: p, statuses: status };
+                            })
+                                .catch((e) => {
+                                status.patient.error = e;
+                                return { patient: patient, statuses: status };
                             });
-                        })
-                        : (allTags.includes('anonymousMedicalInformation')
-                            ? Promise.resolve(patient)
-                            : this.modifyPatientWithUser(user, _.assign(patient, {
-                                delegations: _.assign(patient.delegations, delegateIds
-                                    .filter((id) => !patient.delegations || !patient.delegations[id]) //If there are delegations do not modify
-                                    .reduce((acc, del) => Object.assign(acc, _.fromPairs([[del, []]])), patient.delegations || {})),
-                            })))
-                            .then((p) => {
-                            status.patient.success = true;
-                            return { patient: p, statuses: status };
-                        })
-                            .catch((e) => {
-                            status.patient.error = e;
-                            return { patient: patient, statuses: status };
                         });
-                });
-            });
+                    })
+                    : (allTags.includes('anonymousMedicalInformation')
+                        ? Promise.resolve(patient)
+                        : this.modifyPatientWithUser(user, _.assign(patient, {
+                            delegations: _.assign(patient.delegations, delegateIds
+                                .filter((id) => !patient.delegations || !patient.delegations[id]) //If there are delegations do not modify
+                                .reduce((acc, del) => Object.assign(acc, _.fromPairs([[del, []]])), patient.delegations || {})),
+                        })))
+                        .then((p) => {
+                        status.patient.success = true;
+                        return { patient: p, statuses: status };
+                    })
+                        .catch((e) => {
+                        status.patient.error = e;
+                        return { patient: patient, statuses: status };
+                    });
+            }));
         });
     }
     export(user, patId, ownerId, usingPost = false) {
@@ -738,41 +627,44 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             return (0, utils_1.retry)(() => this.getPatientWithUser(user, patId))
                 .then((patient) => patient.encryptionKeys && Object.keys(patient.encryptionKeys || {}).length
                 ? Promise.resolve(patient)
-                : this.initEncryptionKeys(user, patient).then((patient) => this.modifyPatientWithUser(user, patient)))
-                .then((patient) => {
+                : this.crypto.entities
+                    .ensureEncryptionKeysInitialised(patient)
+                    .then((patient) => this.modifyPatientWithUser(user, patient)))
+                .then((patient) => __awaiter(this, void 0, void 0, function* () {
                 if (!patient) {
                     return Promise.resolve({ id: patId });
                 }
-                return this.crypto.extractDelegationsSFKsAndEncryptionSKs(patient, ownerId).then(([delSfks, ecKeys]) => {
+                const delSfks = yield this.crypto.entities.secretIdsOf(patient, ownerId);
+                return Promise.resolve().then(() => {
                     return delSfks.length
                         ? Promise.all([
-                            (0, utils_1.retry)(() => (usingPost ? this.helementApi
-                                .findByHCPartyPatientSecretFKeysArray(ownerId, _.uniq(delSfks)) : this.helementApi
-                                .findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))).then((hes) => parentId
+                            (0, utils_1.retry)(() => (usingPost
+                                ? this.helementApi.findByHCPartyPatientSecretFKeysArray(ownerId, _.uniq(delSfks))
+                                : this.helementApi.findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))).then((hes) => parentId
                                 ? this.helementApi
                                     .findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreHes) => _.uniqBy(hes.concat(moreHes), 'id'))
                                 : hes)),
-                            (0, utils_1.retry)(() => (usingPost ? this.formApi
-                                .findFormsByHCPartyPatientForeignKeysUsingPost(ownerId, undefined, undefined, undefined, _.uniq(delSfks)) : this.formApi
-                                .findFormsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((frms) => parentId
-                                ? (usingPost ? this.formApi
-                                    .findFormsByHCPartyPatientForeignKeysUsingPost(parentId, undefined, undefined, undefined, _.uniq(delSfks)) : this.formApi
-                                    .findFormsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreFrms) => _.uniqBy(frms.concat(moreFrms), 'id'))
+                            (0, utils_1.retry)(() => (usingPost
+                                ? this.formApi.findFormsByHCPartyPatientForeignKeysUsingPost(ownerId, undefined, undefined, undefined, _.uniq(delSfks))
+                                : this.formApi.findFormsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((frms) => parentId
+                                ? (usingPost
+                                    ? this.formApi.findFormsByHCPartyPatientForeignKeysUsingPost(parentId, undefined, undefined, undefined, _.uniq(delSfks))
+                                    : this.formApi.findFormsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreFrms) => _.uniqBy(frms.concat(moreFrms), 'id'))
                                 : frms)),
-                            (0, utils_1.retry)(() => (usingPost ? this.contactApi
-                                .findByHCPartyPatientSecretFKeysArray(ownerId, _.uniq(delSfks)) : this.contactApi
-                                .findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))).then((ctcs) => parentId
-                                ? (usingPost ? this.contactApi
-                                    .findByHCPartyPatientSecretFKeysArray(parentId, _.uniq(delSfks)) : this.contactApi
-                                    .findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))).then((moreCtcs) => _.uniqBy(ctcs.concat(moreCtcs), 'id'))
+                            (0, utils_1.retry)(() => (usingPost
+                                ? this.contactApi.findByHCPartyPatientSecretFKeysArray(ownerId, _.uniq(delSfks))
+                                : this.contactApi.findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))).then((ctcs) => parentId
+                                ? (usingPost
+                                    ? this.contactApi.findByHCPartyPatientSecretFKeysArray(parentId, _.uniq(delSfks))
+                                    : this.contactApi.findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))).then((moreCtcs) => _.uniqBy(ctcs.concat(moreCtcs), 'id'))
                                 : ctcs)),
-                            (0, utils_1.retry)(() => (usingPost ? this.invoiceApi
-                                .findInvoicesByHCPartyPatientForeignKeysUsingPost(ownerId, _.uniq(delSfks)) : this.invoiceApi
-                                .findInvoicesByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((ivs) => parentId
-                                ? (usingPost ? this.invoiceApi
-                                    .findInvoicesByHCPartyPatientForeignKeysUsingPost(parentId, _.uniq(delSfks)) : this.invoiceApi
-                                    .findInvoicesByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreIvs) => _.uniqBy(ivs.concat(moreIvs), 'id'))
+                            (0, utils_1.retry)(() => (usingPost
+                                ? this.invoiceApi.findInvoicesByHCPartyPatientForeignKeysUsingPost(ownerId, _.uniq(delSfks))
+                                : this.invoiceApi.findInvoicesByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))).then((ivs) => parentId
+                                ? (usingPost
+                                    ? this.invoiceApi.findInvoicesByHCPartyPatientForeignKeysUsingPost(parentId, _.uniq(delSfks))
+                                    : this.invoiceApi.findInvoicesByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreIvs) => _.uniqBy(ivs.concat(moreIvs), 'id'))
                                 : ivs)),
                             (0, utils_1.retry)(() => this.classificationApi
                                 .findClassificationsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
@@ -784,13 +676,13 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                             (0, utils_1.retry)(() => __awaiter(this, void 0, void 0, function* () {
                                 const delegationSFKs = _.uniq(delSfks).join(',');
                                 try {
-                                    let calendarItems = yield (usingPost ?
-                                        this.calendarItemApi.findByHCPartyPatientSecretFKeysArray(ownerId, _.uniq(delSfks)) :
-                                        this.calendarItemApi.findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(',')));
+                                    let calendarItems = yield (usingPost
+                                        ? this.calendarItemApi.findByHCPartyPatientSecretFKeysArray(ownerId, _.uniq(delSfks))
+                                        : this.calendarItemApi.findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(',')));
                                     if (parentId) {
-                                        const moreCalendarItems = yield (usingPost ?
-                                            this.calendarItemApi.findByHCPartyPatientSecretFKeysArray(parentId, _.uniq(delSfks)) :
-                                            this.calendarItemApi.findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(',')));
+                                        const moreCalendarItems = yield (usingPost
+                                            ? this.calendarItemApi.findByHCPartyPatientSecretFKeysArray(parentId, _.uniq(delSfks))
+                                            : this.calendarItemApi.findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(',')));
                                         calendarItems = _.uniqBy(calendarItems.concat(moreCalendarItems), 'id');
                                     }
                                     return calendarItems;
@@ -830,13 +722,13 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                             documents: [],
                         });
                 });
-            });
+            }));
         });
     }
     checkInami(inami) {
         const num_inami = inami.replace(new RegExp('[^(0-9)]', 'g'), '');
-        const checkDigit = num_inami.substr(6, 2);
-        const numSansCheck = num_inami.substr(0, 6);
+        const checkDigit = num_inami.substring(6, 2);
+        const numSansCheck = num_inami.substring(0, 6);
         let retour = false;
         //modulo du niss
         const modINAMI = parseInt(numSansCheck) % 97;
@@ -855,9 +747,9 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         const terNumber = /^[0-9][0-9](([4][0-9])|([5][0-2]))(([0-2][0-9])|([3][0-1]))[0-9]{3}(([0-8][0-9])|([9][0-7]))$/.test(ssin);
         if (normalNumber || bisNumber || terNumber) {
             isValidNiss =
-                97 - (Number(ssin.substr(0, 9)) % 97) === Number(ssin.substr(9, 2))
+                97 - (Number(ssin.substring(0, 9)) % 97) === Number(ssin.substring(9, 2))
                     ? true
-                    : 97 - (Number('2' + ssin.substr(0, 9)) % 97) === Number(ssin.substr(9, 2));
+                    : 97 - (Number('2' + ssin.substring(0, 9)) % 97) === Number(ssin.substring(9, 2));
         }
         return isValidNiss;
     }
@@ -866,7 +758,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             getPatient: { get: () => super.getPatient }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const parentIdsArray = (yield this.crypto.extractCryptedFKs(childDocument, hcpId)).extractedKeys;
+            const parentIdsArray = yield this.crypto.entities.owningEntityIdsOf(childDocument, hcpId);
             const multipleParentIds = _.uniq(parentIdsArray).length > 1;
             if (multipleParentIds) {
                 throw 'Child document with id ' + childDocument.id + ' contains multiple parent ids in its CFKs for hcpId: ' + hcpId;
@@ -888,6 +780,50 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             return patient.id;
         });
     }
+    /**
+     * Share an existing patient with other data owners, allowing them to access the non-encrypted data of the patient and optionally also
+     * the encrypted content.
+     * @param delegateId the id of the data owner which will be granted access to the patient.
+     * @param patient the patient to share.
+     * @param shareSecretIds the secret ids of the Patient that the delegate will be given access to. Allows the delegate to search for data where the
+     * shared Patient is the owning entity id.
+     * @param options optional parameters to customize the sharing behaviour:
+     * - shareEncryptionKey: specifies if the encryption key of the access log should be shared with the delegate, giving access to all encrypted
+     * content of the entity, excluding other encrypted metadata (defaults to {@link ShareMetadataBehaviour.IF_AVAILABLE}). Note that by default a
+     * patient does not have encrypted content.
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated patient.
+     */
+    shareWith(delegateId, patient, shareSecretIds, options = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const self = yield this.dataOwnerApi.getCurrentDataOwnerId();
+            return yield this.modifyAs(self, yield this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(patient, delegateId, shareSecretIds, options.shareEncryptionKey, ShareMetadataBehaviour_1.ShareMetadataBehaviour.IF_AVAILABLE));
+        });
+    }
+    /**
+     * @param patient a patient
+     * @return all the decryptable secret ids of the patient, retrieved from the encrypted metadata. The result may be used to find entities where the
+     * patient is the 'owning entity', or in the {@link shareWith} method in order to share it with other data owners.
+     */
+    decryptSecretIdsOf(patient) {
+        return this.crypto.entities.secretIdsOf(patient, undefined);
+    }
+    /**
+     * @param patient a patient
+     * @return the confidential secret ids of the patient, retrieved from the encrypted metadata. The result may be used to find entities where the
+     * patient is the 'owning entity', or in the {@link shareWith} method in order to share it with other data owners.
+     */
+    decryptConfidentialSecretIdsOf(patient) {
+        return this.crypto.confidential.getConfidentialSecretIds(patient, undefined);
+    }
+    /**
+     * @param patient a patient
+     * @return the non-confidential secret ids of the patient, retrieved from the encrypted metadata. The result may be used to find entities where the
+     * patient is the 'owning entity', or in the {@link shareWith} method in order to share it with other data owners.
+     */
+    decryptNonConfidentialSecretIdsOf(patient) {
+        return this.crypto.confidential.getSecretIdsSharedWithParents(patient);
+    }
 }
 exports.IccPatientXApi = IccPatientXApi;
 //# sourceMappingURL=icc-patient-x-api.js.map