@icure/api 6.4.0 → 7.0.0-beta.1

package/icc-x-api/filters/ContactByHcPartyTagCodeDateFilter.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContactByHcPartyTagCodeDateFilter = void 0;
+/**
+ * iCure Data Stack API Documentation
+ * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.
+ *
+ * OpenAPI spec version: v1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 const AbstractFilterContact_1 = require("../../icc-api/model/AbstractFilterContact");
 class ContactByHcPartyTagCodeDateFilter extends AbstractFilterContact_1.AbstractFilterContact {
     constructor(json) {

package/icc-x-api/filters/ContactByHcPartyTagCodeDateFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContactByHcPartyTagCodeDateFilter.js","sourceRoot":"","sources":["../../../icc-x-api/filters/ContactByHcPartyTagCodeDateFilter.ts"],"names":[],"mappings":";;;AAaA,qFAAiF;AAEjF,MAAa,iCAAkC,SAAQ,6CAAqB;IAE1E,YAAY,IAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAA;QAFb,UAAK,GAAW,mCAAmC,CAAA;QAIjD,MAAM,CAAC,MAAM,CAAC,IAAyC,EAAE,IAAI,CAAC,CAAA;IAChE,CAAC;CAUF;AAhBD,8EAgBC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\nimport { Filter } from './filters'\nimport { Contact } from '../../icc-api/model/Contact'\nimport { AbstractFilterContact } from '../../icc-api/model/AbstractFilterContact'\n\nexport class ContactByHcPartyTagCodeDateFilter extends AbstractFilterContact {\n  $type: string = 'ContactByHcPartyTagCodeDateFilter'\n  constructor(json: JSON | any) {\n    super(json)\n\n    Object.assign(this as ContactByHcPartyTagCodeDateFilter, json)\n  }\n\n  desc?: string\n  healthcarePartyId?: string\n  tagType?: string\n  tagCode?: string\n  codeType?: string\n  codeCode?: string\n  startOfContactOpeningDate?: number\n  endOfContactOpeningDate?: number\n}\n"]}
+{"version":3,"file":"ContactByHcPartyTagCodeDateFilter.js","sourceRoot":"","sources":["../../../icc-x-api/filters/ContactByHcPartyTagCodeDateFilter.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,qFAAiF;AAEjF,MAAa,iCAAkC,SAAQ,6CAAqB;IAE1E,YAAY,IAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAA;QAFb,UAAK,GAAW,mCAAmC,CAAA;QAIjD,MAAM,CAAC,MAAM,CAAC,IAAyC,EAAE,IAAI,CAAC,CAAA;IAChE,CAAC;CAUF;AAhBD,8EAgBC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\nimport { AbstractFilterContact } from '../../icc-api/model/AbstractFilterContact'\n\nexport class ContactByHcPartyTagCodeDateFilter extends AbstractFilterContact {\n  $type: string = 'ContactByHcPartyTagCodeDateFilter'\n  constructor(json: JSON | any) {\n    super(json)\n\n    Object.assign(this as ContactByHcPartyTagCodeDateFilter, json)\n  }\n\n  desc?: string\n  healthcarePartyId?: string\n  tagType?: string\n  tagCode?: string\n  codeType?: string\n  codeCode?: string\n  startOfContactOpeningDate?: number\n  endOfContactOpeningDate?: number\n}\n"]}

package/icc-x-api/filters/DeviceByHcPartyFilter.d.ts

@@ -1,3 +1,14 @@
+/**
+ * iCure Data Stack API Documentation
+ * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.
+ *
+ * OpenAPI spec version: v1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 import { AbstractFilterDevice } from '../../icc-api/model/AbstractFilterDevice';
 export declare class DeviceByHcPartyFilter extends AbstractFilterDevice {
     $type: string;

package/icc-x-api/filters/DeviceByHcPartyFilter.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceByHcPartyFilter = void 0;
+/**
+ * iCure Data Stack API Documentation
+ * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.
+ *
+ * OpenAPI spec version: v1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 const AbstractFilterDevice_1 = require("../../icc-api/model/AbstractFilterDevice");
 class DeviceByHcPartyFilter extends AbstractFilterDevice_1.AbstractFilterDevice {
     constructor(json) {

package/icc-x-api/filters/DeviceByHcPartyFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceByHcPartyFilter.js","sourceRoot":"","sources":["../../../icc-x-api/filters/DeviceByHcPartyFilter.ts"],"names":[],"mappings":";;;AAaA,mFAA+E;AAE/E,MAAa,qBAAsB,SAAQ,2CAAoB;IAE7D,YAAY,IAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAA;QAFb,UAAK,GAAW,uBAAuB,CAAA;QAIrC,MAAM,CAAC,MAAM,CAAC,IAA6B,EAAE,IAAI,CAAC,CAAA;IACpD,CAAC;CAIF;AAVD,sDAUC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\nimport { Filter } from './filters'\nimport { Device } from '../../icc-api/model/Device'\nimport { AbstractFilterDevice } from '../../icc-api/model/AbstractFilterDevice'\n\nexport class DeviceByHcPartyFilter extends AbstractFilterDevice {\n  $type: string = 'DeviceByHcPartyFilter'\n  constructor(json: JSON | any) {\n    super(json)\n\n    Object.assign(this as DeviceByHcPartyFilter, json)\n  }\n\n  desc?: string\n  responsibleId?: string\n}\n"]}
+{"version":3,"file":"DeviceByHcPartyFilter.js","sourceRoot":"","sources":["../../../icc-x-api/filters/DeviceByHcPartyFilter.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,mFAA+E;AAE/E,MAAa,qBAAsB,SAAQ,2CAAoB;IAE7D,YAAY,IAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAA;QAFb,UAAK,GAAW,uBAAuB,CAAA;QAIrC,MAAM,CAAC,MAAM,CAAC,IAA6B,EAAE,IAAI,CAAC,CAAA;IACpD,CAAC;CAIF;AAVD,sDAUC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\nimport { AbstractFilterDevice } from '../../icc-api/model/AbstractFilterDevice'\n\nexport class DeviceByHcPartyFilter extends AbstractFilterDevice {\n  $type: string = 'DeviceByHcPartyFilter'\n  constructor(json: JSON | any) {\n    super(json)\n\n    Object.assign(this as DeviceByHcPartyFilter, json)\n  }\n\n  desc?: string\n  responsibleId?: string\n}\n"]}

package/icc-x-api/filters/DeviceByIdsFilter.d.ts

@@ -1,3 +1,14 @@
+/**
+ * iCure Data Stack API Documentation
+ * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.
+ *
+ * OpenAPI spec version: v1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 import { AbstractFilterDevice } from '../../icc-api/model/AbstractFilterDevice';
 export declare class DeviceByIdsFilter extends AbstractFilterDevice {
     $type: string;

package/icc-x-api/filters/DeviceByIdsFilter.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceByIdsFilter = void 0;
+/**
+ * iCure Data Stack API Documentation
+ * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.
+ *
+ * OpenAPI spec version: v1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 const AbstractFilterDevice_1 = require("../../icc-api/model/AbstractFilterDevice");
 class DeviceByIdsFilter extends AbstractFilterDevice_1.AbstractFilterDevice {
     constructor(json) {

package/icc-x-api/filters/DeviceByIdsFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceByIdsFilter.js","sourceRoot":"","sources":["../../../icc-x-api/filters/DeviceByIdsFilter.ts"],"names":[],"mappings":";;;AAaA,mFAA+E;AAE/E,MAAa,iBAAkB,SAAQ,2CAAoB;IAEzD,YAAY,IAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAA;QAFb,UAAK,GAAW,mBAAmB,CAAA;QAIjC,MAAM,CAAC,MAAM,CAAC,IAAyB,EAAE,IAAI,CAAC,CAAA;IAChD,CAAC;CAIF;AAVD,8CAUC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\nimport { Filter } from './filters'\nimport { Device } from '../../icc-api/model/Device'\nimport { AbstractFilterDevice } from '../../icc-api/model/AbstractFilterDevice'\n\nexport class DeviceByIdsFilter extends AbstractFilterDevice {\n  $type: string = 'DeviceByIdsFilter'\n  constructor(json: JSON | any) {\n    super(json)\n\n    Object.assign(this as DeviceByIdsFilter, json)\n  }\n\n  ids?: Array<string>\n  desc?: string\n}\n"]}
+{"version":3,"file":"DeviceByIdsFilter.js","sourceRoot":"","sources":["../../../icc-x-api/filters/DeviceByIdsFilter.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,mFAA+E;AAE/E,MAAa,iBAAkB,SAAQ,2CAAoB;IAEzD,YAAY,IAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAA;QAFb,UAAK,GAAW,mBAAmB,CAAA;QAIjC,MAAM,CAAC,MAAM,CAAC,IAAyB,EAAE,IAAI,CAAC,CAAA;IAChD,CAAC;CAIF;AAVD,8CAUC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\nimport { AbstractFilterDevice } from '../../icc-api/model/AbstractFilterDevice'\n\nexport class DeviceByIdsFilter extends AbstractFilterDevice {\n  $type: string = 'DeviceByIdsFilter'\n  constructor(json: JSON | any) {\n    super(json)\n\n    Object.assign(this as DeviceByIdsFilter, json)\n  }\n\n  ids?: Array<string>\n  desc?: string\n}\n"]}

package/icc-x-api/filters/HealthElementByHcPartySecretForeignKeysFilter.d.ts

@@ -1,3 +1,14 @@
+/**
+ * iCure Data Stack API Documentation
+ * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.
+ *
+ * OpenAPI spec version: v1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 import { AbstractFilterHealthElement } from '../../icc-api/model/AbstractFilterHealthElement';
 export declare class HealthElementByHcPartySecretForeignKeysFilter extends AbstractFilterHealthElement {
     $type: string;

package/icc-x-api/filters/HealthElementByHcPartySecretForeignKeysFilter.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HealthElementByHcPartySecretForeignKeysFilter = void 0;
+/**
+ * iCure Data Stack API Documentation
+ * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.
+ *
+ * OpenAPI spec version: v1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 const AbstractFilterHealthElement_1 = require("../../icc-api/model/AbstractFilterHealthElement");
 class HealthElementByHcPartySecretForeignKeysFilter extends AbstractFilterHealthElement_1.AbstractFilterHealthElement {
     constructor(json) {

package/icc-x-api/filters/HealthElementByHcPartySecretForeignKeysFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"HealthElementByHcPartySecretForeignKeysFilter.js","sourceRoot":"","sources":["../../../icc-x-api/filters/HealthElementByHcPartySecretForeignKeysFilter.ts"],"names":[],"mappings":";;;AAaA,iGAA6F;AAE7F,MAAa,6CAA8C,SAAQ,yDAA2B;IAE5F,YAAY,IAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAA;QAFb,UAAK,GAAW,+CAA+C,CAAA;QAI7D,MAAM,CAAC,MAAM,CAAC,IAAqD,EAAE,IAAI,CAAC,CAAA;IAC5E,CAAC;CAKF;AAXD,sGAWC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\nimport { Filter } from './filters'\nimport { HealthElement } from '../../icc-api/model/HealthElement'\nimport { AbstractFilterHealthElement } from '../../icc-api/model/AbstractFilterHealthElement'\n\nexport class HealthElementByHcPartySecretForeignKeysFilter extends AbstractFilterHealthElement {\n  $type: string = 'HealthElementByHcPartySecretForeignKeysFilter'\n  constructor(json: JSON | any) {\n    super(json)\n\n    Object.assign(this as HealthElementByHcPartySecretForeignKeysFilter, json)\n  }\n\n  desc?: string\n  healthcarePartyId?: string\n  patientSecretForeignKeys?: Array<string>\n}\n"]}
+{"version":3,"file":"HealthElementByHcPartySecretForeignKeysFilter.js","sourceRoot":"","sources":["../../../icc-x-api/filters/HealthElementByHcPartySecretForeignKeysFilter.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,iGAA6F;AAE7F,MAAa,6CAA8C,SAAQ,yDAA2B;IAE5F,YAAY,IAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAA;QAFb,UAAK,GAAW,+CAA+C,CAAA;QAI7D,MAAM,CAAC,MAAM,CAAC,IAAqD,EAAE,IAAI,CAAC,CAAA;IAC5E,CAAC;CAKF;AAXD,sGAWC","sourcesContent":["/**\n * iCure Data Stack API Documentation\n * The iCure Data Stack Application API is the native interface to iCure. This version is obsolete, please use v2.\n *\n * OpenAPI spec version: v1\n *\n *\n * NOTE: This class is auto generated by the swagger code generator program.\n * https://github.com/swagger-api/swagger-codegen.git\n * Do not edit the class manually.\n */\nimport { AbstractFilterHealthElement } from '../../icc-api/model/AbstractFilterHealthElement'\n\nexport class HealthElementByHcPartySecretForeignKeysFilter extends AbstractFilterHealthElement {\n  $type: string = 'HealthElementByHcPartySecretForeignKeysFilter'\n  constructor(json: JSON | any) {\n    super(json)\n\n    Object.assign(this as HealthElementByHcPartySecretForeignKeysFilter, json)\n  }\n\n  desc?: string\n  healthcarePartyId?: string\n  patientSecretForeignKeys?: Array<string>\n}\n"]}

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

@@ -4,6 +4,7 @@ import * as models from '../icc-api/model/models';
 import { AccessLog, PaginatedListAccessLog } from '../icc-api/model/models';
 import { IccDataOwnerXApi } from './icc-data-owner-x-api';
 import { AuthenticationProvider } from './auth/AuthenticationProvider';
+import { ShareMetadataBehaviour } from './crypto/ShareMetadataBehaviour';
 export interface AccessLogWithPatientId extends AccessLog {
     patientId: string;
 }
@@ -14,7 +15,27 @@ export declare class IccAccesslogXApi extends IccAccesslogApi {
     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, h: any): Promise<any>;
+    /**
+     * Creates a new instance of access log with initialised encryption metadata (not in the database).
+     * @param user the current user.
+     * @param patient the patient this access log refers to.
+     * @param h initialised data for the access log. 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 access log. 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 access log.
+     */
+    newInstance(user: models.User, patient: models.Patient, h: any, options?: {
+        additionalDelegates?: {
+            [dataOwnerId: string]: 'WRITE';
+        };
+        preferredSfk?: string;
+    }): Promise<models.AccessLog>;
     /**
      * 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.
@@ -32,12 +53,12 @@ export declare class IccAccesslogXApi extends IccAccesslogApi {
      * @param keepObsoleteVersions
      * @param usingPost
      */
-    findBy(hcpartyId: string, patient: models.Patient, usingPost?: boolean): Promise<any>;
-    findByHCPartyPatientSecretFKeys(hcPartyId: string, secretFKeys: string): Promise<Array<AccessLog> | any>;
+    findBy(hcpartyId: string, patient: models.Patient, usingPost?: boolean): Promise<models.AccessLog[]>;
+    findByHCPartyPatientSecretFKeys(hcPartyId: string, secretFKeys: string): Promise<AccessLog[]>;
     findByHCPartyPatientSecretFKeysArray(hcPartyId: string, secretFKeys: string[]): Promise<Array<AccessLog> | any>;
     decrypt(hcpId: string, accessLogs: Array<models.AccessLog>): Promise<Array<models.AccessLog>>;
-    initEncryptionKeys(user: models.User, accessLog: models.AccessLog): Promise<models.AccessLog>;
     encrypt(user: models.User, accessLogs: Array<models.AccessLog>): Promise<Array<models.AccessLog>>;
+    private encryptAs;
     createAccessLog(body?: models.AccessLog): never;
     createAccessLogWithUser(user: models.User, body?: models.AccessLog): Promise<models.AccessLog | any>;
     getAccessLog(accessLogId: string): never;
@@ -46,7 +67,31 @@ export declare class IccAccesslogXApi extends IccAccesslogApi {
     listAccessLogsWithUser(user: models.User, fromEpoch?: number, toEpoch?: number, startKey?: number, startDocumentId?: string, limit?: number, descending?: boolean): Promise<PaginatedListAccessLog>;
     modifyAccessLog(body?: models.AccessLog): never;
     modifyAccessLogWithUser(user: models.User, body?: models.AccessLog): Promise<models.AccessLog | null>;
+    private modifyAs;
     findByUserAfterDate(userId: string, accessType?: string, startDate?: number, startKey?: string, startDocumentId?: string, limit?: number, descending?: boolean): never;
     findByUserAfterDateWithUser(user: models.User, userId: string, accessType?: string, startDate?: number, startKey?: string, startDocumentId?: string, limit?: number, descending?: boolean): Promise<models.AccessLog | any>;
     findLatestAccessLogsOfPatientsWithUser(user: models.User, userId: string, limit?: number, startDate?: number): Promise<models.AccessLog[]>;
+    /**
+     * @param accessLog an access log
+     * @return the id of the patient that the access log refers to, retrieved from the encrypted metadata (not from the decrypted entity body). Normally
+     * there should only be one element in the returned array, but in case of entity merges there could be multiple values.
+     */
+    decryptPatientIdOf(accessLog: AccessLog): Promise<string[]>;
+    /**
+     * Share an existing access log with other data owners, allowing them to access the non-encrypted data of the access log and optionally also the
+     * encrypted content.
+     * @param delegateId the id of the data owner which will be granted access to the access log.
+     * @param accessLog the access log 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}).
+     * - sharePatientId: specifies if the id of the patient that this access log refers to should be shared with the delegate. Normally this would
+     * be the same as objectId, but it is encrypted separately from it allowing you to give access to the patient id without giving access to the other
+     * encrypted data of the access log (defaults to {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated entity.
+     */
+    shareWith(delegateId: string, accessLog: AccessLog, options?: {
+        shareEncryptionKey?: ShareMetadataBehaviour;
+        sharePatientId?: ShareMetadataBehaviour;
+    }): Promise<AccessLog>;
 }

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

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IccAccesslogXApi = void 0;
 const icc_api_1 = require("../icc-api");
+const models_1 = require("../icc-api/model/models");
 const _ = require("lodash");
-const utils_1 = require("./utils");
 const AuthenticationProvider_1 = require("./auth/AuthenticationProvider");
 class IccAccesslogXApi extends icc_api_1.IccAccesslogApi {
     constructor(host, headers, crypto, dataOwnerApi, authenticationProvider = new AuthenticationProvider_1.NoAuthenticationProvider(), fetchImpl = typeof window !== 'undefined'
@@ -25,38 +25,54 @@ class IccAccesslogXApi extends icc_api_1.IccAccesslogApi {
         this.crypto = crypto;
         this.dataOwnerApi = dataOwnerApi;
     }
-    newInstance(user, patient, h) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        const accessslog = _.assign({
-            id: this.crypto.randomUuid(),
-            _type: 'org.taktik.icure.entities.AccessLog',
-            created: new Date().getTime(),
-            modified: new Date().getTime(),
-            date: +new Date(),
-            responsible: dataOwnerId,
-            author: user.id,
-            codes: [],
-            tags: [],
-            user: user.id,
-            patientId: patient.id,
-            accessType: 'USER_ACCESS',
-        }, h || {});
-        return this.crypto.extractDelegationsSFKs(patient, dataOwnerId).then((secretForeignKeys) => __awaiter(this, void 0, void 0, function* () {
-            const dels = yield this.crypto.initObjectDelegations(accessslog, patient, dataOwnerId, secretForeignKeys.extractedKeys[0]);
-            const eks = yield this.crypto.initEncryptionKeys(accessslog, dataOwnerId);
-            _.extend(accessslog, {
-                delegations: dels.delegations,
-                cryptedForeignKeys: dels.cryptedForeignKeys,
-                secretForeignKeys: dels.secretForeignKeys,
-                encryptionKeys: eks.encryptionKeys,
-            });
-            let promise = Promise.resolve(accessslog);
-            (user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : []).forEach((delegateId) => (promise = promise.then(() => this.crypto.addDelegationsAndEncryptionKeys(patient, accessslog, dataOwnerId, delegateId, dels.secretId, eks.secretId).catch((e) => {
-                console.log(e);
-                return accessslog;
-            }))));
-            return promise;
-        }));
+    /**
+     * Creates a new instance of access log with initialised encryption metadata (not in the database).
+     * @param user the current user.
+     * @param patient the patient this access log refers to.
+     * @param h initialised data for the access log. 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 access log. 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 access log.
+     */
+    newInstance(user, patient, h, options = {}) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function* () {
+            const dataOwnerId = this.dataOwnerApi.getDataOwnerIdOf(user);
+            const accessLog = _.assign({
+                id: this.crypto.primitives.randomUuid(),
+                _type: 'org.taktik.icure.entities.AccessLog',
+                created: new Date().getTime(),
+                modified: new Date().getTime(),
+                date: +new Date(),
+                responsible: dataOwnerId,
+                author: user.id,
+                codes: [],
+                tags: [],
+                user: user.id,
+                patientId: patient.id,
+                accessType: 'USER_ACCESS',
+            }, h || {});
+            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.administrativeData) !== null && _f !== void 0 ? _f : []),
+            ];
+            return new models_1.AccessLog(yield this.crypto.entities
+                .entityWithInitialisedEncryptedMetadata(accessLog, patient.id, sfk, true, extraDelegations)
+                .then((x) => x.updatedEntity));
+        });
     }
     // noinspection JSUnusedGlobalSymbols
     /**
@@ -77,69 +93,36 @@ class IccAccesslogXApi extends icc_api_1.IccAccesslogApi {
      * @param usingPost
      */
     findBy(hcpartyId, patient, usingPost = false) {
-        return this.crypto
-            .extractDelegationsSFKs(patient, hcpartyId)
-            .then((secretForeignKeys) => secretForeignKeys && secretForeignKeys.extractedKeys && secretForeignKeys.extractedKeys.length > 0
-            ? (usingPost ?
-                this.findByHCPartyPatientSecretFKeysArray(secretForeignKeys.hcpartyId, _.uniq(secretForeignKeys.extractedKeys)) :
-                this.findByHCPartyPatientSecretFKeys(secretForeignKeys.hcpartyId, _.uniq(secretForeignKeys.extractedKeys).join(',')))
-            : Promise.resolve([]));
+        return __awaiter(this, void 0, void 0, function* () {
+            const extractedKeys = yield this.crypto.entities.secretIdsOf(patient, hcpartyId);
+            const topmostParentId = (yield this.dataOwnerApi.getCurrentDataOwnerHierarchyIds())[0];
+            return extractedKeys && extractedKeys.length > 0
+                ? usingPost
+                    ? this.findByHCPartyPatientSecretFKeysArray(topmostParentId, _.uniq(extractedKeys))
+                    : this.findByHCPartyPatientSecretFKeys(topmostParentId, _.uniq(extractedKeys).join(','))
+                : Promise.resolve([]);
+        });
     }
     findByHCPartyPatientSecretFKeys(hcPartyId, secretFKeys) {
-        return super.findAccessLogsByHCPartyPatientForeignKeys(hcPartyId, secretFKeys).then((accesslogs) => this.decrypt(hcPartyId, accesslogs));
+        const _super = Object.create(null, {
+            findAccessLogsByHCPartyPatientForeignKeys: { get: () => super.findAccessLogsByHCPartyPatientForeignKeys }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const accessLogs = yield _super.findAccessLogsByHCPartyPatientForeignKeys.call(this, hcPartyId, secretFKeys);
+            return yield this.decrypt(hcPartyId, accessLogs);
+        });
     }
     findByHCPartyPatientSecretFKeysArray(hcPartyId, secretFKeys) {
         return super.findAccessLogsByHCPartyPatientForeignKeysUsingPost(hcPartyId, secretFKeys).then((accesslogs) => this.decrypt(hcPartyId, accesslogs));
     }
     decrypt(hcpId, accessLogs) {
-        //First check that we have no dangling delegation
-        return Promise.all(accessLogs.map((accessLog) => {
-            return accessLog.encryptedSelf
-                ? this.crypto
-                    .extractKeysFromDelegationsForHcpHierarchy(hcpId, accessLog.id, _.size(accessLog.encryptionKeys) ? accessLog.encryptionKeys : accessLog.delegations)
-                    .then(({ extractedKeys: sfks }) => {
-                    if (!sfks || !sfks.length) {
-                        //console.log("Cannot decrypt contact", ctc.id)
-                        return Promise.resolve(accessLog);
-                    }
-                    return this.crypto.AES.importKey('raw', (0, utils_1.hex2ua)(sfks[0].replace(/-/g, ''))).then((key) => (0, utils_1.decrypt)(accessLog, (ec) => this.crypto.AES.decrypt(key, ec).then((dec) => {
-                        const jsonContent = dec && (0, utils_1.ua2utf8)(dec);
-                        try {
-                            return JSON.parse(jsonContent);
-                        }
-                        catch (e) {
-                            console.log('Cannot parse access log', accessLog.id, jsonContent || 'Invalid content');
-                            return {};
-                        }
-                    })));
-                })
-                : Promise.resolve(accessLog);
-        }));
-    }
-    initEncryptionKeys(user, accessLog) {
-        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
-        return this.crypto.initEncryptionKeys(accessLog, dataOwnerId).then((eks) => {
-            let promise = Promise.resolve(_.extend(accessLog, {
-                encryptionKeys: eks.encryptionKeys,
-            }));
-            (user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : []).forEach((delegateId) => (promise = promise.then((accessLog) => this.crypto.appendEncryptionKeys(accessLog, dataOwnerId, delegateId, eks.secretId).then((extraEks) => {
-                return _.extend(extraEks.modifiedObject, {
-                    encryptionKeys: extraEks.encryptionKeys,
-                });
-            }))));
-            return promise;
-        });
+        return Promise.all(accessLogs.map((x) => this.crypto.entities.decryptEntity(x, hcpId, (json) => new models_1.AccessLog(json)).then(({ entity }) => entity)));
     }
     encrypt(user, accessLogs) {
-        return Promise.all(accessLogs.map((accessLog) => (accessLog.encryptionKeys && Object.keys(accessLog.encryptionKeys).length
-            ? Promise.resolve(accessLog)
-            : this.initEncryptionKeys(user, accessLog))
-            .then((accessLog) => this.crypto.extractKeysFromDelegationsForHcpHierarchy(this.dataOwnerApi.getDataOwnerOf(user), accessLog.id, accessLog.encryptionKeys))
-            .then((eks) => __awaiter(this, void 0, void 0, function* () {
-            const rawKey = eks.extractedKeys[0].replace(/-/g, '');
-            const key = yield this.crypto.AES.importKey('raw', (0, utils_1.hex2ua)(rawKey));
-            return (0, utils_1.crypt)(accessLog, (obj) => this.crypto.AES.encrypt(key, (0, utils_1.utf8_2ua)(JSON.stringify(obj)), rawKey), this.cryptedKeys);
-        }))));
+        return this.encryptAs(this.dataOwnerApi.getDataOwnerIdOf(user), accessLogs);
+    }
+    encryptAs(dataOwner, accessLogs) {
+        return Promise.all(accessLogs.map((x) => this.crypto.entities.tryEncryptEntity(x, dataOwner, this.cryptedKeys, false, true, (json) => new models_1.AccessLog(json))));
     }
     createAccessLog(body) {
         throw new Error('Cannot call a method that returns access logs without providing a user for de/encryption');
@@ -148,7 +131,7 @@ class IccAccesslogXApi extends icc_api_1.IccAccesslogApi {
         return body
             ? this.encrypt(user, [_.cloneDeep(body)])
                 .then((als) => super.createAccessLog(als[0]))
-                .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), [accessLog]))
+                .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), [accessLog]))
                 .then((als) => als[0])
             : Promise.resolve();
     }
@@ -158,7 +141,7 @@ class IccAccesslogXApi extends icc_api_1.IccAccesslogApi {
     getAccessLogWithUser(user, accessLogId) {
         return super
             .getAccessLog(accessLogId)
-            .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), [accessLog]))
+            .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), [accessLog]))
             .then((als) => als[0]);
     }
     listAccessLogs(fromEpoch, toEpoch, startKey, startDocumentId, limit) {
@@ -167,31 +150,29 @@ class IccAccesslogXApi extends icc_api_1.IccAccesslogApi {
     listAccessLogsWithUser(user, fromEpoch, toEpoch, startKey, startDocumentId, limit, descending) {
         return super
             .listAccessLogs(fromEpoch, toEpoch, startKey, startDocumentId, limit, descending)
-            .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), accessLog.rows).then((dr) => Object.assign(accessLog, { rows: dr })));
+            .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), accessLog.rows).then((dr) => Object.assign(accessLog, { rows: dr })));
     }
     modifyAccessLog(body) {
         throw new Error('Cannot call a method that returns access logs without providing a user for de/encryption');
     }
     modifyAccessLogWithUser(user, body) {
-        const _super = Object.create(null, {
-            modifyAccessLog: { get: () => super.modifyAccessLog }
-        });
         return __awaiter(this, void 0, void 0, function* () {
-            return body
-                ? this.encrypt(user, [_.cloneDeep(body)])
-                    .then((als) => _super.modifyAccessLog.call(this, als[0]))
-                    .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), [accessLog]))
-                    .then((als) => als[0])
-                : null;
+            return body ? this.modifyAs(this.dataOwnerApi.getDataOwnerIdOf(user), _.cloneDeep(body)) : null;
         });
     }
+    modifyAs(dataOwner, accessLog) {
+        return this.encryptAs(dataOwner, [_.cloneDeep(accessLog)])
+            .then((als) => super.modifyAccessLog(als[0]))
+            .then((accessLog) => this.decrypt(dataOwner, [accessLog]))
+            .then((als) => als[0]);
+    }
     findByUserAfterDate(userId, accessType, startDate, startKey, startDocumentId, limit, descending) {
         throw new Error('Cannot call a method that returns access logs without providing a user for de/encryption');
     }
     findByUserAfterDateWithUser(user, userId, accessType, startDate, startKey, startDocumentId, limit, descending) {
         return super
             .findByUserAfterDate(userId, accessType, startDate, startKey, startDocumentId, limit, descending)
-            .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), accessLog.rows).then((dr) => Object.assign(accessLog, { rows: dr })));
+            .then((accessLog) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), accessLog.rows).then((dr) => Object.assign(accessLog, { rows: dr })));
     }
     findLatestAccessLogsOfPatientsWithUser(user, userId, limit = 100, startDate) {
         const _super = Object.create(null, {
@@ -204,8 +185,8 @@ class IccAccesslogXApi extends icc_api_1.IccAccesslogApi {
             for (let currentIteration = 0; foundAccessLogs.length < limit && currentIteration < MAX_WHILE_ITERATIONS; currentIteration++) {
                 const currentLimit = limit - foundAccessLogs.length;
                 const { rows: logs, nextKeyPair: newNextKeyPair } = (yield _super.findByUserAfterDate.call(this, userId, 'USER_ACCESS', startDate, nextKeyPair && JSON.stringify(nextKeyPair.startKey), nextKeyPair && nextKeyPair.startKeyDocId, numberRequestedAccessLogs, true));
-                const logsWithPatientId = yield this.decrypt(this.dataOwnerApi.getDataOwnerOf(user), logs).then((decryptedLogs) => Promise.all(_.map(decryptedLogs, (decryptedLog) => {
-                    return this.crypto.extractCryptedFKs(decryptedLog, user.healthcarePartyId).then((keys) => (Object.assign(Object.assign({}, decryptedLog), { patientId: _.head(keys.extractedKeys) })));
+                const logsWithPatientId = yield this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), logs).then((decryptedLogs) => Promise.all(_.map(decryptedLogs, (decryptedLog) => {
+                    return this.crypto.entities.owningEntityIdsOf(decryptedLog, user.healthcarePartyId).then((keys) => (Object.assign(Object.assign({}, decryptedLog), { patientId: _.head(keys) })));
                 })));
                 const uniqueLogs = _.chain(logsWithPatientId)
                     .reject((log) => _.some(foundAccessLogs, ({ patientId }) => patientId === log.patientId))
@@ -226,6 +207,35 @@ class IccAccesslogXApi extends icc_api_1.IccAccesslogApi {
             return foundAccessLogs;
         });
     }
+    /**
+     * @param accessLog an access log
+     * @return the id of the patient that the access log refers to, retrieved from the encrypted metadata (not from the decrypted entity body). Normally
+     * there should only be one element in the returned array, but in case of entity merges there could be multiple values.
+     */
+    decryptPatientIdOf(accessLog) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.crypto.entities.owningEntityIdsOf(accessLog, undefined);
+        });
+    }
+    /**
+     * Share an existing access log with other data owners, allowing them to access the non-encrypted data of the access log and optionally also the
+     * encrypted content.
+     * @param delegateId the id of the data owner which will be granted access to the access log.
+     * @param accessLog the access log 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}).
+     * - sharePatientId: specifies if the id of the patient that this access log refers to should be shared with the delegate. Normally this would
+     * be the same as objectId, but it is encrypted separately from it allowing you to give access to the patient id without giving access to the other
+     * encrypted data of the access log (defaults to {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated entity.
+     */
+    shareWith(delegateId, accessLog, 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(accessLog, delegateId, undefined, options.shareEncryptionKey, options.sharePatientId));
+        });
+    }
 }
 exports.IccAccesslogXApi = IccAccesslogXApi;
 //# sourceMappingURL=icc-accesslog-x-api.js.map