@icure/api 7.0.0-beta.3 → 7.0.0

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

@@ -11,9 +11,24 @@ export declare class IccContactXApi extends IccContactApi implements EncryptedEn
     i18n: any;
     crypto: IccCryptoXApi;
     dataOwnerApi: IccDataOwnerXApi;
+    private readonly contactEncryptedFields;
+    private readonly serviceEncryptedFieldsNoContent;
+    private readonly serviceEncryptedFieldsWithContent;
+    /**
+     *
+     * @param host
+     * @param headers
+     * @param crypto
+     * @param dataOwnerApi
+     * @param authenticationProvider
+     * @param fetchImpl
+     * @param contactEncryptedKeys custom encrypted fields for Contact. Note that to customise the encryption of contained services (`services` field),
+     * you need to use the serviceEncryptedKeys parameter.
+     * @param serviceEncryptedKeys custom encrypted fields for Service. Note that you can't customise encryption of the `content` field
+     */
     constructor(host: string, headers: {
         [key: string]: string;
-    }, crypto: IccCryptoXApi, dataOwnerApi: IccDataOwnerXApi, authenticationProvider?: AuthenticationProvider, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>);
+    }, crypto: IccCryptoXApi, dataOwnerApi: IccDataOwnerXApi, authenticationProvider?: AuthenticationProvider, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>, contactEncryptedKeys?: string[], serviceEncryptedKeys?: string[]);
     /**
      * Creates a new instance of contact with initialised encryption metadata (not in the database).
      * @param user the current user.
@@ -70,6 +85,7 @@ export declare class IccContactXApi extends IccContactApi implements EncryptedEn
     findByHCPartyPatientSecretFKeysArray(hcPartyId: string, secretFKeys: string[], planOfActionIds?: string, skipClosedContacts?: boolean): Promise<Array<models.Contact> | any>;
     filterByWithUser(user: models.User, startDocumentId?: string, limit?: number, body?: models.FilterChainContact): Promise<PaginatedListContact | any>;
     listContactsByOpeningDateWithUser(user: models.User, startKey: number, endKey: number, hcpartyid: string, startDocumentId?: string, limit?: number): Promise<PaginatedListContact | any>;
+    getServiceWithUser(user: models.User, serviceId: string): Promise<Service>;
     listServicesWithUser(user: models.User, serviceIds: ListOfIds): Promise<Array<Service> | any>;
     findByHCPartyFormIdWithUser(user: models.User, hcPartyId: string, formId: string): Promise<Array<models.Contact> | any>;
     findByHCPartyFormIdsWithUser(user: models.User, hcPartyId: string, body: models.ListOfIds): Promise<Array<models.Contact> | any>;

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

@@ -21,15 +21,39 @@ const ServiceByIdsFilter_1 = require("./filters/ServiceByIdsFilter");
 const utils_1 = require("./utils");
 const AuthenticationProvider_1 = require("./auth/AuthenticationProvider");
 class IccContactXApi extends icc_api_1.IccContactApi {
+    /**
+     *
+     * @param host
+     * @param headers
+     * @param crypto
+     * @param dataOwnerApi
+     * @param authenticationProvider
+     * @param fetchImpl
+     * @param contactEncryptedKeys custom encrypted fields for Contact. Note that to customise the encryption of contained services (`services` field),
+     * you need to use the serviceEncryptedKeys parameter.
+     * @param serviceEncryptedKeys custom encrypted fields for Service. Note that you can't customise encryption of the `content` field
+     */
     constructor(host, headers, crypto, dataOwnerApi, authenticationProvider = new AuthenticationProvider_1.NoAuthenticationProvider(), fetchImpl = typeof window !== 'undefined'
         ? window.fetch
         : typeof self !== 'undefined'
             ? self.fetch
-            : fetch) {
+            : fetch, contactEncryptedKeys = ['descr'], serviceEncryptedKeys = []) {
         super(host, headers, authenticationProvider, fetchImpl);
         this.i18n = contact_i18n_1.default;
+        if (contactEncryptedKeys.some((key) => key.startsWith('services'))) {
+            throw new Error("You can't customise encryption of the `services` field of Contact. Use the serviceEncryptedKeys parameter instead.");
+        }
+        if (serviceEncryptedKeys.some((key) => key.startsWith('content'))) {
+            throw new Error("You can't customise encryption of the `content` of a Service. The content values for services is automatically encrypted.");
+        }
         this.crypto = crypto;
         this.dataOwnerApi = dataOwnerApi;
+        this.contactEncryptedFields = (0, utils_1.parseEncryptedFields)(contactEncryptedKeys, 'Contact.');
+        const customServiceEncryptedFields = (0, utils_1.parseEncryptedFields)(serviceEncryptedKeys, 'Service.');
+        if (serviceEncryptedKeys.length > 0) {
+            this.serviceEncryptedFieldsNoContent = customServiceEncryptedFields;
+        }
+        this.serviceEncryptedFieldsWithContent = Object.assign(Object.assign({}, customServiceEncryptedFields), { topLevelFields: [...customServiceEncryptedFields.topLevelFields, { fieldName: 'content', fieldPath: 'Service.content' }] });
     }
     /**
      * Creates a new instance of contact with initialised encryption metadata (not in the database).
@@ -49,33 +73,20 @@ class IccContactXApi extends icc_api_1.IccContactApi {
      * @return a new instance of contact.
      */
     newInstance(user, patient, c, options = {}) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         return __awaiter(this, void 0, void 0, function* () {
-            const contact = new models.Contact(_.extend({
-                id: this.crypto.primitives.randomUuid(),
-                _type: 'org.taktik.icure.entities.Contact',
-                created: new Date().getTime(),
-                modified: new Date().getTime(),
-                responsible: this.dataOwnerApi.getDataOwnerIdOf(user),
-                author: user.id,
-                codes: [],
-                tags: [],
-                groupId: this.crypto.primitives.randomUuid(),
-                subContacts: [],
-                services: [],
-                openingDate: parseInt(moment().format('YYYYMMDDHHmmss')),
-            }, c || {}));
+            const contact = new models.Contact(Object.assign(Object.assign({}, (c !== null && c !== void 0 ? c : {})), { _type: 'org.taktik.icure.entities.Contact', id: (_a = c === null || c === void 0 ? void 0 : c.id) !== null && _a !== void 0 ? _a : this.crypto.primitives.randomUuid(), created: (_b = c === null || c === void 0 ? void 0 : c.created) !== null && _b !== void 0 ? _b : new Date().getTime(), modified: (_c = c === null || c === void 0 ? void 0 : c.modified) !== null && _c !== void 0 ? _c : new Date().getTime(), responsible: (_d = c === null || c === void 0 ? void 0 : c.responsible) !== null && _d !== void 0 ? _d : this.dataOwnerApi.getDataOwnerIdOf(user), author: (_e = c === null || c === void 0 ? void 0 : c.author) !== null && _e !== void 0 ? _e : user.id, codes: (_f = c === null || c === void 0 ? void 0 : c.codes) !== null && _f !== void 0 ? _f : [], tags: (_g = c === null || c === void 0 ? void 0 : c.tags) !== null && _g !== void 0 ? _g : [], groupId: (_h = c === null || c === void 0 ? void 0 : c.groupId) !== null && _h !== void 0 ? _h : this.crypto.primitives.randomUuid(), subContacts: (_j = c === null || c === void 0 ? void 0 : c.subContacts) !== null && _j !== void 0 ? _j : [], services: (_k = c === null || c === void 0 ? void 0 : c.services) !== null && _k !== void 0 ? _k : [], openingDate: (_l = c === null || c === void 0 ? void 0 : c.openingDate) !== null && _l !== void 0 ? _l : parseInt(moment().format('YYYYMMDDHHmmss')) }));
             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 : (!!options.confidential
+            const sfk = (_m = options.preferredSfk) !== null && _m !== void 0 ? _m : (!!options.confidential
                 ? yield this.crypto.confidential.getConfidentialSecretId(patient)
                 : yield this.crypto.confidential.getAnySecretIdSharedWithParents(patient));
             if (!sfk)
                 throw new Error(`Couldn't find any sfk of parent patient ${patient.id} for confidential=${!!options.confidential}`);
             const extraDelegations = [
-                ...Object.keys((_b = options.additionalDelegates) !== null && _b !== void 0 ? _b : {}),
-                ...(options.confidential ? [] : [...((_d = (_c = user.autoDelegations) === null || _c === void 0 ? void 0 : _c.all) !== null && _d !== void 0 ? _d : []), ...((_f = (_e = user.autoDelegations) === null || _e === void 0 ? void 0 : _e.medicalInformation) !== null && _f !== void 0 ? _f : [])]),
+                ...Object.keys((_o = options.additionalDelegates) !== null && _o !== void 0 ? _o : {}),
+                ...(options.confidential ? [] : [...((_q = (_p = user.autoDelegations) === null || _p === void 0 ? void 0 : _p.all) !== null && _q !== void 0 ? _q : []), ...((_s = (_r = user.autoDelegations) === null || _r === void 0 ? void 0 : _r.medicalInformation) !== null && _s !== void 0 ? _s : [])]),
             ];
             const initialisationInfo = yield this.crypto.entities.entityWithInitialisedEncryptedMetadata(contact, patient.id, sfk, true, extraDelegations);
             return new models.Contact(initialisationInfo.updatedEntity);
@@ -191,11 +202,17 @@ class IccContactXApi extends icc_api_1.IccContactApi {
             .listContactsByOpeningDate(startKey, endKey, hcpartyid, startDocumentId, limit)
             .then((ctcs) => this.decrypt(user.healthcarePartyId || user.patientId, ctcs.rows).then((decryptedRows) => Object.assign(ctcs, { rows: decryptedRows })));
     }
+    getServiceWithUser(user, serviceId) {
+        return super
+            .getService(serviceId)
+            .then((service) => { var _a, _b; return this.decryptServices((_b = (_a = user.healthcarePartyId) !== null && _a !== void 0 ? _a : user.patientId) !== null && _b !== void 0 ? _b : user.deviceId, [service]); })
+            .then((decrypted) => decrypted[0]);
+    }
     listServicesWithUser(user, serviceIds) {
         var _a;
         return super
             .filterServicesBy(undefined, (_a = serviceIds.ids) === null || _a === void 0 ? void 0 : _a.length, new models_1.FilterChainService({ filter: new ServiceByIdsFilter_1.ServiceByIdsFilter({ ids: serviceIds.ids }) }))
-            .then((paginatedList) => { var _a; return this.decryptServices(user.healthcarePartyId || user.patientId, (_a = paginatedList.rows) !== null && _a !== void 0 ? _a : []); });
+            .then((paginatedList) => { var _a, _b, _c; return this.decryptServices((_b = (_a = user.healthcarePartyId) !== null && _a !== void 0 ? _a : user.patientId) !== null && _b !== void 0 ? _b : user.deviceId, (_c = paginatedList.rows) !== null && _c !== void 0 ? _c : []); });
     }
     findByHCPartyFormIdWithUser(user, hcPartyId, formId) {
         return super.findByHCPartyFormId(hcPartyId, formId).then((ctcs) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), ctcs));
@@ -262,32 +279,37 @@ class IccContactXApi extends icc_api_1.IccContactApi {
     }
     encryptServices(key, rawKey, services) {
         return Promise.all(services.map((svc) => __awaiter(this, void 0, void 0, function* () {
-            if (!svc.content) {
-                return svc;
-            }
-            if (Object.values(svc.content).every((c) => c.compoundValue &&
-                !c.stringValue &&
-                !c.documentId &&
-                !c.measureValue &&
-                !c.medicationValue &&
-                (c.booleanValue === null || c.booleanValue === undefined) &&
-                (c.numberValue === null || c.numberValue === undefined) &&
-                !c.instantValue &&
-                !c.fuzzyDateValue &&
-                !c.binaryValue)) {
-                svc.content = _.fromPairs(yield Promise.all(_.toPairs(svc.content).map((p) => __awaiter(this, void 0, void 0, function* () {
+            if (svc.content &&
+                Object.values(svc.content).every((c) => c.compoundValue &&
+                    !c.stringValue &&
+                    !c.documentId &&
+                    !c.measureValue &&
+                    !c.medicationValue &&
+                    (c.booleanValue === null || c.booleanValue === undefined) &&
+                    (c.numberValue === null || c.numberValue === undefined) &&
+                    !c.instantValue &&
+                    !c.fuzzyDateValue &&
+                    !c.binaryValue)) {
+                const recursivelyEncryptedContent = Object.fromEntries(yield Promise.all(Object.entries(svc.content).map((p) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     if ((_a = p[1].compoundValue) === null || _a === void 0 ? void 0 : _a.length) {
-                        p[1].compoundValue = yield this.encryptServices(key, rawKey, p[1].compoundValue);
+                        return [p[0], Object.assign(Object.assign({}, p[1]), { compoundValue: yield this.encryptServices(key, rawKey, p[1].compoundValue) })];
                     }
-                    return p;
+                    else
+                        return p;
                 }))));
+                const copyWithEncryptedContent = Object.assign(Object.assign({}, svc), { content: recursivelyEncryptedContent });
+                return this.serviceEncryptedFieldsNoContent
+                    ? (0, utils_1.encryptObject)(copyWithEncryptedContent, (obj) => {
+                        return this.crypto.primitives.AES.encrypt(key, (0, binary_utils_1.utf8_2ua)(JSON.stringify(obj)), rawKey);
+                    }, this.serviceEncryptedFieldsNoContent, 'service')
+                    : copyWithEncryptedContent;
             }
             else {
-                svc.encryptedSelf = (0, binary_utils_1.b2a)((0, binary_utils_1.ua2string)(yield this.crypto.primitives.AES.encrypt(key, (0, binary_utils_1.utf8_2ua)(JSON.stringify({ content: svc.content })), rawKey)));
-                delete svc.content;
+                return (0, utils_1.encryptObject)(svc, (obj) => {
+                    return this.crypto.primitives.AES.encrypt(key, (0, binary_utils_1.utf8_2ua)(JSON.stringify(obj)), rawKey);
+                }, this.serviceEncryptedFieldsWithContent, 'service');
             }
-            return svc;
         })));
     }
     encrypt(user, ctcs) {
@@ -296,14 +318,14 @@ class IccContactXApi extends icc_api_1.IccContactApi {
     encryptAs(hcpartyId, ctcs) {
         const bypassEncryption = false; //Used for debug
         return Promise.all(ctcs.map((ctc) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const initialisedCtc = bypassEncryption //Prevent encryption for test ctc
                 ? ctc
-                : yield this.crypto.entities.ensureEncryptionKeysInitialised(ctc);
+                : (_a = (yield this.crypto.entities.ensureEncryptionKeysInitialised(ctc))) !== null && _a !== void 0 ? _a : ctc;
             const encryptionKey = yield this.crypto.entities.importFirstValidKey(yield this.crypto.entities.encryptionKeysOf(ctc, hcpartyId), ctc.id);
-            initialisedCtc.services = yield this.encryptServices(encryptionKey.key, encryptionKey.raw, ctc.services || []);
-            initialisedCtc.encryptedSelf = (0, binary_utils_1.b2a)((0, binary_utils_1.ua2string)(yield this.crypto.primitives.AES.encrypt(encryptionKey.key, (0, binary_utils_1.utf8_2ua)(JSON.stringify({ descr: ctc.descr })), encryptionKey.raw)));
-            delete initialisedCtc.descr;
-            return initialisedCtc;
+            return new models_1.Contact(yield (0, utils_1.encryptObject)(Object.assign(Object.assign({}, initialisedCtc), { services: initialisedCtc.services ? yield this.encryptServices(encryptionKey.key, encryptionKey.raw, initialisedCtc.services) : [] }), (obj) => {
+                return this.crypto.primitives.AES.encrypt(encryptionKey.key, (0, binary_utils_1.utf8_2ua)(JSON.stringify(obj)), encryptionKey.raw);
+            }, this.contactEncryptedFields, 'contact'));
         })));
     }
     decrypt(hcpartyId, ctcs) {
@@ -313,22 +335,10 @@ class IccContactXApi extends icc_api_1.IccContactApi {
                 console.log('Cannot decrypt contact', ctc.id);
                 return ctc;
             }
-            ctc.services = yield this.decryptServices(hcpartyId, ctc.services || [], keys);
-            if (ctc.encryptedSelf) {
-                try {
-                    const json = yield this.crypto.entities.tryDecryptJson(keys, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(ctc.encryptedSelf)), false);
-                    if (json) {
-                        _.assign(ctc, json);
-                    }
-                    else {
-                        console.log('Cannot decrypt ctc: no valid key could produce valid json', ctc.id);
-                    }
-                }
-                catch (e) {
-                    console.log('Failed to decrypt ctc', ctc.id, e);
-                }
-            }
-            return ctc;
+            return new models_1.Contact(yield (0, utils_1.decryptObject)(ctc, (encrypted) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                return (_a = (yield this.crypto.entities.tryDecryptJson(keys, encrypted, false))) !== null && _a !== void 0 ? _a : {};
+            })));
         })));
     }
     decryptServices(hcpartyId, svcs, keys) {
@@ -336,43 +346,10 @@ class IccContactXApi extends icc_api_1.IccContactApi {
             if (!keys) {
                 keys = yield this.crypto.entities.importAllValidKeys(yield this.crypto.entities.encryptionKeysOf(svc, hcpartyId));
             }
-            if (svc.encryptedContent) {
-                try {
-                    const json = yield this.crypto.entities.tryDecryptJson(keys, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(svc.encryptedContent)), true);
-                    if (json) {
-                        Object.assign(svc, { content: json });
-                    }
-                    else {
-                        console.log('Cannot decrypt service: no valid key could produce valid json', svc.id);
-                    }
-                }
-                catch (e) {
-                    console.log('Cannot decrypt service', svc.id, e);
-                }
-            }
-            else if (svc.encryptedSelf) {
-                try {
-                    const json = yield this.crypto.entities.tryDecryptJson(keys, (0, binary_utils_1.string2ua)((0, binary_utils_1.a2b)(svc.encryptedSelf)), true);
-                    if (json) {
-                        Object.assign(svc, json);
-                    }
-                    else {
-                        console.log('Cannot decrypt service: no valid key could produce valid json', svc.id);
-                    }
-                }
-                catch (e) {
-                    console.log('Cannot decrypt service', svc.id, e);
-                }
-            }
-            else {
-                svc.content = _.fromPairs(yield Promise.all(_.toPairs(svc.content).map((p) => __awaiter(this, void 0, void 0, function* () {
-                    if (p[1].compoundValue) {
-                        p[1].compoundValue = yield this.decryptServices(hcpartyId, p[1].compoundValue, keys);
-                    }
-                    return p;
-                }))));
-            }
-            return svc;
+            return new models_1.Contact(yield (0, utils_1.decryptObject)(svc, (encrypted) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                return (_a = (yield this.crypto.entities.tryDecryptJson(keys, encrypted, false))) !== null && _a !== void 0 ? _a : {};
+            })));
         })));
     }
     contactOfService(ctcs, svcId) {
@@ -773,13 +750,18 @@ class IccContactXApi extends icc_api_1.IccContactApi {
     shareWithMany(contact, 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(contact, true, Object.fromEntries(Object.entries(delegates).map(([delegateId, options]) => [
+            const extended = yield this.crypto.entities.entityWithAutoExtendedEncryptedMetadata(contact, true, Object.fromEntries(Object.entries(delegates).map(([delegateId, options]) => [
                 delegateId,
                 {
                     shareEncryptionKey: options.shareEncryptionKey,
                     shareOwningEntityIds: options.sharePatientId,
                 },
-            ]))));
+            ])));
+            if (!!extended) {
+                return yield this.modifyAs(self, extended);
+            }
+            else
+                return contact;
         });
     }
     getDataOwnersWithAccessTo(entity) {