@icure/api 7.1.16 → 8.0.0-RC.2

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

@@ -18,11 +18,18 @@ const ModelHelper_1 = require("../icc-api/model/ModelHelper");
 const person_util_1 = require("./utils/person-util");
 const utils_1 = require("./utils");
 const AuthenticationProvider_1 = require("./auth/AuthenticationProvider");
+const SecureDelegation_1 = require("../icc-api/model/SecureDelegation");
+const EntityShareRequest_1 = require("../icc-api/model/requests/EntityShareRequest");
+const ShareMetadataBehaviour_1 = require("./crypto/ShareMetadataBehaviour");
+var AccessLevelEnum = SecureDelegation_1.SecureDelegation.AccessLevelEnum;
+var RequestedPermissionEnum = EntityShareRequest_1.EntityShareRequest.RequestedPermissionEnum;
 const Connection_1 = require("../icc-api/model/Connection");
-const websocket_1 = require("./utils/websocket");
 // noinspection JSUnusedGlobalSymbols
 class IccPatientXApi extends icc_api_1.IccPatientApi {
-    constructor(host, headers, crypto, contactApi, formApi, helementApi, invoiceApi, documentApi, hcpartyApi, classificationApi, dataOwnerApi, calendarItemaApi, userApi, authApi, encryptedKeys = ['note'], authenticationProvider = new AuthenticationProvider_1.NoAuthenticationProvider(), fetchImpl = typeof window !== 'undefined'
+    get headers() {
+        return super.headers.then((h) => this.crypto.accessControlKeysHeaders.addAccessControlKeysHeaders(h, 'Patient'));
+    }
+    constructor(host, headers, crypto, contactApi, formApi, helementApi, invoiceApi, documentApi, hcpartyApi, classificationApi, dataOwnerApi, calendarItemApi, userApi, authApi, autofillAuthor, encryptedKeys = ['note'], authenticationProvider = new AuthenticationProvider_1.NoAuthenticationProvider(), fetchImpl = typeof window !== 'undefined'
         ? window.fetch
         : typeof self !== 'undefined'
             ? self.fetch
@@ -33,13 +40,14 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         this.formApi = formApi;
         this.helementApi = helementApi;
         this.invoiceApi = invoiceApi;
-        this.hcpartyApi = hcpartyApi;
         this.documentApi = documentApi;
+        this.hcpartyApi = hcpartyApi;
         this.classificationApi = classificationApi;
-        this.calendarItemApi = calendarItemaApi;
         this.dataOwnerApi = dataOwnerApi;
+        this.calendarItemApi = calendarItemApi;
         this.userApi = userApi;
         this.authApi = authApi;
+        this.autofillAuthor = autofillAuthor;
         this.encryptedFields = (0, utils_1.parseEncryptedFields)(encryptedKeys, 'Patient.');
     }
     /**
@@ -50,23 +58,18 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
      * @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.
+     * auto-delegations, in such case the access level specified here will be used.
      * @return a new instance of patient.
      */
     newInstance(user, p = {}, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         return __awaiter(this, void 0, void 0, function* () {
-            const patient = Object.assign(Object.assign({}, (p !== null && p !== void 0 ? p : {})), { _type: 'org.taktik.icure.entities.Patient', id: (_a = p === null || p === void 0 ? void 0 : p.id) !== null && _a !== void 0 ? _a : this.crypto.primitives.randomUuid(), created: (_b = p === null || p === void 0 ? void 0 : p.created) !== null && _b !== void 0 ? _b : new Date().getTime(), modified: (_c = p === null || p === void 0 ? void 0 : p.modified) !== null && _c !== void 0 ? _c : new Date().getTime(), responsible: (_d = p === null || p === void 0 ? void 0 : p.responsible) !== null && _d !== void 0 ? _d : this.dataOwnerApi.getDataOwnerIdOf(user), author: (_e = p === null || p === void 0 ? void 0 : p.author) !== null && _e !== void 0 ? _e : user.id, codes: (_f = p === null || p === void 0 ? void 0 : p.codes) !== null && _f !== void 0 ? _f : [], tags: (_g = p === null || p === void 0 ? void 0 : p.tags) !== null && _g !== void 0 ? _g : [] });
+            const patient = Object.assign(Object.assign({}, (p !== null && p !== void 0 ? p : {})), { _type: 'org.taktik.icure.entities.Patient', id: (_a = p === null || p === void 0 ? void 0 : p.id) !== null && _a !== void 0 ? _a : this.crypto.primitives.randomUuid(), created: (_b = p === null || p === void 0 ? void 0 : p.created) !== null && _b !== void 0 ? _b : new Date().getTime(), modified: (_c = p === null || p === void 0 ? void 0 : p.modified) !== null && _c !== void 0 ? _c : new Date().getTime(), responsible: (_d = p === null || p === void 0 ? void 0 : p.responsible) !== null && _d !== void 0 ? _d : (this.autofillAuthor ? this.dataOwnerApi.getDataOwnerIdOf(user) : undefined), author: (_e = p === null || p === void 0 ? void 0 : p.author) !== null && _e !== void 0 ? _e : (this.autofillAuthor ? user.id : undefined), codes: (_f = p === null || p === void 0 ? void 0 : p.codes) !== null && _f !== void 0 ? _f : [], tags: (_g = p === null || p === void 0 ? void 0 : p.tags) !== null && _g !== void 0 ? _g : [] });
             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((_h = options.additionalDelegates) !== null && _h !== void 0 ? _h : {}),
-                ...((_k = (_j = user.autoDelegations) === null || _j === void 0 ? void 0 : _j.all) !== null && _k !== void 0 ? _k : []),
-                ...((_m = (_l = user.autoDelegations) === null || _l === void 0 ? void 0 : _l.medicalInformation) !== null && _m !== void 0 ? _m : []),
-            ];
-            const initialisationInfo = yield this.crypto.entities.entityWithInitialisedEncryptedMetadata(patient, undefined, undefined, true, extraDelegations);
+            const extraDelegations = Object.assign(Object.assign({}, Object.fromEntries([...((_j = (_h = user.autoDelegations) === null || _h === void 0 ? void 0 : _h.all) !== null && _j !== void 0 ? _j : []), ...((_l = (_k = user.autoDelegations) === null || _k === void 0 ? void 0 : _k.medicalInformation) !== null && _l !== void 0 ? _l : [])].map((d) => [d, AccessLevelEnum.WRITE]))), ((_m = options === null || options === void 0 ? void 0 : options.additionalDelegates) !== null && _m !== void 0 ? _m : {}));
+            const initialisationInfo = yield this.crypto.xapi.entityWithInitialisedEncryptedMetadata(patient, 'Patient', undefined, undefined, true, true, extraDelegations);
             return new models.Patient(initialisationInfo.updatedEntity);
         });
     }
@@ -92,7 +95,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         if (!finalPatient.alias && !!(0, person_util_1.hasName)(finalPatient, models.PersonName.UseEnum.Nickname)) {
             finalPatient = Object.assign(Object.assign({}, finalPatient), { alias: (0, person_util_1.findName)(finalPatient, models.PersonName.UseEnum.Nickname).lastName });
         }
-        return finalPatient;
+        return new models_1.Patient(finalPatient);
     }
     /**
      * @deprecated replace with {@link initConfidentialSecretId}
@@ -114,12 +117,18 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             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);
+            let updatedPatient = patient;
+            if (!patient.rev) {
+                updatedPatient = yield this.createPatientWithUser(user, patient);
+                if (!updatedPatient)
+                    throw new Error('Could not create patient');
+            }
+            const initialised = yield this.crypto.confidential.initialiseConfidentialSecretId(updatedPatient, 'Patient', (x) => this.bulkSharePatients(x));
             if (initialised) {
-                return initialised.rev ? this.modifyPatientWithUser(user, initialised) : this.createPatientWithUser(user, initialised);
+                return initialised;
             }
             else {
-                return patient;
+                return updatedPatient;
             }
         });
     }
@@ -182,13 +191,13 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     getPatientWithUser(user, patientId) {
         return super
             .getPatient(patientId)
-            .then((p) => this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), [p]))
+            .then((p) => this.tryDecryptOrReturnOriginal([p]))
             .then((pats) => pats[0].entity);
     }
     getPotentiallyEncryptedPatientWithUser(user, patientId) {
         return super
             .getPatient(patientId)
-            .then((p) => this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), [p]))
+            .then((p) => this.tryDecryptOrReturnOriginal([p]))
             .then((pats) => ({ patient: pats[0].entity, decrypted: pats[0].decrypted }));
     }
     getPatients(body) {
@@ -261,17 +270,20 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     modifyPatient(body) {
         throw new Error('Cannot call a method that returns contacts without providing a user for de/encryption');
     }
+    /**
+     * @internal this method is for internal use only and may be changed without notice.
+     */
     modifyPatientRaw(body) {
         return super.modifyPatient(body);
     }
     modifyPatientWithUser(user, body) {
-        return body ? this.modifyAs(this.dataOwnerApi.getDataOwnerIdOf(user), body) : Promise.resolve(null);
+        return body ? this.modifyPatientAs(this.dataOwnerApi.getDataOwnerIdOf(user), body) : Promise.resolve(null);
     }
-    modifyAs(dataOwner, body) {
+    modifyPatientAs(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);
+            .then((p) => this.decryptAs(dataOwner, [p]))
+            .then((pats) => pats[0]);
     }
     modifyPatientReferral(patientId, referralId, start, end) {
         throw new Error('Cannot call a method that returns contacts without providing a user for de/encryption');
@@ -283,19 +295,23 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             .then((pats) => pats[0]);
     }
     encrypt(user, pats) {
-        return this.encryptAs(this.dataOwnerApi.getDataOwnerIdOf(user), pats);
+        const dataOwnerId = this.dataOwnerApi.getDataOwnerIdOf(user);
+        return this.encryptAs(dataOwnerId, pats);
     }
-    encryptAs(dataOwnerId, pats) {
-        return Promise.all(pats.map((p) => this.crypto.entities.tryEncryptEntity(p, dataOwnerId, this.encryptedFields, true, false, (x) => new models.Patient(x))));
+    encryptAs(dataOwner, pats) {
+        return Promise.all(pats.map((p) => this.crypto.xapi.tryEncryptEntity(p, 'Patient', this.encryptedFields, 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(this.dataOwnerApi.getDataOwnerIdOf(user), patients).then((ps) => ps.map((p) => p.entity));
+        return this.decryptAs(this.dataOwnerApi.getDataOwnerIdOf(user), patients, fillDelegations);
+    }
+    decryptAs(dataOwner, patients, fillDelegations = true) {
+        return this.tryDecryptOrReturnOriginal(patients).then((ps) => ps.map((p) => p.entity));
     }
-    tryDecryptOrReturnOriginal(dataOwnerId, patients) {
+    tryDecryptOrReturnOriginal(patients) {
         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))
+            return yield this.crypto.xapi
+                .decryptEntity(p, 'Patient', (x) => new models.Patient(x))
                 .then((p) => {
                 if (p.entity.picture && !(p.entity.picture instanceof ArrayBuffer)) {
                     return {
@@ -308,34 +324,20 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             });
         })));
     }
+    /**
+     * @deprecated replace with {@link shareAllDataOfPatient}
+     */
     share(user, patId, ownerId, delegateIds, delegationTags, usingPost = false) {
-        const addDelegationsAndKeys = (dtos, markerPromise, delegateId, patient) => {
-            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)));
-        // Determine which keys to share, depending on the delegation tag. For example, anonymousMedicalData only shares encryption keys and no delegations or secret foreign keys.
-        const shareDelegations = allTags.some((tag) => tag != 'anonymousMedicalInformation');
-        const shareEncryptionKeys = true;
-        const shareCryptedForeignKeys = allTags.some((tag) => tag != 'anonymousMedicalInformation');
-        // Anonymous sharing, will not change anything to the patient, only its contacts and health elements.
-        const shareAnonymously = allTags.every((tag) => tag == 'anonymousMedicalInformation');
-        return this.hcpartyApi.getHealthcareParty(ownerId).then((hcp) => {
-            const parentId = hcp.parentId;
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.shareAllDataOfPatient(user, patId, ownerId, delegateIds, delegationTags, usingPost);
+        });
+    }
+    shareAllDataOfPatient(user, patId, ownerId, delegateIds, delegationTags, usingPost = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const allTags = _.uniq(_.flatMap(Object.values(delegationTags)));
             const status = {
                 contacts: {
-                    success: allTags.includes('medicalInformation') || allTags.includes('anonymousMedicalInformation') || allTags.includes('all') ? false : null,
+                    success: allTags.includes('medicalInformation') || allTags.includes('all') ? false : null,
                     error: null,
                     modified: 0,
                 },
@@ -345,7 +347,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                     modified: 0,
                 },
                 healthElements: {
-                    success: allTags.includes('medicalInformation') || allTags.includes('anonymousMedicalInformation') || allTags.includes('all') ? false : null,
+                    success: allTags.includes('medicalInformation') || allTags.includes('all') ? false : null,
                     error: null,
                     modified: 0,
                 },
@@ -371,25 +373,169 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                 },
                 patient: { success: false, error: null, modified: 0 },
             };
+            const hcp = yield this.hcpartyApi.getHealthcareParty(ownerId);
+            const parentId = hcp.parentId;
+            let patient = yield (0, utils_1.retry)(() => this.getPatientWithUser(user, patId));
+            const patientWithInitialisedEncryption = yield this.crypto.xapi.ensureEncryptionKeysInitialised(patient, 'Patient');
+            if (patientWithInitialisedEncryption) {
+                patient = yield this.modifyPatientWithUser(user, patientWithInitialisedEncryption);
+            }
+            if (!patient) {
+                status.patient = {
+                    success: false,
+                    error: new Error('Patient does not exist or cannot initialise encryption keys'),
+                };
+                return { patient: patient, statuses: status };
+            }
+            const delSfks = yield this.crypto.xapi.secretIdsOf({ entity: patient, type: 'Patient' }, ownerId);
+            const ecKeys = yield this.crypto.xapi.encryptionKeysOf({ entity: patient, type: 'Patient' }, ownerId);
+            if (delSfks.length) {
+                const retrievedHealthElements = yield (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));
+                const retrievedForms = yield (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));
+                const retrievedContacts = yield (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));
+                const retrievedInvoices = yield (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));
+                const retrievedClassifications = yield (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));
+                const retrievedCalendarItems = yield (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));
+                const isMedicalInfoTags = (tags) => tags.includes('medicalInformation') || tags.includes('all');
+                const isFinancialInfoTags = (tags) => tags.includes('financialInformation') || tags.includes('all');
+                const doShareEntitiesAndUpdateStatus = (entities, entitiesType, status, tagsCondition, doShareMinimal) => __awaiter(this, void 0, void 0, function* () {
+                    const delegatesToApply = delegateIds.filter((delegateId) => tagsCondition(delegationTags[delegateId]));
+                    if (entities.length && delegatesToApply.length) {
+                        const requests = [];
+                        for (const entity of entities) {
+                            const currentEntityRequests = {};
+                            const secretIds = yield this.crypto.xapi.secretIdsOf({ entity, type: entitiesType }, undefined);
+                            const encryptionKeys = yield this.crypto.xapi.encryptionKeysOf({ entity, type: entitiesType }, undefined);
+                            const request = {
+                                shareSecretIds: secretIds,
+                                shareEncryptionKeys: encryptionKeys,
+                                shareOwningEntityIds: [patient.id],
+                                requestedPermissions: RequestedPermissionEnum.MAX_WRITE,
+                            };
+                            for (const delegateId of delegatesToApply) {
+                                currentEntityRequests[delegateId] = request;
+                            }
+                            requests.push({ dataForDelegates: currentEntityRequests, entity });
+                        }
+                        yield this.crypto.xapi
+                            .bulkShareOrUpdateEncryptedEntityMetadataNoEntities(entitiesType, requests, (x) => doShareMinimal(x))
+                            .then((shareResult) => {
+                            status.modified = new Set(shareResult.successfulUpdates.map((x) => x.entityId)).size;
+                            status.success = shareResult.updateErrors.length === 0;
+                            if (!status.success) {
+                                const errorMsg = `Error while sharing (some) entities of type ${entitiesType} for patient ${patient.id} : ${JSON.stringify(shareResult.updateErrors)}`;
+                                console.error(errorMsg);
+                                status.error = new Error(errorMsg);
+                            }
+                        })
+                            .catch((e) => {
+                            status.success = false;
+                            status.error = e;
+                        });
+                    }
+                    else {
+                        status.success = true;
+                    }
+                });
+                yield doShareEntitiesAndUpdateStatus(retrievedHealthElements, 'HealthElement', status.healthElements, isMedicalInfoTags, (x) => this.helementApi.bulkShareHealthElementsMinimal(x));
+                yield doShareEntitiesAndUpdateStatus(retrievedContacts, 'Contact', status.contacts, isMedicalInfoTags, (x) => this.contactApi.bulkShareContactsMinimal(x));
+                yield doShareEntitiesAndUpdateStatus(retrievedInvoices, 'Invoice', status.invoices, isFinancialInfoTags, (x) => this.invoiceApi.bulkShareInvoicesMinimal(x));
+                yield doShareEntitiesAndUpdateStatus(retrievedClassifications, 'Classification', status.classifications, isMedicalInfoTags, (x) => this.classificationApi.bulkShareClassificationsMinimal(x));
+                yield doShareEntitiesAndUpdateStatus(retrievedCalendarItems, 'CalendarItem', status.calendarItems, isMedicalInfoTags, (x) => this.calendarItemApi.bulkShareCalendarItemsMinimal(x));
+                yield doShareEntitiesAndUpdateStatus(retrievedForms, 'Form', status.forms, isMedicalInfoTags, (x) => this.formApi.bulkShareFormsMinimal(x));
+            }
+            const sharePatientDataRequest = {
+                shareSecretIds: delSfks,
+                shareEncryptionKeys: ecKeys,
+                shareOwningEntityIds: [],
+                requestedPermissions: RequestedPermissionEnum.MAX_WRITE,
+            };
+            const sharePatientRequest = {
+                entity: patient,
+                dataForDelegates: Object.fromEntries(delegateIds.map((delegateId) => [delegateId, sharePatientDataRequest])),
+            };
+            return yield this.crypto.xapi
+                .bulkShareOrUpdateEncryptedEntityMetadata('Patient', [sharePatientRequest], (x) => this.bulkSharePatients(x))
+                .then((shareResult) => {
+                var _a;
+                if (shareResult.updatedEntities.length && !shareResult.updateErrors.length) {
+                    status.patient.success = true;
+                    return { patient: shareResult.updatedEntities[0], statuses: status };
+                }
+                else {
+                    const errorMsg = `Error while sharing patient with id ${patient.id} : ${JSON.stringify(shareResult.updateErrors)}`;
+                    console.error(errorMsg);
+                    status.patient.error = new Error(errorMsg);
+                    status.patient.success = false;
+                    return { patient: (_a = shareResult.updatedEntities[0]) !== null && _a !== void 0 ? _a : patient, statuses: status };
+                }
+            })
+                .catch((e) => {
+                status.patient.error = e;
+                status.patient.success = false;
+                return { patient, statuses: status };
+            });
+        });
+    }
+    export(user, patId, ownerId, usingPost = false) {
+        return this.hcpartyApi.getHealthcareParty(ownerId).then((hcp) => {
+            const parentId = hcp.parentId;
             return (0, utils_1.retry)(() => this.getPatientWithUser(user, patId))
-                .then((patient) => patient.encryptionKeys && Object.keys(patient.encryptionKeys || {}).length
-                ? Promise.resolve(patient)
-                : this.crypto.entities.ensureEncryptionKeysInitialised(patient).then((p) => (!!p ? this.modifyPatientWithUser(user, p) : patient)))
+                .then((patient) => __awaiter(this, void 0, void 0, function* () {
+                const initialised = yield this.crypto.xapi.ensureEncryptionKeysInitialised(patient, 'Patient');
+                if (!initialised) {
+                    return patient;
+                }
+                else {
+                    return yield this.modifyPatientWithUser(user, initialised);
+                }
+            }))
                 .then((patient) => __awaiter(this, void 0, void 0, function* () {
                 if (!patient) {
-                    status.patient = {
-                        success: false,
-                        error: new Error('Patient does not exist or cannot initialise encryption keys'),
-                    };
-                    return Promise.resolve({ patient: patient, statuses: status });
+                    return Promise.resolve({ id: patId });
                 }
-                const delSfks = yield this.crypto.entities.secretIdsOf(patient, ownerId);
-                const ecKeys = yield this.crypto.entities.encryptionKeysOf(patient, ownerId);
+                const delSfks = yield this.crypto.xapi.secretIdsOf({ entity: patient, type: '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
+                            ? this.helementApi.findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))
+                            : this.helementApi.findByHCPartyPatientSecretFKeysArray(ownerId, delSfks)).then((hes) => parentId
                             ? (usingPost
                                 ? this.helementApi.findHealthElementsDelegationsStubsByHCPartyPatientForeignKeysUsingPost(parentId, _.uniq(delSfks))
                                 : this.helementApi.findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))).then((moreHes) => _.uniqBy(hes.concat(moreHes), 'id'))
@@ -422,300 +568,57 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                                 .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)),
+                        (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(',')));
+                                if (parentId) {
+                                    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;
+                            }
+                            catch (ex) {
+                                console.log(`exception occured exporting calendarItem for ownerId: ${ownerId} - ${ex}`);
+                                //throw ex
+                            }
+                        })),
                     ]).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(() => __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;
-                                    });
-                                    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 };
-                            });
+                            return {
+                                id: patId,
+                                patient: patient,
+                                contacts: ctcs,
+                                forms: frms,
+                                healthElements: hes,
+                                invoices: ivs,
+                                classifications: cls,
+                                calItems: cis,
+                                documents: docs,
+                            };
                         });
                     })
-                    : (allTags.includes('anonymousMedicalInformation')
-                        ? // TODO check also in v8 how patient is shared with anonymousMedicalInformation tag
-                            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 };
+                    : Promise.resolve({
+                        id: patId,
+                        patient: patient,
+                        contacts: [],
+                        forms: [],
+                        healthElements: [],
+                        invoices: [],
+                        classifications: [],
+                        calItems: [],
+                        documents: [],
                     });
             }));
         });
     }
-    export(user, patId, ownerId, usingPost = false) {
-        return this.hcpartyApi.getHealthcareParty(ownerId).then((hcp) => {
-            const parentId = hcp.parentId;
-            return (0, utils_1.retry)(() => this.getPatientWithUser(user, patId))
-                .then((patient) => patient.encryptionKeys && Object.keys(patient.encryptionKeys || {}).length
-                ? Promise.resolve(patient)
-                : this.crypto.entities.ensureEncryptionKeysInitialised(patient).then((p) => (!!p ? this.modifyPatientWithUser(user, p) : patient)))
-                .then((patient) => __awaiter(this, void 0, void 0, function* () {
-                if (!patient) {
-                    return Promise.resolve({ id: patId });
-                }
-                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
-                                ? 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'))
-                                : 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'))
-                                : 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'))
-                                : 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)(() => __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(',')));
-                                    if (parentId) {
-                                        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;
-                                }
-                                catch (ex) {
-                                    console.log(`exception occured exporting calendarItem for ownerId: ${ownerId} - ${ex}`);
-                                    //throw ex
-                                }
-                            })),
-                        ]).then(([hes, frms, ctcs, ivs, cls, cis]) => {
-                            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) => {
-                                return {
-                                    id: patId,
-                                    patient: patient,
-                                    contacts: ctcs,
-                                    forms: frms,
-                                    healthElements: hes,
-                                    invoices: ivs,
-                                    classifications: cls,
-                                    calItems: cis,
-                                    documents: docs,
-                                };
-                            });
-                        })
-                        : Promise.resolve({
-                            id: patId,
-                            patient: patient,
-                            contacts: [],
-                            forms: [],
-                            healthElements: [],
-                            invoices: [],
-                            classifications: [],
-                            calItems: [],
-                            documents: [],
-                        });
-                });
-            }));
-        });
-    }
     checkInami(inami) {
         const num_inami = inami.replace(new RegExp('[^(0-9)]', 'g'), '');
         const checkDigit = num_inami.substring(6, 2);
@@ -744,12 +647,12 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         }
         return isValidNiss;
     }
-    getPatientIdOfChildDocumentForHcpAndHcpParents(childDocument, hcpId) {
+    getPatientIdOfChildDocumentForHcpAndHcpParents(childDocument, hcpId, childDocumentType) {
         const _super = Object.create(null, {
             getPatient: { get: () => super.getPatient }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const parentIdsArray = yield this.crypto.entities.owningEntityIdsOf(childDocument, hcpId);
+            const parentIdsArray = yield this.crypto.xapi.owningEntityIdsOf({ entity: childDocument, type: childDocumentType }, 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;
@@ -771,9 +674,17 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             return patient.id;
         });
     }
+    /**
+     * @return if the logged data owner has write access to the content of the given patient
+     */
+    hasWriteAccess(patient) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.crypto.xapi.hasWriteAccess({ entity: patient, type: 'Patient' });
+        });
+    }
     /**
      * 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.
+     * the encrypted content, with read-only or read-write permissions.
      * @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
@@ -783,35 +694,65 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
      * 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.
+     * - requestedPermissions: the requested permissions for the delegate, defaults to {@link RequestedPermissionEnum.MAX_WRITE}.
+     * @return the updated entity
      */
     shareWith(delegateId, patient, shareSecretIds, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.shareWithMany(patient, { [delegateId]: Object.assign({ shareSecretIds }, options) });
+            return this.shareWithMany(patient, { [delegateId]: Object.assign(Object.assign({}, options), { shareSecretIds: shareSecretIds }) });
         });
     }
     /**
      * 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.
+     * the encrypted content, with read-only or read-write permissions.
      * @param patient the patient to share.
-     * @param delegates sharing options for each delegate.
+     * @param delegates associates the id of data owners which will be granted access to the entity, to the following sharing options:
+     * - 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.
      * - 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}).
+     * - requestedPermissions: the requested permissions for the delegate, defaults to {@link RequestedPermissionEnum.MAX_WRITE}.
+     * @return the updated entity
+     */
+    shareWithMany(patient, delegates) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield this.tryShareWithMany(patient, delegates)).updatedEntityOrThrow;
+        });
+    }
+    /**
+     * 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, with read-only or read-write permissions.
+     * @param patient the patient to share.
+     * @param delegates associates the id of data owners which will be granted access to the entity, to the following sharing options:
      * - 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.
+     * - 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.
+     * - requestedPermissions: the requested permissions for the delegate, defaults to {@link RequestedPermissionEnum.MAX_WRITE}.
+     * @return a promise which will contain the result of the operation: the updated entity if the operation was successful or details of the error if
+     * the operation failed.
      */
-    shareWithMany(patient, delegates) {
+    tryShareWithMany(patient, delegates) {
         return __awaiter(this, void 0, void 0, function* () {
             const self = yield this.dataOwnerApi.getCurrentDataOwnerId();
-            const extended = yield this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(patient, false, delegates);
-            if (!!extended) {
-                return yield this.modifyAs(self, extended);
-            }
-            else
-                return patient;
+            // All entities should have an encryption key.
+            const entityWithEncryptionKey = yield this.crypto.xapi.ensureEncryptionKeysInitialised(patient, 'Patient');
+            const updatedEntity = entityWithEncryptionKey ? yield this.modifyPatientAs(self, entityWithEncryptionKey) : patient;
+            return this.crypto.xapi
+                .simpleShareOrUpdateEncryptedEntityMetadata({ entity: updatedEntity, type: 'Patient' }, false, Object.fromEntries(Object.entries(delegates).map(([delegateId, options]) => [
+                delegateId,
+                {
+                    requestedPermissions: options.requestedPermissions,
+                    shareEncryptionKeys: options.shareEncryptionKey,
+                    shareOwningEntityIds: ShareMetadataBehaviour_1.ShareMetadataBehaviour.NEVER,
+                    shareSecretIds: options.shareSecretIds,
+                },
+            ])), (x) => this.bulkSharePatients(x))
+                .then((r) => r.mapSuccessAsync((e) => this.decryptAs(self, [e]).then((es) => es[0])));
         });
     }
     /**
@@ -820,7 +761,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
      * 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);
+        return this.crypto.xapi.secretIdsOf({ entity: patient, type: 'Patient' }, undefined);
     }
     /**
      * @param patient a patient
@@ -828,7 +769,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
      * 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);
+        return this.crypto.confidential.getConfidentialSecretIds({ entity: patient, type: 'Patient' }, undefined);
     }
     /**
      * @param patient a patient
@@ -836,17 +777,13 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
      * 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);
+        return this.crypto.confidential.getSecretIdsSharedWithParents({ entity: patient, type: 'Patient' });
     }
     getDataOwnersWithAccessTo(entity) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.crypto.entities.getDataOwnersWithAccessTo(entity);
-        });
+        return this.crypto.delegationsDeAnonymization.getDataOwnersWithAccessTo({ entity, type: 'Patient' });
     }
     getEncryptionKeysOf(entity) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.crypto.entities.encryptionKeysOf(entity);
-        });
+        return this.crypto.xapi.encryptionKeysOf({ entity, type: 'Patient' }, undefined);
     }
     /**
      * Merge two patients into one. This method performs the following operations:
@@ -890,18 +827,20 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             baseMergePatients: { get: () => super.baseMergePatients }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const encryptedMerged = (yield this.encryptAs(undefined, [mergedInto]))[0];
+            const encryptedMerged = (yield this.encryptAs(yield this.dataOwnerApi.getCurrentDataOwnerId(), [mergedInto]))[0];
             const merged = yield _super.baseMergePatients.call(this, from.id, from.rev, encryptedMerged);
-            return (yield this.tryDecryptOrReturnOriginal(undefined, [merged]))[0].entity;
+            return (yield this.tryDecryptOrReturnOriginal([merged]))[0].entity;
         });
     }
     subscribeToPatientEvents(eventTypes, filter, eventFired, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const currentUser = yield this.userApi.getCurrentUser();
-            return (0, websocket_1.subscribeToEntityEvents)(this.host, this.authApi, 'Patient', eventTypes, filter, eventFired, options, (encrypted) => __awaiter(this, void 0, void 0, function* () { return (yield this.decrypt(currentUser, [encrypted]))[0]; }))
-                .then((rs) => new Connection_1.ConnectionImpl(rs));
+            return (0, utils_1.subscribeToEntityEvents)(this.host, this.authApi, 'Patient', eventTypes, filter, eventFired, options, (encrypted) => __awaiter(this, void 0, void 0, function* () { return (yield this.decrypt(currentUser, [encrypted]))[0]; })).then((rs) => new Connection_1.ConnectionImpl(rs));
         });
     }
+    createDelegationDeAnonymizationMetadata(entity, delegates) {
+        return this.crypto.delegationsDeAnonymization.createOrUpdateDeAnonymizationInfo({ entity, type: 'Patient' }, delegates);
+    }
 }
 exports.IccPatientXApi = IccPatientXApi;
 //# sourceMappingURL=icc-patient-x-api.js.map