@icure/api 5.0.12 → 5.0.15

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;AAK3B,MAAa,cAAe,SAAQ,uBAAa;IAG/C,YACE,IAAY,EACZ,OAAkC,EAC1B,MAAqB,EAC7B,OAAoB,EACpB,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,SAAS,CAAC,CAAA;QARvB,WAAM,GAAN,MAAM,CAAe;QAS7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,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,sBAAsB,CAAC,IAAU,EAAE,OAAuB,EAAE,IAAS,EAAE,EAAE,YAAsB,EAAE;QAC/F,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CACtB;YACE,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YAC5B,KAAK,EAAE,mCAAmC;YAC1C,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;YAC7B,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;YAC9B,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;YAC9C,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,EAAE;SACT,EACD,CAAC,IAAI,EAAE,CACR,CAAA;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QAErD,OAAO,IAAI,CAAC,MAAM;aACf,sBAAsB,CAAC,OAAO,EAAE,WAAW,CAAC;aAC5C,IAAI,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAY,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;aAClI,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE;gBAChB,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;gBAC/C,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;aAC9C,CAAC,CAAA;YAEF,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACtC,CAAC,CAAC,IAAI,CACJ,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACrI,CAAC,OAAO,CACP,CAAC,UAAU,EAAE,EAAE,CACb,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CACnC,IAAI,CAAC,MAAM;iBACR,wCAAwC,CAAC,QAAQ,EAAE,OAAO,EAAE,WAAY,EAAE,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC;iBACxG,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAClB,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACjB,WAAW,EAAE,SAAS,CAAC,WAAW;gBAClC,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;aACjD,CAAC,CACH;iBACA,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;gBACd,OAAO,QAAQ,CAAA;YACjB,CAAC,CAAC,CACL,CAAC,CACL,CAAA;YACD,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CAAA;IACN,CAAC;CACF;AA1ED,wCA0EC","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 { IccUserXApi } from './icc-user-x-api'\n\nexport class IccMessageXApi extends IccMessageApi {\n  userApi: IccUserXApi\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    private crypto: IccCryptoXApi,\n    userApi: IccUserXApi,\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, fetchImpl)\n    this.crypto = crypto\n    this.userApi = userApi\n  }\n\n  // noinspection JSUnusedGlobalSymbols\n  newInstance(user: User, m: any) {\n    return this.newInstanceWithPatient(user, null, m)\n  }\n\n  newInstanceWithPatient(user: User, patient: Patient | null, m: any = {}, delegates: string[] = []) {\n    const message = _.extend(\n      {\n        id: this.crypto.randomUuid(),\n        _type: 'org.taktik.icure.entities.Message',\n        created: new Date().getTime(),\n        modified: new Date().getTime(),\n        responsible: this.userApi.getDataOwnerOf(user),\n        author: user.id,\n        codes: [],\n        tags: [],\n      },\n      m || {}\n    )\n\n    const dataOwnerId = this.userApi.getDataOwnerOf(user)\n\n    return this.crypto\n      .extractDelegationsSFKs(patient, dataOwnerId)\n      .then((secretForeignKeys) => this.crypto.initObjectDelegations(message, patient, dataOwnerId!, secretForeignKeys.extractedKeys[0]))\n      .then((initData) => {\n        _.extend(message, {\n          delegations: initData.delegations,\n          cryptedForeignKeys: initData.cryptedForeignKeys,\n          secretForeignKeys: initData.secretForeignKeys,\n        })\n\n        let promise = Promise.resolve(message)\n        _.uniq(\n          delegates.concat(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : [])\n        ).forEach(\n          (delegateId) =>\n            (promise = promise.then((helement) =>\n              this.crypto\n                .extendedDelegationsAndCryptedForeignKeys(helement, patient, dataOwnerId!, delegateId, initData.secretId)\n                .then((extraData) =>\n                  _.extend(helement, {\n                    delegations: extraData.delegations,\n                    cryptedForeignKeys: extraData.cryptedForeignKeys,\n                  })\n                )\n                .catch((e) => {\n                  console.log(e)\n                  return helement\n                })\n            ))\n        )\n        return promise\n      })\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'\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    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, 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  newInstanceWithPatient(user: User, patient: Patient | null, m: any = {}, delegates: string[] = []) {\n    const message = _.extend(\n      {\n        id: this.crypto.randomUuid(),\n        _type: 'org.taktik.icure.entities.Message',\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      m || {}\n    )\n\n    const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user)\n\n    return this.crypto\n      .extractDelegationsSFKs(patient, dataOwnerId)\n      .then((secretForeignKeys) => this.crypto.initObjectDelegations(message, patient, dataOwnerId!, secretForeignKeys.extractedKeys[0]))\n      .then((initData) => {\n        _.extend(message, {\n          delegations: initData.delegations,\n          cryptedForeignKeys: initData.cryptedForeignKeys,\n          secretForeignKeys: initData.secretForeignKeys,\n        })\n\n        let promise = Promise.resolve(message)\n        _.uniq(\n          delegates.concat(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : [])\n        ).forEach(\n          (delegateId) =>\n            (promise = promise.then((helement) =>\n              this.crypto\n                .extendedDelegationsAndCryptedForeignKeys(helement, patient, dataOwnerId!, delegateId, initData.secretId)\n                .then((extraData) =>\n                  _.extend(helement, {\n                    delegations: extraData.delegations,\n                    cryptedForeignKeys: extraData.cryptedForeignKeys,\n                  })\n                )\n                .catch((e) => {\n                  console.log(e)\n                  return helement\n                })\n            ))\n        )\n        return promise\n      })\n  }\n}\n"]}

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

@@ -9,7 +9,7 @@ import { IccHelementXApi } from './icc-helement-x-api';
 import { IccClassificationXApi } from './icc-classification-x-api';
 import * as models from '../icc-api/model/models';
 import { IccCalendarItemXApi } from './icc-calendar-item-x-api';
-import { IccUserXApi } from './icc-user-x-api';
+import { IccDataOwnerXApi } from './icc-data-owner-x-api';
 export declare class IccPatientXApi extends IccPatientApi {
     crypto: IccCryptoXApi;
     contactApi: IccContactXApi;
@@ -20,11 +20,11 @@ export declare class IccPatientXApi extends IccPatientApi {
     documentApi: IccDocumentXApi;
     classificationApi: IccClassificationXApi;
     calendarItemApi: IccCalendarItemXApi;
-    userApi: IccUserXApi;
+    dataOwnerApi: IccDataOwnerXApi;
     private readonly encryptedKeys;
     constructor(host: string, headers: {
         [key: string]: string;
-    }, crypto: IccCryptoXApi, contactApi: IccContactXApi, formApi: IccFormXApi, helementApi: IccHelementXApi, invoiceApi: IccInvoiceXApi, documentApi: IccDocumentXApi, hcpartyApi: IccHcpartyXApi, classificationApi: IccClassificationXApi, userApi: IccUserXApi, calendarItemaApi: IccCalendarItemXApi, encryptedKeys?: Array<string>, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>);
+    }, crypto: IccCryptoXApi, contactApi: IccContactXApi, formApi: IccFormXApi, helementApi: IccHelementXApi, invoiceApi: IccInvoiceXApi, documentApi: IccDocumentXApi, hcpartyApi: IccHcpartyXApi, classificationApi: IccClassificationXApi, dataOwnerApi: IccDataOwnerXApi, calendarItemaApi: IccCalendarItemXApi, encryptedKeys?: Array<string>, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>);
     newInstance(user: models.User, p?: any, delegates?: string[]): Promise<models.Patient>;
     completeNames(patient: models.Patient): models.Patient;
     initDelegationsAndEncryptionKeys(patient: models.Patient, user: models.User, secretForeignKey?: string | undefined, delegates?: string[]): Promise<models.Patient>;

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

@@ -20,7 +20,7 @@ const person_util_1 = require("./utils/person-util");
 const utils_1 = require("./utils");
 // noinspection JSUnusedGlobalSymbols
 class IccPatientXApi extends icc_api_1.IccPatientApi {
-    constructor(host, headers, crypto, contactApi, formApi, helementApi, invoiceApi, documentApi, hcpartyApi, classificationApi, userApi, calendarItemaApi, encryptedKeys = ['note'], fetchImpl = typeof window !== 'undefined'
+    constructor(host, headers, crypto, contactApi, formApi, helementApi, invoiceApi, documentApi, hcpartyApi, classificationApi, dataOwnerApi, calendarItemaApi, encryptedKeys = ['note'], fetchImpl = typeof window !== 'undefined'
         ? window.fetch
         : typeof self !== 'undefined'
             ? self.fetch
@@ -35,7 +35,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         this.documentApi = documentApi;
         this.classificationApi = classificationApi;
         this.calendarItemApi = calendarItemaApi;
-        this.userApi = userApi;
+        this.dataOwnerApi = dataOwnerApi;
         this.encryptedKeys = encryptedKeys;
     }
     // noinspection JSUnusedGlobalSymbols
@@ -45,7 +45,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             _type: 'org.taktik.icure.entities.Patient',
             created: new Date().getTime(),
             modified: new Date().getTime(),
-            responsible: this.userApi.getDataOwnerOf(user),
+            responsible: this.dataOwnerApi.getDataOwnerOf(user),
             author: user.id,
             codes: [],
             tags: [],
@@ -65,7 +65,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             finalPatient = (0, person_util_1.garnishPersonWithName)(finalPatient, models.PersonName.UseEnum.Nickname, finalPatient.alias, finalPatient.firstName);
         }
         if (!finalPatient.lastName && !!(0, person_util_1.hasName)(finalPatient, models.PersonName.UseEnum.Official)) {
-            let officialName = (0, person_util_1.findName)(finalPatient, models.PersonName.UseEnum.Official);
+            const officialName = (0, person_util_1.findName)(finalPatient, models.PersonName.UseEnum.Official);
             finalPatient = Object.assign(Object.assign({}, finalPatient), { lastName: officialName.lastName, firstName: (_a = officialName.firstNames) === null || _a === void 0 ? void 0 : _a[0] });
         }
         if (!finalPatient.maidenName && !!(0, person_util_1.hasName)(finalPatient, models.PersonName.UseEnum.Maiden)) {
@@ -78,7 +78,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     }
     initDelegationsAndEncryptionKeys(patient, user, secretForeignKey = undefined, delegates = []) {
         return __awaiter(this, void 0, void 0, function* () {
-            const dataOwnerId = this.userApi.getDataOwnerOf(user);
+            const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
             const dels = yield this.crypto.initObjectDelegations(patient, null, dataOwnerId, null);
             const eks = yield this.crypto.initEncryptionKeys(patient, dataOwnerId);
             _.extend(patient, {
@@ -98,7 +98,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         });
     }
     initConfidentialDelegation(patient, user) {
-        const dataOwnerId = this.userApi.getDataOwnerOf(user);
+        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
         return this.crypto.extractPreferredSfk(patient, dataOwnerId, true).then((k) => {
             if (!k) {
                 const secretId = this.crypto.randomUuid();
@@ -263,7 +263,11 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             ? this.encrypt(user, [_.cloneDeep(this.completeNames(body))])
                 .then((pats) => super.modifyPatient(pats[0]))
                 .then((p) => this.decrypt(user, [p]))
-                .then((pats) => pats[0])
+                .then((pats) => {
+                var _a;
+                ((_a = pats[0]) === null || _a === void 0 ? void 0 : _a.id) && this.crypto.emptyHcpCache(pats[0].id);
+                return pats[0];
+            })
             : Promise.resolve(null);
     }
     modifyPatientReferral(patientId, referralId, start, end) {
@@ -273,10 +277,14 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         return super
             .modifyPatientReferral(patientId, referralId, start, end)
             .then((p) => this.decrypt(user, [p]))
-            .then((pats) => pats[0]);
+            .then((pats) => {
+            var _a;
+            ((_a = pats[0]) === null || _a === void 0 ? void 0 : _a.id) && this.crypto.emptyHcpCache(pats[0].id);
+            return pats[0];
+        });
     }
     encrypt(user, pats) {
-        const dataOwnerId = this.userApi.getDataOwnerOf(user);
+        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
         const fixEncryptionKeys = (p) => {
             if (p.delegations && p.delegations[dataOwnerId])
                 return this.initEncryptionKeys(user, p, Object.keys(p.delegations));
@@ -304,7 +312,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
         }))), this.encryptedKeys))));
     }
     decrypt(user, pats, fillDelegations = true) {
-        const dataOwnerId = this.userApi.getDataOwnerOf(user);
+        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
         return (user.healthcarePartyId ? this.hcpartyApi.getHealthcarePartyHierarchyIds(user.healthcarePartyId) : Promise.resolve([dataOwnerId])).then((ids) => {
             const hcpId = ids[0];
             //First check that we have no dangling delegation
@@ -363,7 +371,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     /** By default, an encryptionKey will be added for every hcp in the autoDelegations of the provided user.
      * In optional field additionalDelegateIds, you can ask the method to create encryptionKeys for additional hcps */
     initEncryptionKeys(user, pat, additionalDelegateIds) {
-        const dataOwnerId = this.userApi.getDataOwnerOf(user);
+        const dataOwnerId = this.dataOwnerApi.getDataOwnerOf(user);
         const userAutoDelegations = user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : [];
         return this.crypto.initEncryptionKeys(pat, dataOwnerId).then((eks) => {
             let promise = Promise.resolve(_.extend(pat, {