@icure/api 6.4.0 → 7.0.0-beta.1

package/icc-x-api/icc-form-x-api.d.ts

@@ -3,17 +3,34 @@ import { IccCryptoXApi } from './icc-crypto-x-api';
 import * as models from '../icc-api/model/models';
 import { IccDataOwnerXApi } from './icc-data-owner-x-api';
 import { AuthenticationProvider } from './auth/AuthenticationProvider';
+import { ShareMetadataBehaviour } from './crypto/ShareMetadataBehaviour';
 export declare class IccFormXApi extends IccFormApi {
     crypto: IccCryptoXApi;
     dataOwnerApi: IccDataOwnerXApi;
     constructor(host: string, headers: {
         [key: string]: string;
     }, crypto: IccCryptoXApi, dataOwnerApi: IccDataOwnerXApi, authenticationProvider?: AuthenticationProvider, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>);
-    newInstance(user: models.User, patient: models.Patient, c?: any, delegates?: string[]): Promise<models.Form>;
-    initEncryptionKeys(user: models.User, form: models.Form): Promise<models.Form & {
-        encryptionKeys: any;
-    }>;
-    private initDelegationsAndEncryptionKeys;
+    /**
+     * Creates a new instance of form with initialised encryption metadata (not in the database).
+     * @param user the current user.
+     * @param patient the patient this form refers to.
+     * @param c initialised data for the form. 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.
+     * @return a new instance of form.
+     */
+    newInstance(user: models.User, patient: models.Patient, c?: any, options?: {
+        additionalDelegates?: {
+            [dataOwnerId: string]: 'WRITE';
+        };
+        preferredSfk?: string;
+    }): Promise<models.Form>;
     /**
      * 1. Check whether there is a delegation with 'hcpartyId' or not.
      * 2. 'fetchHcParty[hcpartyId][1]': is encrypted AES exchange key by RSA public key of him.
@@ -30,6 +47,29 @@ export declare class IccFormXApi extends IccFormApi {
      * @param patient
      * @param usingPost (Promise)
      */
-    findBy(hcpartyId: string, patient: models.Patient, usingPost?: boolean): Promise<void | (void | models.Form)[]>;
-    decrypt(hcpartyId: string, forms: Array<models.Form>): Promise<void | (void | models.Form)[]>;
+    findBy(hcpartyId: string, patient: models.Patient, usingPost?: boolean): Promise<models.Form[]>;
+    decrypt(hcpartyId: string, forms: Array<models.Form>): Promise<models.Form[]>;
+    /**
+     * @param form a form
+     * @return the id of the patient that the form 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(form: models.Form): Promise<string[]>;
+    /**
+     * Share an existing form with other data owners, allowing them to access the non-encrypted data of the form and optionally also
+     * the encrypted content.
+     * @param delegateId the id of the data owner which will be granted access to the form.
+     * @param form the form 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
+     * form does not have encrypted content.
+     * - sharePatientId: specifies if the id of the patient that this form refers to should be shared with the delegate (defaults to
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated form.
+     */
+    shareWith(delegateId: string, form: models.Form, options?: {
+        shareEncryptionKey?: ShareMetadataBehaviour;
+        sharePatientId?: ShareMetadataBehaviour;
+    }): Promise<models.Form>;
 }

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

@@ -1,9 +1,18 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IccFormXApi = void 0;
 const icc_api_1 = require("../icc-api");
 const _ = require("lodash");
-const binary_utils_1 = require("./utils/binary-utils");
+const models = require("../icc-api/model/models");
 const AuthenticationProvider_1 = require("./auth/AuthenticationProvider");
 // noinspection JSUnusedGlobalSymbols
 class IccFormXApi extends icc_api_1.IccFormApi {
@@ -16,57 +25,46 @@ class IccFormXApi extends icc_api_1.IccFormApi {
         this.crypto = crypto;
         this.dataOwnerApi = dataOwnerApi;
     }
-    // noinspection JSUnusedGlobalSymbols
-    newInstance(user, patient, c = {}, delegates = []) {
-        const form = _.extend({
-            id: this.crypto.randomUuid(),
-            _type: 'org.taktik.icure.entities.Form',
-            created: new Date().getTime(),
-            modified: new Date().getTime(),
-            responsible: this.dataOwnerApi.getDataOwnerOf(user),
-            author: user.id,
-            codes: [],
-            tags: [],
-        }, c || {});
-        return this.initDelegationsAndEncryptionKeys(user, patient, form, delegates);
-    }
-    initEncryptionKeys(user, form) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        return this.crypto.initEncryptionKeys(form, dataOwnerId).then((eks) => {
-            let promise = Promise.resolve(_.extend(form, {
-                encryptionKeys: eks.encryptionKeys,
-            }));
-            (user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : []).forEach((delegateId) => (promise = promise.then((contact) => this.crypto.appendEncryptionKeys(contact, dataOwnerId, delegateId, eks.secretId).then((extraEks) => {
-                return _.extend(extraEks.modifiedObject, {
-                    encryptionKeys: extraEks.encryptionKeys,
-                });
-            }))));
-            return promise;
-        });
-    }
-    initDelegationsAndEncryptionKeys(user, patient, form, delegates = []) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        return this.crypto
-            .extractDelegationsSFKs(patient, dataOwnerId)
-            .then((secretForeignKeys) => Promise.all([
-            this.crypto.initObjectDelegations(form, patient, dataOwnerId, secretForeignKeys.extractedKeys[0]),
-            this.crypto.initEncryptionKeys(form, dataOwnerId),
-        ]))
-            .then((initData) => {
-            const dels = initData[0];
-            const eks = initData[1];
-            _.extend(form, {
-                delegations: dels.delegations,
-                cryptedForeignKeys: dels.cryptedForeignKeys,
-                secretForeignKeys: dels.secretForeignKeys,
-                encryptionKeys: eks.encryptionKeys,
-            });
-            let promise = Promise.resolve(form);
-            _.uniq(delegates.concat(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : [])).forEach((delegateId) => (promise = promise.then((form) => this.crypto.addDelegationsAndEncryptionKeys(patient, form, dataOwnerId, delegateId, dels.secretId, eks.secretId).catch((e) => {
-                console.log(e);
-                return form;
-            }))));
-            return promise;
+    /**
+     * Creates a new instance of form with initialised encryption metadata (not in the database).
+     * @param user the current user.
+     * @param patient the patient this form refers to.
+     * @param c initialised data for the form. 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.
+     * @return a new instance of form.
+     */
+    newInstance(user, patient, c = {}, options = {}) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function* () {
+            const form = _.extend({
+                id: this.crypto.randomUuid(),
+                _type: 'org.taktik.icure.entities.Form',
+                created: new Date().getTime(),
+                modified: new Date().getTime(),
+                responsible: this.dataOwnerApi.getDataOwnerIdOf(user),
+                author: user.id,
+                codes: [],
+                tags: [],
+            }, 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 : (yield this.crypto.confidential.getAnySecretIdSharedWithParents(patient));
+            if (!sfk)
+                throw new Error(`Couldn't find any sfk of parent patient ${patient.id}`);
+            const extraDelegations = [
+                ...Object.keys((_b = options.additionalDelegates) !== null && _b !== void 0 ? _b : {}),
+                ...((_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 : []),
+            ];
+            return new models.Form(yield this.crypto.entities.entityWithInitialisedEncryptedMetadata(form, patient.id, sfk, true, extraDelegations).then((x) => x.updatedEntity));
         });
     }
     // noinspection JSUnusedGlobalSymbols
@@ -87,43 +85,44 @@ class IccFormXApi extends icc_api_1.IccFormApi {
      * @param usingPost (Promise)
      */
     findBy(hcpartyId, patient, usingPost = false) {
-        return this.crypto
-            .extractDelegationsSFKs(patient, hcpartyId)
-            .then((secretForeignKeys) => usingPost ?
-            this.findFormsByHCPartyPatientForeignKeysUsingPost(secretForeignKeys.hcpartyId, undefined, undefined, undefined, _.uniq(secretForeignKeys.extractedKeys)) :
-            this.findFormsByHCPartyPatientForeignKeys(secretForeignKeys.hcpartyId, _.uniq(secretForeignKeys.extractedKeys).join(',')))
-            .then((forms) => this.decrypt(hcpartyId, forms))
-            .then(function (decryptedForms) {
-            return decryptedForms;
+        return __awaiter(this, void 0, void 0, function* () {
+            const extractedKeys = yield this.crypto.entities.secretIdsOf(patient, hcpartyId);
+            const topmostParentId = (yield this.dataOwnerApi.getCurrentDataOwnerHierarchyIds())[0];
+            let forms = usingPost
+                ? yield this.findFormsByHCPartyPatientForeignKeysUsingPost(topmostParentId, undefined, undefined, undefined, _.uniq(extractedKeys))
+                : yield this.findFormsByHCPartyPatientForeignKeys(topmostParentId, _.uniq(extractedKeys).join(','));
+            return yield this.decrypt(hcpartyId, forms);
         });
     }
     decrypt(hcpartyId, forms) {
-        return Promise.all(forms.map((form) => this.crypto
-            .extractKeysFromDelegationsForHcpHierarchy(hcpartyId, form.id, _.size(form.encryptionKeys) ? form.encryptionKeys : form.delegations)
-            .then(({ extractedKeys: sfks }) => {
-            if (form.encryptedSelf) {
-                return this.crypto.AES.importKey('raw', (0, binary_utils_1.hex2ua)(sfks[0].replace(/-/g, '')))
-                    .then((key) => new Promise((resolve) => {
-                    this.crypto.AES.decrypt(key, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(form.encryptedSelf))).then(resolve, () => {
-                        console.log('Cannot decrypt form', form.id);
-                        resolve(null);
-                    });
-                }))
-                    .then((decrypted) => {
-                    if (decrypted) {
-                        form = _.extend(form, JSON.parse((0, binary_utils_1.ua2string)(decrypted)));
-                    }
-                    return form;
-                });
-            }
-            else {
-                return Promise.resolve(form);
-            }
-        })
-            .catch(function (e) {
-            console.log(e);
-        }))).catch(function (e) {
-            console.log(e);
+        return Promise.all(forms.map((form) => this.crypto.entities.decryptEntity(form, hcpartyId, (x) => new models.Form(x)).then(({ entity }) => entity)));
+    }
+    /**
+     * @param form a form
+     * @return the id of the patient that the form 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(form) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.crypto.entities.owningEntityIdsOf(form, undefined);
+        });
+    }
+    /**
+     * Share an existing form with other data owners, allowing them to access the non-encrypted data of the form and optionally also
+     * the encrypted content.
+     * @param delegateId the id of the data owner which will be granted access to the form.
+     * @param form the form 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
+     * form does not have encrypted content.
+     * - sharePatientId: specifies if the id of the patient that this form refers to should be shared with the delegate (defaults to
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated form.
+     */
+    shareWith(delegateId, form, options = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.modifyForm(yield this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(form, delegateId, undefined, options.shareEncryptionKey, options.sharePatientId));
         });
     }
 }

package/icc-x-api/icc-form-x-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"icc-form-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-form-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccFormApi } from '../icc-api'\nimport { IccCryptoXApi } from './icc-crypto-x-api'\n\nimport * as _ from 'lodash'\nimport * as models from '../icc-api/model/models'\n\nimport { a2b, hex2ua, string2ua, ua2string } from './utils/binary-utils'\nimport { IccDataOwnerXApi } from './icc-data-owner-x-api'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\n\n// noinspection JSUnusedGlobalSymbols\nexport class IccFormXApi extends IccFormApi {\n  crypto: IccCryptoXApi\n  dataOwnerApi: IccDataOwnerXApi\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    crypto: IccCryptoXApi,\n    dataOwnerApi: IccDataOwnerXApi,\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !== 'undefined'\n      ? window.fetch\n      : typeof self !== 'undefined'\n      ? self.fetch\n      : fetch\n  ) {\n    super(host, headers, authenticationProvider, fetchImpl)\n    this.crypto = crypto\n    this.dataOwnerApi = dataOwnerApi\n  }\n\n  // noinspection JSUnusedGlobalSymbols\n  newInstance(user: models.User, patient: models.Patient, c: any = {}, delegates: string[] = []) {\n    const form = _.extend(\n      {\n        id: this.crypto.randomUuid(),\n        _type: 'org.taktik.icure.entities.Form',\n        created: new Date().getTime(),\n        modified: new Date().getTime(),\n        responsible: this.dataOwnerApi.getDataOwnerOf(user),\n        author: user.id,\n        codes: [],\n        tags: [],\n      },\n      c || {}\n    )\n\n    return this.initDelegationsAndEncryptionKeys(user, patient, form, delegates)\n  }\n\n  initEncryptionKeys(user: models.User, form: models.Form) {\n    const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user)\n    return this.crypto.initEncryptionKeys(form, dataOwnerId!).then((eks) => {\n      let promise = Promise.resolve(\n        _.extend(form, {\n          encryptionKeys: eks.encryptionKeys,\n        })\n      )\n      ;(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : []).forEach(\n        (delegateId) =>\n          (promise = promise.then((contact) =>\n            this.crypto.appendEncryptionKeys(contact, dataOwnerId!, delegateId, eks.secretId).then((extraEks) => {\n              return _.extend(extraEks.modifiedObject, {\n                encryptionKeys: extraEks.encryptionKeys,\n              })\n            })\n          ))\n      )\n      return promise\n    })\n  }\n\n  private initDelegationsAndEncryptionKeys(\n    user: models.User,\n    patient: models.Patient,\n    form: models.Form,\n    delegates: string[] = []\n  ): Promise<models.Form> {\n    const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user)\n    return this.crypto\n      .extractDelegationsSFKs(patient, dataOwnerId!)\n      .then((secretForeignKeys) =>\n        Promise.all([\n          this.crypto.initObjectDelegations(form, patient, dataOwnerId!, secretForeignKeys.extractedKeys[0]),\n          this.crypto.initEncryptionKeys(form, dataOwnerId!),\n        ])\n      )\n      .then((initData) => {\n        const dels = initData[0]\n        const eks = initData[1]\n        _.extend(form, {\n          delegations: dels.delegations,\n          cryptedForeignKeys: dels.cryptedForeignKeys,\n          secretForeignKeys: dels.secretForeignKeys,\n          encryptionKeys: eks.encryptionKeys,\n        })\n\n        let promise = Promise.resolve(form)\n        _.uniq(\n          delegates.concat(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : [])\n        ).forEach(\n          (delegateId) =>\n            (promise = promise.then((form) =>\n              this.crypto.addDelegationsAndEncryptionKeys(patient, form, dataOwnerId!, delegateId, dels.secretId, eks.secretId).catch((e) => {\n                console.log(e)\n                return form\n              })\n            ))\n        )\n        return promise\n      })\n  }\n\n  // noinspection JSUnusedGlobalSymbols\n  /**\n   * 1. Check whether there is a delegation with 'hcpartyId' or not.\n   * 2. 'fetchHcParty[hcpartyId][1]': is encrypted AES exchange key by RSA public key of him.\n   * 3. Obtain the AES exchange key, by decrypting the previous step value with hcparty private key\n   *      3.1.  KeyPair should be fetch from cache (in jwk)\n   *      3.2.  if it doesn't exist in the cache, it has to be loaded from Browser Local store, and then import it to WebCrypto\n   * 4. Obtain the array of delegations which are delegated to his ID (hcpartyId) in this patient\n   * 5. Decrypt and collect all keys (secretForeignKeys) within delegations of previous step (with obtained AES key of step 4)\n   * 6. Do the REST call to get all contacts with (allSecretForeignKeysDelimitedByComa, hcpartyId)\n   *\n   * After these painful steps, you have the contacts of the patient.\n   *\n   * @param hcpartyId\n   * @param patient\n   * @param usingPost (Promise)\n   */\n  findBy(hcpartyId: string, patient: models.Patient, usingPost: boolean = false) {\n    return this.crypto\n      .extractDelegationsSFKs(patient, hcpartyId)\n      .then((secretForeignKeys) =>\n        usingPost ?\n          this.findFormsByHCPartyPatientForeignKeysUsingPost(secretForeignKeys.hcpartyId!, undefined, undefined, undefined, _.uniq(secretForeignKeys.extractedKeys)) :\n          this.findFormsByHCPartyPatientForeignKeys(secretForeignKeys.hcpartyId!, _.uniq(secretForeignKeys.extractedKeys).join(','))\n      )\n      .then((forms) => this.decrypt(hcpartyId, forms))\n      .then(function (decryptedForms) {\n        return decryptedForms\n      })\n  }\n\n  decrypt(hcpartyId: string, forms: Array<models.Form>) {\n    return Promise.all(\n      forms.map((form) =>\n        this.crypto\n          .extractKeysFromDelegationsForHcpHierarchy(hcpartyId, form.id!, _.size(form.encryptionKeys) ? form.encryptionKeys! : form.delegations!)\n          .then(({ extractedKeys: sfks }) => {\n            if (form.encryptedSelf) {\n              return this.crypto.AES.importKey('raw', hex2ua(sfks[0].replace(/-/g, '')))\n                .then(\n                  (key) =>\n                    new Promise((resolve: (value: any) => any) => {\n                      this.crypto.AES.decrypt(key, string2ua(a2b(form.encryptedSelf!))).then(resolve, () => {\n                        console.log('Cannot decrypt form', form.id)\n                        resolve(null)\n                      })\n                    })\n                )\n                .then((decrypted: ArrayBuffer) => {\n                  if (decrypted) {\n                    form = _.extend(form, JSON.parse(ua2string(decrypted)))\n                  }\n                  return form\n                })\n            } else {\n              return Promise.resolve(form)\n            }\n          })\n          .catch(function (e) {\n            console.log(e)\n          })\n      )\n    ).catch(function (e) {\n      console.log(e)\n    })\n  }\n}\n"]}
+{"version":3,"file":"icc-form-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-form-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccFormApi } from '../icc-api'\nimport { IccCryptoXApi } from './icc-crypto-x-api'\n\nimport * as _ from 'lodash'\nimport * as models from '../icc-api/model/models'\n\nimport { IccDataOwnerXApi } from './icc-data-owner-x-api'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\nimport { ShareMetadataBehaviour } from './crypto/ShareMetadataBehaviour'\n\n// noinspection JSUnusedGlobalSymbols\nexport class IccFormXApi extends IccFormApi {\n  crypto: IccCryptoXApi\n  dataOwnerApi: IccDataOwnerXApi\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    crypto: IccCryptoXApi,\n    dataOwnerApi: IccDataOwnerXApi,\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !== 'undefined'\n      ? window.fetch\n      : typeof self !== 'undefined'\n      ? self.fetch\n      : fetch\n  ) {\n    super(host, headers, authenticationProvider, fetchImpl)\n    this.crypto = crypto\n    this.dataOwnerApi = dataOwnerApi\n  }\n\n  /**\n   * Creates a new instance of form with initialised encryption metadata (not in the database).\n   * @param user the current user.\n   * @param patient the patient this form refers to.\n   * @param c initialised data for the form. Metadata such as id, creation data, etc. will be automatically initialised, but you can specify\n   * other kinds of data or overwrite generated metadata with this. You can't specify encryption metadata.\n   * @param options optional parameters:\n   * - additionalDelegates: delegates which will have access to the entity in addition to the current data owner and delegates from the\n   * 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\n   * auto-delegations, in such case the access level specified here will be used. Currently only WRITE access is supported, but in future also read\n   * access will be possible.\n   * - preferredSfk: secret id of the patient to use as the secret foreign key to use for the classification. The default value will be a\n   * secret id of patient known by the topmost parent in the current data owner hierarchy.\n   * @return a new instance of form.\n   */\n  async newInstance(\n    user: models.User,\n    patient: models.Patient,\n    c: any = {},\n    options: {\n      additionalDelegates?: { [dataOwnerId: string]: 'WRITE' }\n      preferredSfk?: string\n    } = {}\n  ) {\n    const form = _.extend(\n      {\n        id: this.crypto.randomUuid(),\n        _type: 'org.taktik.icure.entities.Form',\n        created: new Date().getTime(),\n        modified: new Date().getTime(),\n        responsible: this.dataOwnerApi.getDataOwnerIdOf(user),\n        author: user.id,\n        codes: [],\n        tags: [],\n      },\n      c || {}\n    )\n\n    const ownerId = this.dataOwnerApi.getDataOwnerIdOf(user)\n    if (ownerId !== (await this.dataOwnerApi.getCurrentDataOwnerId())) throw new Error('Can only initialise entities as current data owner.')\n    const sfk = options.preferredSfk ?? (await this.crypto.confidential.getAnySecretIdSharedWithParents(patient))\n    if (!sfk) throw new Error(`Couldn't find any sfk of parent patient ${patient.id}`)\n    const extraDelegations = [\n      ...Object.keys(options.additionalDelegates ?? {}),\n      ...(user.autoDelegations?.all ?? []),\n      ...(user.autoDelegations?.medicalInformation ?? []),\n    ]\n    return new models.Form(\n      await this.crypto.entities.entityWithInitialisedEncryptedMetadata(form, patient.id, sfk, true, extraDelegations).then((x) => x.updatedEntity)\n    )\n  }\n\n  // noinspection JSUnusedGlobalSymbols\n  /**\n   * 1. Check whether there is a delegation with 'hcpartyId' or not.\n   * 2. 'fetchHcParty[hcpartyId][1]': is encrypted AES exchange key by RSA public key of him.\n   * 3. Obtain the AES exchange key, by decrypting the previous step value with hcparty private key\n   *      3.1.  KeyPair should be fetch from cache (in jwk)\n   *      3.2.  if it doesn't exist in the cache, it has to be loaded from Browser Local store, and then import it to WebCrypto\n   * 4. Obtain the array of delegations which are delegated to his ID (hcpartyId) in this patient\n   * 5. Decrypt and collect all keys (secretForeignKeys) within delegations of previous step (with obtained AES key of step 4)\n   * 6. Do the REST call to get all contacts with (allSecretForeignKeysDelimitedByComa, hcpartyId)\n   *\n   * After these painful steps, you have the contacts of the patient.\n   *\n   * @param hcpartyId\n   * @param patient\n   * @param usingPost (Promise)\n   */\n  async findBy(hcpartyId: string, patient: models.Patient, usingPost: boolean = false) {\n    const extractedKeys = await this.crypto.entities.secretIdsOf(patient, hcpartyId)\n    const topmostParentId = (await this.dataOwnerApi.getCurrentDataOwnerHierarchyIds())[0]\n    let forms: Array<models.Form> = usingPost\n      ? await this.findFormsByHCPartyPatientForeignKeysUsingPost(topmostParentId, undefined, undefined, undefined, _.uniq(extractedKeys))\n      : await this.findFormsByHCPartyPatientForeignKeys(topmostParentId, _.uniq(extractedKeys).join(','))\n    return await this.decrypt(hcpartyId, forms)\n  }\n\n  decrypt(hcpartyId: string, forms: Array<models.Form>) {\n    return Promise.all(\n      forms.map((form) => this.crypto.entities.decryptEntity(form, hcpartyId, (x) => new models.Form(x)).then(({ entity }) => entity))\n    )\n  }\n\n  /**\n   * @param form a form\n   * @return the id of the patient that the form refers to, retrieved from the encrypted metadata. Normally there should only be one element\n   * in the returned array, but in case of entity merges there could be multiple values.\n   */\n  async decryptPatientIdOf(form: models.Form): Promise<string[]> {\n    return this.crypto.entities.owningEntityIdsOf(form, undefined)\n  }\n\n  /**\n   * Share an existing form with other data owners, allowing them to access the non-encrypted data of the form and optionally also\n   * the encrypted content.\n   * @param delegateId the id of the data owner which will be granted access to the form.\n   * @param form the form to share.\n   * @param options optional parameters to customize the sharing behaviour:\n   * - shareEncryptionKey: specifies if the encryption key of the access log should be shared with the delegate, giving access to all encrypted\n   * content of the entity, excluding other encrypted metadata (defaults to {@link ShareMetadataBehaviour.IF_AVAILABLE}). Note that by default a\n   * form does not have encrypted content.\n   * - sharePatientId: specifies if the id of the patient that this form refers to should be shared with the delegate (defaults to\n   * {@link ShareMetadataBehaviour.IF_AVAILABLE}).\n   * @return a promise which will contain the updated form.\n   */\n  async shareWith(\n    delegateId: string,\n    form: models.Form,\n    options: {\n      shareEncryptionKey?: ShareMetadataBehaviour // Defaults to ShareMetadataBehaviour.IF_AVAILABLE\n      sharePatientId?: ShareMetadataBehaviour // Defaults to ShareMetadataBehaviour.IF_AVAILABLE\n    } = {}\n  ): Promise<models.Form> {\n    return await this.modifyForm(\n      await this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(\n        form,\n        delegateId,\n        undefined,\n        options.shareEncryptionKey,\n        options.sharePatientId\n      )\n    )\n  }\n}\n"]}

package/icc-x-api/icc-hcparty-x-api.d.ts

@@ -24,7 +24,7 @@ export declare class IccHcpartyXApi extends IccHcpartyApi {
     getHealthcareParty(healthcarePartyId: string, bypassCache?: boolean): Promise<HealthcareParty | any>;
     getHealthcarePartyHierarchyIds(healthcarePartyId: string, bypassCache?: boolean): Promise<string[]>;
     getHealthcareParties(healthcarePartyIds: string): Promise<Array<HealthcareParty> | any>;
-    getCurrentHealthcareParty(): Promise<HealthcareParty | any>;
+    getCurrentHealthcareParty(): Promise<HealthcareParty>;
     getHcPartyKeysForDelegate(healthcarePartyId: string, bypassCache?: boolean): Promise<{
         [key: string]: string;
     }>;

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

@@ -110,7 +110,7 @@ class IccHcpartyXApi extends icc_api_1.IccHcpartyApi {
     isValidCbe(cbe) {
         cbe = cbe.replace(new RegExp('[^(0-9)]', 'g'), '');
         cbe = cbe.length == 9 ? '0' + cbe : cbe;
-        return 97 - (Number(cbe.substr(0, 8)) % 97) === Number(cbe.substr(8, 2));
+        return 97 - (Number(cbe.substring(0, 8)) % 97) === Number(cbe.substring(8, 2));
     }
 }
 exports.IccHcpartyXApi = IccHcpartyXApi;

package/icc-x-api/icc-hcparty-x-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"icc-hcparty-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-hcparty-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccHcpartyApi } from '../icc-api'\nimport { HealthcareParty } from '../icc-api/model/HealthcareParty'\nimport * as models from '../icc-api/model/models'\nimport { findName, garnishPersonWithName, hasName } from './utils/person-util'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\n\n// noinspection JSUnusedGlobalSymbols\nexport class IccHcpartyXApi extends IccHcpartyApi {\n  hcPartyKeysCache: { [key: string]: { [key: string]: string } } = {}\n  hcPartyCache: { [key: string]: [number, Promise<HealthcareParty>] } = {}\n\n  private CACHE_RETENTION_IN_MS = 300_000\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !== 'undefined'\n      ? window.fetch\n      : typeof self !== 'undefined'\n      ? self.fetch\n      : fetch\n  ) {\n    super(host, headers, authenticationProvider, fetchImpl)\n  }\n\n  private getHcPartyFromCache(key: string) {\n    const hcpInCache = this.hcPartyCache[key]\n    const now = Date.now()\n    if (hcpInCache && hcpInCache[0] > now) {\n      return hcpInCache[1]\n    }\n    if (!hcpInCache) {\n      console.log(`Cache miss for key ${key} because not in cache`)\n    } else {\n      console.log(`Cache miss for key ${key} because ${hcpInCache[0]} > ${now}`)\n    }\n    return null\n  }\n\n  completeNames(hcParty?: models.HealthcareParty): models.HealthcareParty | undefined {\n    if (!hcParty) {\n      return hcParty\n    }\n\n    let finalHcParty = hcParty\n\n    if ((!!finalHcParty.lastName || !!finalHcParty.name) && !hasName(finalHcParty, models.PersonName.UseEnum.Official)) {\n      finalHcParty = garnishPersonWithName(\n        finalHcParty,\n        models.PersonName.UseEnum.Official,\n        finalHcParty.lastName,\n        finalHcParty.firstName,\n        finalHcParty.name\n      )\n    }\n\n    if ((!finalHcParty.lastName || !finalHcParty.name) && !!hasName(finalHcParty, models.PersonName.UseEnum.Official)) {\n      let officialName = findName(finalHcParty, models.PersonName.UseEnum.Official)\n      finalHcParty = {\n        ...finalHcParty,\n        lastName: officialName!.lastName,\n        firstName: officialName!.firstNames ? officialName!.firstNames[0] : undefined,\n        name: officialName!.text,\n      }\n    }\n\n    return finalHcParty\n  }\n\n  putHcPartyInCache(key: string, value: Promise<HealthcareParty> | null = null): Promise<HealthcareParty> {\n    const hcp =\n      value ||\n      super.getHealthcareParty(key).catch((e) => {\n        console.log(`Evict key ${key} because of error`)\n        delete this.hcPartyCache[key]\n        throw e\n      })\n    this.hcPartyCache[key] = [Date.now() + this.CACHE_RETENTION_IN_MS, hcp]\n    return hcp\n  }\n\n  createHealthcareParty(body?: HealthcareParty): Promise<HealthcareParty> {\n    return super.createHealthcareParty(this.completeNames(body))\n  }\n\n  createHealthcarePartyInGroup(groupId: string, body?: HealthcareParty): Promise<HealthcareParty> {\n    return super.createHealthcarePartyInGroup(groupId, this.completeNames(body))\n  }\n\n  modifyHealthcareParty(body?: HealthcareParty): Promise<HealthcareParty | any> {\n    if (body && body.id) {\n      console.log(`Evict key ${body.id} because of modification`)\n      delete this.hcPartyCache[body.id]\n    }\n\n    return super.modifyHealthcareParty(this.completeNames(body)).then((hcp) => this.putHcPartyInCache(hcp.id!, Promise.resolve(hcp)))\n  }\n\n  getHealthcareParty(healthcarePartyId: string, bypassCache = false): Promise<HealthcareParty | any> {\n    const fromCache = bypassCache ? undefined : this.getHcPartyFromCache(healthcarePartyId)\n    return fromCache || this.putHcPartyInCache(healthcarePartyId)\n  }\n\n  getHealthcarePartyHierarchyIds(healthcarePartyId: string, bypassCache = false): Promise<string[]> {\n    const fromCache = bypassCache ? undefined : this.getHcPartyFromCache(healthcarePartyId)\n    return (fromCache || this.putHcPartyInCache(healthcarePartyId)).then(async (hcp: HealthcareParty) => {\n      return hcp ? (hcp.parentId ? (await this.getHealthcarePartyHierarchyIds(hcp.parentId!, bypassCache)).concat([hcp.id!]) : [hcp.id!]) : []\n    })\n  }\n\n  getHealthcareParties(healthcarePartyIds: string): Promise<Array<HealthcareParty> | any> {\n    const ids = healthcarePartyIds.split(',').filter((x) => !!x)\n    const cached: Array<[string, Promise<HealthcareParty> | null]> = ids.map((id) => [id, this.getHcPartyFromCache(id)])\n    const toFetch = cached.filter((x) => !x[1]).map((x) => x[0])\n\n    if (!toFetch.length) {\n      return Promise.all(cached.map((x) => x[1]!))\n    }\n\n    const prom: Promise<HealthcareParty[]> = super.getHealthcareParties(toFetch.join(','))\n    return Promise.all(\n      cached.map(\n        (x) =>\n          x[1] ||\n          this.putHcPartyInCache(\n            x[0],\n            prom.then((hcps) => hcps.find((h) => h.id === x[0])!)\n          )\n      )\n    )\n  }\n\n  getCurrentHealthcareParty(): Promise<HealthcareParty | any> {\n    return super.getCurrentHealthcareParty().then((hcp) => this.putHcPartyInCache(hcp.id!, Promise.resolve(hcp)))\n  }\n\n  getHcPartyKeysForDelegate(healthcarePartyId: string, bypassCache = false): Promise<{ [key: string]: string }> {\n    const cached = bypassCache ? null : this.hcPartyKeysCache[healthcarePartyId]\n    return cached\n      ? Promise.resolve(cached)\n      : super.getHcPartyKeysForDelegate(healthcarePartyId).then((r) => (this.hcPartyKeysCache[healthcarePartyId] = r))\n  }\n\n  isValidCbe(cbe: string) {\n    cbe = cbe.replace(new RegExp('[^(0-9)]', 'g'), '')\n    cbe = cbe.length == 9 ? '0' + cbe : cbe\n\n    return 97 - (Number(cbe.substr(0, 8)) % 97) === Number(cbe.substr(8, 2))\n  }\n}\n"]}
+{"version":3,"file":"icc-hcparty-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-hcparty-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccHcpartyApi } from '../icc-api'\nimport { HealthcareParty } from '../icc-api/model/HealthcareParty'\nimport * as models from '../icc-api/model/models'\nimport { findName, garnishPersonWithName, hasName } from './utils/person-util'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\n\n// noinspection JSUnusedGlobalSymbols\nexport class IccHcpartyXApi extends IccHcpartyApi {\n  hcPartyKeysCache: { [key: string]: { [key: string]: string } } = {}\n  hcPartyCache: { [key: string]: [number, Promise<HealthcareParty>] } = {}\n\n  private CACHE_RETENTION_IN_MS = 300_000\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !== 'undefined'\n      ? window.fetch\n      : typeof self !== 'undefined'\n      ? self.fetch\n      : fetch\n  ) {\n    super(host, headers, authenticationProvider, fetchImpl)\n  }\n\n  private getHcPartyFromCache(key: string) {\n    const hcpInCache = this.hcPartyCache[key]\n    const now = Date.now()\n    if (hcpInCache && hcpInCache[0] > now) {\n      return hcpInCache[1]\n    }\n    if (!hcpInCache) {\n      console.log(`Cache miss for key ${key} because not in cache`)\n    } else {\n      console.log(`Cache miss for key ${key} because ${hcpInCache[0]} > ${now}`)\n    }\n    return null\n  }\n\n  completeNames(hcParty?: models.HealthcareParty): models.HealthcareParty | undefined {\n    if (!hcParty) {\n      return hcParty\n    }\n\n    let finalHcParty = hcParty\n\n    if ((!!finalHcParty.lastName || !!finalHcParty.name) && !hasName(finalHcParty, models.PersonName.UseEnum.Official)) {\n      finalHcParty = garnishPersonWithName(\n        finalHcParty,\n        models.PersonName.UseEnum.Official,\n        finalHcParty.lastName,\n        finalHcParty.firstName,\n        finalHcParty.name\n      )\n    }\n\n    if ((!finalHcParty.lastName || !finalHcParty.name) && !!hasName(finalHcParty, models.PersonName.UseEnum.Official)) {\n      let officialName = findName(finalHcParty, models.PersonName.UseEnum.Official)\n      finalHcParty = {\n        ...finalHcParty,\n        lastName: officialName!.lastName,\n        firstName: officialName!.firstNames ? officialName!.firstNames[0] : undefined,\n        name: officialName!.text,\n      }\n    }\n\n    return finalHcParty\n  }\n\n  putHcPartyInCache(key: string, value: Promise<HealthcareParty> | null = null): Promise<HealthcareParty> {\n    const hcp =\n      value ||\n      super.getHealthcareParty(key).catch((e) => {\n        console.log(`Evict key ${key} because of error`)\n        delete this.hcPartyCache[key]\n        throw e\n      })\n    this.hcPartyCache[key] = [Date.now() + this.CACHE_RETENTION_IN_MS, hcp]\n    return hcp\n  }\n\n  createHealthcareParty(body?: HealthcareParty): Promise<HealthcareParty> {\n    return super.createHealthcareParty(this.completeNames(body))\n  }\n\n  createHealthcarePartyInGroup(groupId: string, body?: HealthcareParty): Promise<HealthcareParty> {\n    return super.createHealthcarePartyInGroup(groupId, this.completeNames(body))\n  }\n\n  modifyHealthcareParty(body?: HealthcareParty): Promise<HealthcareParty | any> {\n    if (body && body.id) {\n      console.log(`Evict key ${body.id} because of modification`)\n      delete this.hcPartyCache[body.id]\n    }\n\n    return super.modifyHealthcareParty(this.completeNames(body)).then((hcp) => this.putHcPartyInCache(hcp.id!, Promise.resolve(hcp)))\n  }\n\n  getHealthcareParty(healthcarePartyId: string, bypassCache = false): Promise<HealthcareParty | any> {\n    const fromCache = bypassCache ? undefined : this.getHcPartyFromCache(healthcarePartyId)\n    return fromCache || this.putHcPartyInCache(healthcarePartyId)\n  }\n\n  getHealthcarePartyHierarchyIds(healthcarePartyId: string, bypassCache = false): Promise<string[]> {\n    const fromCache = bypassCache ? undefined : this.getHcPartyFromCache(healthcarePartyId)\n    return (fromCache || this.putHcPartyInCache(healthcarePartyId)).then(async (hcp: HealthcareParty) => {\n      return hcp ? (hcp.parentId ? (await this.getHealthcarePartyHierarchyIds(hcp.parentId!, bypassCache)).concat([hcp.id!]) : [hcp.id!]) : []\n    })\n  }\n\n  getHealthcareParties(healthcarePartyIds: string): Promise<Array<HealthcareParty> | any> {\n    const ids = healthcarePartyIds.split(',').filter((x) => !!x)\n    const cached: Array<[string, Promise<HealthcareParty> | null]> = ids.map((id) => [id, this.getHcPartyFromCache(id)])\n    const toFetch = cached.filter((x) => !x[1]).map((x) => x[0])\n\n    if (!toFetch.length) {\n      return Promise.all(cached.map((x) => x[1]!))\n    }\n\n    const prom: Promise<HealthcareParty[]> = super.getHealthcareParties(toFetch.join(','))\n    return Promise.all(\n      cached.map(\n        (x) =>\n          x[1] ||\n          this.putHcPartyInCache(\n            x[0],\n            prom.then((hcps) => hcps.find((h) => h.id === x[0])!)\n          )\n      )\n    )\n  }\n\n  getCurrentHealthcareParty(): Promise<HealthcareParty> {\n    return super.getCurrentHealthcareParty().then((hcp) => this.putHcPartyInCache(hcp.id!, Promise.resolve(hcp)))\n  }\n\n  getHcPartyKeysForDelegate(healthcarePartyId: string, bypassCache = false): Promise<{ [key: string]: string }> {\n    const cached = bypassCache ? null : this.hcPartyKeysCache[healthcarePartyId]\n    return cached\n      ? Promise.resolve(cached)\n      : super.getHcPartyKeysForDelegate(healthcarePartyId).then((r) => (this.hcPartyKeysCache[healthcarePartyId] = r))\n  }\n\n  isValidCbe(cbe: string) {\n    cbe = cbe.replace(new RegExp('[^(0-9)]', 'g'), '')\n    cbe = cbe.length == 9 ? '0' + cbe : cbe\n\n    return 97 - (Number(cbe.substring(0, 8)) % 97) === Number(cbe.substring(8, 2))\n  }\n}\n"]}

package/icc-x-api/icc-helement-x-api.d.ts

@@ -4,6 +4,7 @@ import * as models from '../icc-api/model/models';
 import { FilterChainHealthElement, HealthElement, PaginatedListHealthElement } from '../icc-api/model/models';
 import { IccDataOwnerXApi } from './icc-data-owner-x-api';
 import { AuthenticationProvider } from './auth/AuthenticationProvider';
+import { ShareMetadataBehaviour } from './crypto/ShareMetadataBehaviour';
 export declare class IccHelementXApi extends IccHelementApi {
     crypto: IccCryptoXApi;
     dataOwnerApi: IccDataOwnerXApi;
@@ -11,8 +12,30 @@ export declare class IccHelementXApi extends IccHelementApi {
     constructor(host: string, headers: {
         [key: string]: string;
     }, crypto: IccCryptoXApi, dataOwnerApi: IccDataOwnerXApi, encryptedKeys?: Array<string>, authenticationProvider?: AuthenticationProvider, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>);
-    newInstance(user: models.User, patient: models.Patient, h: any, confidential?: boolean, delegates?: string[]): Promise<models.HealthElement>;
-    initDelegationsAndEncryptionKeys(healthElement: models.HealthElement, patient: models.Patient, user: models.User, confidential: boolean, delegates?: string[]): Promise<models.HealthElement>;
+    /**
+     * Creates a new instance of health element with initialised encryption metadata (not in the database).
+     * @param user the current user.
+     * @param patient the patient this health element refers to.
+     * @param h initialised data for the health element. 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 health element.
+     */
+    newInstance(user: models.User, patient: models.Patient, h: any, options?: {
+        additionalDelegates?: {
+            [dataOwnerId: string]: 'WRITE';
+        };
+        preferredSfk?: string;
+        confidential?: boolean;
+    }): Promise<models.HealthElement>;
     createHealthElement(body?: models.HealthElement): never;
     createHealthElementWithUser(user: models.User, body?: models.HealthElement): Promise<models.HealthElement | any>;
     createHealthElements(body?: Array<HealthElement>): never;
@@ -29,6 +52,7 @@ export declare class IccHelementXApi extends IccHelementApi {
     findHealthElementsByHCPartyAndPatientWithUser(user: models.User, hcPartyId: string, patient: models.Patient, usingPost?: boolean): Promise<models.HealthElement[]>;
     modifyHealthElement(body?: HealthElement): never;
     modifyHealthElementWithUser(user: models.User, body?: HealthElement): Promise<HealthElement | any>;
+    private modifyAs;
     modifyHealthElements(body?: Array<HealthElement>): never;
     modifyHealthElementsWithUser(user: models.User, bodies?: HealthElement[]): Promise<HealthElement[] | any>;
     /**
@@ -52,11 +76,34 @@ export declare class IccHelementXApi extends IccHelementApi {
     findByHCPartyPatientSecretFKeys(hcPartyId: string, secretFKeys: string): Promise<Array<models.Contact> | any>;
     findByHCPartyPatientSecretFKeysArray(hcPartyId: string, secretFKeys: string[]): Promise<Array<models.Contact> | any>;
     encrypt(user: models.User, healthElements: Array<models.HealthElement>): Promise<Array<models.HealthElement>>;
-    initEncryptionKeys(user: models.User, he: models.HealthElement): Promise<models.HealthElement>;
+    private encryptAs;
     decryptWithUser(user: models.User, hes: Array<models.HealthElement>): Promise<Array<models.HealthElement>>;
     decrypt(dataOwnerId: string, hes: Array<models.HealthElement>): Promise<Array<models.HealthElement>>;
     filterHealthElementsBy(startDocumentId?: string, limit?: number, body?: FilterChainHealthElement): never;
     filterByWithUser(user: models.User, startDocumentId?: string, limit?: number, body?: FilterChainHealthElement): Promise<PaginatedListHealthElement>;
     serviceToHealthElement(user: models.User, patient: models.Patient, heSvc: models.Service, descr: string): Promise<never>;
     stringToCode(code: string): models.Code;
+    /**
+     * @param healthElement a health element
+     * @return the id of the patient that the health element 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(healthElement: models.HealthElement): Promise<string[]>;
+    /**
+     * Share an existing health element with other data owners, allowing them to access the non-encrypted data of the health element and optionally also
+     * 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 health element.
+     * @param healthElement the health element 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
+     * health element does not have encrypted content.
+     * - sharePatientId: specifies if the id of the patient that this health element refers to should be shared with the delegate (defaults to
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated health element.
+     */
+    shareWith(delegateId: string, healthElement: models.HealthElement, options?: {
+        shareEncryptionKey?: ShareMetadataBehaviour;
+        sharePatientId?: ShareMetadataBehaviour;
+    }): Promise<models.HealthElement>;
 }