@icure/api 8.0.8 → 8.0.10

package/test/icc-x-api/crypto/signature-keys-manager-test.d.ts

@@ -0,0 +1 @@
+export {};

package/test/icc-x-api/crypto/signature-keys-manager-test.js

@@ -0,0 +1,44 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const UserSignatureKeysManager_1 = require("../../../icc-x-api/crypto/UserSignatureKeysManager");
+const IcureStorageFacade_1 = require("../../../icc-x-api/storage/IcureStorageFacade");
+const TestStorage_1 = require("../../utils/TestStorage");
+const DefaultStorageEntryKeysFactory_1 = require("../../../icc-x-api/storage/DefaultStorageEntryKeysFactory");
+const FakeDataOwnerApi_1 = require("../../utils/FakeDataOwnerApi");
+const CryptoPrimitives_1 = require("../../../icc-x-api/crypto/CryptoPrimitives");
+const crypto_1 = require("crypto");
+const DataOwnerTypeEnum_1 = require("../../../icc-api/model/DataOwnerTypeEnum");
+const icc_x_api_1 = require("../../../icc-x-api");
+const chai_1 = require("chai");
+const utils_1 = require("../../../icc-x-api/crypto/utils");
+describe('SignatureKeysManager', () => {
+    it('should be able to store a key pair in local storage and reload it', () => __awaiter(void 0, void 0, void 0, function* () {
+        const iCureStorage = new IcureStorageFacade_1.IcureStorageFacade(new TestStorage_1.TestKeyStorage(), new TestStorage_1.TestStorage(), new DefaultStorageEntryKeysFactory_1.DefaultStorageEntryKeysFactory());
+        const primitives = new CryptoPrimitives_1.CryptoPrimitives(crypto_1.webcrypto);
+        const dataOwnerApi = new FakeDataOwnerApi_1.FakeDataOwnerApi({ id: primitives.randomUuid(), type: DataOwnerTypeEnum_1.DataOwnerTypeEnum.Hcp });
+        const manager1 = new UserSignatureKeysManager_1.UserSignatureKeysManager(iCureStorage, dataOwnerApi, primitives);
+        const pair1 = yield manager1.getOrCreateSignatureKeyPair();
+        const manager2 = new UserSignatureKeysManager_1.UserSignatureKeysManager(iCureStorage, dataOwnerApi, primitives);
+        const pair2 = yield manager2.getOrCreateSignatureKeyPair();
+        const private1 = (0, icc_x_api_1.ua2hex)(yield primitives.RSA.exportKey(pair1.keyPair.privateKey, 'pkcs8'));
+        const private2 = (0, icc_x_api_1.ua2hex)(yield primitives.RSA.exportKey(pair2.keyPair.privateKey, 'pkcs8'));
+        (0, chai_1.expect)(private1).to.equal(private2);
+        const public1 = (0, icc_x_api_1.ua2hex)(yield primitives.RSA.exportKey(pair1.keyPair.publicKey, 'spki'));
+        const public2 = (0, icc_x_api_1.ua2hex)(yield primitives.RSA.exportKey(pair2.keyPair.publicKey, 'spki'));
+        (0, chai_1.expect)(public1).to.equal(public2);
+        const verification1 = (0, icc_x_api_1.ua2hex)(yield primitives.RSA.exportKey((yield manager1.getSignatureVerificationKey((0, utils_1.fingerprintV1)(public1))), 'spki'));
+        const verification2 = (0, icc_x_api_1.ua2hex)(yield primitives.RSA.exportKey((yield manager2.getSignatureVerificationKey((0, utils_1.fingerprintV1)(public1))), 'spki'));
+        (0, chai_1.expect)(verification1).to.equal(public1);
+        (0, chai_1.expect)(verification2).to.equal(public1);
+    }));
+});
+//# sourceMappingURL=signature-keys-manager-test.js.map

package/test/icc-x-api/crypto/signature-keys-manager-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signature-keys-manager-test.js","sourceRoot":"","sources":["../../../../test/icc-x-api/crypto/signature-keys-manager-test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,iGAA6F;AAC7F,sFAAkF;AAClF,yDAAqE;AACrE,8GAA0G;AAC1G,mEAA+D;AAC/D,iFAA6E;AAC7E,mCAAkC;AAClC,gFAA4E;AAC5E,kDAA2C;AAC3C,+BAA6B;AAC7B,2DAA+D;AAE/D,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,mEAAmE,EAAE,GAAS,EAAE;QACjF,MAAM,YAAY,GAAG,IAAI,uCAAkB,CAAC,IAAI,4BAAc,EAAE,EAAE,IAAI,yBAAW,EAAE,EAAE,IAAI,+DAA8B,EAAE,CAAC,CAAA;QAC1H,MAAM,UAAU,GAAG,IAAI,mCAAgB,CAAC,kBAAgB,CAAC,CAAA;QACzD,MAAM,YAAY,GAAG,IAAI,mCAAgB,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,qCAAiB,CAAC,GAAG,EAAE,CAAC,CAAA;QACvG,MAAM,QAAQ,GAAG,IAAI,mDAAwB,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QACrF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,2BAA2B,EAAE,CAAA;QAC1D,MAAM,QAAQ,GAAG,IAAI,mDAAwB,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QACrF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,2BAA2B,EAAE,CAAA;QAC1D,MAAM,QAAQ,GAAG,IAAA,kBAAM,EAAC,MAAM,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;QAC1F,MAAM,QAAQ,GAAG,IAAA,kBAAM,EAAC,MAAM,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;QAC1F,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACnC,MAAM,OAAO,GAAG,IAAA,kBAAM,EAAC,MAAM,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;QACvF,MAAM,OAAO,GAAG,IAAA,kBAAM,EAAC,MAAM,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;QACvF,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACjC,MAAM,aAAa,GAAG,IAAA,kBAAM,EAAC,MAAM,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,QAAQ,CAAC,2BAA2B,CAAC,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC,CAAE,EAAE,MAAM,CAAC,CAAC,CAAA;QAC3I,MAAM,aAAa,GAAG,IAAA,kBAAM,EAAC,MAAM,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,QAAQ,CAAC,2BAA2B,CAAC,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC,CAAE,EAAE,MAAM,CAAC,CAAC,CAAA;QAC3I,IAAA,aAAM,EAAC,aAAa,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACvC,IAAA,aAAM,EAAC,aAAa,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACzC,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { UserSignatureKeysManager } from '../../../icc-x-api/crypto/UserSignatureKeysManager'\nimport { IcureStorageFacade } from '../../../icc-x-api/storage/IcureStorageFacade'\nimport { TestKeyStorage, TestStorage } from '../../utils/TestStorage'\nimport { DefaultStorageEntryKeysFactory } from '../../../icc-x-api/storage/DefaultStorageEntryKeysFactory'\nimport { FakeDataOwnerApi } from '../../utils/FakeDataOwnerApi'\nimport { CryptoPrimitives } from '../../../icc-x-api/crypto/CryptoPrimitives'\nimport { webcrypto } from 'crypto'\nimport { DataOwnerTypeEnum } from '../../../icc-api/model/DataOwnerTypeEnum'\nimport { ua2hex } from '../../../icc-x-api'\nimport { expect } from 'chai'\nimport { fingerprintV1 } from '../../../icc-x-api/crypto/utils'\n\ndescribe('SignatureKeysManager', () => {\n  it('should be able to store a key pair in local storage and reload it', async () => {\n    const iCureStorage = new IcureStorageFacade(new TestKeyStorage(), new TestStorage(), new DefaultStorageEntryKeysFactory())\n    const primitives = new CryptoPrimitives(webcrypto as any)\n    const dataOwnerApi = new FakeDataOwnerApi({ id: primitives.randomUuid(), type: DataOwnerTypeEnum.Hcp })\n    const manager1 = new UserSignatureKeysManager(iCureStorage, dataOwnerApi, primitives)\n    const pair1 = await manager1.getOrCreateSignatureKeyPair()\n    const manager2 = new UserSignatureKeysManager(iCureStorage, dataOwnerApi, primitives)\n    const pair2 = await manager2.getOrCreateSignatureKeyPair()\n    const private1 = ua2hex(await primitives.RSA.exportKey(pair1.keyPair.privateKey, 'pkcs8'))\n    const private2 = ua2hex(await primitives.RSA.exportKey(pair2.keyPair.privateKey, 'pkcs8'))\n    expect(private1).to.equal(private2)\n    const public1 = ua2hex(await primitives.RSA.exportKey(pair1.keyPair.publicKey, 'spki'))\n    const public2 = ua2hex(await primitives.RSA.exportKey(pair2.keyPair.publicKey, 'spki'))\n    expect(public1).to.equal(public2)\n    const verification1 = ua2hex(await primitives.RSA.exportKey((await manager1.getSignatureVerificationKey(fingerprintV1(public1)))!, 'spki'))\n    const verification2 = ua2hex(await primitives.RSA.exportKey((await manager2.getSignatureVerificationKey(fingerprintV1(public1)))!, 'spki'))\n    expect(verification1).to.equal(public1)\n    expect(verification2).to.equal(public1)\n  })\n})\n"]}

package/test/icc-x-api/crypto/user-encryption-keys-manager-test.d.ts

@@ -0,0 +1 @@
+import 'isomorphic-fetch';

package/test/icc-x-api/crypto/user-encryption-keys-manager-test.js

@@ -0,0 +1,246 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mocha_1 = require("mocha");
+const crypto_1 = require("crypto");
+require("isomorphic-fetch");
+const chai_1 = require("chai");
+const test_utils_1 = require("../../utils/test_utils");
+const TestStorage_1 = require("../../utils/TestStorage");
+const TestCryptoStrategies_1 = require("../../utils/TestCryptoStrategies");
+const types_1 = require("@icure/test-setup/types");
+const icc_x_api_1 = require("../../../icc-x-api");
+const apiV6_1 = require("@icure/apiV6");
+(0, test_utils_1.setLocalStorage)(fetch);
+let env;
+(0, mocha_1.describe)('Key manager', function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        this.timeout(600000);
+        (0, mocha_1.before)(function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                const initializer = yield (0, test_utils_1.getEnvironmentInitializer)();
+                env = yield initializer.execute((0, types_1.getEnvVariables)());
+            });
+        });
+        (0, mocha_1.it)(`Should not ask crypto strategies to recover available keys`, () => __awaiter(this, void 0, void 0, function* () {
+            const apis = yield (0, test_utils_1.createHcpHierarchyApis)(env);
+            const storageWithoutParentKey = yield (0, TestStorage_1.testStorageWithKeys)([
+                {
+                    dataOwnerId: apis.grandCredentials.dataOwnerId,
+                    pairs: [
+                        { keyPair: { privateKey: apis.grandCredentials.privateKey, publicKey: apis.grandCredentials.publicKey }, shaVersion: icc_x_api_1.ShaVersion.Sha1 },
+                    ],
+                },
+                {
+                    dataOwnerId: apis.childCredentials.dataOwnerId,
+                    pairs: [
+                        { keyPair: { privateKey: apis.childCredentials.privateKey, publicKey: apis.childCredentials.publicKey }, shaVersion: icc_x_api_1.ShaVersion.Sha1 },
+                    ],
+                },
+            ]);
+            const cryptoStrats = new TestCryptoStrategies_1.TestCryptoStrategies(undefined, {}, undefined, {
+                [apis.parentCredentials.dataOwnerId]: {
+                    pair: { privateKey: apis.parentCredentials.privateKey, publicKey: apis.parentCredentials.publicKey },
+                    shaVersion: icc_x_api_1.ShaVersion.Sha1,
+                },
+            });
+            yield icc_x_api_1.IcureApi.initialise(env.iCureUrl, { username: apis.childCredentials.user, password: apis.childCredentials.password }, cryptoStrats, crypto_1.webcrypto, fetch, {
+                storage: storageWithoutParentKey.storage,
+                keyStorage: storageWithoutParentKey.keyStorage,
+                entryKeysFactory: storageWithoutParentKey.keyFactory,
+            });
+            (0, chai_1.expect)(cryptoStrats.recoverAndVerifyCallsParams).to.have.length(1);
+            const params = cryptoStrats.recoverAndVerifyCallsParams[0];
+            (0, chai_1.expect)(params).to.have.length(3);
+            (0, chai_1.expect)(params[0].dataOwner.dataOwner.id).to.equal(apis.grandCredentials.dataOwnerId);
+            (0, chai_1.expect)(params[0].unavailableKeys).to.be.empty;
+            (0, chai_1.expect)(params[0].unknownKeys).to.be.empty;
+            (0, chai_1.expect)(params[1].dataOwner.dataOwner.id).to.equal(apis.parentCredentials.dataOwnerId);
+            (0, chai_1.expect)(params[1].unavailableKeys).to.have.members([apis.parentCredentials.publicKey]);
+            (0, chai_1.expect)(params[1].unknownKeys).to.have.members([apis.parentCredentials.publicKey]);
+            (0, chai_1.expect)(params[2].dataOwner.dataOwner.id).to.equal(apis.childCredentials.dataOwnerId);
+            (0, chai_1.expect)(params[2].unavailableKeys).to.be.empty;
+            (0, chai_1.expect)(params[2].unknownKeys).to.be.empty;
+        }));
+        (0, mocha_1.it)('Should not ask crypto strategies to recover keys if all keys are available', () => __awaiter(this, void 0, void 0, function* () {
+            const apis = yield (0, test_utils_1.createHcpHierarchyApis)(env);
+            const storageWithoutParentKey = yield (0, TestStorage_1.testStorageWithKeys)([
+                {
+                    dataOwnerId: apis.grandCredentials.dataOwnerId,
+                    pairs: [
+                        { keyPair: { privateKey: apis.grandCredentials.privateKey, publicKey: apis.grandCredentials.publicKey }, shaVersion: icc_x_api_1.ShaVersion.Sha1 },
+                    ],
+                },
+                {
+                    dataOwnerId: apis.parentCredentials.dataOwnerId,
+                    pairs: [
+                        { keyPair: { privateKey: apis.parentCredentials.privateKey, publicKey: apis.parentCredentials.publicKey }, shaVersion: icc_x_api_1.ShaVersion.Sha1 },
+                    ],
+                },
+                {
+                    dataOwnerId: apis.childCredentials.dataOwnerId,
+                    pairs: [
+                        { keyPair: { privateKey: apis.childCredentials.privateKey, publicKey: apis.childCredentials.publicKey }, shaVersion: icc_x_api_1.ShaVersion.Sha1 },
+                    ],
+                },
+            ]);
+            const cryptoStrats = new TestCryptoStrategies_1.TestCryptoStrategies();
+            yield icc_x_api_1.IcureApi.initialise(env.iCureUrl, { username: apis.childCredentials.user, password: apis.childCredentials.password }, cryptoStrats, crypto_1.webcrypto, fetch, {
+                storage: storageWithoutParentKey.storage,
+                keyStorage: storageWithoutParentKey.keyStorage,
+                entryKeysFactory: storageWithoutParentKey.keyFactory,
+            });
+            (0, chai_1.expect)(cryptoStrats.recoverAndVerifyCallsParams).to.have.length(0);
+        }));
+        (0, mocha_1.it)('Should allow to retrieve all keys for a data owner and his parents', () => __awaiter(this, void 0, void 0, function* () {
+            const apis = yield (0, test_utils_1.createHcpHierarchyApis)(env);
+            const keysData = yield apis.childApi.cryptoApi.getEncryptionDecryptionKeypairsForDataOwnerHierarchy();
+            function checkKey(userDetails, key) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    const exportedPrivateKey = (0, apiV6_1.ua2hex)(yield apis.childApi.cryptoApi.primitives.RSA.exportKey(key.privateKey, 'pkcs8'));
+                    const exportedPublicKey = (0, apiV6_1.ua2hex)(yield apis.childApi.cryptoApi.primitives.RSA.exportKey(key.publicKey, 'spki'));
+                    (0, chai_1.expect)(exportedPublicKey).to.equal(userDetails.publicKey);
+                    (0, chai_1.expect)(exportedPrivateKey).to.equal(userDetails.privateKey);
+                });
+            }
+            (0, chai_1.expect)(keysData.self.dataOwnerId).to.equal(apis.childCredentials.dataOwnerId);
+            (0, chai_1.expect)(keysData.self.keys).to.have.length(1);
+            (0, chai_1.expect)(keysData.self.keys[0].verified).to.be.true;
+            yield checkKey(apis.childCredentials, keysData.self.keys[0].pair);
+            (0, chai_1.expect)(keysData.parents).to.have.length(2);
+            (0, chai_1.expect)(keysData.parents[0].dataOwnerId).to.equal(apis.grandCredentials.dataOwnerId);
+            (0, chai_1.expect)(keysData.parents[0].keys).to.have.length(1);
+            yield checkKey(apis.grandCredentials, keysData.parents[0].keys[0].pair);
+            (0, chai_1.expect)(keysData.parents[1].dataOwnerId).to.equal(apis.parentCredentials.dataOwnerId);
+            (0, chai_1.expect)(keysData.parents[1].keys).to.have.length(1);
+            yield checkKey(apis.parentCredentials, keysData.parents[1].keys[0].pair);
+        }));
+        (0, mocha_1.it)('If a HCP has no key yet, but the parent does the crypto strategies should first ask to recover the keys for the parent then ask for the generation of a new key to the data owner', () => __awaiter(this, void 0, void 0, function* () {
+            const hcpsInfo = yield (0, test_utils_1.createNewHcpWithoutKeyAndParentWithKey)(env);
+            const cryptoStrats = new (class {
+                constructor() {
+                    this.generateNewKeyCalled = false;
+                    this.recoverCalled = false;
+                    this.generatedKeyPair = undefined;
+                }
+                generateNewKeyForDataOwner(self, cryptoPrimitives) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        if (this.generateNewKeyCalled)
+                            throw new Error('generateNewKeyForDataOwner called twice');
+                        if (!this.recoverCalled)
+                            throw new Error('generateNewKeyForDataOwner called before recoverAndVerifySelfHierarchyKeys');
+                        this.generateNewKeyCalled = true;
+                        (0, chai_1.expect)(self.dataOwner.id).to.equal(hcpsInfo.childDataOwnerId);
+                        return (this.generatedKeyPair = yield cryptoPrimitives.RSA.generateKeyPair(icc_x_api_1.ShaVersion.Sha256));
+                    });
+                }
+                recoverAndVerifySelfHierarchyKeys(keysData, cryptoPrimitives) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        if (this.recoverCalled)
+                            throw new Error('recoverAndVerifySelfHierarchyKeys called twice');
+                        this.recoverCalled = true;
+                        (0, chai_1.expect)(keysData).to.have.length(2);
+                        (0, chai_1.expect)(keysData[0].dataOwner.dataOwner.id).to.equal(hcpsInfo.parentCredentials.dataOwnerId);
+                        (0, chai_1.expect)(keysData[0].unknownKeys).to.have.members([hcpsInfo.parentCredentials.publicKey]);
+                        (0, chai_1.expect)(keysData[0].unavailableKeys).to.have.members([hcpsInfo.parentCredentials.publicKey]);
+                        (0, chai_1.expect)(keysData[1].dataOwner.dataOwner.id).to.equal(hcpsInfo.childDataOwnerId);
+                        (0, chai_1.expect)(keysData[1].unknownKeys).to.be.empty;
+                        (0, chai_1.expect)(keysData[1].unavailableKeys).to.be.empty;
+                        return {
+                            [hcpsInfo.parentCredentials.dataOwnerId]: {
+                                recoveredKeys: {
+                                    [hcpsInfo.parentCredentials.publicKey.slice(-32)]: yield cryptoPrimitives.RSA.importKeyPair('pkcs8', (0, icc_x_api_1.hex2ua)(hcpsInfo.parentCredentials.privateKey), 'spki', (0, icc_x_api_1.hex2ua)(hcpsInfo.parentCredentials.publicKey), icc_x_api_1.ShaVersion.Sha1),
+                                },
+                                keyAuthenticity: {},
+                            },
+                            [hcpsInfo.childDataOwnerId]: {
+                                recoveredKeys: {},
+                                keyAuthenticity: {},
+                            },
+                        };
+                    });
+                }
+                verifyDelegatePublicKeys(delegate, publicKeys, cryptoPrimitives) {
+                    throw new Error('This method should not be called by this test');
+                }
+                dataOwnerRequiresAnonymousDelegation(dataOwner) {
+                    return false;
+                }
+            })();
+            const childApi = yield icc_x_api_1.IcureApi.initialise(env.iCureUrl, { username: hcpsInfo.childUser, password: hcpsInfo.childPassword }, cryptoStrats, crypto_1.webcrypto, fetch, {
+                storage: new TestStorage_1.TestStorage(),
+                keyStorage: new TestStorage_1.TestKeyStorage(),
+            });
+            (0, chai_1.expect)(cryptoStrats.generateNewKeyCalled).to.be.true;
+            (0, chai_1.expect)(cryptoStrats.recoverCalled).to.be.true;
+            const keys = Array.from(childApi.dataOwnerApi.getHexPublicKeysOf((yield childApi.dataOwnerApi.getCurrentDataOwner()).dataOwner));
+            (0, chai_1.expect)(keys).to.have.length(1);
+            (0, chai_1.expect)(Array.from(keys)[0]).to.equal((0, apiV6_1.ua2hex)(yield childApi.cryptoApi.primitives.RSA.exportKey(cryptoStrats.generatedKeyPair.publicKey, 'spki')));
+        }));
+        (0, mocha_1.it)('If a HCP has no key yet, but the parent does and the key is available the crypto strategies should ask for the generation of a new key to the data owner', () => __awaiter(this, void 0, void 0, function* () {
+            function doTest(initialiseEmptyKeyForChild) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    const hcpsInfo = yield (0, test_utils_1.createNewHcpWithoutKeyAndParentWithKey)(env, { initialiseEmptyKeyForChild });
+                    const cryptoStrats = new (class {
+                        constructor() {
+                            this.generateNewKeyCalled = false;
+                            this.generatedKeyPair = undefined;
+                        }
+                        generateNewKeyForDataOwner(self, cryptoPrimitives) {
+                            return __awaiter(this, void 0, void 0, function* () {
+                                if (this.generateNewKeyCalled)
+                                    throw new Error('generateNewKeyForDataOwner called twice');
+                                this.generateNewKeyCalled = true;
+                                (0, chai_1.expect)(self.dataOwner.id).to.equal(hcpsInfo.childDataOwnerId);
+                                return (this.generatedKeyPair = yield cryptoPrimitives.RSA.generateKeyPair(icc_x_api_1.ShaVersion.Sha256));
+                            });
+                        }
+                        recoverAndVerifySelfHierarchyKeys(keysData, cryptoPrimitives) {
+                            return __awaiter(this, void 0, void 0, function* () {
+                                throw new Error('This method should not be called by this test');
+                            });
+                        }
+                        dataOwnerRequiresAnonymousDelegation(dataOwner) {
+                            return false;
+                        }
+                        verifyDelegatePublicKeys(delegate, publicKeys, cryptoPrimitives) {
+                            throw new Error('This method should not be called by this test');
+                        }
+                    })();
+                    const storages = yield (0, TestStorage_1.testStorageWithKeys)([
+                        {
+                            dataOwnerId: hcpsInfo.parentCredentials.dataOwnerId,
+                            pairs: [
+                                {
+                                    keyPair: { privateKey: hcpsInfo.parentCredentials.privateKey, publicKey: hcpsInfo.parentCredentials.publicKey },
+                                    shaVersion: icc_x_api_1.ShaVersion.Sha1,
+                                },
+                            ],
+                        },
+                    ]);
+                    const childApi = yield icc_x_api_1.IcureApi.initialise(env.iCureUrl, { username: hcpsInfo.childUser, password: hcpsInfo.childPassword }, cryptoStrats, crypto_1.webcrypto, fetch, {
+                        storage: storages.storage,
+                        keyStorage: storages.keyStorage,
+                        entryKeysFactory: storages.keyFactory,
+                    });
+                    (0, chai_1.expect)(cryptoStrats.generateNewKeyCalled).to.be.true;
+                    const initialisedHcp = (yield childApi.dataOwnerApi.getCurrentDataOwner()).dataOwner;
+                    const keys = Array.from(childApi.dataOwnerApi.getHexPublicKeysOf(initialisedHcp));
+                    (0, chai_1.expect)(keys).to.have.length(1);
+                    (0, chai_1.expect)(keys[0]).to.equal((0, apiV6_1.ua2hex)(yield childApi.cryptoApi.primitives.RSA.exportKey(cryptoStrats.generatedKeyPair.publicKey, 'spki')));
+                });
+            }
+            yield doTest(false);
+            yield doTest(true);
+        }));
+    });
+});
+//# sourceMappingURL=user-encryption-keys-manager-test.js.map

package/test/icc-x-api/crypto/user-encryption-keys-manager-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-encryption-keys-manager-test.js","sourceRoot":"","sources":["../../../../test/icc-x-api/crypto/user-encryption-keys-manager-test.ts"],"names":[],"mappings":"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","sourcesContent":["import { v4 as uuid } from 'uuid'\nimport { User } from '../../../icc-api/model/User'\nimport { before, describe, it } from 'mocha'\n\nimport { webcrypto } from 'crypto'\nimport 'isomorphic-fetch'\nimport { expect } from 'chai'\nimport { createHcpHierarchyApis, createNewHcpWithoutKeyAndParentWithKey, getEnvironmentInitializer, setLocalStorage } from '../../utils/test_utils'\nimport { TestKeyStorage, TestStorage, testStorageWithKeys } from '../../utils/TestStorage'\nimport { TestCryptoStrategies } from '../../utils/TestCryptoStrategies'\nimport { getEnvVariables, TestVars, UserDetails } from '@icure/test-setup/types'\nimport { CryptoPrimitives, CryptoStrategies, hex2ua, IcureApi, KeyPair, ShaVersion } from '../../../icc-x-api'\nimport { ua2hex } from '@icure/apiV6'\nimport { DataOwnerWithType } from '../../../icc-api/model/DataOwnerWithType'\nimport { CryptoActorStubWithType } from '../../../icc-api/model/CryptoActorStub'\n\nsetLocalStorage(fetch)\n\nlet env: TestVars\n\ndescribe('Key manager', async function () {\n  this.timeout(600000)\n\n  before(async function () {\n    const initializer = await getEnvironmentInitializer()\n    env = await initializer.execute(getEnvVariables())\n  })\n\n  it(`Should not ask crypto strategies to recover available keys`, async () => {\n    const apis = await createHcpHierarchyApis(env)\n    const storageWithoutParentKey = await testStorageWithKeys([\n      {\n        dataOwnerId: apis.grandCredentials.dataOwnerId,\n        pairs: [\n          { keyPair: { privateKey: apis.grandCredentials.privateKey, publicKey: apis.grandCredentials.publicKey }, shaVersion: ShaVersion.Sha1 },\n        ],\n      },\n      {\n        dataOwnerId: apis.childCredentials.dataOwnerId,\n        pairs: [\n          { keyPair: { privateKey: apis.childCredentials.privateKey, publicKey: apis.childCredentials.publicKey }, shaVersion: ShaVersion.Sha1 },\n        ],\n      },\n    ])\n    const cryptoStrats = new TestCryptoStrategies(undefined, {}, undefined, {\n      [apis.parentCredentials.dataOwnerId]: {\n        pair: { privateKey: apis.parentCredentials.privateKey, publicKey: apis.parentCredentials.publicKey },\n        shaVersion: ShaVersion.Sha1,\n      },\n    })\n    await IcureApi.initialise(\n      env.iCureUrl,\n      { username: apis.childCredentials.user, password: apis.childCredentials.password },\n      cryptoStrats,\n      webcrypto as any,\n      fetch,\n      {\n        storage: storageWithoutParentKey.storage,\n        keyStorage: storageWithoutParentKey.keyStorage,\n        entryKeysFactory: storageWithoutParentKey.keyFactory,\n      }\n    )\n    expect(cryptoStrats.recoverAndVerifyCallsParams).to.have.length(1)\n    const params = cryptoStrats.recoverAndVerifyCallsParams[0]\n    expect(params).to.have.length(3)\n    expect(params[0].dataOwner.dataOwner.id).to.equal(apis.grandCredentials.dataOwnerId)\n    expect(params[0].unavailableKeys).to.be.empty\n    expect(params[0].unknownKeys).to.be.empty\n    expect(params[1].dataOwner.dataOwner.id).to.equal(apis.parentCredentials.dataOwnerId)\n    expect(params[1].unavailableKeys).to.have.members([apis.parentCredentials.publicKey])\n    expect(params[1].unknownKeys).to.have.members([apis.parentCredentials.publicKey])\n    expect(params[2].dataOwner.dataOwner.id).to.equal(apis.childCredentials.dataOwnerId)\n    expect(params[2].unavailableKeys).to.be.empty\n    expect(params[2].unknownKeys).to.be.empty\n  })\n\n  it('Should not ask crypto strategies to recover keys if all keys are available', async () => {\n    const apis = await createHcpHierarchyApis(env)\n    const storageWithoutParentKey = await testStorageWithKeys([\n      {\n        dataOwnerId: apis.grandCredentials.dataOwnerId,\n        pairs: [\n          { keyPair: { privateKey: apis.grandCredentials.privateKey, publicKey: apis.grandCredentials.publicKey }, shaVersion: ShaVersion.Sha1 },\n        ],\n      },\n      {\n        dataOwnerId: apis.parentCredentials.dataOwnerId,\n        pairs: [\n          { keyPair: { privateKey: apis.parentCredentials.privateKey, publicKey: apis.parentCredentials.publicKey }, shaVersion: ShaVersion.Sha1 },\n        ],\n      },\n      {\n        dataOwnerId: apis.childCredentials.dataOwnerId,\n        pairs: [\n          { keyPair: { privateKey: apis.childCredentials.privateKey, publicKey: apis.childCredentials.publicKey }, shaVersion: ShaVersion.Sha1 },\n        ],\n      },\n    ])\n    const cryptoStrats = new TestCryptoStrategies()\n    await IcureApi.initialise(\n      env.iCureUrl,\n      { username: apis.childCredentials.user, password: apis.childCredentials.password },\n      cryptoStrats,\n      webcrypto as any,\n      fetch,\n      {\n        storage: storageWithoutParentKey.storage,\n        keyStorage: storageWithoutParentKey.keyStorage,\n        entryKeysFactory: storageWithoutParentKey.keyFactory,\n      }\n    )\n    expect(cryptoStrats.recoverAndVerifyCallsParams).to.have.length(0)\n  })\n\n  it('Should allow to retrieve all keys for a data owner and his parents', async () => {\n    const apis = await createHcpHierarchyApis(env)\n    const keysData = await apis.childApi.cryptoApi.getEncryptionDecryptionKeypairsForDataOwnerHierarchy()\n    async function checkKey(userDetails: UserDetails, key: KeyPair<CryptoKey>) {\n      const exportedPrivateKey = ua2hex(await apis.childApi.cryptoApi.primitives.RSA.exportKey(key.privateKey, 'pkcs8'))\n      const exportedPublicKey = ua2hex(await apis.childApi.cryptoApi.primitives.RSA.exportKey(key.publicKey, 'spki'))\n      expect(exportedPublicKey).to.equal(userDetails.publicKey)\n      expect(exportedPrivateKey).to.equal(userDetails.privateKey)\n    }\n    expect(keysData.self.dataOwnerId).to.equal(apis.childCredentials.dataOwnerId)\n    expect(keysData.self.keys).to.have.length(1)\n    expect(keysData.self.keys[0].verified).to.be.true\n    await checkKey(apis.childCredentials, keysData.self.keys[0].pair)\n    expect(keysData.parents).to.have.length(2)\n    expect(keysData.parents[0].dataOwnerId).to.equal(apis.grandCredentials.dataOwnerId)\n    expect(keysData.parents[0].keys).to.have.length(1)\n    await checkKey(apis.grandCredentials, keysData.parents[0].keys[0].pair)\n    expect(keysData.parents[1].dataOwnerId).to.equal(apis.parentCredentials.dataOwnerId)\n    expect(keysData.parents[1].keys).to.have.length(1)\n    await checkKey(apis.parentCredentials, keysData.parents[1].keys[0].pair)\n  })\n\n  it('If a HCP has no key yet, but the parent does the crypto strategies should first ask to recover the keys for the parent then ask for the generation of a new key to the data owner', async () => {\n    const hcpsInfo = await createNewHcpWithoutKeyAndParentWithKey(env)\n    const cryptoStrats = new (class implements CryptoStrategies {\n      generateNewKeyCalled: boolean = false\n      recoverCalled: boolean = false\n      generatedKeyPair: KeyPair<CryptoKey> | undefined = undefined\n\n      async generateNewKeyForDataOwner(self: DataOwnerWithType, cryptoPrimitives: CryptoPrimitives): Promise<KeyPair<CryptoKey> | boolean> {\n        if (this.generateNewKeyCalled) throw new Error('generateNewKeyForDataOwner called twice')\n        if (!this.recoverCalled) throw new Error('generateNewKeyForDataOwner called before recoverAndVerifySelfHierarchyKeys')\n        this.generateNewKeyCalled = true\n        expect(self.dataOwner.id).to.equal(hcpsInfo.childDataOwnerId)\n        return (this.generatedKeyPair = await cryptoPrimitives.RSA.generateKeyPair(ShaVersion.Sha256))\n      }\n\n      async recoverAndVerifySelfHierarchyKeys(\n        keysData: {\n          dataOwner: DataOwnerWithType\n          unknownKeys: string[]\n          unavailableKeys: string[]\n        }[],\n        cryptoPrimitives: CryptoPrimitives\n      ): Promise<{\n        [p: string]: { recoveredKeys: { [p: string]: KeyPair<CryptoKey> }; keyAuthenticity: { [p: string]: boolean } }\n      }> {\n        if (this.recoverCalled) throw new Error('recoverAndVerifySelfHierarchyKeys called twice')\n        this.recoverCalled = true\n        expect(keysData).to.have.length(2)\n        expect(keysData[0].dataOwner.dataOwner.id).to.equal(hcpsInfo.parentCredentials.dataOwnerId)\n        expect(keysData[0].unknownKeys).to.have.members([hcpsInfo.parentCredentials.publicKey])\n        expect(keysData[0].unavailableKeys).to.have.members([hcpsInfo.parentCredentials.publicKey])\n        expect(keysData[1].dataOwner.dataOwner.id).to.equal(hcpsInfo.childDataOwnerId)\n        expect(keysData[1].unknownKeys).to.be.empty\n        expect(keysData[1].unavailableKeys).to.be.empty\n        return {\n          [hcpsInfo.parentCredentials.dataOwnerId]: {\n            recoveredKeys: {\n              [hcpsInfo.parentCredentials.publicKey.slice(-32)]: await cryptoPrimitives.RSA.importKeyPair(\n                'pkcs8',\n                hex2ua(hcpsInfo.parentCredentials.privateKey),\n                'spki',\n                hex2ua(hcpsInfo.parentCredentials.publicKey),\n                ShaVersion.Sha1\n              ),\n            },\n            keyAuthenticity: {},\n          },\n          [hcpsInfo.childDataOwnerId]: {\n            recoveredKeys: {},\n            keyAuthenticity: {},\n          },\n        }\n      }\n\n      verifyDelegatePublicKeys(delegate: CryptoActorStubWithType, publicKeys: string[], cryptoPrimitives: CryptoPrimitives): Promise<string[]> {\n        throw new Error('This method should not be called by this test')\n      }\n\n      dataOwnerRequiresAnonymousDelegation(dataOwner: CryptoActorStubWithType): boolean {\n        return false\n      }\n    })()\n    const childApi = await IcureApi.initialise(\n      env.iCureUrl,\n      { username: hcpsInfo.childUser, password: hcpsInfo.childPassword },\n      cryptoStrats,\n      webcrypto as any,\n      fetch,\n      {\n        storage: new TestStorage(),\n        keyStorage: new TestKeyStorage(),\n      }\n    )\n    expect(cryptoStrats.generateNewKeyCalled).to.be.true\n    expect(cryptoStrats.recoverCalled).to.be.true\n    const keys = Array.from(childApi.dataOwnerApi.getHexPublicKeysOf((await childApi.dataOwnerApi.getCurrentDataOwner()).dataOwner))\n    expect(keys).to.have.length(1)\n    expect(Array.from(keys)[0]).to.equal(ua2hex(await childApi.cryptoApi.primitives.RSA.exportKey(cryptoStrats.generatedKeyPair!.publicKey, 'spki')))\n  })\n\n  it('If a HCP has no key yet, but the parent does and the key is available the crypto strategies should ask for the generation of a new key to the data owner', async () => {\n    async function doTest(initialiseEmptyKeyForChild: boolean) {\n      const hcpsInfo = await createNewHcpWithoutKeyAndParentWithKey(env, { initialiseEmptyKeyForChild })\n      const cryptoStrats = new (class implements CryptoStrategies {\n        generateNewKeyCalled: boolean = false\n        generatedKeyPair: KeyPair<CryptoKey> | undefined = undefined\n\n        async generateNewKeyForDataOwner(self: DataOwnerWithType, cryptoPrimitives: CryptoPrimitives): Promise<KeyPair<CryptoKey> | boolean> {\n          if (this.generateNewKeyCalled) throw new Error('generateNewKeyForDataOwner called twice')\n          this.generateNewKeyCalled = true\n          expect(self.dataOwner.id).to.equal(hcpsInfo.childDataOwnerId)\n          return (this.generatedKeyPair = await cryptoPrimitives.RSA.generateKeyPair(ShaVersion.Sha256))\n        }\n\n        async recoverAndVerifySelfHierarchyKeys(\n          keysData: {\n            dataOwner: DataOwnerWithType\n            unknownKeys: string[]\n            unavailableKeys: string[]\n          }[],\n          cryptoPrimitives: CryptoPrimitives\n        ): Promise<{\n          [p: string]: { recoveredKeys: { [p: string]: KeyPair<CryptoKey> }; keyAuthenticity: { [p: string]: boolean } }\n        }> {\n          throw new Error('This method should not be called by this test')\n        }\n\n        dataOwnerRequiresAnonymousDelegation(dataOwner: CryptoActorStubWithType): boolean {\n          return false\n        }\n\n        verifyDelegatePublicKeys(delegate: CryptoActorStubWithType, publicKeys: string[], cryptoPrimitives: CryptoPrimitives): Promise<string[]> {\n          throw new Error('This method should not be called by this test')\n        }\n      })()\n      const storages = await testStorageWithKeys([\n        {\n          dataOwnerId: hcpsInfo.parentCredentials.dataOwnerId,\n          pairs: [\n            {\n              keyPair: { privateKey: hcpsInfo.parentCredentials.privateKey, publicKey: hcpsInfo.parentCredentials.publicKey },\n              shaVersion: ShaVersion.Sha1,\n            },\n          ],\n        },\n      ])\n      const childApi = await IcureApi.initialise(\n        env.iCureUrl,\n        { username: hcpsInfo.childUser, password: hcpsInfo.childPassword },\n        cryptoStrats,\n        webcrypto as any,\n        fetch,\n        {\n          storage: storages.storage,\n          keyStorage: storages.keyStorage,\n          entryKeysFactory: storages.keyFactory,\n        }\n      )\n      expect(cryptoStrats.generateNewKeyCalled).to.be.true\n      const initialisedHcp = (await childApi.dataOwnerApi.getCurrentDataOwner()).dataOwner\n      const keys = Array.from(childApi.dataOwnerApi.getHexPublicKeysOf(initialisedHcp))\n      expect(keys).to.have.length(1)\n      expect(keys[0]).to.equal(ua2hex(await childApi.cryptoApi.primitives.RSA.exportKey(cryptoStrats.generatedKeyPair!.publicKey, 'spki')))\n    }\n    await doTest(false)\n    await doTest(true)\n  })\n})\n"]}

package/test/icc-x-api/entity-with-attachments-api-test.d.ts

@@ -0,0 +1 @@
+import 'isomorphic-fetch';

package/test/icc-x-api/entity-with-attachments-api-test.js

@@ -0,0 +1,142 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("isomorphic-fetch");
+const test_utils_1 = require("../utils/test_utils");
+const mocha_1 = require("mocha");
+const icc_x_api_1 = require("../../icc-x-api");
+var initApi = test_utils_1.TestUtils.initApi;
+const chai_1 = require("chai");
+const types_1 = require("@icure/test-setup/types");
+(0, test_utils_1.setLocalStorage)(fetch);
+let env;
+let apis;
+let user;
+const entityWithAttachmentApis = {
+    docMainAttachment: (apis, currentUser) => ({
+        createEntity() {
+            return __awaiter(this, void 0, void 0, function* () {
+                return apis.documentApi.createDocument(yield apis.documentApi.newInstance(currentUser));
+            });
+        },
+        encryptAndSetAttachment(entity, attachment) {
+            return apis.documentApi.encryptAndSetDocumentAttachment(entity, attachment);
+        },
+        getAndDecryptAttachment(entity, validator) {
+            return apis.documentApi.getAndDecryptDocumentAttachment(entity, validator);
+        },
+        getEncryptedAttachment(entity) {
+            return apis.documentApi.getDocumentAttachment(entity.id, 'unused');
+        },
+    }),
+    docSecondaryAttachment: (apis, currentUser) => ({
+        createEntity() {
+            return __awaiter(this, void 0, void 0, function* () {
+                return apis.documentApi.createDocument(yield apis.documentApi.newInstance(currentUser));
+            });
+        },
+        encryptAndSetAttachment(entity, attachment) {
+            return apis.documentApi.encryptAndSetSecondaryDocumentAttachment(entity, 'secondary', attachment);
+        },
+        getAndDecryptAttachment(entity, validator) {
+            return apis.documentApi.getAndDecryptSecondaryDocumentAttachment(entity, 'secondary', validator);
+        },
+        getEncryptedAttachment(entity) {
+            return apis.documentApi.getSecondaryAttachment(entity.id, 'secondary');
+        },
+    }),
+    receipt: (apis, currentUser) => ({
+        createEntity() {
+            return __awaiter(this, void 0, void 0, function* () {
+                return apis.receiptApi.createReceipt(yield apis.receiptApi.newInstance(currentUser, {}));
+            });
+        },
+        encryptAndSetAttachment(entity, attachment) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return apis.receiptApi.encryptAndSetReceiptAttachment(entity, 'tack', attachment);
+            });
+        },
+        getAndDecryptAttachment(entity, validator) {
+            var _a;
+            return apis.receiptApi.getAndDecryptReceiptAttachment(entity, ((_a = entity.attachmentIds) !== null && _a !== void 0 ? _a : {})['tack'], validator);
+        },
+        getEncryptedAttachment(entity) {
+            var _a;
+            return apis.receiptApi.getReceiptAttachment(entity.id, ((_a = entity.attachmentIds) !== null && _a !== void 0 ? _a : {})['tack']);
+        },
+    }),
+};
+(0, mocha_1.before)(function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        this.timeout(600000);
+        const initializer = yield (0, test_utils_1.getEnvironmentInitializer)();
+        env = yield initializer.execute((0, types_1.getEnvVariables)());
+        for (const [a, b] of Object.entries(env.dataOwnerDetails)) {
+            console.log(a);
+            console.log(b.password);
+            console.log('');
+        }
+        apis = yield initApi(env, test_utils_1.hcp1Username);
+        user = yield apis.userApi.getCurrentUser();
+    });
+});
+describe('Entity attachment update methods', function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        Object.entries(entityWithAttachmentApis).forEach(([type, attachmentApiInitialiser]) => {
+            it(`should automatically encrypt and decrypt attachments (${type})`, () => __awaiter(this, void 0, void 0, function* () {
+                const attachmentApi = attachmentApiInitialiser(apis, user);
+                const entity = yield attachmentApi.createEntity();
+                console.log(`entity id ${entity.id}`);
+                const attachmentContent = 'This is some secret attachment';
+                const entityWithEncrypted = yield attachmentApi.encryptAndSetAttachment(entity, (0, icc_x_api_1.utf8_2ua)(attachmentContent));
+                const decryptedAttachment = yield attachmentApi.getAndDecryptAttachment(entityWithEncrypted, (d) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        return (0, icc_x_api_1.ua2utf8)(d) === attachmentContent;
+                    }
+                    catch (_c) {
+                        return false;
+                    }
+                }));
+                (0, chai_1.expect)((0, icc_x_api_1.ua2utf8)(decryptedAttachment)).to.equal(attachmentContent);
+                const encryptedAttachment = yield attachmentApi.getEncryptedAttachment(entityWithEncrypted);
+                let conversionFailed;
+                try {
+                    conversionFailed = (0, icc_x_api_1.ua2utf8)(encryptedAttachment) !== attachmentContent;
+                }
+                catch (_a) {
+                    conversionFailed = true;
+                }
+                (0, chai_1.expect)(conversionFailed).to.be.true;
+                const attachmentContent2 = 'This is an updated secret attachment';
+                const entityWithEncrypted2 = yield attachmentApi.encryptAndSetAttachment(entityWithEncrypted, (0, icc_x_api_1.utf8_2ua)(attachmentContent2));
+                const decryptedAttachment2 = yield attachmentApi.getAndDecryptAttachment(entityWithEncrypted2, (d) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        return (0, icc_x_api_1.ua2utf8)(d) === attachmentContent2;
+                    }
+                    catch (_d) {
+                        return false;
+                    }
+                }));
+                (0, chai_1.expect)((0, icc_x_api_1.ua2utf8)(decryptedAttachment2)).to.equal(attachmentContent2);
+                const encryptedAttachment2 = yield attachmentApi.getEncryptedAttachment(entityWithEncrypted2);
+                let conversionFailed2;
+                try {
+                    conversionFailed2 = (0, icc_x_api_1.ua2utf8)(encryptedAttachment2) !== attachmentContent2;
+                }
+                catch (_b) {
+                    conversionFailed2 = true;
+                }
+                (0, chai_1.expect)(conversionFailed2).to.be.true;
+            }));
+        });
+    });
+});
+//# sourceMappingURL=entity-with-attachments-api-test.js.map

package/test/icc-x-api/entity-with-attachments-api-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-with-attachments-api-test.js","sourceRoot":"","sources":["../../../test/icc-x-api/entity-with-attachments-api-test.ts"],"names":[],"mappings":"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","sourcesContent":["import 'isomorphic-fetch'\nimport { getEnvironmentInitializer, hcp1Username, setLocalStorage, TestUtils } from '../utils/test_utils'\nimport { before } from 'mocha'\nimport * as models from '../../icc-api/model/models'\nimport { User } from '../../icc-api/model/User'\nimport { Apis, ua2utf8, utf8_2ua } from '../../icc-x-api'\nimport initApi = TestUtils.initApi\nimport { expect } from 'chai'\nimport { getEnvVariables, TestVars } from '@icure/test-setup/types'\n\nsetLocalStorage(fetch)\nlet env: TestVars\nlet apis: Apis\nlet user: User\n\ninterface EntityWithAttachmentApi<T> {\n  createEntity(): Promise<T>\n  encryptAndSetAttachment(entity: T, attachment: ArrayBuffer | Uint8Array): Promise<T>\n  getAndDecryptAttachment(entity: T, validator: (decrypted: ArrayBuffer) => Promise<boolean>): Promise<ArrayBuffer>\n  getEncryptedAttachment(entity: T): Promise<ArrayBuffer>\n}\n\nconst entityWithAttachmentApis = {\n  docMainAttachment: (apis: Apis, currentUser: User) =>\n    <EntityWithAttachmentApi<models.Document>>{\n      async createEntity(): Promise<models.Document> {\n        return apis.documentApi.createDocument(await apis.documentApi.newInstance(currentUser))\n      },\n      encryptAndSetAttachment(entity: models.Document, attachment: ArrayBuffer | Uint8Array): Promise<models.Document> {\n        return apis.documentApi.encryptAndSetDocumentAttachment(entity, attachment)\n      },\n      getAndDecryptAttachment(entity: models.Document, validator: (decrypted: ArrayBuffer) => Promise<boolean>): Promise<ArrayBuffer> {\n        return apis.documentApi.getAndDecryptDocumentAttachment(entity, validator)\n      },\n      getEncryptedAttachment(entity: models.Document): Promise<ArrayBuffer> {\n        return apis.documentApi.getDocumentAttachment(entity.id!, 'unused')\n      },\n    },\n  docSecondaryAttachment: (apis: Apis, currentUser: User) =>\n    <EntityWithAttachmentApi<models.Document>>{\n      async createEntity(): Promise<models.Document> {\n        return apis.documentApi.createDocument(await apis.documentApi.newInstance(currentUser))\n      },\n      encryptAndSetAttachment(entity: models.Document, attachment: ArrayBuffer | Uint8Array): Promise<models.Document> {\n        return apis.documentApi.encryptAndSetSecondaryDocumentAttachment(entity, 'secondary', attachment)\n      },\n      getAndDecryptAttachment(entity: models.Document, validator: (decrypted: ArrayBuffer) => Promise<boolean>): Promise<ArrayBuffer> {\n        return apis.documentApi.getAndDecryptSecondaryDocumentAttachment(entity, 'secondary', validator)\n      },\n      getEncryptedAttachment(entity: models.Document): Promise<ArrayBuffer> {\n        return apis.documentApi.getSecondaryAttachment(entity.id!, 'secondary')\n      },\n    },\n  receipt: (apis: Apis, currentUser: User) =>\n    <EntityWithAttachmentApi<models.Receipt>>{\n      async createEntity(): Promise<models.Receipt> {\n        return apis.receiptApi.createReceipt(await apis.receiptApi.newInstance(currentUser, {}))\n      },\n      async encryptAndSetAttachment(entity: models.Receipt, attachment: ArrayBuffer | Uint8Array): Promise<models.Receipt> {\n        return apis.receiptApi.encryptAndSetReceiptAttachment(entity, 'tack', attachment)\n      },\n      getAndDecryptAttachment(entity: models.Receipt, validator: (decrypted: ArrayBuffer) => Promise<boolean>): Promise<ArrayBuffer> {\n        return apis.receiptApi.getAndDecryptReceiptAttachment(entity, (entity.attachmentIds ?? {})['tack'], validator)\n      },\n      getEncryptedAttachment(entity: models.Receipt): Promise<ArrayBuffer> {\n        return apis.receiptApi.getReceiptAttachment(entity.id!, (entity.attachmentIds ?? {})['tack'])\n      },\n    },\n}\n\nbefore(async function () {\n  this.timeout(600000)\n  const initializer = await getEnvironmentInitializer()\n  env = await initializer.execute(getEnvVariables())\n  for (const [a, b] of Object.entries(env.dataOwnerDetails)) {\n    console.log(a)\n    console.log(b.password)\n    console.log('')\n  }\n  apis = await initApi(env!, hcp1Username)\n  user = await apis.userApi.getCurrentUser()\n})\n\ndescribe('Entity attachment update methods', async function () {\n  Object.entries(entityWithAttachmentApis).forEach(([type, attachmentApiInitialiser]) => {\n    it(`should automatically encrypt and decrypt attachments (${type})`, async () => {\n      const attachmentApi = attachmentApiInitialiser(apis, user)\n      const entity = await attachmentApi.createEntity()\n      console.log(`entity id ${entity.id}`)\n      const attachmentContent = 'This is some secret attachment'\n      const entityWithEncrypted = await attachmentApi.encryptAndSetAttachment(entity, utf8_2ua(attachmentContent))\n      const decryptedAttachment = await attachmentApi.getAndDecryptAttachment(entityWithEncrypted, async (d) => {\n        try {\n          return ua2utf8(d) === attachmentContent\n        } catch {\n          return false\n        }\n      })\n      expect(ua2utf8(decryptedAttachment)).to.equal(attachmentContent)\n      const encryptedAttachment = await attachmentApi.getEncryptedAttachment(entityWithEncrypted)\n      let conversionFailed\n      try {\n        conversionFailed = ua2utf8(encryptedAttachment) !== attachmentContent\n      } catch {\n        conversionFailed = true\n      }\n      expect(conversionFailed).to.be.true\n      const attachmentContent2 = 'This is an updated secret attachment'\n      const entityWithEncrypted2 = await attachmentApi.encryptAndSetAttachment(entityWithEncrypted, utf8_2ua(attachmentContent2))\n      const decryptedAttachment2 = await attachmentApi.getAndDecryptAttachment(entityWithEncrypted2, async (d) => {\n        try {\n          return ua2utf8(d) === attachmentContent2\n        } catch {\n          return false\n        }\n      })\n      expect(ua2utf8(decryptedAttachment2)).to.equal(attachmentContent2)\n      const encryptedAttachment2 = await attachmentApi.getEncryptedAttachment(entityWithEncrypted2)\n      let conversionFailed2\n      try {\n        conversionFailed2 = ua2utf8(encryptedAttachment2) !== attachmentContent2\n      } catch {\n        conversionFailed2 = true\n      }\n      expect(conversionFailed2).to.be.true\n    })\n  })\n})\n"]}

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

@@ -0,0 +1 @@
+import 'mocha';

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

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+require("mocha");
+const filters_1 = require("../../../icc-x-api/filters/filters");
+describe('Composition', () => {
+    it('or should return an or combining other filters', () => {
+        const builder = filters_1.Filter.patient().forHcp('me').olderThan(65).or().youngerThan(18);
+        const filter = builder.build();
+        (0, chai_1.expect)(filter.$type).to.equal('UnionFilter');
+    });
+    it('and should work with or', () => {
+        const builder = filters_1.Filter.patient().forHcp('me').olderThan(65).or().youngerThan(18).and().searchByName('dup');
+        const filter = builder.build();
+        (0, chai_1.expect)(filter.$type).to.equal('IntersectionFilter');
+        (0, chai_1.expect)(filter.filters[0].$type).to.equal('UnionFilter');
+    });
+    it('precedence of operators can be managed for and/or', () => {
+        const builder = filters_1.Filter.patient()
+            .forHcp('me')
+            .olderThan(65)
+            .or((it) => it.youngerThan(18).and().searchByName('dup'));
+        const filter = builder.build();
+        (0, chai_1.expect)(filter.$type).to.equal('UnionFilter');
+        (0, chai_1.expect)(filter.filters[0].$type).to.equal('PatientByHcPartyDateOfBirthBetweenFilter');
+        (0, chai_1.expect)(filter.filters[1].$type).to.equal('IntersectionFilter');
+    });
+    it('and should work with and', () => {
+        const builder = filters_1.Filter.patient().youngerThan(65).and().olderThan(18).and().searchByName('dup');
+        const filter = builder.build();
+        (0, chai_1.expect)(filter.$type).to.equal('IntersectionFilter');
+        (0, chai_1.expect)(filter.filters[0].$type).to.equal('IntersectionFilter');
+    });
+    it('should not crash miserably on incomplete or/and', () => {
+        const builder = filters_1.Filter.patient().youngerThan(65).and();
+        const filter = builder.build();
+        (0, chai_1.expect)(filter.$type).to.equal('IntersectionFilter');
+        (0, chai_1.expect)(filter.filters[0].$type).to.equal('PatientByHcPartyDateOfBirthBetweenFilter');
+        (0, chai_1.expect)(filter.filters[1].$type).to.equal('PatientByHcPartyFilter');
+    });
+    it('should not crash miserably on combination of or/and', () => {
+        const builder = filters_1.Filter.patient().youngerThan(65).and().or().olderThan(75);
+        const filter = builder.build();
+        (0, chai_1.expect)(filter.$type).to.equal('IntersectionFilter');
+        (0, chai_1.expect)(filter.filters[0].$type).to.equal('PatientByHcPartyDateOfBirthBetweenFilter');
+        (0, chai_1.expect)(filter.filters[1].$type).to.equal('PatientByHcPartyDateOfBirthBetweenFilter');
+    });
+});
+//# sourceMappingURL=filters.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../test/icc-x-api/filters/filters.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from 'chai'\nimport 'mocha'\nimport { Filter } from '../../../icc-x-api/filters/filters'\n\ndescribe('Composition', () => {\n  it('or should return an or combining other filters', () => {\n    const builder = Filter.patient().forHcp('me').olderThan(65).or().youngerThan(18)\n    const filter = builder.build()\n\n    expect((filter as any).$type).to.equal('UnionFilter')\n  })\n\n  it('and should work with or', () => {\n    const builder = Filter.patient().forHcp('me').olderThan(65).or().youngerThan(18).and().searchByName('dup')\n    const filter = builder.build()\n\n    expect((filter as any).$type).to.equal('IntersectionFilter')\n    expect((filter as any).filters[0].$type).to.equal('UnionFilter')\n  })\n\n  it('precedence of operators can be managed for and/or', () => {\n    const builder = Filter.patient()\n      .forHcp('me')\n      .olderThan(65)\n      .or((it) => it.youngerThan(18).and().searchByName('dup'))\n    const filter = builder.build()\n\n    expect((filter as any).$type).to.equal('UnionFilter')\n    expect((filter as any).filters[0].$type).to.equal('PatientByHcPartyDateOfBirthBetweenFilter')\n    expect((filter as any).filters[1].$type).to.equal('IntersectionFilter')\n  })\n\n  it('and should work with and', () => {\n    const builder = Filter.patient().youngerThan(65).and().olderThan(18).and().searchByName('dup')\n    const filter = builder.build()\n\n    expect((filter as any).$type).to.equal('IntersectionFilter')\n    expect((filter as any).filters[0].$type).to.equal('IntersectionFilter')\n  })\n\n  it('should not crash miserably on incomplete or/and', () => {\n    const builder = Filter.patient().youngerThan(65).and()\n    const filter = builder.build()\n\n    expect((filter as any).$type).to.equal('IntersectionFilter')\n    expect((filter as any).filters[0].$type).to.equal('PatientByHcPartyDateOfBirthBetweenFilter')\n    expect((filter as any).filters[1].$type).to.equal('PatientByHcPartyFilter')\n  })\n\n  it('should not crash miserably on combination of or/and', () => {\n    const builder = Filter.patient().youngerThan(65).and().or().olderThan(75)\n    const filter = builder.build()\n\n    expect((filter as any).$type).to.equal('IntersectionFilter')\n    expect((filter as any).filters[0].$type).to.equal('PatientByHcPartyDateOfBirthBetweenFilter')\n    expect((filter as any).filters[1].$type).to.equal('PatientByHcPartyDateOfBirthBetweenFilter')\n  })\n})\n"]}

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

@@ -0,0 +1 @@
+import 'isomorphic-fetch';