@icure/api 6.4.0 → 7.0.0-beta.1

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

@@ -31,79 +31,54 @@ class IccContactXApi extends icc_api_1.IccContactApi {
         this.crypto = crypto;
         this.dataOwnerApi = dataOwnerApi;
     }
-    newInstance(user, patient, c, confidential = false, delegates = []) {
-        const contact = new models.Contact(_.extend({
-            id: this.crypto.randomUuid(),
-            _type: 'org.taktik.icure.entities.Contact',
-            created: new Date().getTime(),
-            modified: new Date().getTime(),
-            responsible: this.dataOwnerApi.getDataOwnerOf(user),
-            author: user.id,
-            codes: [],
-            tags: [],
-            groupId: this.crypto.randomUuid(),
-            subContacts: [],
-            services: [],
-            openingDate: parseInt(moment().format('YYYYMMDDHHmmss')),
-        }, c || {}));
-        return this.initDelegationsAndEncryptionKeys(user, patient, contact, confidential, delegates);
-    }
     /**
-     * 1. Extract(decrypt) the patient's secretForeignKeys from the
-     * "delegations" object.
-     * 2. Initialize & encrypt the Contact's delegations & cryptedForeignKeys.
-     * 3. Initialize & encrypt the Contact's encryptionKeys.
-     * 4. Return the contact with the extended delegations, cryptedForeignKeys
-     * & encryptionKeys.
+     * Creates a new instance of contact with initialised encryption metadata (not in the database).
+     * @param user the current user.
+     * @param patient the patient this contact refers to.
+     * @param c initialised data for the contact. 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.
+     * - preferredSfk: secret id of the patient to use as the secret foreign key to use for the classification. The default value will be a
+     * secret id of patient known by the topmost parent in the current data owner hierarchy.
+     * - confidential: if true, the entity will be created as confidential. Confidential entities are not shared with auto-delegations, and the default
+     * foreign key used is any key that is not shared with any of the data owner parents. By default entities are created as non-confidential.
+     * @return a new instance of contact.
      */
-    initDelegationsAndEncryptionKeys(user, patient, contact, confidential = false, delegates = []) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        return this.crypto.extractPreferredSfk(patient, dataOwnerId, confidential).then((key) => __awaiter(this, void 0, void 0, function* () {
-            if (!key) {
-                console.error(`SFK cannot be found for Contact ${key}. The contact will not be reachable from the patient side`);
-            }
-            const dels = yield this.crypto.initObjectDelegations(contact, patient, dataOwnerId, key !== null && key !== void 0 ? key : null);
-            const eks = yield this.crypto.initEncryptionKeys(contact, dataOwnerId);
-            _.extend(contact, {
-                delegations: dels.delegations,
-                cryptedForeignKeys: dels.cryptedForeignKeys,
-                secretForeignKeys: dels.secretForeignKeys,
-                encryptionKeys: eks.encryptionKeys,
-            });
-            let promise = Promise.resolve(contact);
-            _.uniq(delegates.concat(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : [])).forEach((delegateId) => (promise = promise.then((contact) => this.crypto.addDelegationsAndEncryptionKeys(patient, contact, dataOwnerId, delegateId, dels.secretId, eks.secretId).catch((e) => {
-                console.log(e);
-                return contact;
-            }))));
-            (user.autoDelegations && user.autoDelegations.anonymousMedicalInformation ? user.autoDelegations.anonymousMedicalInformation : []).forEach((delegateId) => (promise = promise.then((contact) => this.crypto.addDelegationsAndEncryptionKeys(patient, contact, dataOwnerId, delegateId, null, eks.secretId).catch((e) => {
-                console.log(e);
-                return contact;
-            }))));
-            return promise;
-        }));
-    }
-    initEncryptionKeys(user, ctc) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        return this.crypto.initEncryptionKeys(ctc, dataOwnerId).then((eks) => {
-            let promise = Promise.resolve(_.extend(ctc, {
-                encryptionKeys: eks.encryptionKeys,
-            }));
-            (user.autoDelegations
-                ? (user.autoDelegations.all || [])
-                    .concat(user.autoDelegations.medicalInformation || [])
-                    .concat(user.autoDelegations.anonymousMedicalInformation || [])
-                : []).forEach((delegateId) => (promise = promise.then((contact) => this.crypto
-                .appendEncryptionKeys(contact, dataOwnerId, delegateId, eks.secretId)
-                .then((extraEks) => {
-                return _.extend(extraEks.modifiedObject, {
-                    encryptionKeys: extraEks.encryptionKeys,
-                });
-            })
-                .catch((e) => {
-                console.log(e.message);
-                return contact;
-            }))));
-            return promise;
+    newInstance(user, patient, c, options = {}) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function* () {
+            const contact = new models.Contact(_.extend({
+                id: this.crypto.primitives.randomUuid(),
+                _type: 'org.taktik.icure.entities.Contact',
+                created: new Date().getTime(),
+                modified: new Date().getTime(),
+                responsible: this.dataOwnerApi.getDataOwnerIdOf(user),
+                author: user.id,
+                codes: [],
+                tags: [],
+                groupId: this.crypto.primitives.randomUuid(),
+                subContacts: [],
+                services: [],
+                openingDate: parseInt(moment().format('YYYYMMDDHHmmss')),
+            }, c || {}));
+            const ownerId = this.dataOwnerApi.getDataOwnerIdOf(user);
+            if (ownerId !== (yield this.dataOwnerApi.getCurrentDataOwnerId()))
+                throw new Error('Can only initialise entities as current data owner.');
+            const sfk = (_a = options.preferredSfk) !== null && _a !== void 0 ? _a : (!!options.confidential
+                ? yield this.crypto.confidential.getConfidentialSecretId(patient)
+                : yield this.crypto.confidential.getAnySecretIdSharedWithParents(patient));
+            if (!sfk)
+                throw new Error(`Couldn't find any sfk of parent patient ${patient.id} for confidential=${!!options.confidential}`);
+            const extraDelegations = [
+                ...Object.keys((_b = options.additionalDelegates) !== null && _b !== void 0 ? _b : {}),
+                ...(options.confidential ? [] : [...((_d = (_c = user.autoDelegations) === null || _c === void 0 ? void 0 : _c.all) !== null && _d !== void 0 ? _d : []), ...((_f = (_e = user.autoDelegations) === null || _e === void 0 ? void 0 : _e.medicalInformation) !== null && _f !== void 0 ? _f : [])]),
+            ];
+            const initialisationInfo = yield this.crypto.entities.entityWithInitialisedEncryptedMetadata(contact, patient.id, sfk, true, extraDelegations);
+            return new models.Contact(initialisationInfo.updatedEntity);
         });
     }
     /**
@@ -123,33 +98,35 @@ class IccContactXApi extends icc_api_1.IccContactApi {
      * @param usingPost
      */
     findBy(hcpartyId, patient, usingPost = false) {
-        return this.crypto.extractSFKsHierarchyFromDelegations(patient, hcpartyId).then((secretForeignKeys) => secretForeignKeys && secretForeignKeys.length > 0
-            ? Promise.all(secretForeignKeys
-                .reduce((acc, level) => {
-                return acc.concat([
-                    {
-                        hcpartyId: level.hcpartyId,
-                        extractedKeys: level.extractedKeys.filter((key) => !acc.some((previousLevel) => previousLevel.extractedKeys.includes(key))),
-                    },
-                ]);
-            }, [])
-                .filter((l) => l.extractedKeys.length > 0)
-                .map(({ hcpartyId, extractedKeys }) => usingPost ?
-                this.findByHCPartyPatientSecretFKeysArray(hcpartyId, _.uniq(extractedKeys)) :
-                this.findByHCPartyPatientSecretFKeys(hcpartyId, _.uniq(extractedKeys).join(',')))).then((results) => _.uniqBy(_.flatMap(results), (x) => x.id))
-            : Promise.resolve([]));
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.crypto.entities.secretIdsForHcpHierarchyOf(patient).then((keysHierarchy) => keysHierarchy && keysHierarchy.length > 0
+                ? Promise.all(keysHierarchy
+                    .reduce((acc, level) => {
+                    return acc.concat([
+                        {
+                            hcpartyId: level.ownerId,
+                            extractedKeys: level.extracted.filter((key) => !acc.some((previousLevel) => previousLevel.extractedKeys.includes(key))),
+                        },
+                    ]);
+                }, [])
+                    .filter((l) => l.extractedKeys.length > 0)
+                    .map(({ hcpartyId, extractedKeys }) => usingPost
+                    ? this.findByHCPartyPatientSecretFKeysArray(hcpartyId, _.uniq(extractedKeys))
+                    : this.findByHCPartyPatientSecretFKeys(hcpartyId, _.uniq(extractedKeys).join(',')))).then((results) => _.uniqBy(_.flatMap(results), (x) => x.id))
+                : Promise.resolve([]));
+        });
     }
     findByPatientSFKs(hcpartyId, patients) {
         return __awaiter(this, void 0, void 0, function* () {
             const perHcpId = {};
             for (const patient of patients) {
                 ;
-                (yield this.crypto.extractSFKsHierarchyFromDelegations(patient, hcpartyId))
+                (yield this.crypto.entities.secretIdsForHcpHierarchyOf(patient))
                     .reduce((acc, level) => {
                     return acc.concat([
                         {
-                            hcpartyId: level.hcpartyId,
-                            extractedKeys: level.extractedKeys.filter((key) => !acc.some((previousLevel) => previousLevel.extractedKeys.includes(key))),
+                            hcpartyId: level.ownerId,
+                            extractedKeys: level.extracted.filter((key) => !acc.some((previousLevel) => previousLevel.extractedKeys.includes(key))),
                         },
                     ]);
                 }, [])
@@ -218,36 +195,34 @@ class IccContactXApi extends icc_api_1.IccContactApi {
         var _a;
         return super
             .filterServicesBy(undefined, (_a = serviceIds.ids) === null || _a === void 0 ? void 0 : _a.length, new models_1.FilterChainService({ filter: new ServiceByIdsFilter_1.ServiceByIdsFilter({ ids: serviceIds.ids }) }))
-            .then((paginatedList) => { var _a; return this.decryptServices(user.healthcarePartyId || user.patientId, (_a = paginatedList.rows) !== null && _a !== void 0 ? _a : [], undefined, undefined); });
+            .then((paginatedList) => { var _a; return this.decryptServices(user.healthcarePartyId || user.patientId, (_a = paginatedList.rows) !== null && _a !== void 0 ? _a : []); });
     }
     findByHCPartyFormIdWithUser(user, hcPartyId, formId) {
-        return super.findByHCPartyFormId(hcPartyId, formId).then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), ctcs));
+        return super.findByHCPartyFormId(hcPartyId, formId).then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), ctcs));
     }
     findByHCPartyFormIdsWithUser(user, hcPartyId, body) {
-        return super.findByHCPartyFormIds(hcPartyId, body).then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), ctcs));
+        return super.findByHCPartyFormIds(hcPartyId, body).then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), ctcs));
     }
     getContactWithUser(user, contactId) {
         return super
             .getContact(contactId)
-            .then((ctc) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), [ctc]))
+            .then((ctc) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), [ctc]))
             .then((ctcs) => ctcs[0]);
     }
     getContactsWithUser(user, body) {
-        return super.getContacts(body).then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), ctcs));
+        return super.getContacts(body).then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), ctcs));
     }
     modifyContactWithUser(user, body) {
-        const _super = Object.create(null, {
-            modifyContact: { get: () => super.modifyContact }
-        });
         return __awaiter(this, void 0, void 0, function* () {
-            return body
-                ? this.encrypt(user, [_.cloneDeep(body)])
-                    .then((ctcs) => _super.modifyContact.call(this, ctcs[0]))
-                    .then((ctc) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), [ctc]))
-                    .then((ctcs) => ctcs[0])
-                : null;
+            return body ? this.modifyAs(this.dataOwnerApi.getDataOwnerIdOf(user), body) : null;
         });
     }
+    modifyAs(dataOwner, contact) {
+        return this.encryptAs(dataOwner, [_.cloneDeep(contact)])
+            .then((ctcs) => super.modifyContact(ctcs[0]))
+            .then((ctc) => this.decrypt(dataOwner, [ctc]))
+            .then((ctcs) => ctcs[0]);
+    }
     modifyContactsWithUser(user, bodies) {
         const _super = Object.create(null, {
             modifyContacts: { get: () => super.modifyContacts }
@@ -256,7 +231,7 @@ class IccContactXApi extends icc_api_1.IccContactApi {
             return bodies
                 ? this.encrypt(user, bodies.map((c) => _.cloneDeep(c)))
                     .then((ctcs) => _super.modifyContacts.call(this, ctcs))
-                    .then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), ctcs))
+                    .then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), ctcs))
                 : null;
         });
     }
@@ -268,7 +243,7 @@ class IccContactXApi extends icc_api_1.IccContactApi {
             return body
                 ? this.encrypt(user, [_.cloneDeep(body)])
                     .then((ctcs) => _super.createContact.call(this, ctcs[0]))
-                    .then((ctc) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), [ctc]))
+                    .then((ctc) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), [ctc]))
                     .then((ctcs) => ctcs[0])
                 : null;
         });
@@ -281,7 +256,7 @@ class IccContactXApi extends icc_api_1.IccContactApi {
             return bodies
                 ? this.encrypt(user, bodies.map((c) => _.cloneDeep(c)))
                     .then((ctcs) => _super.createContacts.call(this, ctcs))
-                    .then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), ctcs))
+                    .then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), ctcs))
                 : null;
         });
     }
@@ -309,99 +284,90 @@ class IccContactXApi extends icc_api_1.IccContactApi {
                 }))));
             }
             else {
-                svc.encryptedSelf = (0, binary_utils_1.b2a)((0, binary_utils_1.ua2string)(yield this.crypto.AES.encrypt(key, (0, binary_utils_1.utf8_2ua)(JSON.stringify({ content: svc.content })), rawKey)));
+                svc.encryptedSelf = (0, binary_utils_1.b2a)((0, binary_utils_1.ua2string)(yield this.crypto.primitives.AES.encrypt(key, (0, binary_utils_1.utf8_2ua)(JSON.stringify({ content: svc.content })), rawKey)));
                 delete svc.content;
             }
             return svc;
         })));
     }
     encrypt(user, ctcs) {
-        const hcpartyId = this.dataOwnerApi.getDataOwnerOf(user);
+        return this.encryptAs(this.dataOwnerApi.getDataOwnerIdOf(user), ctcs);
+    }
+    encryptAs(hcpartyId, ctcs) {
         const bypassEncryption = false; //Used for debug
         return Promise.all(ctcs.map((ctc) => __awaiter(this, void 0, void 0, function* () {
             const initialisedCtc = bypassEncryption //Prevent encryption for test ctc
                 ? ctc
-                : yield (ctc.encryptionKeys && Object.keys(ctc.encryptionKeys || {}).length ? Promise.resolve(ctc) : this.initEncryptionKeys(user, ctc));
-            const sfks = yield this.crypto.extractKeysFromDelegationsForHcpHierarchy(hcpartyId, initialisedCtc.id, initialisedCtc.encryptionKeys);
-            const rawKey = sfks.extractedKeys[0].replace(/-/g, '');
-            const key = yield this.crypto.AES.importKey('raw', (0, binary_utils_1.hex2ua)(rawKey));
-            initialisedCtc.services = yield this.encryptServices(key, rawKey, ctc.services || []);
-            initialisedCtc.encryptedSelf = (0, binary_utils_1.b2a)((0, binary_utils_1.ua2string)(yield this.crypto.AES.encrypt(key, (0, binary_utils_1.utf8_2ua)(JSON.stringify({ descr: ctc.descr })), rawKey)));
+                : yield this.crypto.entities.ensureEncryptionKeysInitialised(ctc);
+            const encryptionKey = yield this.crypto.entities.importFirstValidKey(yield this.crypto.entities.encryptionKeysOf(ctc, hcpartyId), ctc.id);
+            initialisedCtc.services = yield this.encryptServices(encryptionKey.key, encryptionKey.raw, ctc.services || []);
+            initialisedCtc.encryptedSelf = (0, binary_utils_1.b2a)((0, binary_utils_1.ua2string)(yield this.crypto.primitives.AES.encrypt(encryptionKey.key, (0, binary_utils_1.utf8_2ua)(JSON.stringify({ descr: ctc.descr })), encryptionKey.raw)));
             delete initialisedCtc.descr;
             return initialisedCtc;
         })));
     }
     decrypt(hcpartyId, ctcs) {
         return Promise.all(ctcs.map((ctc) => __awaiter(this, void 0, void 0, function* () {
-            const { extractedKeys: sfks } = yield this.crypto.extractKeysFromDelegationsForHcpHierarchy(hcpartyId, ctc.id, _.size(ctc.encryptionKeys) ? ctc.encryptionKeys : ctc.delegations);
-            if (!sfks || !sfks.length) {
+            const keys = yield this.crypto.entities.importAllValidKeys(yield this.crypto.entities.encryptionKeysOf(ctc, hcpartyId));
+            if (!keys || !keys.length) {
                 console.log('Cannot decrypt contact', ctc.id);
                 return ctc;
             }
-            const rawKey = sfks[0].replace(/-/g, '');
-            const key = yield this.crypto.AES.importKey('raw', (0, binary_utils_1.hex2ua)(rawKey));
-            ctc.services = yield this.decryptServices(hcpartyId, ctc.services || [], key, rawKey);
+            ctc.services = yield this.decryptServices(hcpartyId, ctc.services || [], keys);
             if (ctc.encryptedSelf) {
                 try {
-                    const dec = yield this.crypto.AES.decrypt(key, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(ctc.encryptedSelf)), rawKey);
-                    let jsonContent;
-                    try {
-                        jsonContent = dec && (0, binary_utils_1.ua2utf8)(dec);
-                        jsonContent && _.assign(ctc, JSON.parse(jsonContent));
+                    const json = yield this.crypto.entities.tryDecryptJson(keys, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(ctc.encryptedSelf)), false);
+                    if (json) {
+                        _.assign(ctc, json);
                     }
-                    catch (e) {
-                        console.log('Cannot parse ctc', ctc.id, jsonContent || '<- Invalid encoding');
+                    else {
+                        console.log('Cannot decrypt ctc: no valid key could produce valid json', ctc.id);
                     }
                 }
-                catch (_a) {
-                    console.log('Cannot decrypt contact', ctc.id);
+                catch (e) {
+                    console.log('Failed to decrypt ctc', ctc.id, e);
                 }
             }
             return ctc;
         })));
     }
-    decryptServices(hcpartyId, svcs, key, rawKey) {
+    decryptServices(hcpartyId, svcs, keys) {
         return Promise.all(svcs.map((svc) => __awaiter(this, void 0, void 0, function* () {
-            if (!key) {
-                const { extractedKeys: sfks } = yield this.crypto.extractKeysFromDelegationsForHcpHierarchy(hcpartyId, svc.id, _.size(svc.encryptionKeys) ? svc.encryptionKeys : svc.delegations);
-                key = yield this.crypto.AES.importKey('raw', (0, binary_utils_1.hex2ua)(sfks[0].replace(/-/g, '')));
+            if (!keys) {
+                keys = yield this.crypto.entities.importAllValidKeys(yield this.crypto.entities.encryptionKeysOf(svc, hcpartyId));
             }
             if (svc.encryptedContent) {
                 try {
-                    const dec = yield this.crypto.AES.decrypt(key, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(svc.encryptedContent)));
-                    let jsonContent;
-                    try {
-                        jsonContent = (0, binary_utils_1.ua2utf8)((0, utils_1.truncateTrailingNulls)(new Uint8Array(dec)));
-                        Object.assign(svc, { content: JSON.parse(jsonContent) });
+                    const json = yield this.crypto.entities.tryDecryptJson(keys, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(svc.encryptedContent)), true);
+                    if (json) {
+                        Object.assign(svc, { content: json });
                     }
-                    catch (e) {
-                        console.log('Cannot parse service', svc.id, jsonContent || '<- Invalid encoding');
+                    else {
+                        console.log('Cannot decrypt service: no valid key could produce valid json', svc.id);
                     }
                 }
-                catch (_a) {
-                    console.log('Cannot decrypt service', svc.id);
+                catch (e) {
+                    console.log('Cannot decrypt service', svc.id, e);
                 }
             }
             else if (svc.encryptedSelf) {
                 try {
-                    const dec = yield this.crypto.AES.decrypt(key, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(svc.encryptedSelf)));
-                    let jsonContent;
-                    try {
-                        jsonContent = (0, binary_utils_1.ua2utf8)((0, utils_1.truncateTrailingNulls)(new Uint8Array(dec)));
-                        Object.assign(svc, JSON.parse(jsonContent));
+                    const json = yield this.crypto.entities.tryDecryptJson(keys, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(svc.encryptedSelf)), true);
+                    if (json) {
+                        Object.assign(svc, json);
                     }
-                    catch (e) {
-                        console.log('Cannot parse service', svc.id, jsonContent || '<- Invalid encoding');
+                    else {
+                        console.log('Cannot decrypt service: no valid key could produce valid json', svc.id);
                     }
                 }
-                catch (_b) {
-                    console.log('Cannot decrypt service', svc.id);
+                catch (e) {
+                    console.log('Cannot decrypt service', svc.id, e);
                 }
             }
             else {
                 svc.content = _.fromPairs(yield Promise.all(_.toPairs(svc.content).map((p) => __awaiter(this, void 0, void 0, function* () {
                     if (p[1].compoundValue) {
-                        p[1].compoundValue = yield this.decryptServices(hcpartyId, p[1].compoundValue, key, rawKey);
+                        p[1].compoundValue = yield this.decryptServices(hcpartyId, p[1].compoundValue, keys);
                     }
                     return p;
                 }))));
@@ -509,7 +475,7 @@ class IccContactXApi extends icc_api_1.IccContactApi {
         const existing = ctc.services.find((s) => s.id === svc.id);
         const promoted = _.extend(_.extend(existing || {}, svc), {
             author: user.id,
-            responsible: this.dataOwnerApi.getDataOwnerOf(user),
+            responsible: this.dataOwnerApi.getDataOwnerIdOf(user),
             modified: new Date().getTime(),
         });
         if (!existing) {
@@ -597,11 +563,11 @@ class IccContactXApi extends icc_api_1.IccContactApi {
     service() {
         return {
             newInstance: (user, s) => _.extend({
-                id: this.crypto.randomUuid(),
+                id: this.crypto.primitives.randomUuid(),
                 _type: 'org.taktik.icure.entities.embed.Service',
                 created: new Date().getTime(),
                 modified: new Date().getTime(),
-                responsible: this.dataOwnerApi.getDataOwnerOf(user),
+                responsible: this.dataOwnerApi.getDataOwnerIdOf(user),
                 author: user.id,
                 codes: [],
                 tags: [],
@@ -764,6 +730,35 @@ class IccContactXApi extends icc_api_1.IccContactApi {
         };
         return myself;
     }
+    /**
+     * @param contact a contact
+     * @return the id of the patient that the contact refers to, retrieved from the encrypted metadata. Normally there should only be one element
+     * in the returned array, but in case of entity merges there could be multiple values.
+     */
+    decryptPatientIdOf(contact) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.crypto.entities.owningEntityIdsOf(contact, undefined);
+        });
+    }
+    /**
+     * Share an existing contact with other data owners, allowing them to access the non-encrypted data of the contact and optionally also
+     * the encrypted content.
+     * @param delegateId the id of the data owner which will be granted access to the contact.
+     * @param contact the contact to share.
+     * @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
+     * contact does not have encrypted content.
+     * - sharePatientId: specifies if the id of the patient that this contact refers to should be shared with the delegate (defaults to
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated contact.
+     */
+    shareWith(delegateId, contact, 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(contact, delegateId, undefined, options.shareEncryptionKey, options.sharePatientId));
+        });
+    }
 }
 exports.IccContactXApi = IccContactXApi;
 //# sourceMappingURL=icc-contact-x-api.js.map