@icure/api 5.0.31 → 5.0.32

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

@@ -4,6 +4,8 @@ import { RSAUtils } from './crypto/RSA';
 import { ShamirClass } from './crypto/shamir';
 import { Delegation, Device, Document, EncryptedEntity, EncryptedParentEntity, HealthcareParty, Patient, User } from '../icc-api/model/models';
 import { IccMaintenanceTaskXApi } from './icc-maintenance-task-x-api';
+import { StorageFacade } from './storage/StorageFacade';
+import { KeyStorageFacade } from './storage/KeyStorageFacade';
 interface DelegatorAndKeys {
     delegatorId: string;
     key: CryptoKey;
@@ -64,10 +66,12 @@ export declare class IccCryptoXApi {
     private readonly _AES;
     private readonly _RSA;
     private readonly _shamir;
+    private readonly _storage;
+    private readonly _keyStorage;
     constructor(host: string, headers: {
         [key: string]: string;
     }, hcpartyBaseApi: IccHcpartyApi, //Init with a hcparty x api for better performances
-    patientBaseApi: IccPatientApi, deviceBaseApi: IccDeviceApi, crypto?: Crypto);
+    patientBaseApi: IccPatientApi, deviceBaseApi: IccDeviceApi, crypto?: Crypto, storage?: StorageFacade<string>, keyStorage?: KeyStorageFacade);
     loadAllKeysFromLocalStorage(dataOwnerId: string): Promise<void>;
     getCachedRsaKeyPairForFingerprint(dataOwnerId: string, pubKeyOrFingerprint: string): Promise<{
         publicKey: CryptoKey;
@@ -373,18 +377,9 @@ export declare class IccCryptoXApi {
         remote: boolean;
         local: boolean;
     }>;
-    getKeychainInBrowserLocalStorageAsBase64(id: string): string | null;
-    getKeychainValidityDateInBrowserLocalStorage(id: string): string | null;
+    getKeychainInBrowserLocalStorageAsBase64(id: string): string | undefined;
+    getKeychainValidityDateInBrowserLocalStorage(id: string): string | undefined;
     loadKeychainFromBrowserLocalStorage(id: string): Uint8Array[] | null;
-    /**
-     *
-     * @param id
-     * @param keyPair should be JWK
-     */
-    storeKeyPair(id: string, keyPair: {
-        publicKey: any;
-        privateKey: any;
-    }): void;
     /**
      * loads the RSA key pair (hcparty) in JWK from local storage, not imported
      *

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

@@ -17,9 +17,11 @@ const _ = require("lodash");
 const models_1 = require("../icc-api/model/models");
 const binary_utils_1 = require("./utils/binary-utils");
 const utils_1 = require("./utils");
+const LocalStorageImpl_1 = require("./storage/LocalStorageImpl");
+const KeyStorageImpl_1 = require("./storage/KeyStorageImpl");
 class IccCryptoXApi {
     constructor(host, headers, hcpartyBaseApi, //Init with a hcparty x api for better performances
-    patientBaseApi, deviceBaseApi, crypto = typeof window !== 'undefined' ? window.crypto : typeof self !== 'undefined' ? self.crypto : {}) {
+    patientBaseApi, deviceBaseApi, crypto = typeof window !== 'undefined' ? window.crypto : typeof self !== 'undefined' ? self.crypto : {}, storage, keyStorage) {
         this.hcPartyKeysCache = {};
         //[delegateId][delegatorId] = delegateEncryptedHcPartyKey
         //for each delegate, it stores the list of delegators and the corresponding delegateEncryptedHcPartyKey (shared HcPartyKey, from delegator to delegate, encrypted with the RSA key of the delegate)
@@ -40,6 +42,8 @@ class IccCryptoXApi {
         this._AES = new AES_1.AESUtils(crypto);
         this._RSA = new RSA_1.RSAUtils(crypto);
         this._shamir = new shamir_1.ShamirClass(crypto);
+        this._storage = storage || new LocalStorageImpl_1.LocalStorageImpl();
+        this._keyStorage = keyStorage || new KeyStorageImpl_1.KeyStorageImpl(this._storage);
     }
     get crypto() {
         return this._crypto;
@@ -181,7 +185,7 @@ class IccCryptoXApi {
                 const importedPrivateKey = yield this._RSA.importKey('pkcs8', (0, binary_utils_1.hex2ua)(decryptedPrivatedKey), ['decrypt']);
                 const importedPublicKey = yield this._RSA.importKey('spki', (0, binary_utils_1.hex2ua)(hcp.publicKey), ['encrypt']);
                 const exportedKeyPair = yield this._RSA.exportKeys({ publicKey: importedPublicKey, privateKey: importedPrivateKey }, 'jwk', 'jwk');
-                this.storeKeyPair(hcp.id, exportedKeyPair);
+                this._keyStorage.storeKeyPair(`${this.rsaLocalStoreIdPrefix}${hcp.id}`, exportedKeyPair);
             }
             catch (e) {
                 console.log('Cannot decrypt shamir RSA key');
@@ -1047,7 +1051,7 @@ class IccCryptoXApi {
             const keyPair = yield this._RSA.importKeyPair('jwk', privateKeyInJwk, 'jwk', (0, utils_1.spkiToJwk)((0, binary_utils_1.hex2ua)(publicKey)));
             this.rsaKeyPairs[publicKey.slice(-32)] = keyPair;
             const exportedKeyPair = yield this._RSA.exportKeys(keyPair, 'jwk', 'jwk');
-            return this.storeKeyPair(`${healthcarePartyId}.${publicKey.slice(-32)}`, exportedKeyPair);
+            return this._keyStorage.storeKeyPair(`${this.rsaLocalStoreIdPrefix}${healthcarePartyId}.${publicKey.slice(-32)}`, exportedKeyPair);
         });
     }
     loadKeyPairsAsJwkInBrowserLocalStorage(healthcarePartyId, privateKey) {
@@ -1064,7 +1068,7 @@ class IccCryptoXApi {
             const keyPair = yield this._RSA.importKeyPair('jwk', privateKey, 'jwk', (0, utils_1.spkiToJwk)((0, binary_utils_1.hex2ua)(publicKey)));
             this.rsaKeyPairs[publicKey.slice(-32)] = keyPair;
             const exportedKeyPair = yield this._RSA.exportKeys(keyPair, 'jwk', 'jwk');
-            return this.storeKeyPair(`${healthcarePartyId}.${publicKey.slice(-32)}`, exportedKeyPair);
+            return this._keyStorage.storeKeyPair(`${this.rsaLocalStoreIdPrefix}${healthcarePartyId}.${publicKey.slice(-32)}`, exportedKeyPair);
         });
     }
     // noinspection JSUnusedGlobalSymbols
@@ -1085,20 +1089,20 @@ class IccCryptoXApi {
     }
     // noinspection JSUnusedGlobalSymbols
     saveKeychainInBrowserLocalStorage(id, keychain) {
-        localStorage.setItem(this.keychainLocalStoreIdPrefix + id, (0, binary_utils_1.b2a)(new Uint8Array(keychain).reduce((data, byte) => data + String.fromCharCode(byte), '')));
+        this._storage.setItem(this.keychainLocalStoreIdPrefix + id, (0, binary_utils_1.b2a)(new Uint8Array(keychain).reduce((data, byte) => data + String.fromCharCode(byte), '')));
     }
     saveKeychainInBrowserLocalStorageAsBase64(id, keyChainB64) {
-        localStorage.setItem(this.keychainLocalStoreIdPrefix + id, keyChainB64);
+        this._storage.setItem(this.keychainLocalStoreIdPrefix + id, keyChainB64);
     }
     // noinspection JSUnusedGlobalSymbols
     saveKeychainValidityDateInBrowserLocalStorage(id, date) {
         if (!id)
             return;
         if (!date) {
-            localStorage.removeItem(this.keychainValidityDateLocalStoreIdPrefix + id);
+            this._storage.deleteItem(this.keychainValidityDateLocalStoreIdPrefix + id);
         }
         else {
-            localStorage.setItem(this.keychainValidityDateLocalStoreIdPrefix + id, date);
+            this._storage.setItem(this.keychainValidityDateLocalStoreIdPrefix + id, date);
         }
     }
     /**
@@ -1204,28 +1208,15 @@ class IccCryptoXApi {
         });
     }
     getKeychainInBrowserLocalStorageAsBase64(id) {
-        return localStorage.getItem(this.keychainLocalStoreIdPrefix + id);
+        return this._storage.getItem(this.keychainLocalStoreIdPrefix + id);
     }
     getKeychainValidityDateInBrowserLocalStorage(id) {
-        return localStorage.getItem(this.keychainValidityDateLocalStoreIdPrefix + id);
+        return this._storage.getItem(this.keychainValidityDateLocalStoreIdPrefix + id);
     }
     // noinspection JSUnusedGlobalSymbols
     loadKeychainFromBrowserLocalStorage(id) {
-        const lsItem = localStorage.getItem('org.taktik.icure.ehealth.keychain.' + id);
-        return lsItem !== null ? (0, binary_utils_1.b64_2uas)(lsItem) : null;
-    }
-    /**
-     *
-     * @param id
-     * @param keyPair should be JWK
-     */
-    storeKeyPair(id, keyPair) {
-        if (typeof Storage === 'undefined') {
-            console.log('Your browser does not support HTML5 Browser Local Storage !');
-            throw 'Your browser does not support HTML5 Browser Local Storage !';
-        }
-        //TODO encryption
-        localStorage.setItem(this.rsaLocalStoreIdPrefix + id, JSON.stringify(keyPair));
+        const lsItem = this._storage.getItem(this.keychainLocalStoreIdPrefix + id);
+        return lsItem !== undefined ? (0, binary_utils_1.b64_2uas)(lsItem) : null;
     }
     /**
      * loads the RSA key pair (hcparty) in JWK from local storage, not imported
@@ -1241,11 +1232,13 @@ class IccCryptoXApi {
             throw 'Your browser does not support HTML5 Browser Local Storage !';
         }
         //TODO decryption
-        const item = (_a = (publicKeyFingerPrint && localStorage.getItem(this.rsaLocalStoreIdPrefix + id + '.' + publicKeyFingerPrint.slice(-32)))) !== null && _a !== void 0 ? _a : localStorage.getItem(this.rsaLocalStoreIdPrefix + id);
+        const item = publicKeyFingerPrint
+            ? (_a = this._keyStorage.getKeypair(this.rsaLocalStoreIdPrefix + id + '.' + publicKeyFingerPrint.slice(-32))) !== null && _a !== void 0 ? _a : this._keyStorage.getKeypair(this.rsaLocalStoreIdPrefix + id)
+            : this._keyStorage.getKeypair(this.rsaLocalStoreIdPrefix + id);
         if (!item) {
             console.warn(`No key can be found in local storage for id ${id} and publicKeyFingerPrint ${publicKeyFingerPrint}`);
         }
-        return JSON.parse(item);
+        return item;
     }
     /**
      * Loads and imports the RSA key pair (hcparty) from local storage
@@ -1256,24 +1249,23 @@ class IccCryptoXApi {
     loadKeyPairImported(id) {
         return new Promise((resolve, reject) => {
             try {
-                const jwkKey = localStorage.getItem(this.rsaLocalStoreIdPrefix + id);
-                if (jwkKey) {
-                    const jwkKeyPair = JSON.parse(jwkKey);
+                const jwkKeyPair = this._keyStorage.getKeypair(this.rsaLocalStoreIdPrefix + id);
+                if (jwkKeyPair !== undefined) {
                     if (jwkKeyPair.publicKey && jwkKeyPair.privateKey) {
                         this._RSA.importKeyPair('jwk', jwkKeyPair.privateKey, 'jwk', jwkKeyPair.publicKey).then(resolve, (err) => {
-                            console.log('Error in RSA.importKeyPair: ' + err);
+                            console.error('Error in RSA.importKeyPair: ' + err);
                             reject(err);
                         });
                     }
                     else {
                         const message = 'Error in RSA.importKeyPair: Invalid key';
-                        console.log(message);
+                        console.error(message);
                         reject(Error(message));
                     }
                 }
                 else {
                     const message = 'Error in RSA.importKeyPair: Missing key';
-                    console.log(message);
+                    console.error(message);
                     reject(Error(message));
                 }
             }