@icure/api 6.4.0 → 7.0.0-beta.1

package/icc-x-api/icc-data-owner-x-api.d.ts

@@ -1,14 +1,113 @@
 import { User } from '../icc-api/model/User';
-import { IccPatientApi } from '../icc-api';
-import { IccCryptoXApi } from './icc-crypto-x-api';
-import { Delegation } from '../icc-api/model/Delegation';
+import { IccDeviceApi, IccPatientApi, IccUserApi } from '../icc-api';
+import { HealthcareParty } from '../icc-api/model/HealthcareParty';
+import { Patient } from '../icc-api/model/Patient';
+import { Device } from '../icc-api/model/Device';
+import { IccHcpartyXApi } from './icc-hcparty-x-api';
+/**
+ * Represents a type of data owner.
+ */
+export type DataOwnerTypeEnum = 'patient' | 'device' | 'hcp';
+export declare const DataOwnerTypeEnum: {
+    [key: string]: DataOwnerTypeEnum;
+};
+/**
+ * Represents any data owner.
+ */
+export type DataOwner = (Patient | Device | HealthcareParty) & {
+    id: string;
+};
+/**
+ * Represents any data owner enriched with type information.
+ */
+export type DataOwnerWithType = {
+    type: 'patient';
+    dataOwner: Patient & DataOwner;
+} | {
+    type: 'device';
+    dataOwner: Device & DataOwner;
+} | {
+    type: 'hcp';
+    dataOwner: HealthcareParty & DataOwner;
+};
 export declare class IccDataOwnerXApi {
-    crypto: IccCryptoXApi;
-    private patientBaseApi;
-    constructor(crypto: IccCryptoXApi, patientBaseApi: IccPatientApi);
-    getDataOwnerOf(user: User): string;
-    private _hasAccessTo;
-    hasAccessTo(dataOwner: User, delegations: {
-        [key: string]: Array<Delegation>;
-    }): Promise<boolean>;
+    private readonly userBaseApi;
+    private readonly hcpartyBaseApi;
+    private readonly patientBaseApi;
+    private readonly deviceBaseApi;
+    private currentDataOwnerType;
+    private currentDataOwnerHierarchyIds;
+    private get selfDataOwnerId();
+    constructor(userBaseApi: IccUserApi, hcpartyBaseApi: IccHcpartyXApi, //Init with a hcparty x api for better performances
+    patientBaseApi: IccPatientApi, deviceBaseApi: IccDeviceApi);
+    /**
+     * If the logged user is a data owner get the current data owner. This information is cached without expiration, and will only be updated in case
+     * of forced refresh.
+     * @throws if the current user is not a data owner.
+     */
+    getCurrentDataOwnerId(): Promise<string>;
+    /**
+     * If the logged user is a data owner get its parent hierarchy. This information is cached without expiration, and will only be updated in case
+     * of forced refresh.
+     * The resulting array starts with the topmost parent (the only ancestor without a parent) and ends with the data owner itself.
+     * @throws if the current user is not a data owner.
+     */
+    getCurrentDataOwnerHierarchyIds(): Promise<string[]>;
+    /**
+     * Get the hierarchy for the current data owner starting from the specified parent.
+     * @throws an array starting at the topmost parent and ending at the provided parent id. If the provided id is not part of the hierarchy throws an
+     * error.
+     */
+    getCurrentDataOwnerHierarchyIdsFrom(parentId: string): Promise<string[]>;
+    /**
+     * If the logged user is a data owner get the current data owner.
+     * @throws if the current user is not a data owner.
+     */
+    getCurrentDataOwner(): Promise<DataOwnerWithType>;
+    /**
+     * If the logged user is a data owner get the current data owner and all of his parents.
+     * @throws if the current user is not a data owner.
+     * @return the current data owner hierarchy, starting from the topmost parent to the current data owner.
+     */
+    getCurrentDataOwnerHierarchy(): Promise<DataOwnerWithType[]>;
+    /**
+     * If the logged user is a data owner get the type of the current data owner. This information is cached.
+     * @throws if the current user is not a data owner
+     */
+    getCurrentDataOwnerType(): Promise<DataOwnerTypeEnum>;
+    /**
+     * Get the id of the data owner entity for a user.
+     * @param user a user that is also a data owner.
+     * @return the id of the data owner corresponding to the provided user.
+     * @throws if the user is not a data owner.
+     */
+    getDataOwnerIdOf(user: User): string;
+    /**
+     * Get a data owner. Uses a cache to improve performance.
+     * @param ownerId id of the data owner to retrieve (patient, medical device, hcp, ...)
+     * @return the data owner or undefined if loadIfMissingFromCache is false and there is no data owner with provided id in cache.
+     * @throws if no data owner with the provided id could be found on an error occurred while attempting to retrieve it.
+     */
+    getDataOwner(ownerId: string): Promise<DataOwnerWithType>;
+    /**
+     * Gets the public keys of a data owner in hex format.
+     * @param dataOwner a data owner.
+     * @return the public keys for the data owner in hex format.
+     */
+    getHexPublicKeysOf(dataOwner: DataOwner): Set<string>;
+    /**
+     * Clears the cache of current data owner id and parent hierarchy ids. The hierarchy of a data owner should not normally change over time, so this
+     * method should be rarely needed.
+     */
+    clearCurrentDataOwnerIdsCache(): void;
+    /**
+     * @internal This method is intended only for internal use and may be changed without notice.
+     * Updates a data owner and its cached value.
+     * @param dataOwner a data owner with updated value.
+     * @return the updated data owner, with updated revision.
+     */
+    updateDataOwner(dataOwner: DataOwnerWithType): Promise<DataOwnerWithType>;
+    private checkDataOwnerIntegrity;
+    private forceLoadCurrentDataOwnerHierarchyAndCacheIds;
+    private handleError;
 }

package/icc-x-api/icc-data-owner-x-api.js

@@ -9,13 +9,120 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IccDataOwnerXApi = void 0;
+exports.IccDataOwnerXApi = exports.DataOwnerTypeEnum = void 0;
+const utils_1 = require("./crypto/utils");
+const XHR_1 = require("../icc-api/api/XHR");
+exports.DataOwnerTypeEnum = {
+    Patient: 'patient',
+    Device: 'device',
+    Hcp: 'hcp',
+};
 class IccDataOwnerXApi {
-    constructor(crypto, patientBaseApi) {
-        this.crypto = crypto;
+    get selfDataOwnerId() {
+        if (!this.currentDataOwnerHierarchyIds)
+            return undefined;
+        return this.currentDataOwnerHierarchyIds[this.currentDataOwnerHierarchyIds.length - 1];
+    }
+    constructor(userBaseApi, hcpartyBaseApi, //Init with a hcparty x api for better performances
+    patientBaseApi, deviceBaseApi) {
+        this.userBaseApi = userBaseApi;
+        this.hcpartyBaseApi = hcpartyBaseApi;
         this.patientBaseApi = patientBaseApi;
+        this.deviceBaseApi = deviceBaseApi;
+    }
+    /**
+     * If the logged user is a data owner get the current data owner. This information is cached without expiration, and will only be updated in case
+     * of forced refresh.
+     * @throws if the current user is not a data owner.
+     */
+    getCurrentDataOwnerId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.currentDataOwnerHierarchyIds) {
+                yield this.getCurrentDataOwnerHierarchyIds();
+            }
+            return this.currentDataOwnerHierarchyIds[this.currentDataOwnerHierarchyIds.length - 1];
+        });
+    }
+    /**
+     * If the logged user is a data owner get its parent hierarchy. This information is cached without expiration, and will only be updated in case
+     * of forced refresh.
+     * The resulting array starts with the topmost parent (the only ancestor without a parent) and ends with the data owner itself.
+     * @throws if the current user is not a data owner.
+     */
+    getCurrentDataOwnerHierarchyIds() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.currentDataOwnerHierarchyIds) {
+                yield this.forceLoadCurrentDataOwnerHierarchyAndCacheIds();
+            }
+            return [...this.currentDataOwnerHierarchyIds];
+        });
+    }
+    /**
+     * Get the hierarchy for the current data owner starting from the specified parent.
+     * @throws an array starting at the topmost parent and ending at the provided parent id. If the provided id is not part of the hierarchy throws an
+     * error.
+     */
+    getCurrentDataOwnerHierarchyIdsFrom(parentId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.currentDataOwnerHierarchyIds) {
+                yield this.getCurrentDataOwnerHierarchyIds();
+            }
+            const res = [];
+            for (const dataOwnerId of this.currentDataOwnerHierarchyIds) {
+                res.push(dataOwnerId);
+                if (dataOwnerId === parentId)
+                    return res;
+            }
+            throw new Error(`${parentId} is not part of the data owner hierarchy for the current user`);
+        });
+    }
+    /**
+     * If the logged user is a data owner get the current data owner.
+     * @throws if the current user is not a data owner.
+     */
+    getCurrentDataOwner() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.currentDataOwnerHierarchyIds) {
+                const dataOwnerHierarchy = yield this.forceLoadCurrentDataOwnerHierarchyAndCacheIds();
+                return dataOwnerHierarchy[dataOwnerHierarchy.length - 1];
+            }
+            else
+                return this.getDataOwner(yield this.getCurrentDataOwnerId());
+        });
     }
-    getDataOwnerOf(user) {
+    /**
+     * If the logged user is a data owner get the current data owner and all of his parents.
+     * @throws if the current user is not a data owner.
+     * @return the current data owner hierarchy, starting from the topmost parent to the current data owner.
+     */
+    getCurrentDataOwnerHierarchy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.currentDataOwnerHierarchyIds) {
+                return yield this.forceLoadCurrentDataOwnerHierarchyAndCacheIds();
+            }
+            else
+                return Promise.all(this.currentDataOwnerHierarchyIds.map((id) => this.getDataOwner(id)));
+        });
+    }
+    /**
+     * If the logged user is a data owner get the type of the current data owner. This information is cached.
+     * @throws if the current user is not a data owner
+     */
+    getCurrentDataOwnerType() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.currentDataOwnerHierarchyIds) {
+                yield this.forceLoadCurrentDataOwnerHierarchyAndCacheIds();
+            }
+            return this.currentDataOwnerType;
+        });
+    }
+    /**
+     * Get the id of the data owner entity for a user.
+     * @param user a user that is also a data owner.
+     * @return the id of the data owner corresponding to the provided user.
+     * @throws if the user is not a data owner.
+     */
+    getDataOwnerIdOf(user) {
         var _a, _b;
         const dataOwnerId = (_b = (_a = user.healthcarePartyId) !== null && _a !== void 0 ? _a : user.patientId) !== null && _b !== void 0 ? _b : user.deviceId;
         if (dataOwnerId == undefined) {
@@ -23,22 +130,89 @@ class IccDataOwnerXApi {
         }
         return dataOwnerId;
     }
-    _hasAccessTo(dataOwnerId, delegations) {
+    /**
+     * Get a data owner. Uses a cache to improve performance.
+     * @param ownerId id of the data owner to retrieve (patient, medical device, hcp, ...)
+     * @return the data owner or undefined if loadIfMissingFromCache is false and there is no data owner with provided id in cache.
+     * @throws if no data owner with the provided id could be found on an error occurred while attempting to retrieve it.
+     */
+    getDataOwner(ownerId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.crypto.getDataOwner(dataOwnerId).then(({ dataOwner: dataOwner }) => {
-                const parentId = dataOwner.parentId;
-                if (!dataOwner.id || !delegations[dataOwner.id] || !delegations[dataOwner.id].length) {
-                    return !!parentId ? this._hasAccessTo(parentId, delegations) : false;
-                }
-                return true;
-            });
+            const _url = this.userBaseApi.host + `/dataowner/` + ownerId + '?ts=' + new Date().getTime();
+            let headers = this.userBaseApi.headers;
+            return XHR_1.XHR.sendCommand('GET', _url, headers, null, this.userBaseApi.fetchImpl, undefined, this.userBaseApi.authenticationProvider.getAuthService())
+                .then((doc) => doc.body)
+                .then((dowt) => {
+                if (dowt.dataOwner.id === this.selfDataOwnerId)
+                    this.checkDataOwnerIntegrity(dowt.dataOwner);
+                return dowt;
+            })
+                .catch((err) => this.handleError(err));
         });
     }
-    hasAccessTo(dataOwner, delegations) {
+    /**
+     * Gets the public keys of a data owner in hex format.
+     * @param dataOwner a data owner.
+     * @return the public keys for the data owner in hex format.
+     */
+    getHexPublicKeysOf(dataOwner) {
+        return (0, utils_1.hexPublicKeysOf)(dataOwner);
+    }
+    /**
+     * Clears the cache of current data owner id and parent hierarchy ids. The hierarchy of a data owner should not normally change over time, so this
+     * method should be rarely needed.
+     */
+    clearCurrentDataOwnerIdsCache() {
+        this.currentDataOwnerHierarchyIds = undefined;
+    }
+    /**
+     * @internal This method is intended only for internal use and may be changed without notice.
+     * Updates a data owner and its cached value.
+     * @param dataOwner a data owner with updated value.
+     * @return the updated data owner, with updated revision.
+     */
+    updateDataOwner(dataOwner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ownerType = dataOwner.type;
+            const ownerToUpdate = dataOwner.dataOwner;
+            if (ownerType === 'hcp') {
+                return yield this.hcpartyBaseApi
+                    .modifyHealthcareParty(ownerToUpdate)
+                    .then((x) => ({ type: 'hcp', dataOwner: x }));
+            }
+            else if (ownerType === 'patient') {
+                return yield this.patientBaseApi.modifyPatient(ownerToUpdate).then((x) => ({ type: 'patient', dataOwner: x }));
+            }
+            else if (ownerType === 'device') {
+                return yield this.deviceBaseApi.updateDevice(ownerToUpdate).then((x) => ({ type: 'device', dataOwner: x }));
+            }
+            else
+                throw new Error(`Unrecognised data owner type: ${ownerType}`);
+        });
+    }
+    checkDataOwnerIntegrity(dataOwner) {
+        const keys = this.getHexPublicKeysOf(dataOwner);
+        if (new Set(Array.from(keys).map((x) => x.slice(-32))).size != keys.size)
+            throw new Error(`Different public keys for ${dataOwner.id} have the same fingerprint; this should not happen in normal circumstances. Please report this error to iCure.`);
+    }
+    forceLoadCurrentDataOwnerHierarchyAndCacheIds() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._hasAccessTo(this.getDataOwnerOf(dataOwner), delegations);
+            const currentUser = yield this.userBaseApi.getCurrentUser();
+            let curr = yield this.getDataOwner(this.getDataOwnerIdOf(currentUser));
+            this.checkDataOwnerIntegrity(curr.dataOwner);
+            this.currentDataOwnerType = curr.type;
+            let res = [curr];
+            while (curr.dataOwner.parentId) {
+                curr = yield this.getDataOwner(curr.dataOwner.parentId);
+                res = [curr, ...res];
+            }
+            this.currentDataOwnerHierarchyIds = res.map((x) => x.dataOwner.id);
+            return res;
         });
     }
+    handleError(e) {
+        throw e;
+    }
 }
 exports.IccDataOwnerXApi = IccDataOwnerXApi;
 //# sourceMappingURL=icc-data-owner-x-api.js.map

package/icc-x-api/icc-data-owner-x-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"icc-data-owner-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-data-owner-x-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,MAAa,gBAAgB;IAI3B,YAAY,MAAqB,EAAE,cAA6B;QAC9D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACtC,CAAC;IAED,cAAc,CAAC,IAAU;;QACvB,MAAM,WAAW,GAAG,MAAA,MAAA,IAAI,CAAC,iBAAiB,mCAAI,IAAI,CAAC,SAAS,mCAAI,IAAI,CAAC,QAAQ,CAAA;QAC7E,IAAI,WAAW,IAAI,SAAS,EAAE;YAC5B,MAAM,KAAK,CAAC,QAAQ,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAA;SACnD;QACD,OAAO,WAAW,CAAA;IACpB,CAAC;IAEa,YAAY,CAAC,WAAmB,EAAE,WAAiD;;YAC/F,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE;gBAC7E,MAAM,QAAQ,GAAI,SAA6B,CAAC,QAAQ,CAAA;gBACxD,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE;oBACpF,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;iBACrE;gBACD,OAAO,IAAI,CAAA;YACb,CAAC,CAAC,CAAA;QACJ,CAAC;KAAA;IAEK,WAAW,CAAC,SAAe,EAAE,WAAiD;;YAClF,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,CAAA;QACvE,CAAC;KAAA;CACF;AA9BD,4CA8BC","sourcesContent":["import { User } from '../icc-api/model/User'\nimport { IccPatientApi } from '../icc-api'\nimport { IccCryptoXApi } from './icc-crypto-x-api'\nimport { HealthcareParty } from '../icc-api/model/HealthcareParty'\nimport { Delegation } from '../icc-api/model/Delegation'\n\nexport class IccDataOwnerXApi {\n  crypto: IccCryptoXApi\n  private patientBaseApi: IccPatientApi\n\n  constructor(crypto: IccCryptoXApi, patientBaseApi: IccPatientApi) {\n    this.crypto = crypto\n    this.patientBaseApi = patientBaseApi\n  }\n\n  getDataOwnerOf(user: User): string {\n    const dataOwnerId = user.healthcarePartyId ?? user.patientId ?? user.deviceId\n    if (dataOwnerId == undefined) {\n      throw Error(`User ${user.id} is not a data owner`)\n    }\n    return dataOwnerId\n  }\n\n  private async _hasAccessTo(dataOwnerId: string, delegations: { [key: string]: Array<Delegation> }): Promise<boolean> {\n    return this.crypto.getDataOwner(dataOwnerId).then(({ dataOwner: dataOwner }) => {\n      const parentId = (dataOwner as HealthcareParty).parentId\n      if (!dataOwner.id || !delegations[dataOwner.id] || !delegations[dataOwner.id].length) {\n        return !!parentId ? this._hasAccessTo(parentId, delegations) : false\n      }\n      return true\n    })\n  }\n\n  async hasAccessTo(dataOwner: User, delegations: { [key: string]: Array<Delegation> }): Promise<boolean> {\n    return this._hasAccessTo(this.getDataOwnerOf(dataOwner), delegations)\n  }\n}\n"]}
+{"version":3,"file":"icc-data-owner-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-data-owner-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { User } from '../icc-api/model/User'\nimport { IccDeviceApi, IccPatientApi, IccUserApi } from '../icc-api'\nimport { HealthcareParty } from '../icc-api/model/HealthcareParty'\nimport { Patient } from '../icc-api/model/Patient'\nimport { Device } from '../icc-api/model/Device'\nimport { hexPublicKeysOf } from './crypto/utils'\nimport { IccHcpartyXApi } from './icc-hcparty-x-api'\nimport { XHR } from '../icc-api/api/XHR'\n\n/**\n * Represents a type of data owner.\n */\nexport type DataOwnerTypeEnum = 'patient' | 'device' | 'hcp'\nexport const DataOwnerTypeEnum: { [key: string]: DataOwnerTypeEnum } = {\n  Patient: 'patient',\n  Device: 'device',\n  Hcp: 'hcp',\n}\n\n/**\n * Represents any data owner.\n */\n// Trick to make typechecking work: without this you can pass anything to a data owner\nexport type DataOwner = (Patient | Device | HealthcareParty) & { id: string }\n\n/**\n * Represents any data owner enriched with type information.\n */\nexport type DataOwnerWithType =\n  | { type: 'patient'; dataOwner: Patient & DataOwner }\n  | { type: 'device'; dataOwner: Device & DataOwner }\n  | { type: 'hcp'; dataOwner: HealthcareParty & DataOwner }\n\nexport class IccDataOwnerXApi {\n  private readonly userBaseApi: IccUserApi\n  private readonly hcpartyBaseApi: IccHcpartyXApi\n  private readonly patientBaseApi: IccPatientApi\n  private readonly deviceBaseApi: IccDeviceApi\n  private currentDataOwnerType: DataOwnerTypeEnum | undefined\n  private currentDataOwnerHierarchyIds: string[] | undefined\n\n  private get selfDataOwnerId(): string | undefined {\n    if (!this.currentDataOwnerHierarchyIds) return undefined\n    return this.currentDataOwnerHierarchyIds[this.currentDataOwnerHierarchyIds.length - 1]\n  }\n\n  constructor(\n    userBaseApi: IccUserApi,\n    hcpartyBaseApi: IccHcpartyXApi, //Init with a hcparty x api for better performances\n    patientBaseApi: IccPatientApi,\n    deviceBaseApi: IccDeviceApi\n  ) {\n    this.userBaseApi = userBaseApi\n    this.hcpartyBaseApi = hcpartyBaseApi\n    this.patientBaseApi = patientBaseApi\n    this.deviceBaseApi = deviceBaseApi\n  }\n\n  /**\n   * If the logged user is a data owner get the current data owner. This information is cached without expiration, and will only be updated in case\n   * of forced refresh.\n   * @throws if the current user is not a data owner.\n   */\n  async getCurrentDataOwnerId(): Promise<string> {\n    if (!this.currentDataOwnerHierarchyIds) {\n      await this.getCurrentDataOwnerHierarchyIds()\n    }\n    return this.currentDataOwnerHierarchyIds![this.currentDataOwnerHierarchyIds!.length - 1]\n  }\n\n  /**\n   * If the logged user is a data owner get its parent hierarchy. This information is cached without expiration, and will only be updated in case\n   * of forced refresh.\n   * The resulting array starts with the topmost parent (the only ancestor without a parent) and ends with the data owner itself.\n   * @throws if the current user is not a data owner.\n   */\n  async getCurrentDataOwnerHierarchyIds(): Promise<string[]> {\n    if (!this.currentDataOwnerHierarchyIds) {\n      await this.forceLoadCurrentDataOwnerHierarchyAndCacheIds()\n    }\n    return [...this.currentDataOwnerHierarchyIds!]\n  }\n\n  /**\n   * Get the hierarchy for the current data owner starting from the specified parent.\n   * @throws an array starting at the topmost parent and ending at the provided parent id. If the provided id is not part of the hierarchy throws an\n   * error.\n   */\n  async getCurrentDataOwnerHierarchyIdsFrom(parentId: string): Promise<string[]> {\n    if (!this.currentDataOwnerHierarchyIds) {\n      await this.getCurrentDataOwnerHierarchyIds()\n    }\n    const res = []\n    for (const dataOwnerId of this.currentDataOwnerHierarchyIds!) {\n      res.push(dataOwnerId)\n      if (dataOwnerId === parentId) return res\n    }\n    throw new Error(`${parentId} is not part of the data owner hierarchy for the current user`)\n  }\n\n  /**\n   * If the logged user is a data owner get the current data owner.\n   * @throws if the current user is not a data owner.\n   */\n  async getCurrentDataOwner(): Promise<DataOwnerWithType> {\n    if (!this.currentDataOwnerHierarchyIds) {\n      const dataOwnerHierarchy = await this.forceLoadCurrentDataOwnerHierarchyAndCacheIds()\n      return dataOwnerHierarchy[dataOwnerHierarchy.length - 1]\n    } else return this.getDataOwner(await this.getCurrentDataOwnerId())\n  }\n\n  /**\n   * If the logged user is a data owner get the current data owner and all of his parents.\n   * @throws if the current user is not a data owner.\n   * @return the current data owner hierarchy, starting from the topmost parent to the current data owner.\n   */\n  async getCurrentDataOwnerHierarchy(): Promise<DataOwnerWithType[]> {\n    if (!this.currentDataOwnerHierarchyIds) {\n      return await this.forceLoadCurrentDataOwnerHierarchyAndCacheIds()\n    } else return Promise.all(this.currentDataOwnerHierarchyIds!.map((id) => this.getDataOwner(id)))\n  }\n\n  /**\n   * If the logged user is a data owner get the type of the current data owner. This information is cached.\n   * @throws if the current user is not a data owner\n   */\n  async getCurrentDataOwnerType(): Promise<DataOwnerTypeEnum> {\n    if (!this.currentDataOwnerHierarchyIds) {\n      await this.forceLoadCurrentDataOwnerHierarchyAndCacheIds()\n    }\n    return this.currentDataOwnerType!\n  }\n\n  /**\n   * Get the id of the data owner entity for a user.\n   * @param user a user that is also a data owner.\n   * @return the id of the data owner corresponding to the provided user.\n   * @throws if the user is not a data owner.\n   */\n  getDataOwnerIdOf(user: User): string {\n    const dataOwnerId = user.healthcarePartyId ?? user.patientId ?? user.deviceId\n    if (dataOwnerId == undefined) {\n      throw Error(`User ${user.id} is not a data owner`)\n    }\n    return dataOwnerId\n  }\n\n  /**\n   * Get a data owner. Uses a cache to improve performance.\n   * @param ownerId id of the data owner to retrieve (patient, medical device, hcp, ...)\n   * @return the data owner or undefined if loadIfMissingFromCache is false and there is no data owner with provided id in cache.\n   * @throws if no data owner with the provided id could be found on an error occurred while attempting to retrieve it.\n   */\n  async getDataOwner(ownerId: string): Promise<DataOwnerWithType> {\n    const _url = this.userBaseApi.host + `/dataowner/` + ownerId + '?ts=' + new Date().getTime()\n    let headers = this.userBaseApi.headers\n    return XHR.sendCommand(\n      'GET',\n      _url,\n      headers,\n      null,\n      this.userBaseApi.fetchImpl,\n      undefined,\n      this.userBaseApi.authenticationProvider.getAuthService()\n    )\n      .then((doc) => doc.body as DataOwnerWithType)\n      .then((dowt) => {\n        if (dowt.dataOwner.id === this.selfDataOwnerId) this.checkDataOwnerIntegrity(dowt.dataOwner)\n        return dowt\n      })\n      .catch((err) => this.handleError(err))\n  }\n\n  /**\n   * Gets the public keys of a data owner in hex format.\n   * @param dataOwner a data owner.\n   * @return the public keys for the data owner in hex format.\n   */\n  getHexPublicKeysOf(dataOwner: DataOwner): Set<string> {\n    return hexPublicKeysOf(dataOwner)\n  }\n\n  /**\n   * Clears the cache of current data owner id and parent hierarchy ids. The hierarchy of a data owner should not normally change over time, so this\n   * method should be rarely needed.\n   */\n  clearCurrentDataOwnerIdsCache() {\n    this.currentDataOwnerHierarchyIds = undefined\n  }\n\n  /**\n   * @internal This method is intended only for internal use and may be changed without notice.\n   * Updates a data owner and its cached value.\n   * @param dataOwner a data owner with updated value.\n   * @return the updated data owner, with updated revision.\n   */\n  async updateDataOwner(dataOwner: DataOwnerWithType): Promise<DataOwnerWithType> {\n    const ownerType = dataOwner.type\n    const ownerToUpdate = dataOwner.dataOwner\n    if (ownerType === 'hcp') {\n      return await this.hcpartyBaseApi\n        .modifyHealthcareParty(ownerToUpdate as HealthcareParty)\n        .then((x) => ({ type: 'hcp', dataOwner: x } as DataOwnerWithType))\n    } else if (ownerType === 'patient') {\n      return await this.patientBaseApi.modifyPatient(ownerToUpdate as Patient).then((x) => ({ type: 'patient', dataOwner: x } as DataOwnerWithType))\n    } else if (ownerType === 'device') {\n      return await this.deviceBaseApi.updateDevice(ownerToUpdate as Device).then((x) => ({ type: 'device', dataOwner: x } as DataOwnerWithType))\n    } else throw new Error(`Unrecognised data owner type: ${ownerType}`)\n  }\n\n  private checkDataOwnerIntegrity(dataOwner: DataOwner) {\n    const keys = this.getHexPublicKeysOf(dataOwner)\n    if (new Set(Array.from(keys).map((x) => x.slice(-32))).size != keys.size)\n      throw new Error(\n        `Different public keys for ${dataOwner.id} have the same fingerprint; this should not happen in normal circumstances. Please report this error to iCure.`\n      )\n  }\n\n  private async forceLoadCurrentDataOwnerHierarchyAndCacheIds(): Promise<DataOwnerWithType[]> {\n    const currentUser = await this.userBaseApi.getCurrentUser()\n    let curr = await this.getDataOwner(this.getDataOwnerIdOf(currentUser))\n    this.checkDataOwnerIntegrity(curr.dataOwner)\n    this.currentDataOwnerType = curr.type\n    let res = [curr]\n    while ((curr.dataOwner as HealthcareParty).parentId) {\n      curr = await this.getDataOwner((curr.dataOwner as HealthcareParty).parentId!)\n      res = [curr, ...res]\n    }\n    this.currentDataOwnerHierarchyIds = res.map((x) => x.dataOwner.id!)\n    return res\n  }\n\n  private handleError(e: XHR.XHRError): never {\n    throw e\n  }\n}\n"]}

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

@@ -21,19 +21,19 @@ class IccDoctemplateXApi extends icc_api_1.IccDoctemplateApi {
     newInstance(user, template, c) {
         return new Promise((resolve, reject) => {
             const documentTemplate = (0, lodash_1.extend)({
-                id: this.crypto.randomUuid(),
+                id: this.crypto.primitives.randomUuid(),
                 _type: 'org.taktik.icure.entities.DocumentTemplate',
                 owner: user.id,
                 created: new Date().getTime(),
                 modified: new Date().getTime(),
-                guid: this.crypto.randomUuid(),
+                guid: this.crypto.primitives.randomUuid(),
                 group: null,
                 specialty: null,
                 attachment: (0, binary_utils_1.string2ua)(template),
                 mainUti: 'public.plain-text',
             }, c || {});
             if (documentTemplate.group && documentTemplate.group.guid == null) {
-                documentTemplate.group.guid = this.crypto.randomUuid();
+                documentTemplate.group.guid = this.crypto.primitives.randomUuid();
             }
             //sauver l doctemplate vide
             if (template) {

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

@@ -1 +1 @@
-{"version":3,"file":"icc-doctemplate-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-doctemplate-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccDoctemplateApi } from '../icc-api'\nimport { IccCryptoXApi } from './icc-crypto-x-api'\n\nimport { extend } from 'lodash'\nimport * as models from '../icc-api/model/models'\nimport { DocumentTemplate } from '../icc-api/model/models'\nimport { string2ua } from './utils/binary-utils'\nimport { XHR } from '../icc-api/api/XHR'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\n\n// noinspection JSUnusedGlobalSymbols\nexport class IccDoctemplateXApi extends IccDoctemplateApi {\n  crypto: IccCryptoXApi\n  authenticationProvider: AuthenticationProvider\n  fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response>\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    crypto: IccCryptoXApi,\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !== 'undefined'\n      ? window.fetch\n      : typeof self !== 'undefined'\n      ? self.fetch\n      : fetch\n  ) {\n    super(host, headers, authenticationProvider, fetchImpl)\n    this.crypto = crypto\n    this.authenticationProvider = authenticationProvider\n    this.fetchImpl = fetchImpl\n  }\n\n  newInstance(user: models.User, template: string, c: any): Promise<DocumentTemplate> {\n    return new Promise<DocumentTemplate>((resolve, reject) => {\n      const documentTemplate: DocumentTemplate = extend(\n        {\n          id: this.crypto.randomUuid(),\n          _type: 'org.taktik.icure.entities.DocumentTemplate',\n          owner: user.id,\n          created: new Date().getTime(),\n          modified: new Date().getTime(),\n          guid: this.crypto.randomUuid(),\n          group: null,\n          specialty: null,\n          attachment: string2ua(template),\n          mainUti: 'public.plain-text',\n        },\n        c || {}\n      )\n      if (documentTemplate.group && documentTemplate.group.guid == null) {\n        documentTemplate.group.guid = this.crypto.randomUuid()\n      }\n\n      //sauver l doctemplate vide\n\n      if (template) {\n        //save attachement\n      }\n\n      return resolve(documentTemplate)\n    })\n  }\n\n  // noinspection JSUnusedLocalSymbols\n  findAllByOwnerId(ownerId: string): Promise<Array<models.DocumentTemplate>> {\n    return new Promise(function (resolve, reject) {\n      reject(console.log('findByHCPartyPatientSecretFKeys not implemented in document API!'))\n    })\n  }\n\n  // noinspection JSUnusedGlobalSymbols\n  getAttachmentUrl(documentId: string, attachmentId: string) {\n    return (\n      this.host + '/doctemplate/{documentId}/attachment/{attachmentId}'.replace('{documentId}', documentId).replace('{attachmentId}', attachmentId)\n    )\n  }\n\n  getAttachmentText(documentTemplateId: string, attachmentId: string): Promise<any | boolean> {\n    const _body = null\n\n    const _url =\n      this.host +\n      '/doctemplate/{documentTemplateId}/attachmentText/{attachmentId}'\n        .replace('{documentTemplateId}', documentTemplateId + '')\n        .replace('{attachmentId}', attachmentId + '') +\n      '?ts=' +\n      new Date().getTime()\n\n    return XHR.sendCommand('GET', _url, this.headers, _body, this.fetchImpl, undefined, this.authenticationProvider.getAuthService())\n      .then((doc) => {\n        if (doc.contentType.startsWith('application/octet-stream')) {\n          const enc = new TextDecoder('utf-8')\n          const arr = new Uint8Array(doc.body)\n          return enc.decode(arr)\n        } else if (doc.contentType.startsWith('text/plain') || doc.contentType.startsWith('text/html') || doc.contentType.startsWith('text/xml')) {\n          return doc.body\n        } else {\n          return false\n        }\n      })\n      .catch((err) => this.handleError(err))\n  }\n}\n"]}
+{"version":3,"file":"icc-doctemplate-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-doctemplate-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccDoctemplateApi } from '../icc-api'\nimport { IccCryptoXApi } from './icc-crypto-x-api'\n\nimport { extend } from 'lodash'\nimport * as models from '../icc-api/model/models'\nimport { DocumentTemplate } from '../icc-api/model/models'\nimport { string2ua } from './utils/binary-utils'\nimport { XHR } from '../icc-api/api/XHR'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\n\n// noinspection JSUnusedGlobalSymbols\nexport class IccDoctemplateXApi extends IccDoctemplateApi {\n  crypto: IccCryptoXApi\n  authenticationProvider: AuthenticationProvider\n  fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response>\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    crypto: IccCryptoXApi,\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !== 'undefined'\n      ? window.fetch\n      : typeof self !== 'undefined'\n      ? self.fetch\n      : fetch\n  ) {\n    super(host, headers, authenticationProvider, fetchImpl)\n    this.crypto = crypto\n    this.authenticationProvider = authenticationProvider\n    this.fetchImpl = fetchImpl\n  }\n\n  newInstance(user: models.User, template: string, c: any): Promise<DocumentTemplate> {\n    return new Promise<DocumentTemplate>((resolve, reject) => {\n      const documentTemplate: DocumentTemplate = extend(\n        {\n          id: this.crypto.primitives.randomUuid(),\n          _type: 'org.taktik.icure.entities.DocumentTemplate',\n          owner: user.id,\n          created: new Date().getTime(),\n          modified: new Date().getTime(),\n          guid: this.crypto.primitives.randomUuid(),\n          group: null,\n          specialty: null,\n          attachment: string2ua(template),\n          mainUti: 'public.plain-text',\n        },\n        c || {}\n      )\n      if (documentTemplate.group && documentTemplate.group.guid == null) {\n        documentTemplate.group.guid = this.crypto.primitives.randomUuid()\n      }\n\n      //sauver l doctemplate vide\n\n      if (template) {\n        //save attachement\n      }\n\n      return resolve(documentTemplate)\n    })\n  }\n\n  // noinspection JSUnusedLocalSymbols\n  findAllByOwnerId(ownerId: string): Promise<Array<models.DocumentTemplate>> {\n    return new Promise(function (resolve, reject) {\n      reject(console.log('findByHCPartyPatientSecretFKeys not implemented in document API!'))\n    })\n  }\n\n  // noinspection JSUnusedGlobalSymbols\n  getAttachmentUrl(documentId: string, attachmentId: string) {\n    return (\n      this.host + '/doctemplate/{documentId}/attachment/{attachmentId}'.replace('{documentId}', documentId).replace('{attachmentId}', attachmentId)\n    )\n  }\n\n  getAttachmentText(documentTemplateId: string, attachmentId: string): Promise<any | boolean> {\n    const _body = null\n\n    const _url =\n      this.host +\n      '/doctemplate/{documentTemplateId}/attachmentText/{attachmentId}'\n        .replace('{documentTemplateId}', documentTemplateId + '')\n        .replace('{attachmentId}', attachmentId + '') +\n      '?ts=' +\n      new Date().getTime()\n\n    return XHR.sendCommand('GET', _url, this.headers, _body, this.fetchImpl, undefined, this.authenticationProvider.getAuthService())\n      .then((doc) => {\n        if (doc.contentType.startsWith('application/octet-stream')) {\n          const enc = new TextDecoder('utf-8')\n          const arr = new Uint8Array(doc.body)\n          return enc.decode(arr)\n        } else if (doc.contentType.startsWith('text/plain') || doc.contentType.startsWith('text/html') || doc.contentType.startsWith('text/xml')) {\n          return doc.body\n        } else {\n          return false\n        }\n      })\n      .catch((err) => this.handleError(err))\n  }\n}\n"]}

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

@@ -3,6 +3,7 @@ import { IccCryptoXApi } from './icc-crypto-x-api';
 import * as models from '../icc-api/model/models';
 import { IccDataOwnerXApi } from './icc-data-owner-x-api';
 import { AuthenticationProvider } from './auth/AuthenticationProvider';
+import { ShareMetadataBehaviour } from './crypto/ShareMetadataBehaviour';
 export declare class IccDocumentXApi extends IccDocumentApi {
     private crypto;
     private authApi;
@@ -25,11 +26,27 @@ export declare class IccDocumentXApi extends IccDocumentApi {
     constructor(host: string, headers: {
         [key: string]: string;
     }, crypto: IccCryptoXApi, authApi: IccAuthApi, dataOwnerApi: IccDataOwnerXApi, authenticationProvider?: AuthenticationProvider, fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>);
-    newInstance(user: models.User, message?: models.Message, c?: any): Promise<models.Document>;
-    initEncryptionKeys(user: models.User, document: models.Document): Promise<models.Document & {
-        encryptionKeys: any;
-    }>;
-    private initDelegationsAndEncryptionKeys;
+    /**
+     * Creates a new instance of document with initialised encryption metadata (not in the database).
+     * @param user the current user.
+     * @param message the message this document refers to.
+     * @param c initialised data for the document. 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 classification. 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 document.
+     */
+    newInstance(user: models.User, message?: models.Message, c?: any, options?: {
+        additionalDelegates?: {
+            [dataOwnerId: string]: 'WRITE';
+        };
+        preferredSfk?: string;
+    }): Promise<models.Document>;
     findByMessage(hcpartyId: string, message: models.Message): Promise<models.Document[]>;
     decrypt(hcpartyId: string, documents: Array<models.Document>): Promise<Array<models.Document>>;
     getAttachmentAs(documentId: string, attachmentId: string, returnType: "application/octet-stream", enckeys?: string, fileName?: string): Promise<ArrayBuffer>;
@@ -41,4 +58,58 @@ export declare class IccDocumentXApi extends IccDocumentApi {
     }>, fileName?: string): Promise<string>;
     uti(mimeType: string, extension: string): string;
     mimeType(uti: string): string;
+    /**
+     * Adds an attachment to a document, encrypting it on client side using the encryption keys of the provided document.
+     * @param document a document.
+     * @param attachment a new main attachment for the document.
+     * @return the updated document.
+     */
+    encryptAndSetDocumentAttachment(document: models.Document, attachment: ArrayBuffer | Uint8Array): Promise<models.Document>;
+    /**
+     * Adds a secondary attachment to a document, encrypting it on client side using the encryption keys of the provided document.
+     * @param document a document.
+     * @param secondaryAttachmentKey key for the secondary attachment.
+     * @param attachment a new secondary attachment for the document.
+     * @return the updated document.
+     */
+    encryptAndSetSecondaryDocumentAttachment(document: models.Document, secondaryAttachmentKey: string, attachment: ArrayBuffer | Uint8Array): Promise<models.Document>;
+    /**
+     * Gets the main attachment of a document and tries to decrypt it using the encryption keys of the document.
+     * @param document a document.
+     * @param validator optionally a validator function which checks if the decryption was successful. In cases where the document has many encryption
+     * keys and it is unclear which one should be used this function can help to detect bad decryptions.
+     * @return the decrypted attachment, if it could be decrypted, else the encrypted attachment.
+     */
+    getAndDecryptDocumentAttachment(document: models.Document, validator?: (decrypted: ArrayBuffer) => Promise<boolean>): Promise<ArrayBuffer>;
+    /**
+     * Gets the secondary attachment of a document and tries to decrypt it using the encryption keys of the document.
+     * @param document a document.
+     * @param secondaryAttachmentKey key of the secondary attachment.
+     * @param validator optionally a validator function which checks if the decryption was successful. In cases where the document has many encryption
+     * keys and it is unclear which one should be used this function can help to detect bad decryptions.
+     * @return the decrypted attachment, if it could be decrypted, else the encrypted attachment.
+     */
+    getAndDecryptSecondaryDocumentAttachment(document: models.Document, secondaryAttachmentKey: string, validator?: (decrypted: ArrayBuffer) => Promise<boolean>): Promise<ArrayBuffer>;
+    /**
+     * @param document a document
+     * @return the id of the message that the document refers to, retrieved from the encrypted metadata. Normally there should only be one element
+     * in the returned array, but in case of entity merges there could be multiple values.
+     */
+    decryptMessageIdOf(document: models.Document): Promise<string[]>;
+    /**
+     * Share an existing document with other data owners, allowing them to access the non-encrypted data of the document and optionally also
+     * the encrypted content.
+     * @param delegateId the id of the data owner which will be granted access to the document.
+     * @param document the document 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}).
+     * - shareMessageId: specifies if the id of the message that this document refers to should be shared with the delegate (defaults to
+     * {@link ShareMetadataBehaviour.IF_AVAILABLE}).
+     * @return a promise which will contain the updated document.
+     */
+    shareWith(delegateId: string, document: models.Document, options?: {
+        shareEncryptionKey?: ShareMetadataBehaviour;
+        shareMessageId?: ShareMetadataBehaviour;
+    }): Promise<models.Document>;
 }