@icure/api 4.0.98 → 4.1.1

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

@@ -1,21 +1,11 @@
-import { IccEntityrefApi, IccInsuranceApi, IccMessageApi } from '../icc-api';
+import { IccMessageApi } from '../icc-api';
 import { IccCryptoXApi } from './icc-crypto-x-api';
-import { IccDocumentXApi } from './icc-document-x-api';
-import { IccInvoiceXApi } from './icc-invoice-x-api';
 import { Patient, User } from '../icc-api/model/models';
-import { IccReceiptXApi } from './icc-receipt-x-api';
-import { IccPatientXApi } from './icc-patient-x-api';
 export declare class IccMessageXApi extends IccMessageApi {
     private crypto;
-    private insuranceApi;
-    private entityReferenceApi;
-    private receiptXApi;
-    private invoiceXApi;
-    private documentXApi;
-    private patientApi;
     constructor(host: string, headers: {
         [key: string]: string;
-    }, crypto: IccCryptoXApi, insuranceApi: IccInsuranceApi, entityReferenceApi: IccEntityrefApi, invoiceXApi: IccInvoiceXApi, documentXApi: IccDocumentXApi, receiptXApi: IccReceiptXApi, patientApi: IccPatientXApi, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>);
+    }, crypto: IccCryptoXApi, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>);
     newInstance(user: User, m: any): Promise<any>;
     newInstanceWithPatient(user: User, patient: Patient | null, m: any): Promise<any>;
 }

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

@@ -4,19 +4,14 @@ exports.IccMessageXApi = void 0;
 const icc_api_1 = require("../icc-api");
 const _ = require("lodash");
 class IccMessageXApi extends icc_api_1.IccMessageApi {
-    constructor(host, headers, crypto, insuranceApi, entityReferenceApi, invoiceXApi, documentXApi, receiptXApi, patientApi, fetchImpl = typeof window !== 'undefined'
+    constructor(host, headers, crypto, fetchImpl = typeof window !== 'undefined'
         ? window.fetch
         : typeof self !== 'undefined'
             ? self.fetch
             : fetch) {
         super(host, headers, fetchImpl);
         this.crypto = crypto;
-        this.insuranceApi = insuranceApi;
-        this.entityReferenceApi = entityReferenceApi;
-        this.receiptXApi = receiptXApi;
-        this.invoiceXApi = invoiceXApi;
-        this.documentXApi = documentXApi;
-        this.patientApi = patientApi;
+        this.crypto = crypto;
     }
     // noinspection JSUnusedGlobalSymbols
     newInstance(user, m) {

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":"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","sourcesContent":["import { IccEntityrefApi, IccInsuranceApi, IccMessageApi } from '../icc-api'\nimport { IccCryptoXApi } from './icc-crypto-x-api'\nimport { IccDocumentXApi } from './icc-document-x-api'\nimport { IccInvoiceXApi } from './icc-invoice-x-api'\n\nimport * as _ from 'lodash'\nimport * as moment from 'moment'\n\nimport {\n  AbstractFilterPatient,\n  EntityReference,\n  FilterChainPatient,\n  HealthcareParty,\n  Insurance,\n  Invoice,\n  ListOfIds,\n  Message,\n  PaginatedListPatient,\n  Patient,\n  PatientHealthCareParty,\n  Receipt,\n  ReferralPeriod,\n  User,\n} from '../icc-api/model/models'\n\nimport { IccReceiptXApi } from './icc-receipt-x-api'\nimport { IccPatientXApi } from './icc-patient-x-api'\n\nexport class IccMessageXApi extends IccMessageApi {\n  private crypto: IccCryptoXApi\n  private insuranceApi: IccInsuranceApi\n  private entityReferenceApi: IccEntityrefApi\n  private receiptXApi: IccReceiptXApi\n  private invoiceXApi: IccInvoiceXApi\n  private documentXApi: IccDocumentXApi\n  private patientApi: IccPatientXApi\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    crypto: IccCryptoXApi,\n    insuranceApi: IccInsuranceApi,\n    entityReferenceApi: IccEntityrefApi,\n    invoiceXApi: IccInvoiceXApi,\n    documentXApi: IccDocumentXApi,\n    receiptXApi: IccReceiptXApi,\n    patientApi: IccPatientXApi,\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.insuranceApi = insuranceApi\n    this.entityReferenceApi = entityReferenceApi\n    this.receiptXApi = receiptXApi\n    this.invoiceXApi = invoiceXApi\n    this.documentXApi = documentXApi\n    this.patientApi = patientApi\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) {\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: user.healthcarePartyId,\n        author: user.id,\n        codes: [],\n        tags: [],\n      },\n      m || {}\n    )\n\n    const hcpId = user.healthcarePartyId || user.patientId\n    return this.crypto\n      .extractDelegationsSFKs(patient, hcpId)\n      .then((secretForeignKeys) => this.crypto.initObjectDelegations(message, patient, hcpId!, 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        ;(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : []).forEach(\n          (delegateId) =>\n            (promise = promise.then((helement) =>\n              this.crypto\n                .extendedDelegationsAndCryptedForeignKeys(helement, patient, hcpId!, 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'\n\nexport class IccMessageXApi extends IccMessageApi {\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    private crypto: IccCryptoXApi,\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  }\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) {\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: user.healthcarePartyId,\n        author: user.id,\n        codes: [],\n        tags: [],\n      },\n      m || {}\n    )\n\n    const hcpId = user.healthcarePartyId || user.patientId\n    return this.crypto\n      .extractDelegationsSFKs(patient, hcpId)\n      .then((secretForeignKeys) => this.crypto.initObjectDelegations(message, patient, hcpId!, 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        ;(user.autoDelegations ? (user.autoDelegations.all || []).concat(user.autoDelegations.medicalInformation || []) : []).forEach(\n          (delegateId) =>\n            (promise = promise.then((helement) =>\n              this.crypto\n                .extendedDelegationsAndCryptedForeignKeys(helement, patient, hcpId!, 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.js

@@ -14,11 +14,11 @@ const icc_api_1 = require("../icc-api");
 const _ = require("lodash");
 const models = require("../icc-api/model/models");
 const models_1 = require("../icc-api/model/models");
-const utils_1 = require("./utils");
-const utils_2 = require("./crypto/utils");
+const utils_1 = require("./crypto/utils");
 const ModelHelper_1 = require("../icc-api/model/ModelHelper");
 const binary_utils_1 = require("./utils/binary-utils");
 const person_util_1 = require("./utils/person-util");
+const net_utils_1 = require("./utils/net-utils");
 // noinspection JSUnusedGlobalSymbols
 class IccPatientXApi extends icc_api_1.IccPatientApi {
     constructor(host, headers, crypto, contactApi, formApi, helementApi, invoiceApi, documentApi, hcpartyApi, classificationApi, calendarItemaApi, encryptedKeys = ['note'], fetchImpl = typeof window !== 'undefined'
@@ -276,7 +276,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
             : this.initEncryptionKeys(user, p))
             .then((p) => this.crypto.extractKeysFromDelegationsForHcpHierarchy((user.healthcarePartyId || user.patientId), p.id, p.encryptionKeys))
             .then((sfks) => this.crypto.AES.importKey('raw', binary_utils_1.hex2ua(sfks.extractedKeys[0].replace(/-/g, ''))))
-            .then((key) => utils_2.utils.crypt(p, (obj) => this.crypto.AES.encrypt(key, binary_utils_1.utf8_2ua(JSON.stringify(obj, (k, v) => {
+            .then((key) => utils_1.utils.crypt(p, (obj) => this.crypto.AES.encrypt(key, binary_utils_1.utf8_2ua(JSON.stringify(obj, (k, v) => {
             return v instanceof ArrayBuffer || v instanceof Uint8Array
                 ? binary_utils_1.b2a(new Uint8Array(v).reduce((d, b) => d + String.fromCharCode(b), ''))
                 : v;
@@ -314,7 +314,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                                 //console.log("Cannot decrypt contact", ctc.id)
                                 return Promise.resolve(p);
                             }
-                            return this.crypto.AES.importKey('raw', binary_utils_1.hex2ua(sfks[0].replace(/-/g, ''))).then((key) => utils_2.utils
+                            return this.crypto.AES.importKey('raw', binary_utils_1.hex2ua(sfks[0].replace(/-/g, ''))).then((key) => utils_1.utils
                                 .decrypt(p, (ec) => this.crypto.AES.decrypt(key, ec)
                                 .then((dec) => {
                                 const jsonContent = dec && binary_utils_1.ua2utf8(dec);
@@ -421,7 +421,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                 },
                 patient: { success: false, error: null, modified: 0 },
             };
-            return utils_1.retry(() => this.getPatientWithUser(user, patId))
+            return net_utils_1.retry(() => this.getPatientWithUser(user, patId))
                 .then((patient) => patient.encryptionKeys && Object.keys(patient.encryptionKeys || {}).length
                 ? Promise.resolve(patient)
                 : this.initEncryptionKeys(user, patient).then((patient) => this.modifyPatientWithUser(user, patient)))
@@ -436,46 +436,46 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                 return this.crypto.extractDelegationsSFKsAndEncryptionSKs(patient, ownerId).then(([delSfks, ecKeys]) => {
                     return delSfks.length
                         ? Promise.all([
-                            utils_1.retry(() => this.helementApi
-                                .findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.helementApi
+                                .findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((hes) => parentId
                                 ? this.helementApi
-                                    .findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(parentId, delSfks.join(','))
+                                    .findHealthElementsDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreHes) => _.uniqBy(hes.concat(moreHes), 'id'))
                                 : hes)),
-                            utils_1.retry(() => this.formApi
-                                .findFormsDelegationsStubsByHCPartyPatientForeignKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.formApi
+                                .findFormsDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((frms) => parentId
                                 ? this.formApi
-                                    .findFormsDelegationsStubsByHCPartyPatientForeignKeys(parentId, delSfks.join(','))
+                                    .findFormsDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreFrms) => _.uniqBy(frms.concat(moreFrms), 'id'))
                                 : frms)),
-                            utils_1.retry(() => this.contactApi
-                                .findByHCPartyPatientSecretFKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.contactApi
+                                .findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((ctcs) => parentId
                                 ? this.contactApi
-                                    .findByHCPartyPatientSecretFKeys(parentId, delSfks.join(','))
+                                    .findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreCtcs) => _.uniqBy(ctcs.concat(moreCtcs), 'id'))
                                 : ctcs)),
-                            utils_1.retry(() => this.invoiceApi
-                                .findInvoicesDelegationsStubsByHCPartyPatientForeignKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.invoiceApi
+                                .findInvoicesDelegationsStubsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((ivs) => parentId
                                 ? this.invoiceApi
-                                    .findInvoicesDelegationsStubsByHCPartyPatientForeignKeys(parentId, delSfks.join(','))
+                                    .findInvoicesDelegationsStubsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreIvs) => _.uniqBy(ivs.concat(moreIvs), 'id'))
                                 : ivs)),
-                            utils_1.retry(() => this.classificationApi
-                                .findClassificationsByHCPartyPatientForeignKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.classificationApi
+                                .findClassificationsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((cls) => parentId
                                 ? this.classificationApi
-                                    .findClassificationsByHCPartyPatientForeignKeys(parentId, delSfks.join(','))
+                                    .findClassificationsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreCls) => _.uniqBy(cls.concat(moreCls), 'id'))
                                 : cls)),
-                            utils_1.retry(() => this.calendarItemApi
-                                .findByHCPartyPatientSecretFKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.calendarItemApi
+                                .findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((cls) => parentId
                                 ? this.calendarItemApi
-                                    .findByHCPartyPatientSecretFKeys(parentId, delSfks.join(','))
+                                    .findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreCls) => _.uniqBy(cls.concat(moreCls), 'id'))
                                 : cls)),
                         ]).then(([hes, frms, ctcs, ivs, cls, cis]) => {
@@ -496,7 +496,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                             const docIds = {};
                             ctcs.forEach((c) => c.services &&
                                 c.services.forEach((s) => s.content && Object.values(s.content).forEach((c) => c.documentId && (docIds[c.documentId] = 1))));
-                            return utils_1.retry(() => this.documentApi.getDocuments(new models_1.ListOfIds({ ids: Object.keys(docIds) }))).then((docs) => {
+                            return net_utils_1.retry(() => this.documentApi.getDocuments(new models_1.ListOfIds({ ids: Object.keys(docIds) }))).then((docs) => {
                                 const oDocs = docs.map((x) => _.assign({}, x, cloneKeysAndDelegations(x)));
                                 let markerPromise = Promise.resolve(null);
                                 delegateIds.forEach((delegateId) => {
@@ -684,7 +684,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
     export(user, patId, ownerId) {
         return this.hcpartyApi.getHealthcareParty(ownerId).then((hcp) => {
             const parentId = hcp.parentId;
-            return utils_1.retry(() => this.getPatientWithUser(user, patId))
+            return net_utils_1.retry(() => this.getPatientWithUser(user, patId))
                 .then((patient) => patient.encryptionKeys && Object.keys(patient.encryptionKeys || {}).length
                 ? Promise.resolve(patient)
                 : this.initEncryptionKeys(user, patient).then((patient) => this.modifyPatientWithUser(user, patient)))
@@ -695,43 +695,43 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                 return this.crypto.extractDelegationsSFKsAndEncryptionSKs(patient, ownerId).then(([delSfks, ecKeys]) => {
                     return delSfks.length
                         ? Promise.all([
-                            utils_1.retry(() => this.helementApi
-                                .findByHCPartyPatientSecretFKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.helementApi
+                                .findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((hes) => parentId
                                 ? this.helementApi
-                                    .findByHCPartyPatientSecretFKeys(parentId, delSfks.join(','))
+                                    .findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreHes) => _.uniqBy(hes.concat(moreHes), 'id'))
                                 : hes)),
-                            utils_1.retry(() => this.formApi
-                                .findFormsByHCPartyPatientForeignKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.formApi
+                                .findFormsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((frms) => parentId
                                 ? this.formApi
-                                    .findFormsByHCPartyPatientForeignKeys(parentId, delSfks.join(','))
+                                    .findFormsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreFrms) => _.uniqBy(frms.concat(moreFrms), 'id'))
                                 : frms)),
-                            utils_1.retry(() => this.contactApi
-                                .findByHCPartyPatientSecretFKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.contactApi
+                                .findByHCPartyPatientSecretFKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((ctcs) => parentId
                                 ? this.contactApi
-                                    .findByHCPartyPatientSecretFKeys(parentId, delSfks.join(','))
+                                    .findByHCPartyPatientSecretFKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreCtcs) => _.uniqBy(ctcs.concat(moreCtcs), 'id'))
                                 : ctcs)),
-                            utils_1.retry(() => this.invoiceApi
-                                .findInvoicesByHCPartyPatientForeignKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.invoiceApi
+                                .findInvoicesByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((ivs) => parentId
                                 ? this.invoiceApi
-                                    .findInvoicesByHCPartyPatientForeignKeys(parentId, delSfks.join(','))
+                                    .findInvoicesByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreIvs) => _.uniqBy(ivs.concat(moreIvs), 'id'))
                                 : ivs)),
-                            utils_1.retry(() => this.classificationApi
-                                .findClassificationsByHCPartyPatientForeignKeys(ownerId, delSfks.join(','))
+                            net_utils_1.retry(() => this.classificationApi
+                                .findClassificationsByHCPartyPatientForeignKeys(ownerId, _.uniq(delSfks).join(','))
                                 .then((cls) => parentId
                                 ? this.classificationApi
-                                    .findClassificationsByHCPartyPatientForeignKeys(parentId, delSfks.join(','))
+                                    .findClassificationsByHCPartyPatientForeignKeys(parentId, _.uniq(delSfks).join(','))
                                     .then((moreCls) => _.uniqBy(cls.concat(moreCls), 'id'))
                                 : cls)),
-                            utils_1.retry(() => __awaiter(this, void 0, void 0, function* () {
-                                const delegationSFKs = delSfks.join(',');
+                            net_utils_1.retry(() => __awaiter(this, void 0, void 0, function* () {
+                                const delegationSFKs = _.uniq(delSfks).join(',');
                                 try {
                                     let calendarItems = yield this.calendarItemApi.findByHCPartyPatientSecretFKeys(ownerId, delegationSFKs);
                                     if (parentId) {
@@ -749,7 +749,7 @@ class IccPatientXApi extends icc_api_1.IccPatientApi {
                             const docIds = {};
                             ctcs.forEach((c) => c.services &&
                                 c.services.forEach((s) => s.content && Object.values(s.content).forEach((c) => c.documentId && (docIds[c.documentId] = 1))));
-                            return utils_1.retry(() => this.documentApi.getDocuments(new models_1.ListOfIds({ ids: Object.keys(docIds) }))).then((docs) => {
+                            return net_utils_1.retry(() => this.documentApi.getDocuments(new models_1.ListOfIds({ ids: Object.keys(docIds) }))).then((docs) => {
                                 return {
                                     id: patId,
                                     patient: patient,