@icure/api 7.0.0-beta.1 → 7.0.0-beta.3

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

@@ -102,7 +102,33 @@ class IccMessageXApi extends icc_api_1.IccMessageApi {
      */
     shareWith(delegateId, message, shareSecretIds, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.modifyMessage(yield this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(message, delegateId, shareSecretIds, options.shareEncryptionKey, options.sharePatientId));
+            return this.shareWithMany(message, { [delegateId]: Object.assign({ shareSecretIds }, options) });
+        });
+    }
+    /**
+     * Share an existing message with other data owners, allowing them to access the non-encrypted data of the message and optionally also
+     * the encrypted content.
+     * @param message the message to share.
+     * @param delegates sharing options for each delegate.
+     * - 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
+     * message does not have encrypted content.
+     * - sharePatientId: specifies if the id of the patient that this message refers to should be shared with the delegate (defaults to
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * - shareSecretIds the secret ids of the Message that the delegate will be given access to. Allows the delegate to search for data where the
+     * shared Message is the owning entity id.
+     * @return a promise which will contain the updated message
+     */
+    shareWithMany(message, delegates = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.modifyMessage(yield this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(message, false, Object.fromEntries(Object.entries(delegates).map(([delegateId, options]) => [
+                delegateId,
+                {
+                    shareSecretIds: options.shareSecretIds,
+                    shareEncryptionKey: options.shareEncryptionKey,
+                    shareOwningEntityIds: options.sharePatientId,
+                },
+            ]))));
         });
     }
     /**
@@ -113,6 +139,16 @@ class IccMessageXApi extends icc_api_1.IccMessageApi {
     decryptSecretIdsOf(message) {
         return this.crypto.entities.secretIdsOf(message, undefined);
     }
+    getDataOwnersWithAccessTo(entity) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.crypto.entities.getDataOwnersWithAccessTo(entity);
+        });
+    }
+    getEncryptionKeysOf(entity) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.crypto.entities.encryptionKeysOf(entity);
+        });
+    }
 }
 exports.IccMessageXApi = IccMessageXApi;
 //# sourceMappingURL=icc-message-x-api.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"icc-message-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-message-x-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAG1C,4BAA2B;AAI3B,0EAAgG;AAChG,kDAAiD;AAGjD,MAAa,cAAe,SAAQ,uBAAa;IAG/C,YACE,IAAY,EACZ,OAAkC,EAC1B,MAAqB,EAC7B,YAA8B,EAC9B,yBAAiD,IAAI,iDAAwB,EAAE,EAC/E,YAA2E,OAAO,MAAM,KAAK,WAAW;QACtG,CAAC,CAAC,MAAM,CAAC,KAAK;QACd,CAAC,CAAC,OAAO,IAAI,KAAK,WAAW;YAC7B,CAAC,CAAC,IAAI,CAAC,KAAK;YACZ,CAAC,CAAC,KAAK;QAET,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAT/C,WAAM,GAAN,MAAM,CAAe;QAU7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IAClC,CAAC;IAED,qCAAqC;IACrC,WAAW,CAAC,IAAU,EAAE,CAAM;QAC5B,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnD,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACG,sBAAsB,CAC1B,IAAU,EACV,OAAuB,EACvB,IAAS,EAAE,EACX,UAGI,EAAE;;;YAEN,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,YAAY;gBAAE,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAA;YAChI,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CACtB;gBACE,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE;gBACvC,KAAK,EAAE,mCAAmC;gBAC1C,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;gBAC7B,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;gBAC9B,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACrD,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,EAAE;aACT,EACD,CAAC,IAAI,EAAE,CACR,CAAA;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACxD,IAAI,OAAO,KAAK,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;YACzI,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACpI,IAAI,OAAO,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;YAC7F,MAAM,gBAAgB,GAAG;gBACvB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,mCAAI,EAAE,CAAC;gBAClD,GAAG,CAAC,MAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,GAAG,mCAAI,EAAE,CAAC;gBACpC,GAAG,CAAC,MAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,kBAAkB,mCAAI,EAAE,CAAC;aACpD,CAAA;YACD,OAAO,IAAI,MAAM,CAAC,OAAO,CACvB,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ;iBACvB,sCAAsC,CAAC,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,gBAAgB,CAAC;iBACzF,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAChC,CAAA;;KACF;IAED;;;;OAIG;IACG,kBAAkB,CAAC,OAAuB;;YAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACnE,CAAC;KAAA;IAED;;;;;;;;;;;;;;OAcG;IACG,SAAS,CACb,UAAkB,EAClB,OAAuB,EACvB,cAAwB,EACxB,UAGI,EAAE;;YAEN,OAAO,MAAM,IAAI,CAAC,aAAa,CAC7B,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,uCAAuC,CAChE,OAAO,EACP,UAAU,EACV,cAAc,EACd,OAAO,CAAC,kBAAkB,EAC1B,OAAO,CAAC,cAAc,CACvB,CACF,CAAA;QACH,CAAC;KAAA;IAED;;;;OAIG;IACH,kBAAkB,CAAC,OAAuB;QACxC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IAC7D,CAAC;CACF;AApID,wCAoIC","sourcesContent":["import { IccMessageApi } from '../icc-api'\nimport { IccCryptoXApi } from './icc-crypto-x-api'\n\nimport * as _ from 'lodash'\n\nimport { Patient, User } from '../icc-api/model/models'\nimport { IccDataOwnerXApi } from './icc-data-owner-x-api'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\nimport * as models from '../icc-api/model/models'\nimport { ShareMetadataBehaviour } from './crypto/ShareMetadataBehaviour'\n\nexport class IccMessageXApi extends IccMessageApi {\n  dataOwnerApi: IccDataOwnerXApi\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    private 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: User, m: any) {\n    return this.newInstanceWithPatient(user, null, m)\n  }\n\n  /**\n   * Creates a new instance of message with initialised encryption metadata (not in the database).\n   * @param user the current user.\n   * @param patient the patient this message refers to.\n   * @param m initialised data for the message. 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 message.\n   */\n  async newInstanceWithPatient(\n    user: User,\n    patient: Patient | null,\n    m: any = {},\n    options: {\n      additionalDelegates?: { [dataOwnerId: string]: 'WRITE' }\n      preferredSfk?: string\n    } = {}\n  ) {\n    if (!patient && options.preferredSfk) throw new Error('You need to specify parent patient in order to use secret foreign keys.')\n    const message = _.extend(\n      {\n        id: this.crypto.primitives.randomUuid(),\n        _type: 'org.taktik.icure.entities.Message',\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      m || {}\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 = patient ? options?.preferredSfk ?? (await this.crypto.confidential.getAnySecretIdSharedWithParents(patient)) : undefined\n    if (patient && !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.Message(\n      await this.crypto.entities\n        .entityWithInitialisedEncryptedMetadata(message, patient?.id, sfk, true, extraDelegations)\n        .then((x) => x.updatedEntity)\n    )\n  }\n\n  /**\n   * @param message a message\n   * @return the id of the patient that the message 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(message: models.Message): Promise<string[]> {\n    return this.crypto.entities.owningEntityIdsOf(message, undefined)\n  }\n\n  /**\n   * Share an existing message with other data owners, allowing them to access the non-encrypted data of the message and optionally also\n   * the encrypted content.\n   * @param delegateId the id of the data owner which will be granted access to the message.\n   * @param message the message to share.\n   * @param shareSecretIds the secret ids of the Message that the delegate will be given access to. Allows the delegate to search for data where the\n   * shared Message is the owning entity id.\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   * message does not have encrypted content.\n   * - sharePatientId: specifies if the id of the patient that this message refers to should be shared with the delegate (defaults to\n   * {@link ShareMetadataBehaviour.IF_AVAILABLE}).\n   * @return a promise which will contain the updated message\n   */\n  async shareWith(\n    delegateId: string,\n    message: models.Message,\n    shareSecretIds: string[],\n    options: {\n      shareEncryptionKey?: ShareMetadataBehaviour // Defaults to ShareMetadataBehaviour.IF_AVAILABLE\n      sharePatientId?: ShareMetadataBehaviour // Defaults to ShareMetadataBehaviour.IF_AVAILABLE\n    } = {}\n  ): Promise<models.Message> {\n    return await this.modifyMessage(\n      await this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(\n        message,\n        delegateId,\n        shareSecretIds,\n        options.shareEncryptionKey,\n        options.sharePatientId\n      )\n    )\n  }\n\n  /**\n   * @param message a message\n   * @return the secret ids of the message, retrieved from the encrypted metadata. The result may be used to find entities where the message is\n   * the 'owning entity', or in the {@link shareWith} method in order to share it with other data owners.\n   */\n  decryptSecretIdsOf(message: models.Message): Promise<string[]> {\n    return this.crypto.entities.secretIdsOf(message, undefined)\n  }\n}\n"]}
+{"version":3,"file":"icc-message-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-message-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccMessageApi } from '../icc-api'\nimport { IccCryptoXApi } from './icc-crypto-x-api'\n\nimport * as _ from 'lodash'\n\nimport { Patient, User } from '../icc-api/model/models'\nimport { IccDataOwnerXApi } from './icc-data-owner-x-api'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\nimport * as models from '../icc-api/model/models'\nimport { ShareMetadataBehaviour } from './crypto/ShareMetadataBehaviour'\nimport { EncryptedEntityXApi } from './basexapi/EncryptedEntityXApi'\n\nexport class IccMessageXApi extends IccMessageApi implements EncryptedEntityXApi<models.Message> {\n  dataOwnerApi: IccDataOwnerXApi\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    private 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: User, m: any) {\n    return this.newInstanceWithPatient(user, null, m)\n  }\n\n  /**\n   * Creates a new instance of message with initialised encryption metadata (not in the database).\n   * @param user the current user.\n   * @param patient the patient this message refers to.\n   * @param m initialised data for the message. 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 message.\n   */\n  async newInstanceWithPatient(\n    user: User,\n    patient: Patient | null,\n    m: any = {},\n    options: {\n      additionalDelegates?: { [dataOwnerId: string]: 'WRITE' }\n      preferredSfk?: string\n    } = {}\n  ) {\n    if (!patient && options.preferredSfk) throw new Error('You need to specify parent patient in order to use secret foreign keys.')\n    const message = _.extend(\n      {\n        id: this.crypto.primitives.randomUuid(),\n        _type: 'org.taktik.icure.entities.Message',\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      m || {}\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 = patient ? options?.preferredSfk ?? (await this.crypto.confidential.getAnySecretIdSharedWithParents(patient)) : undefined\n    if (patient && !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.Message(\n      await this.crypto.entities\n        .entityWithInitialisedEncryptedMetadata(message, patient?.id, sfk, true, extraDelegations)\n        .then((x) => x.updatedEntity)\n    )\n  }\n\n  /**\n   * @param message a message\n   * @return the id of the patient that the message 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(message: models.Message): Promise<string[]> {\n    return this.crypto.entities.owningEntityIdsOf(message, undefined)\n  }\n\n  /**\n   * Share an existing message with other data owners, allowing them to access the non-encrypted data of the message and optionally also\n   * the encrypted content.\n   * @param delegateId the id of the data owner which will be granted access to the message.\n   * @param message the message to share.\n   * @param shareSecretIds the secret ids of the Message that the delegate will be given access to. Allows the delegate to search for data where the\n   * shared Message is the owning entity id.\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   * message does not have encrypted content.\n   * - sharePatientId: specifies if the id of the patient that this message refers to should be shared with the delegate (defaults to\n   * {@link ShareMetadataBehaviour.IF_AVAILABLE}).\n   * @return a promise which will contain the updated message\n   */\n  async shareWith(\n    delegateId: string,\n    message: models.Message,\n    shareSecretIds: string[],\n    options: {\n      shareEncryptionKey?: ShareMetadataBehaviour // Defaults to ShareMetadataBehaviour.IF_AVAILABLE\n      sharePatientId?: ShareMetadataBehaviour // Defaults to ShareMetadataBehaviour.IF_AVAILABLE\n    } = {}\n  ): Promise<models.Message> {\n    return this.shareWithMany(message, { [delegateId]: { shareSecretIds, ...options } })\n  }\n\n  /**\n   * Share an existing message with other data owners, allowing them to access the non-encrypted data of the message and optionally also\n   * the encrypted content.\n   * @param message the message to share.\n   * @param delegates sharing options for each delegate.\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   * message does not have encrypted content.\n   * - sharePatientId: specifies if the id of the patient that this message refers to should be shared with the delegate (defaults to\n   * {@link ShareMetadataBehaviour.IF_AVAILABLE}).\n   * - shareSecretIds the secret ids of the Message that the delegate will be given access to. Allows the delegate to search for data where the\n   * shared Message is the owning entity id.\n   * @return a promise which will contain the updated message\n   */\n  async shareWithMany(\n    message: models.Message,\n    delegates: {\n      [delegateId: string]: {\n        shareSecretIds: string[]\n        shareEncryptionKey?: ShareMetadataBehaviour // Defaults to ShareMetadataBehaviour.IF_AVAILABLE\n        sharePatientId?: ShareMetadataBehaviour // Defaults to ShareMetadataBehaviour.IF_AVAILABLE\n      }\n    } = {}\n  ): Promise<models.Message> {\n    return await this.modifyMessage(\n      await this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(\n        message,\n        false,\n        Object.fromEntries(\n          Object.entries(delegates).map(([delegateId, options]) => [\n            delegateId,\n            {\n              shareSecretIds: options.shareSecretIds,\n              shareEncryptionKey: options.shareEncryptionKey,\n              shareOwningEntityIds: options.sharePatientId,\n            },\n          ])\n        )\n      )\n    )\n  }\n\n  /**\n   * @param message a message\n   * @return the secret ids of the message, retrieved from the encrypted metadata. The result may be used to find entities where the message is\n   * the 'owning entity', or in the {@link shareWith} method in order to share it with other data owners.\n   */\n  decryptSecretIdsOf(message: models.Message): Promise<string[]> {\n    return this.crypto.entities.secretIdsOf(message, undefined)\n  }\n\n  async getDataOwnersWithAccessTo(\n    entity: models.Message\n  ): Promise<{ permissionsByDataOwnerId: { [p: string]: 'WRITE' }; hasUnknownAnonymousDataOwners: boolean }> {\n    return await this.crypto.entities.getDataOwnersWithAccessTo(entity)\n  }\n\n  async getEncryptionKeysOf(entity: models.Message): Promise<string[]> {\n    return await this.crypto.entities.encryptionKeysOf(entity)\n  }\n}\n"]}

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

@@ -8,11 +8,13 @@ import { IccDocumentXApi } from './icc-document-x-api';
 import { IccHelementXApi } from './icc-helement-x-api';
 import { IccClassificationXApi } from './icc-classification-x-api';
 import * as models from '../icc-api/model/models';
+import { Patient } from '../icc-api/model/models';
 import { IccCalendarItemXApi } from './icc-calendar-item-x-api';
 import { IccDataOwnerXApi } from './icc-data-owner-x-api';
 import { AuthenticationProvider } from './auth/AuthenticationProvider';
 import { ShareMetadataBehaviour } from './crypto/ShareMetadataBehaviour';
-export declare class IccPatientXApi extends IccPatientApi {
+import { EncryptedEntityXApi } from './basexapi/EncryptedEntityXApi';
+export declare class IccPatientXApi extends IccPatientApi implements EncryptedEntityXApi<models.Patient> {
     crypto: IccCryptoXApi;
     contactApi: IccContactXApi;
     formApi: IccFormXApi;
@@ -138,6 +140,25 @@ export declare class IccPatientXApi extends IccPatientApi {
     shareWith(delegateId: string, patient: models.Patient, shareSecretIds: string[], options?: {
         shareEncryptionKey?: ShareMetadataBehaviour;
     }): Promise<models.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.
+     * @param patient the patient to share.
+     * @param delegates sharing options for each delegate.
+     * - 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.
+     * - 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.
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated patient.
+     */
+    shareWithMany(patient: models.Patient, delegates: {
+        [delegateId: string]: {
+            shareSecretIds: string[];
+            shareEncryptionKey?: ShareMetadataBehaviour;
+        };
+    }): Promise<models.Patient>;
     /**
      * @param patient a patient
      * @return all the decryptable secret ids of the patient, retrieved from the encrypted metadata. The result may be used to find entities where the
@@ -156,4 +177,49 @@ export declare class IccPatientXApi extends IccPatientApi {
      * patient is the 'owning entity', or in the {@link shareWith} method in order to share it with other data owners.
      */
     decryptNonConfidentialSecretIdsOf(patient: models.Patient): Promise<string[]>;
+    getDataOwnersWithAccessTo(entity: models.Patient): Promise<{
+        permissionsByDataOwnerId: {
+            [p: string]: 'WRITE';
+        };
+        hasUnknownAnonymousDataOwners: boolean;
+    }>;
+    getEncryptionKeysOf(entity: models.Patient): Promise<string[]>;
+    /**
+     * Merge two patients into one. This method performs the following operations:
+     * - The `from` patient will be soft-deleted, and it will point to the `into` patient. Only the `deletionDate` and `mergeToPatientId` fields of the
+     *   patient will be changed (automatically by this method). Note that the value of {@link from} is only used to verify that the client is aware of
+     *   the last version of the `from` patient: any changes to its content and/or metadata compared to what is actually stored in the database will be
+     *   ignored.
+     * - The metadata of the `into` patient will be automatically updated to contain also the metadata of the `from` patient and to keep track of the
+     *   merge:
+     *   - the `mergedIds` will be updated to contain the `from` patient id
+     *   - all secret ids of the `from` patient will be added to the `into` patient
+     *   - all data owners (including anonymous data owners) with access to the `from` patient will have the same access to the merged `into` patient
+     *     (unless they already had greater access to the `into` patient, in which case they keep the greater access)
+     * - The content of the `into` patient will be updated to match the content (name, address, note, ...) of the provided {@link mergedInto} parameter.
+     *   Note that since the metadata is automatically updated by this method you must not change the metadata of the `mergedInto` patient
+     *   (`delegations`, mergedInto`, ...): if there is any change between the metadata of the provided `mergedInto` patient and the stored patient this
+     *   method will fail with an error.
+     *
+     * In case the revisions of {@link from} and/or {@link mergedInto} does not match the latest revisions for these patients in the database this
+     * method will fail without soft-deleting the `from` patient and without updating the `into` patient with the merged content and metadata. You will
+     * have to retrieve the updated versions of both patients before retrying the merge.
+     *
+     * Finally, note that this method only merges existing data, and does not perform any automatic sharing of the data. The secret ids and encryption
+     * keys will not be shared with users that had access only to one of the entity, you will have to use the {@link shareWith} method after the merge
+     * if you want to do so.
+     * For example consider hcps A, B with access to P' and hcps A, C with access to P'', and we merge P'' into P'. After the merge:
+     * - A has access to all secret ids of the merged patient and to the encryption key of the merged patient
+     * - B has access to the encryption key of the merged patient (since it is the same as in P'), but only to the secret id which was originally from
+     *   the unmerged P'
+     * - C has no access to the encryption key of the merged patient, and has access only to the secret id which was originally from the unmerged P''
+     *
+     * @param from the original, unmodified `from` patient. Its content will be unchanged and its metadata will be automatically updated by this method
+     * to reflect the merge.
+     * @param mergedInto the `into` patient with updated content result of the merge with the `from` patient, as specified by your application logic.
+     * The metadata of the `mergedInto` patient must not differ from the metadata of the stored version of the patient, since it will be automatically
+     * updated by the method.
+     * @return the updated `into` patient.
+     */
+    mergePatients(from: Patient, mergedInto: Patient): Promise<Patient>;
 }

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

@@ -18,7 +18,6 @@ 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 ShareMetadataBehaviour_1 = require("./crypto/ShareMetadataBehaviour");
 // noinspection JSUnusedGlobalSymbols
 class IccPatientXApi extends icc_api_1.IccPatientApi {
     constructor(host, headers, crypto, contactApi, formApi, helementApi, invoiceApi, documentApi, hcpartyApi, classificationApi, dataOwnerApi, calendarItemaApi, encryptedKeys = ['note'], authenticationProvider = new AuthenticationProvider_1.NoAuthenticationProvider(), fetchImpl = typeof window !== 'undefined'
@@ -188,13 +187,13 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     getPatientWithUser(user, patientId) {
         return super
             .getPatient(patientId)
-            .then((p) => this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), [p], false))
+            .then((p) => this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), [p]))
             .then((pats) => pats[0].entity);
     }
     getPotentiallyEncryptedPatientWithUser(user, patientId) {
         return super
             .getPatient(patientId)
-            .then((p) => this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), [p], false))
+            .then((p) => this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), [p]))
             .then((pats) => ({ patient: pats[0].entity, decrypted: pats[0].decrypted }));
     }
     getPatients(body) {
@@ -296,9 +295,9 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     }
     // If patient can't be decrypted returns patient with encrypted data.
     decrypt(user, patients, fillDelegations = true) {
-        return this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), patients, fillDelegations).then((ps) => ps.map((p) => p.entity));
+        return this.tryDecryptOrReturnOriginal(this.dataOwnerApi.getDataOwnerIdOf(user), patients).then((ps) => ps.map((p) => p.entity));
     }
-    tryDecryptOrReturnOriginal(dataOwnerId, patients, fillDelegations = true) {
+    tryDecryptOrReturnOriginal(dataOwnerId, 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))
@@ -795,9 +794,27 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
      * @return a promise which will contain the updated patient.
      */
     shareWith(delegateId, patient, shareSecretIds, options = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.shareWithMany(patient, { [delegateId]: Object.assign({ shareSecretIds }, options) });
+        });
+    }
+    /**
+     * Share an existing patient with other data owners, allowing them to access the non-encrypted data of the patient and optionally also
+     * the encrypted content.
+     * @param patient the patient to share.
+     * @param delegates sharing options for each delegate.
+     * - 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.
+     * - 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.
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated patient.
+     */
+    shareWithMany(patient, delegates) {
         return __awaiter(this, void 0, void 0, function* () {
             const self = yield this.dataOwnerApi.getCurrentDataOwnerId();
-            return yield this.modifyAs(self, yield this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(patient, delegateId, shareSecretIds, options.shareEncryptionKey, ShareMetadataBehaviour_1.ShareMetadataBehaviour.IF_AVAILABLE));
+            return yield this.modifyAs(self, yield this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(patient, false, delegates));
         });
     }
     /**
@@ -824,6 +841,63 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     decryptNonConfidentialSecretIdsOf(patient) {
         return this.crypto.confidential.getSecretIdsSharedWithParents(patient);
     }
+    getDataOwnersWithAccessTo(entity) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.crypto.entities.getDataOwnersWithAccessTo(entity);
+        });
+    }
+    getEncryptionKeysOf(entity) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.crypto.entities.encryptionKeysOf(entity);
+        });
+    }
+    /**
+     * Merge two patients into one. This method performs the following operations:
+     * - The `from` patient will be soft-deleted, and it will point to the `into` patient. Only the `deletionDate` and `mergeToPatientId` fields of the
+     *   patient will be changed (automatically by this method). Note that the value of {@link from} is only used to verify that the client is aware of
+     *   the last version of the `from` patient: any changes to its content and/or metadata compared to what is actually stored in the database will be
+     *   ignored.
+     * - The metadata of the `into` patient will be automatically updated to contain also the metadata of the `from` patient and to keep track of the
+     *   merge:
+     *   - the `mergedIds` will be updated to contain the `from` patient id
+     *   - all secret ids of the `from` patient will be added to the `into` patient
+     *   - all data owners (including anonymous data owners) with access to the `from` patient will have the same access to the merged `into` patient
+     *     (unless they already had greater access to the `into` patient, in which case they keep the greater access)
+     * - The content of the `into` patient will be updated to match the content (name, address, note, ...) of the provided {@link mergedInto} parameter.
+     *   Note that since the metadata is automatically updated by this method you must not change the metadata of the `mergedInto` patient
+     *   (`delegations`, mergedInto`, ...): if there is any change between the metadata of the provided `mergedInto` patient and the stored patient this
+     *   method will fail with an error.
+     *
+     * In case the revisions of {@link from} and/or {@link mergedInto} does not match the latest revisions for these patients in the database this
+     * method will fail without soft-deleting the `from` patient and without updating the `into` patient with the merged content and metadata. You will
+     * have to retrieve the updated versions of both patients before retrying the merge.
+     *
+     * Finally, note that this method only merges existing data, and does not perform any automatic sharing of the data. The secret ids and encryption
+     * keys will not be shared with users that had access only to one of the entity, you will have to use the {@link shareWith} method after the merge
+     * if you want to do so.
+     * For example consider hcps A, B with access to P' and hcps A, C with access to P'', and we merge P'' into P'. After the merge:
+     * - A has access to all secret ids of the merged patient and to the encryption key of the merged patient
+     * - B has access to the encryption key of the merged patient (since it is the same as in P'), but only to the secret id which was originally from
+     *   the unmerged P'
+     * - C has no access to the encryption key of the merged patient, and has access only to the secret id which was originally from the unmerged P''
+     *
+     * @param from the original, unmodified `from` patient. Its content will be unchanged and its metadata will be automatically updated by this method
+     * to reflect the merge.
+     * @param mergedInto the `into` patient with updated content result of the merge with the `from` patient, as specified by your application logic.
+     * The metadata of the `mergedInto` patient must not differ from the metadata of the stored version of the patient, since it will be automatically
+     * updated by the method.
+     * @return the updated `into` patient.
+     */
+    mergePatients(from, mergedInto) {
+        const _super = Object.create(null, {
+            baseMergePatients: { get: () => super.baseMergePatients }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const encryptedMerged = (yield this.encryptAs(undefined, [mergedInto]))[0];
+            const merged = yield _super.baseMergePatients.call(this, from.id, from.rev, encryptedMerged);
+            return (yield this.tryDecryptOrReturnOriginal(undefined, [merged]))[0].entity;
+        });
+    }
 }
 exports.IccPatientXApi = IccPatientXApi;
 //# sourceMappingURL=icc-patient-x-api.js.map