@icure/api 7.1.14 → 8.0.0-RC.1

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

@@ -10,19 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IccUserXApi = void 0;
-const icc_api_1 = require("../icc-api");
+const IccUserApi_1 = require("../icc-api/api/IccUserApi");
 const AuthenticationProvider_1 = require("./auth/AuthenticationProvider");
 const Connection_1 = require("../icc-api/model/Connection");
 const utils_1 = require("./utils");
-class IccUserXApi extends icc_api_1.IccUserApi {
+class IccUserXApi extends IccUserApi_1.IccUserApi {
     constructor(host, headers, authenticationProvider = new AuthenticationProvider_1.NoAuthenticationProvider(), authApi, fetchImpl = typeof window !== 'undefined'
         ? window.fetch
         : typeof self !== 'undefined'
             ? self.fetch
             : fetch) {
         super(host, headers, authenticationProvider, fetchImpl);
-        this.fetchImpl = fetchImpl;
         this.authApi = authApi;
+        this.fetchImpl = fetchImpl;
     }
     getCurrentUser(bypassCache = false) {
         var _a;

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

@@ -1 +1 @@
-{"version":3,"file":"icc-user-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-user-x-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAuC;AACvC,0EAAgG;AAGhG,4DAAwE;AACxE,mCAAsE;AAGtE,MAAa,WAAY,SAAQ,oBAAU;IAKzC,YACE,IAAY,EACZ,OAAkC,EAClC,yBAAiD,IAAI,iDAAwB,EAAE,EAC/E,OAAmB,EACnB,YAA2E,OAAO,MAAM,KAAK,WAAW;QACtG,CAAC,CAAC,MAAM,CAAC,KAAK;QACd,CAAC,CAAC,OAAO,IAAI,KAAK,WAAW;YAC7B,CAAC,CAAC,IAAI,CAAC,KAAK;YACZ,CAAC,CAAC,KAAK;QAET,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,SAAS,CAAC,CAAA;QACvD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,cAAc,CAAC,cAAuB,KAAK;;QACzC,IAAI,WAAW;YAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAA;;YACpE,OAAO,MAAA,IAAI,CAAC,iBAAiB,mCAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAA;IACzF,CAAC;IAEK,UAAU,CAAC,IAAW;;;;;YAC1B,IAAI,IAAI,CAAC,iBAAiB,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,CAAA,EAAE;gBAC5E,IAAI;oBACF,MAAM,YAAY,GAAG,MAAM,OAAM,UAAU,YAAC,IAAI,CAAC,CAAA;oBACjD,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;oBACtD,OAAO,YAAY,CAAA;iBACpB;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAA;oBAClC,MAAM,CAAC,CAAA;iBACR;aACF;;gBAAM,OAAO,OAAM,UAAU,YAAC,IAAI,EAAC;QACtC,CAAC;KAAA;IAEK,qBAAqB,CACzB,UAA8C,EAC9C,MAAwC,EACxC,UAAyC,EACzC,UAA+B,EAAE;;YAEjC,MAAM,EAAE,GAAG,MAAM,IAAA,+BAAuB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;YAClH,OAAO,IAAI,2BAAc,CAAC,EAAE,CAAC,CAAA;QAC/B,CAAC;KAAA;CACF;AAhDD,kCAgDC","sourcesContent":["import { IccUserApi } from '../icc-api'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\nimport { AbstractFilter } from './filters/filters'\nimport { User } from '../icc-api/model/User'\nimport { Connection, ConnectionImpl } from '../icc-api/model/Connection'\nimport { subscribeToEntityEvents , SubscriptionOptions} from './utils'\nimport { IccAuthApi } from '../icc-api'\n\nexport class IccUserXApi extends IccUserApi {\n  fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response>\n  authApi: IccAuthApi\n  private cachedCurrentUser: Promise<User> | undefined\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    authApi: IccAuthApi,\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.fetchImpl = fetchImpl\n    this.authApi = authApi\n  }\n\n  getCurrentUser(bypassCache: boolean = false): Promise<User> {\n    if (bypassCache) return (this.cachedCurrentUser = super.getCurrentUser())\n    else return this.cachedCurrentUser ?? (this.cachedCurrentUser = super.getCurrentUser())\n  }\n\n  async modifyUser(body?: User): Promise<User> {\n    if (this.cachedCurrentUser && (await this.cachedCurrentUser).id === body?.id) {\n      try {\n        const modifiedUser = await super.modifyUser(body)\n        this.cachedCurrentUser = Promise.resolve(modifiedUser)\n        return modifiedUser\n      } catch (e) {\n        this.cachedCurrentUser = undefined\n        throw e\n      }\n    } else return super.modifyUser(body)\n  }\n\n  async subscribeToUserEvents(\n    eventTypes: ('CREATE' | 'UPDATE' | 'DELETE')[],\n    filter: AbstractFilter<User> | undefined,\n    eventFired: (user: User) => Promise<void>,\n    options: SubscriptionOptions = {}\n  ): Promise<Connection> {\n    const rs = await subscribeToEntityEvents(this.host, this.authApi, 'User', eventTypes, filter, eventFired, options)\n    return new ConnectionImpl(rs)\n  }\n}\n"]}
+{"version":3,"file":"icc-user-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-user-x-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAsD;AACtD,0EAAgG;AAGhG,4DAAwE;AACxE,mCAAsE;AAGtE,MAAa,WAAY,SAAQ,uBAAU;IAIzC,YACE,IAAY,EACZ,OAAkC,EAClC,yBAAiD,IAAI,iDAAwB,EAAE,EAC9D,OAAmB,EACpC,YAA2E,OAAO,MAAM,KAAK,WAAW;QACtG,CAAC,CAAC,MAAM,CAAC,KAAK;QACd,CAAC,CAAC,OAAO,IAAI,KAAK,WAAW;YAC7B,CAAC,CAAC,IAAI,CAAC,KAAK;YACZ,CAAC,CAAC,KAAK;QAET,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAPtC,YAAO,GAAP,OAAO,CAAY;QAQpC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAED,cAAc,CAAC,cAAuB,KAAK;;QACzC,IAAI,WAAW;YAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAA;;YACpE,OAAO,MAAA,IAAI,CAAC,iBAAiB,mCAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAA;IACzF,CAAC;IAEK,UAAU,CAAC,IAAW;;;;;YAC1B,IAAI,IAAI,CAAC,iBAAiB,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,CAAA,EAAE;gBAC5E,IAAI;oBACF,MAAM,YAAY,GAAG,MAAM,OAAM,UAAU,YAAC,IAAI,CAAC,CAAA;oBACjD,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;oBACtD,OAAO,YAAY,CAAA;iBACpB;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAA;oBAClC,MAAM,CAAC,CAAA;iBACR;aACF;;gBAAM,OAAO,OAAM,UAAU,YAAC,IAAI,EAAC;QACtC,CAAC;KAAA;IAEK,qBAAqB,CACzB,UAA8C,EAC9C,MAAwC,EACxC,UAAyC,EACzC,UAA+B,EAAE;;YAEjC,MAAM,EAAE,GAAG,MAAM,IAAA,+BAAuB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;YAClH,OAAO,IAAI,2BAAc,CAAC,EAAE,CAAC,CAAA;QAC/B,CAAC;KAAA;CACF;AA9CD,kCA8CC","sourcesContent":["import { IccUserApi } from '../icc-api/api/IccUserApi'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\nimport { AbstractFilter } from './filters/filters'\nimport { User } from '../icc-api/model/User'\nimport { Connection, ConnectionImpl } from '../icc-api/model/Connection'\nimport { subscribeToEntityEvents , SubscriptionOptions} from './utils'\nimport { IccAuthApi } from '../icc-api'\n\nexport class IccUserXApi extends IccUserApi {\n  fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response>\n  private cachedCurrentUser: Promise<User> | undefined\n\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    private readonly authApi: IccAuthApi,\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.fetchImpl = fetchImpl\n  }\n\n  getCurrentUser(bypassCache: boolean = false): Promise<User> {\n    if (bypassCache) return (this.cachedCurrentUser = super.getCurrentUser())\n    else return this.cachedCurrentUser ?? (this.cachedCurrentUser = super.getCurrentUser())\n  }\n\n  async modifyUser(body?: User): Promise<User> {\n    if (this.cachedCurrentUser && (await this.cachedCurrentUser).id === body?.id) {\n      try {\n        const modifiedUser = await super.modifyUser(body)\n        this.cachedCurrentUser = Promise.resolve(modifiedUser)\n        return modifiedUser\n      } catch (e) {\n        this.cachedCurrentUser = undefined\n        throw e\n      }\n    } else return super.modifyUser(body)\n  }\n\n  async subscribeToUserEvents(\n    eventTypes: ('CREATE' | 'UPDATE' | 'DELETE')[],\n    filter: AbstractFilter<User> | undefined,\n    eventFired: (user: User) => Promise<void>,\n    options: SubscriptionOptions = {}\n  ): Promise<Connection> {\n    const rs = await subscribeToEntityEvents(this.host, this.authApi, 'User', eventTypes, filter, eventFired, options)\n    return new ConnectionImpl(rs)\n  }\n}\n"]}

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

@@ -23,10 +23,10 @@ import { AuthenticationProvider } from './auth/AuthenticationProvider';
 import { StorageEntryKeysFactory } from './storage/StorageEntryKeysFactory';
 import { CryptoStrategies } from './crypto/CryptoStrategies';
 import { IccIcureMaintenanceXApi } from './icc-icure-maintenance-x-api';
+import { IccDeviceXApi } from './icc-device-x-api';
 import { IccBekmehrXApi } from './icc-bekmehr-x-api';
 import { IccDoctemplateXApi } from './icc-doctemplate-x-api';
 import { UserGroup } from '../icc-api/model/UserGroup';
-import { IccDeviceXApi } from './icc-device-x-api';
 export * from './icc-accesslog-x-api';
 export * from './icc-bekmehr-x-api';
 export * from './icc-calendar-item-x-api';
@@ -127,7 +127,9 @@ export interface IcureApiOptions {
      */
     readonly entryKeysFactory?: StorageEntryKeysFactory;
     /**
-     * Specifies if iCure should create maintenance tasks for requesting access back when a new key is generated at initialisation time.
+     * Specifies if iCure should automatically create maintenance tasks for requesting access back when a new key is generated at initialisation time.
+     * Note that the maintenance task will be created only towards HCP data owners: if you want to create a maintenance task also to other types of data
+     * owners you should disable this and call {@link IccIcureMaintenanceXApi.createMaintenanceTasksForNewKeypair} yourself.
      * @default true
      */
     readonly createMaintenanceTasksOnNewKey?: boolean;

package/icc-x-api/index.js

@@ -47,7 +47,7 @@ const LocalStorageImpl_1 = require("./storage/LocalStorageImpl");
 const KeyStorageImpl_1 = require("./storage/KeyStorageImpl");
 const AuthenticationProvider_1 = require("./auth/AuthenticationProvider");
 const CryptoPrimitives_1 = require("./crypto/CryptoPrimitives");
-const KeyManager_1 = require("./crypto/KeyManager");
+const UserEncryptionKeysManager_1 = require("./crypto/UserEncryptionKeysManager");
 const IcureStorageFacade_1 = require("./storage/IcureStorageFacade");
 const DefaultStorageEntryKeysFactory_1 = require("./storage/DefaultStorageEntryKeysFactory");
 const KeyRecovery_1 = require("./crypto/KeyRecovery");
@@ -56,13 +56,24 @@ const ExchangeKeysManager_1 = require("./crypto/ExchangeKeysManager");
 const ShamirKeysManager_1 = require("./crypto/ShamirKeysManager");
 const TransferKeysManager_1 = require("./crypto/TransferKeysManager");
 const icc_icure_maintenance_x_api_1 = require("./icc-icure-maintenance-x-api");
-const EntitiesEncryption_1 = require("./crypto/EntitiesEncryption");
 const ConfidentialEntities_1 = require("./crypto/ConfidentialEntities");
 const utils_1 = require("./crypto/utils");
-const CryptoActorStub_1 = require("../icc-api/model/CryptoActorStub");
+const SecureDelegationsSecurityMetadataDecryptor_1 = require("./crypto/SecureDelegationsSecurityMetadataDecryptor");
+const ExchangeDataManager_1 = require("./crypto/ExchangeDataManager");
+const BaseExchangeDataManager_1 = require("./crypto/BaseExchangeDataManager");
+const IccExchangeDataApi_1 = require("../icc-api/api/IccExchangeDataApi");
+const UserSignatureKeysManager_1 = require("./crypto/UserSignatureKeysManager");
+const AccessControlSecretUtils_1 = require("./crypto/AccessControlSecretUtils");
+const SecureDelegationsEncryption_1 = require("./crypto/SecureDelegationsEncryption");
+const LegacyDelegationSecurityMetadataDecryptor_1 = require("./crypto/LegacyDelegationSecurityMetadataDecryptor");
+const ExtendedApisUtilsImpl_1 = require("./crypto/ExtendedApisUtilsImpl");
+const SecureDelegationsManager_1 = require("./crypto/SecureDelegationsManager");
+const AccessControlKeysHeadersProvider_1 = require("./crypto/AccessControlKeysHeadersProvider");
+const IccExchangeDataMapApi_1 = require("../icc-api/api/IccExchangeDataMapApi");
+const ExchangeDataMapManager_1 = require("./crypto/ExchangeDataMapManager");
+const icc_device_x_api_1 = require("./icc-device-x-api");
 const icc_bekmehr_x_api_1 = require("./icc-bekmehr-x-api");
 const icc_doctemplate_x_api_1 = require("./icc-doctemplate-x-api");
-const icc_device_x_api_1 = require("./icc-device-x-api");
 __exportStar(require("./icc-accesslog-x-api"), exports);
 __exportStar(require("./icc-bekmehr-x-api"), exports);
 __exportStar(require("./icc-calendar-item-x-api"), exports);
@@ -173,51 +184,89 @@ var IcureApi;
     IcureApi.initialise = initialise;
 })(IcureApi = exports.IcureApi || (exports.IcureApi = {}));
 function initialiseCryptoWithProvider(host, fetchImpl, groupSpecificAuthenticationProvider, params, cryptoStrategies, crypto) {
-    var _a, _b;
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        // Here I instantiate a separate instance of the AuthApi that can call also login-protected methods (logout)
         const authApi = new icc_api_1.IccAuthApi(host, params.headers, groupSpecificAuthenticationProvider, fetchImpl);
         const userApi = new icc_user_x_api_1.IccUserXApi(host, params.headers, groupSpecificAuthenticationProvider, authApi, fetchImpl);
         const healthcarePartyApi = new icc_hcparty_x_api_1.IccHcpartyXApi(host, params.headers, groupSpecificAuthenticationProvider, authApi, fetchImpl);
         const deviceApi = new icc_device_x_api_1.IccDeviceXApi(host, params.headers, groupSpecificAuthenticationProvider, userApi, authApi, fetchImpl);
         const basePatientApi = new icc_api_1.IccPatientApi(host, params.headers, groupSpecificAuthenticationProvider, fetchImpl);
         const dataOwnerApi = new icc_data_owner_x_api_1.IccDataOwnerXApi(host, params.headers, groupSpecificAuthenticationProvider, fetchImpl);
+        const exchangeDataApi = new IccExchangeDataApi_1.IccExchangeDataApi(host, params.headers, groupSpecificAuthenticationProvider, fetchImpl);
         // Crypto initialisation
         const icureStorage = new IcureStorageFacade_1.IcureStorageFacade(params.keyStorage, params.storage, params.entryKeysFactory);
         const cryptoPrimitives = new CryptoPrimitives_1.CryptoPrimitives(crypto);
         const baseExchangeKeysManager = new BaseExchangeKeysManager_1.BaseExchangeKeysManager(cryptoPrimitives, dataOwnerApi, healthcarePartyApi, basePatientApi, deviceApi);
-        const keyRecovery = new KeyRecovery_1.KeyRecovery(cryptoPrimitives, baseExchangeKeysManager, dataOwnerApi);
-        const keyManager = new KeyManager_1.KeyManager(cryptoPrimitives, dataOwnerApi, icureStorage, keyRecovery, baseExchangeKeysManager, cryptoStrategies, !params.disableParentKeysInitialisation);
-        const newKey = yield keyManager.initialiseKeys();
-        yield new TransferKeysManager_1.TransferKeysManager(cryptoPrimitives, baseExchangeKeysManager, dataOwnerApi, keyManager, icureStorage).updateTransferKeys(CryptoActorStub_1.CryptoActorStubWithType.fromDataOwner(yield dataOwnerApi.getCurrentDataOwner()));
+        const baseExchangeDataManager = new BaseExchangeDataManager_1.BaseExchangeDataManager(exchangeDataApi, dataOwnerApi, cryptoPrimitives, cryptoStrategies.dataOwnerRequiresAnonymousDelegation(yield dataOwnerApi.getCurrentDataOwnerStub()));
+        const keyRecovery = new KeyRecovery_1.KeyRecovery(cryptoPrimitives, dataOwnerApi, baseExchangeKeysManager, baseExchangeDataManager);
+        const userEncryptionKeysManager = new UserEncryptionKeysManager_1.UserEncryptionKeysManager(cryptoPrimitives, dataOwnerApi, icureStorage, keyRecovery, cryptoStrategies, !params.disableParentKeysInitialisation);
+        const userSignatureKeysManager = new UserSignatureKeysManager_1.UserSignatureKeysManager(icureStorage, dataOwnerApi, cryptoPrimitives);
+        const newKey = yield userEncryptionKeysManager.initialiseKeys();
+        yield new TransferKeysManager_1.TransferKeysManager(cryptoPrimitives, baseExchangeDataManager, dataOwnerApi, userEncryptionKeysManager, userSignatureKeysManager, icureStorage).updateTransferKeys(yield dataOwnerApi.getCurrentDataOwnerStub());
         // TODO customise cache size?
-        const exchangeKeysManager = new ExchangeKeysManager_1.ExchangeKeysManager(100, 500, 60000, 600000, cryptoStrategies, cryptoPrimitives, keyManager, baseExchangeKeysManager, dataOwnerApi, !params.disableParentKeysInitialisation);
-        const entitiesEncryption = new EntitiesEncryption_1.EntitiesEncryption(cryptoPrimitives, dataOwnerApi, exchangeKeysManager, !params.disableParentKeysInitialisation);
-        const shamirManager = new ShamirKeysManager_1.ShamirKeysManager(cryptoPrimitives, dataOwnerApi, keyManager, exchangeKeysManager);
-        const confidentialEntitites = new ConfidentialEntities_1.ConfidentialEntities(entitiesEncryption, cryptoPrimitives, dataOwnerApi);
-        yield (0, utils_1.ensureDelegationForSelf)(dataOwnerApi, entitiesEncryption, cryptoPrimitives, basePatientApi);
-        const cryptoApi = new icc_crypto_x_api_1.IccCryptoXApi(exchangeKeysManager, cryptoPrimitives, keyManager, dataOwnerApi, entitiesEncryption, shamirManager, params.storage, params.keyStorage, icureStorage, healthcarePartyApi, confidentialEntitites, basePatientApi);
-        const maintenanceTaskApi = new icc_maintenance_task_x_api_1.IccMaintenanceTaskXApi(host, params.headers, cryptoApi, healthcarePartyApi, dataOwnerApi, userApi, authApi, (_b = (_a = params.encryptedFieldsConfig) === null || _a === void 0 ? void 0 : _a.maintenanceTask) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.maintenanceTask, groupSpecificAuthenticationProvider, fetchImpl);
-        const icureMaintenanceTaskApi = new icc_icure_maintenance_x_api_1.IccIcureMaintenanceXApi(cryptoApi, maintenanceTaskApi, dataOwnerApi);
+        const exchangeKeysManager = new ExchangeKeysManager_1.ExchangeKeysManager(100, 500, 600000, 60000, cryptoStrategies, cryptoPrimitives, userEncryptionKeysManager, baseExchangeKeysManager, dataOwnerApi, !params.disableParentKeysInitialisation, icureStorage);
+        const accessControlSecretUtils = new AccessControlSecretUtils_1.AccessControlSecretUtils(cryptoPrimitives);
+        const exchangeDataManager = yield (0, ExchangeDataManager_1.initialiseExchangeDataManagerForCurrentDataOwner)(baseExchangeDataManager, userEncryptionKeysManager, userSignatureKeysManager, accessControlSecretUtils, cryptoStrategies, dataOwnerApi, cryptoPrimitives, !params.disableParentKeysInitialisation);
+        const exchangeDataMapManager = new ExchangeDataMapManager_1.ExchangeDataMapManager(new IccExchangeDataMapApi_1.IccExchangeDataMapApi(host, params.headers, groupSpecificAuthenticationProvider, fetchImpl));
+        const secureDelegationsEncryption = new SecureDelegationsEncryption_1.SecureDelegationsEncryption(userEncryptionKeysManager, cryptoPrimitives);
+        const xApiUtils = new ExtendedApisUtilsImpl_1.ExtendedApisUtilsImpl(cryptoPrimitives, dataOwnerApi, new LegacyDelegationSecurityMetadataDecryptor_1.LegacyDelegationSecurityMetadataDecryptor(exchangeKeysManager, cryptoPrimitives), new SecureDelegationsSecurityMetadataDecryptor_1.SecureDelegationsSecurityMetadataDecryptor(exchangeDataManager, exchangeDataMapManager, secureDelegationsEncryption, dataOwnerApi), new SecureDelegationsManager_1.SecureDelegationsManager(exchangeDataManager, exchangeDataMapManager, secureDelegationsEncryption, accessControlSecretUtils, userEncryptionKeysManager, cryptoPrimitives, dataOwnerApi, cryptoStrategies, cryptoStrategies.dataOwnerRequiresAnonymousDelegation(yield dataOwnerApi.getCurrentDataOwnerStub())), userApi, !params.disableParentKeysInitialisation);
+        const shamirManager = new ShamirKeysManager_1.ShamirKeysManager(cryptoPrimitives, dataOwnerApi, userEncryptionKeysManager, exchangeDataManager);
+        const confidentialEntitites = new ConfidentialEntities_1.ConfidentialEntities(xApiUtils, cryptoPrimitives, dataOwnerApi);
+        yield (0, utils_1.ensureDelegationForSelf)(dataOwnerApi, xApiUtils, basePatientApi, cryptoPrimitives);
+        const cryptoApi = new icc_crypto_x_api_1.IccCryptoXApi(exchangeKeysManager, cryptoPrimitives, userEncryptionKeysManager, dataOwnerApi, xApiUtils, shamirManager, params.storage, params.keyStorage, confidentialEntitites, exchangeDataManager, new AccessControlKeysHeadersProvider_1.AccessControlKeysHeadersProvider(exchangeDataManager));
+        const maintenanceTaskApi = new icc_maintenance_task_x_api_1.IccMaintenanceTaskXApi(host, params.headers, cryptoApi, healthcarePartyApi, dataOwnerApi, userApi, authApi, (_a = params.encryptedFieldsConfig.maintenanceTask) !== null && _a !== void 0 ? _a : EncryptedFieldsConfig.Defaults.maintenanceTask, groupSpecificAuthenticationProvider, fetchImpl);
+        const icureMaintenanceTaskApi = new icc_icure_maintenance_x_api_1.IccIcureMaintenanceXApi(cryptoApi, maintenanceTaskApi, dataOwnerApi, exchangeDataApi);
         if (newKey && params.createMaintenanceTasksOnNewKey) {
             yield icureMaintenanceTaskApi.createMaintenanceTasksForNewKeypair(yield userApi.getCurrentUser(), newKey.newKeyPair);
         }
         return {
             cryptoApi,
+            userApi,
             healthcarePartyApi,
             deviceApi,
+            maintenanceTaskApi,
             dataOwnerApi,
-            userApi,
             icureMaintenanceTaskApi,
-            maintenanceTaskApi,
         };
     });
 }
 class IcureApiImpl {
-    get cryptoApi() {
-        return this.cryptoInitApis.cryptoApi;
+    constructor(cryptoInitApis, host, groupSpecificAuthenticationProvider, fetch, grouplessUserApi, latestMatches, currentGroupInfo, params, cryptoStrategies) {
+        this.cryptoInitApis = cryptoInitApis;
+        this.host = host;
+        this.groupSpecificAuthenticationProvider = groupSpecificAuthenticationProvider;
+        this.fetch = fetch;
+        this.grouplessUserApi = grouplessUserApi;
+        this.latestMatches = latestMatches;
+        this.currentGroupInfo = currentGroupInfo;
+        this.params = params;
+        this.cryptoStrategies = cryptoStrategies;
+        this.latestGroupsRequest = Promise.resolve(latestMatches);
     }
-    get dataOwnerApi() {
-        return this.cryptoInitApis.dataOwnerApi;
+    get authApi() {
+        var _a;
+        return (_a = this._authApi) !== null && _a !== void 0 ? _a : (this._authApi = new icc_api_1.IccAuthApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
+    }
+    get codeApi() {
+        var _a;
+        return (_a = this._codeApi) !== null && _a !== void 0 ? _a : (this._codeApi = new icc_code_x_api_1.IccCodeXApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
+    }
+    get calendarItemTypeApi() {
+        var _a;
+        return ((_a = this._calendarItemTypeApi) !== null && _a !== void 0 ? _a : (this._calendarItemTypeApi = new icc_api_1.IccCalendarItemTypeApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get medicalLocationApi() {
+        var _a;
+        return ((_a = this._medicalLocationApi) !== null && _a !== void 0 ? _a : (this._medicalLocationApi = new icc_api_1.IccMedicallocationApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get entityReferenceApi() {
+        var _a;
+        return ((_a = this._entityReferenceApi) !== null && _a !== void 0 ? _a : (this._entityReferenceApi = new icc_api_1.IccEntityrefApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get permissionApi() {
+        var _a;
+        return ((_a = this._permissionApi) !== null && _a !== void 0 ? _a : (this._permissionApi = new icc_api_1.IccPermissionApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
     get accessLogApi() {
         var _a, _b;
@@ -227,6 +276,58 @@ class IcureApiImpl {
         var _a;
         return ((_a = this._agendaApi) !== null && _a !== void 0 ? _a : (this._agendaApi = new icc_api_1.IccAgendaApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
+    get contactApi() {
+        var _a, _b, _c;
+        return ((_a = this._contactApi) !== null && _a !== void 0 ? _a : (this._contactApi = new icc_contact_x_api_1.IccContactXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.userApi, this.authApi, this.groupSpecificAuthenticationProvider, this.fetch, (_b = this.params.encryptedFieldsConfig.contact) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.contact, (_c = this.params.encryptedFieldsConfig.service) !== null && _c !== void 0 ? _c : EncryptedFieldsConfig.Defaults.service)));
+    }
+    get formApi() {
+        var _a;
+        return ((_a = this._formApi) !== null && _a !== void 0 ? _a : (this._formApi = new icc_form_x_api_1.IccFormXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get groupApi() {
+        var _a;
+        return (_a = this._groupApi) !== null && _a !== void 0 ? _a : (this._groupApi = new icc_api_1.IccGroupApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
+    }
+    get invoiceApi() {
+        var _a;
+        return ((_a = this._invoiceApi) !== null && _a !== void 0 ? _a : (this._invoiceApi = new icc_invoice_x_api_1.IccInvoiceXApi(this.host, this.params.headers, this.cryptoApi, this.entityReferenceApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get insuranceApi() {
+        var _a;
+        return ((_a = this._insuranceApi) !== null && _a !== void 0 ? _a : (this._insuranceApi = new icc_api_1.IccInsuranceApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get documentApi() {
+        var _a;
+        return ((_a = this._documentApi) !== null && _a !== void 0 ? _a : (this._documentApi = new icc_document_x_api_1.IccDocumentXApi(this.host, this.params.headers, this.cryptoApi, this.authApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get healthcareElementApi() {
+        var _a, _b;
+        return ((_a = this._healthcareElementApi) !== null && _a !== void 0 ? _a : (this._healthcareElementApi = new icc_helement_x_api_1.IccHelementXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.userApi, this.authApi, (_b = this.params.encryptedFieldsConfig.healthElement) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.healthElement, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get classificationApi() {
+        var _a;
+        return ((_a = this._classificationApi) !== null && _a !== void 0 ? _a : (this._classificationApi = new icc_classification_x_api_1.IccClassificationXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get calendarItemApi() {
+        var _a, _b;
+        return ((_a = this._calendarItemApi) !== null && _a !== void 0 ? _a : (this._calendarItemApi = new icc_calendar_item_x_api_1.IccCalendarItemXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, (_b = this.params.encryptedFieldsConfig.calendarItem) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.calendarItem, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get receiptApi() {
+        var _a;
+        return ((_a = this._receiptApi) !== null && _a !== void 0 ? _a : (this._receiptApi = new icc_receipt_x_api_1.IccReceiptXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get timetableApi() {
+        var _a;
+        return ((_a = this._timetableApi) !== null && _a !== void 0 ? _a : (this._timetableApi = new icc_time_table_x_api_1.IccTimeTableXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get patientApi() {
+        var _a, _b;
+        return ((_a = this._patientApi) !== null && _a !== void 0 ? _a : (this._patientApi = new icc_patient_x_api_1.IccPatientXApi(this.host, this.params.headers, this.cryptoApi, this.contactApi, this.formApi, this.healthcareElementApi, this.invoiceApi, this.documentApi, this.healthcarePartyApi, this.classificationApi, this.dataOwnerApi, this.calendarItemApi, this.userApi, this.authApi, (_b = this.params.encryptedFieldsConfig.patient) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.patient, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
+    get messageApi() {
+        var _a;
+        return ((_a = this._messageApi) !== null && _a !== void 0 ? _a : (this._messageApi = new icc_message_x_api_1.IccMessageXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
+    }
     get anonymousAccessApi() {
         var _a;
         return ((_a = this._anonymousAccessApi) !== null && _a !== void 0 ? _a : (this._anonymousAccessApi = new icc_api_1.IccAnonymousAccessApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
@@ -239,18 +340,14 @@ class IcureApiImpl {
         var _a;
         return ((_a = this._articleApi) !== null && _a !== void 0 ? _a : (this._articleApi = new icc_api_1.IccArticleApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get authApi() {
+    get bekmehrApi() {
         var _a;
-        return (_a = this._authApi) !== null && _a !== void 0 ? _a : (this._authApi = new icc_api_1.IccAuthApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
+        return ((_a = this._bekmehrApi) !== null && _a !== void 0 ? _a : (this._bekmehrApi = new icc_bekmehr_x_api_1.IccBekmehrXApi(this.host, this.params.headers, this.authApi, this.contactApi, this.healthcareElementApi, this.documentApi, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
     get beefactApi() {
         var _a;
         return ((_a = this._beefactApi) !== null && _a !== void 0 ? _a : (this._beefactApi = new icc_api_1.IccBeefactApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get bekmehrApi() {
-        var _a;
-        return ((_a = this._bekmehrApi) !== null && _a !== void 0 ? _a : (this._bekmehrApi = new icc_bekmehr_x_api_1.IccBekmehrXApi(this.host, this.params.headers, this.authApi, this.contactApi, this.healthcareElementApi, this.documentApi, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
     get beresultexportApi() {
         var _a;
         return ((_a = this._beresultexportApi) !== null && _a !== void 0 ? _a : (this._beresultexportApi = new icc_api_1.IccBeresultexportApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
@@ -263,110 +360,34 @@ class IcureApiImpl {
         var _a;
         return ((_a = this._besamv2Api) !== null && _a !== void 0 ? _a : (this._besamv2Api = new icc_api_1.IccBesamv2Api(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get calendarItemApi() {
-        var _a, _b;
-        return ((_a = this._calendarItemApi) !== null && _a !== void 0 ? _a : (this._calendarItemApi = new icc_calendar_item_x_api_1.IccCalendarItemXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, (_b = this.params.encryptedFieldsConfig.calendarItem) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.calendarItem, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
-    get calendarItemTypeApi() {
-        var _a;
-        return ((_a = this._calendarItemTypeApi) !== null && _a !== void 0 ? _a : (this._calendarItemTypeApi = new icc_api_1.IccCalendarItemTypeApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
-    get classificationApi() {
-        var _a;
-        return ((_a = this._classificationApi) !== null && _a !== void 0 ? _a : (this._classificationApi = new icc_classification_x_api_1.IccClassificationXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
     get classificationTemplateApi() {
         var _a;
         return ((_a = this._classificationTemplateApi) !== null && _a !== void 0 ? _a : (this._classificationTemplateApi = new icc_api_1.IccClassificationTemplateApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get codeApi() {
-        var _a;
-        return (_a = this._codeApi) !== null && _a !== void 0 ? _a : (this._codeApi = new icc_code_x_api_1.IccCodeXApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
-    }
-    get contactApi() {
-        var _a, _b, _c;
-        return ((_a = this._contactApi) !== null && _a !== void 0 ? _a : (this._contactApi = new icc_contact_x_api_1.IccContactXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.userApi, this.authApi, this.groupSpecificAuthenticationProvider, this.fetch, (_b = this.params.encryptedFieldsConfig.contact) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.contact, (_c = this.params.encryptedFieldsConfig.service) !== null && _c !== void 0 ? _c : EncryptedFieldsConfig.Defaults.service)));
-    }
-    get deviceApi() {
-        return this.cryptoInitApis.deviceApi;
-    }
     get doctemplateApi() {
         var _a;
         return ((_a = this._doctemplateApi) !== null && _a !== void 0 ? _a : (this._doctemplateApi = new icc_doctemplate_x_api_1.IccDoctemplateXApi(this.host, this.params.headers, this.cryptoApi, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get documentApi() {
-        var _a;
-        return ((_a = this._documentApi) !== null && _a !== void 0 ? _a : (this._documentApi = new icc_document_x_api_1.IccDocumentXApi(this.host, this.params.headers, this.cryptoApi, this.authApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
-    get entityReferenceApi() {
-        var _a;
-        return ((_a = this._entityReferenceApi) !== null && _a !== void 0 ? _a : (this._entityReferenceApi = new icc_api_1.IccEntityrefApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
     get entitytemplateApi() {
         var _a;
         return ((_a = this._entitytemplateApi) !== null && _a !== void 0 ? _a : (this._entitytemplateApi = new icc_api_1.IccEntitytemplateApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get formApi() {
-        var _a;
-        return ((_a = this._formApi) !== null && _a !== void 0 ? _a : (this._formApi = new icc_form_x_api_1.IccFormXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
     get frontendmigrationApi() {
         var _a;
         return ((_a = this._frontendmigrationApi) !== null && _a !== void 0 ? _a : (this._frontendmigrationApi = new icc_api_1.IccFrontendmigrationApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get groupApi() {
-        var _a;
-        return (_a = this._groupApi) !== null && _a !== void 0 ? _a : (this._groupApi = new icc_api_1.IccGroupApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
-    }
-    get healthcareElementApi() {
-        var _a, _b;
-        return ((_a = this._healthcareElementApi) !== null && _a !== void 0 ? _a : (this._healthcareElementApi = new icc_helement_x_api_1.IccHelementXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.userApi, this.authApi, (_b = this.params.encryptedFieldsConfig.healthElement) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.healthElement, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
-    get healthcarePartyApi() {
-        return this.cryptoInitApis.healthcarePartyApi;
-    }
     get icureApi() {
         var _a;
         return (_a = this._icureApi) !== null && _a !== void 0 ? _a : (this._icureApi = new icc_api_1.IccIcureApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
     }
-    get icureMaintenanceTaskApi() {
-        return this.cryptoInitApis.icureMaintenanceTaskApi;
-    }
-    get insuranceApi() {
-        var _a;
-        return ((_a = this._insuranceApi) !== null && _a !== void 0 ? _a : (this._insuranceApi = new icc_api_1.IccInsuranceApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
-    get invoiceApi() {
-        var _a;
-        return ((_a = this._invoiceApi) !== null && _a !== void 0 ? _a : (this._invoiceApi = new icc_invoice_x_api_1.IccInvoiceXApi(this.host, this.params.headers, this.cryptoApi, this.entityReferenceApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
     get keywordApi() {
         var _a;
         return ((_a = this._keywordApi) !== null && _a !== void 0 ? _a : (this._keywordApi = new icc_api_1.IccKeywordApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get maintenanceTaskApi() {
-        return this.cryptoInitApis.maintenanceTaskApi;
-    }
     get medexApi() {
         var _a;
         return (_a = this._medexApi) !== null && _a !== void 0 ? _a : (this._medexApi = new icc_api_1.IccMedexApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
     }
-    get medicalLocationApi() {
-        var _a;
-        return ((_a = this._medicalLocationApi) !== null && _a !== void 0 ? _a : (this._medicalLocationApi = new icc_api_1.IccMedicallocationApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
-    get messageApi() {
-        var _a;
-        return ((_a = this._messageApi) !== null && _a !== void 0 ? _a : (this._messageApi = new icc_message_x_api_1.IccMessageXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
-    get patientApi() {
-        var _a, _b;
-        return ((_a = this._patientApi) !== null && _a !== void 0 ? _a : (this._patientApi = new icc_patient_x_api_1.IccPatientXApi(this.host, this.params.headers, this.cryptoApi, this.contactApi, this.formApi, this.healthcareElementApi, this.invoiceApi, this.documentApi, this.healthcarePartyApi, this.classificationApi, this.dataOwnerApi, this.calendarItemApi, this.userApi, this.authApi, (_b = this.params.encryptedFieldsConfig.patient) !== null && _b !== void 0 ? _b : EncryptedFieldsConfig.Defaults.patient, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
-    get permissionApi() {
-        var _a;
-        return ((_a = this._permissionApi) !== null && _a !== void 0 ? _a : (this._permissionApi = new icc_api_1.IccPermissionApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
     get placeApi() {
         var _a;
         return (_a = this._placeApi) !== null && _a !== void 0 ? _a : (this._placeApi = new icc_api_1.IccPlaceApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
@@ -375,10 +396,6 @@ class IcureApiImpl {
         var _a;
         return ((_a = this._pubsubApi) !== null && _a !== void 0 ? _a : (this._pubsubApi = new icc_api_1.IccPubsubApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get receiptApi() {
-        var _a;
-        return ((_a = this._receiptApi) !== null && _a !== void 0 ? _a : (this._receiptApi = new icc_receipt_x_api_1.IccReceiptXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
     get replicationApi() {
         var _a;
         return ((_a = this._replicationApi) !== null && _a !== void 0 ? _a : (this._replicationApi = new icc_api_1.IccReplicationApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
@@ -387,29 +404,31 @@ class IcureApiImpl {
         var _a;
         return ((_a = this._tarificationApi) !== null && _a !== void 0 ? _a : (this._tarificationApi = new icc_api_1.IccTarificationApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch)));
     }
-    get timetableApi() {
-        var _a;
-        return ((_a = this._timetableApi) !== null && _a !== void 0 ? _a : (this._timetableApi = new icc_time_table_x_api_1.IccTimeTableXApi(this.host, this.params.headers, this.cryptoApi, this.dataOwnerApi, this.groupSpecificAuthenticationProvider, this.fetch)));
-    }
     get tmpApi() {
         var _a;
         return (_a = this._tmpApi) !== null && _a !== void 0 ? _a : (this._tmpApi = new icc_api_1.IccTmpApi(this.host, this.params.headers, this.groupSpecificAuthenticationProvider, this.fetch));
     }
+    get cryptoApi() {
+        return this.cryptoInitApis.cryptoApi;
+    }
+    get dataOwnerApi() {
+        return this.cryptoInitApis.dataOwnerApi;
+    }
+    get deviceApi() {
+        return this.cryptoInitApis.deviceApi;
+    }
+    get healthcarePartyApi() {
+        return this.cryptoInitApis.healthcarePartyApi;
+    }
+    get icureMaintenanceTaskApi() {
+        return this.cryptoInitApis.icureMaintenanceTaskApi;
+    }
+    get maintenanceTaskApi() {
+        return this.cryptoInitApis.maintenanceTaskApi;
+    }
     get userApi() {
         return this.cryptoInitApis.userApi;
     }
-    constructor(cryptoInitApis, host, groupSpecificAuthenticationProvider, fetch, grouplessUserApi, latestMatches, currentGroupInfo, params, cryptoStrategies) {
-        this.cryptoInitApis = cryptoInitApis;
-        this.host = host;
-        this.groupSpecificAuthenticationProvider = groupSpecificAuthenticationProvider;
-        this.fetch = fetch;
-        this.grouplessUserApi = grouplessUserApi;
-        this.latestMatches = latestMatches;
-        this.currentGroupInfo = currentGroupInfo;
-        this.params = params;
-        this.cryptoStrategies = cryptoStrategies;
-        this.latestGroupsRequest = Promise.resolve(latestMatches);
-    }
     getGroupsInfo() {
         return __awaiter(this, void 0, void 0, function* () {
             this.latestGroupsRequest = this.grouplessUserApi.getMatchingUsers();
@@ -436,18 +455,18 @@ const BasicApis = function (host, username, password, crypto = typeof window !==
         : fetch, forceBasic = false) {
     return __awaiter(this, void 0, void 0, function* () {
         const headers = {};
-        const authenticationProvider = forceBasic
+        const groupSpecificAuthenticationProvider = forceBasic
             ? new AuthenticationProvider_1.BasicAuthenticationProvider(username, password)
             : new AuthenticationProvider_1.EnsembleAuthenticationProvider(new icc_api_1.IccAuthApi(host, headers, new AuthenticationProvider_1.NoAuthenticationProvider(), fetchImpl), username, password);
-        const authApi = new icc_api_1.IccAuthApi(host, headers, authenticationProvider, fetchImpl);
-        const codeApi = new icc_code_x_api_1.IccCodeXApi(host, headers, authenticationProvider, fetchImpl);
-        const entityReferenceApi = new icc_api_1.IccEntityrefApi(host, headers, authenticationProvider, fetchImpl);
-        const userApi = new icc_user_x_api_1.IccUserXApi(host, headers, authenticationProvider, authApi, fetchImpl);
-        const permissionApi = new icc_api_1.IccPermissionApi(host, headers, authenticationProvider, fetchImpl);
-        const agendaApi = new icc_api_1.IccAgendaApi(host, headers, authenticationProvider, fetchImpl);
-        const groupApi = new icc_api_1.IccGroupApi(host, headers, authenticationProvider);
-        const insuranceApi = new icc_api_1.IccInsuranceApi(host, headers, authenticationProvider, fetchImpl);
-        const healthcarePartyApi = new icc_hcparty_x_api_1.IccHcpartyXApi(host, headers, authenticationProvider, authApi, fetchImpl);
+        const authApi = new icc_api_1.IccAuthApi(host, headers, groupSpecificAuthenticationProvider, fetchImpl);
+        const codeApi = new icc_code_x_api_1.IccCodeXApi(host, headers, groupSpecificAuthenticationProvider, fetchImpl);
+        const entityReferenceApi = new icc_api_1.IccEntityrefApi(host, headers, groupSpecificAuthenticationProvider, fetchImpl);
+        const userApi = new icc_user_x_api_1.IccUserXApi(host, headers, groupSpecificAuthenticationProvider, authApi, fetchImpl);
+        const permissionApi = new icc_api_1.IccPermissionApi(host, headers, groupSpecificAuthenticationProvider, fetchImpl);
+        const agendaApi = new icc_api_1.IccAgendaApi(host, headers, groupSpecificAuthenticationProvider, fetchImpl);
+        const groupApi = new icc_api_1.IccGroupApi(host, headers, groupSpecificAuthenticationProvider);
+        const insuranceApi = new icc_api_1.IccInsuranceApi(host, headers, groupSpecificAuthenticationProvider, fetchImpl);
+        const healthcarePartyApi = new icc_hcparty_x_api_1.IccHcpartyXApi(host, headers, groupSpecificAuthenticationProvider, authApi, fetchImpl);
         return {
             authApi,
             codeApi,