@nmshd/app-runtime 3.0.4 → 3.1.0

package/lib-web/nmshd.app-runtime.js

@@ -297,6 +297,16 @@ class LokiJsConnection {
     onCollectionClosed(name) {
         this.providers.delete(name);
     }
+    async deleteDatabase(name) {
+        const database = await this.getDatabase(name);
+        const loki = database["db"];
+        await new Promise((resolve, reject) => loki.deleteDatabase((err) => {
+            if (err)
+                reject(err);
+            resolve();
+        }));
+        this.providers.delete(name);
+    }
     async getDatabase(name) {
         const givenProvider = this.providers.get(name);
         if (givenProvider) {
@@ -21655,7 +21665,8 @@ function createAppConfig(...configs) {
                 displayName: "Notification Module",
                 location: "@nmshd/runtime:NotificationModule"
             }
-        }
+        },
+        allowMultipleAccountsWithSameAddress: false
     };
     const mergedConfig = (0, lodash_1.defaultsDeep)({}, ...configs, appConfig);
     return mergedConfig;
@@ -21683,12 +21694,12 @@ const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transpor
 const AppConfig_1 = __webpack_require__(/*! ./AppConfig */ "./dist/AppConfig.js");
 const AppRuntimeErrors_1 = __webpack_require__(/*! ./AppRuntimeErrors */ "./dist/AppRuntimeErrors.js");
 const AppStringProcessor_1 = __webpack_require__(/*! ./AppStringProcessor */ "./dist/AppStringProcessor.js");
-const SessionStorage_1 = __webpack_require__(/*! ./SessionStorage */ "./dist/SessionStorage.js");
-const UserfriendlyResult_1 = __webpack_require__(/*! ./UserfriendlyResult */ "./dist/UserfriendlyResult.js");
 const events_1 = __webpack_require__(/*! ./events */ "./dist/events/index.js");
 const extensibility_1 = __webpack_require__(/*! ./extensibility */ "./dist/extensibility/index.js");
 const modules_1 = __webpack_require__(/*! ./modules */ "./dist/modules/index.js");
 const multiAccount_1 = __webpack_require__(/*! ./multiAccount */ "./dist/multiAccount/index.js");
+const SessionStorage_1 = __webpack_require__(/*! ./SessionStorage */ "./dist/SessionStorage.js");
+const UserfriendlyResult_1 = __webpack_require__(/*! ./UserfriendlyResult */ "./dist/UserfriendlyResult.js");
 class AppRuntime extends runtime_1.Runtime {
     constructor(_nativeEnvironment, appConfig) {
         super(appConfig, _nativeEnvironment.loggerFactory);
@@ -21759,7 +21770,7 @@ class AppRuntime extends runtime_1.Runtime {
             dataViewExpander: session.expander
         };
     }
-    async selectAccount(accountReference, _password) {
+    async selectAccount(accountReference) {
         const session = await this.getOrCreateSession(accountReference);
         this.sessionStorage.currentSession = session;
         this.eventBus.publish(new events_1.AccountSelectedEvent(session.address, session.account.id));
@@ -21773,7 +21784,7 @@ class AppRuntime extends runtime_1.Runtime {
         }
         return await this.createSession(accountReference);
     }
-    async createSession(accountReference, masterPassword = "") {
+    async createSession(accountReference) {
         const accountId = accountReference.length === 20 ? accountReference : (await this.multiAccountController.getAccountByAddress(accountReference)).id.toString();
         if (this.currentSessionPromise?.accountId === accountId) {
             return await this.currentSessionPromise.promise;
@@ -21782,9 +21793,9 @@ class AppRuntime extends runtime_1.Runtime {
             await this.currentSessionPromise.promise.catch(() => {
                 // ignore
             });
-            return await this.createSession(accountId, masterPassword);
+            return await this.createSession(accountId);
         }
-        this.currentSessionPromise = { promise: this._createSession(accountId, masterPassword), accountId };
+        this.currentSessionPromise = { promise: this._createSession(accountId), accountId };
         try {
             return await this.currentSessionPromise.promise;
         }
@@ -21792,8 +21803,8 @@ class AppRuntime extends runtime_1.Runtime {
             this.currentSessionPromise = undefined;
         }
     }
-    async _createSession(accountId, masterPassword) {
-        const [localAccount, accountController] = await this._multiAccountController.selectAccount(transport_1.CoreId.from(accountId), masterPassword);
+    async _createSession(accountId) {
+        const [localAccount, accountController] = await this._multiAccountController.selectAccount(transport_1.CoreId.from(accountId));
         if (!localAccount.address) {
             throw AppRuntimeErrors_1.AppRuntimeErrors.general.addressUnavailable().logWith(this.logger);
         }
@@ -21821,7 +21832,7 @@ class AppRuntime extends runtime_1.Runtime {
             return UserfriendlyResult_1.UserfriendlyResult.fail(AppRuntimeErrors_1.AppRuntimeErrors.general.noAccountAvailable(accountSelectionResult.error));
         }
         if (accountSelectionResult.value)
-            await this.selectAccount(accountSelectionResult.value.id, "");
+            await this.selectAccount(accountSelectionResult.value.id);
         return UserfriendlyResult_1.UserfriendlyResult.ok(accountSelectionResult.value);
     }
     async selectRelationship(id) {
@@ -21844,7 +21855,7 @@ class AppRuntime extends runtime_1.Runtime {
         return Promise.resolve(health);
     }
     async initAccount() {
-        this._multiAccountController = new multiAccount_1.MultiAccountController(this.transport, this.runtimeConfig);
+        this._multiAccountController = new multiAccount_1.MultiAccountController(this.transport, this.runtimeConfig, this.lokiConnection, this.sessionStorage);
         await this._multiAccountController.init();
         this._accountServices = new multiAccount_1.AccountServices(this._multiAccountController);
     }
@@ -22194,6 +22205,12 @@ class SessionStorage {
             throw new Error("Session already exists");
         this._availableSessions.push(session);
     }
+    removeSession(accountReference) {
+        const session = this.findSession(accountReference);
+        if (!session)
+            return;
+        this._availableSessions.splice(this._availableSessions.indexOf(session), 1);
+    }
 }
 exports.SessionStorage = SessionStorage;
 //# sourceMappingURL=SessionStorage.js.map
@@ -22263,11 +22280,11 @@ const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const runtime_1 = __webpack_require__(/*! @nmshd/runtime */ "@nmshd/runtime");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "3.0.4",
-    build: "21",
-    date: "2024-02-13T07:12:58+00:00",
-    commit: "a0b7c20718e10aba493f26ea129344f104822503",
-    dependencies: {"@js-soft/docdb-access-loki":"^1.0.6","@js-soft/native-abstractions":"^1.2.2","lodash":"^4.17.21"},
+    version: "3.1.0",
+    build: "64",
+    date: "2024-04-08T14:18:55+00:00",
+    commit: "2c9d6dbb7fd529de72e9693b07ad44c49073c795",
+    dependencies: {"@js-soft/docdb-access-loki":"^1.1.0","@js-soft/native-abstractions":"^1.2.2","lodash":"^4.17.21"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         crypto: crypto_1.buildInformation,
@@ -23439,6 +23456,9 @@ class AccountServices {
         const localAccount = await this.multiAccountController.getAccount(transport_1.CoreId.from(id));
         return LocalAccountMapper_1.LocalAccountMapper.toLocalAccountDTO(localAccount);
     }
+    async deleteAccount(id) {
+        await this.multiAccountController.deleteAccount(transport_1.CoreId.from(id));
+    }
     async getAccountByAddress(address) {
         const localAccount = await this.multiAccountController.getAccountByAddress(address);
         return LocalAccountMapper_1.LocalAccountMapper.toLocalAccountDTO(localAccount);
@@ -23474,10 +23494,12 @@ class MultiAccountController {
     get path() {
         return this._path;
     }
-    constructor(transport, config) {
+    constructor(transport, config, databaseConnection, sessionStorage) {
         this.config = config;
+        this.databaseConnection = databaseConnection;
+        this.sessionStorage = sessionStorage;
         this._dbClosed = false;
-        this._openAccounts = [];
+        this._openAccounts = {};
         this._transport = transport;
         this._log = transport_1.TransportLoggerFactory.getLogger(MultiAccountController);
     }
@@ -23497,9 +23519,6 @@ class MultiAccountController {
             this._dbClosed = true;
         }
     }
-    get openAccounts() {
-        return this._openAccounts;
-    }
     async getAccount(id) {
         const dbAccount = await this._localAccounts.read(id.toString());
         if (!dbAccount) {
@@ -23518,13 +23537,16 @@ class MultiAccountController {
         const dbAccounts = await this._localAccounts.list();
         return dbAccounts.map((account) => LocalAccount_1.LocalAccount.from(account));
     }
-    async selectAccount(id, _masterPassword) {
+    async selectAccount(id) {
         this._log.trace(`Selecting LocalAccount with id ${id}...`);
         const account = await this._localAccounts.read(id.toString());
         if (!account) {
             throw transport_1.CoreErrors.general.recordNotFound(LocalAccount_1.LocalAccount, id.toString()).logWith(this._log);
         }
         let localAccount = LocalAccount_1.LocalAccount.from(account);
+        if (this._openAccounts[localAccount.id.toString()]) {
+            return [localAccount, this._openAccounts[localAccount.id.toString()]];
+        }
         this._log.trace(`Opening DB for account ${localAccount.id}...`);
         const db = await this.transport.createDatabase(`acc-${localAccount.id.toString()}`);
         this._log.trace(`DB for account ${id} opened.`);
@@ -23532,26 +23554,39 @@ class MultiAccountController {
         const accountController = new transport_1.AccountController(this.transport, db, this.transport.config);
         await accountController.init();
         this._log.trace(`AccountController for local account ${id} initialized.`);
-        this._openAccounts.push(accountController);
+        this._openAccounts[localAccount.id.toString()] = accountController;
         if (!localAccount.address) {
             // Update address after first login if not set already
             localAccount = await this.updateLocalAccountAddress(localAccount.id, accountController.identity.address);
         }
         return [localAccount, accountController];
     }
+    async deleteAccount(id) {
+        const [localAccount, accountController] = await this.selectAccount(id);
+        await accountController.unregisterPushNotificationToken();
+        await accountController.activeDevice.markAsOffboarded();
+        await accountController.close();
+        delete this._openAccounts[localAccount.id.toString()];
+        await this.databaseConnection.deleteDatabase(`acc-${id.toString()}`);
+        await this._localAccounts.delete({ id: id.toString() });
+        this.sessionStorage.removeSession(id.toString());
+    }
     async clearAccounts() {
         await this._localAccounts.delete({});
     }
     async closeAccounts() {
-        for (let i = 0, l = this._openAccounts.length; i < l; i++) {
-            const account = this._openAccounts[i];
-            await account.close();
+        for (const account of Object.values(this._openAccounts)) {
+            await account?.close();
         }
     }
     async onboardDevice(deviceSharedSecret) {
+        const existingAccounts = await this._localAccounts.find({ address: deviceSharedSecret.identity.address.toString() });
+        if (existingAccounts.length > 0 && !this.config.allowMultipleAccountsWithSameAddress) {
+            throw new transport_1.CoreError("error.app-runtime.onboardedAccountAlreadyExists", `An account with the address '${deviceSharedSecret.identity.address.toString()}' already exists in this app-runtime instance.`).logWith(this._log);
+        }
         this._log.trace(`Onboarding device ${deviceSharedSecret.id} for identity ${deviceSharedSecret.identity.address}...`);
         const id = await transport_1.CoreId.generate();
-        let localAccount = LocalAccount_1.LocalAccount.from({
+        const localAccount = LocalAccount_1.LocalAccount.from({
             id,
             address: deviceSharedSecret.identity.address,
             directory: ".",
@@ -23568,9 +23603,9 @@ class MultiAccountController {
         const accountController = new transport_1.AccountController(this.transport, db, this.transport.config);
         await accountController.init(deviceSharedSecret);
         this._log.trace(`AccountController for local account ${id} initialized.`);
-        this._openAccounts.push(accountController);
-        localAccount = await this.updateLocalAccountAddress(localAccount.id, accountController.identity.address);
-        return [localAccount, accountController];
+        this._openAccounts[id.toString()] = accountController;
+        const updatedLocalAccount = await this.updateLocalAccountAddress(localAccount.id, accountController.identity.address);
+        return [updatedLocalAccount, accountController];
     }
     async createAccount(realm, name) {
         this._log.trace(`Creating account for realm ${realm}.`);
@@ -23591,7 +23626,7 @@ class MultiAccountController {
         const accountController = new transport_1.AccountController(this.transport, db, this.transport.config);
         await accountController.init();
         this._log.trace(`AccountController for local account ${id} initialized.`);
-        this._openAccounts.push(accountController);
+        this._openAccounts[id.toString()] = accountController;
         localAccount = await this.updateLocalAccountAddress(localAccount.id, accountController.identity.address);
         return [localAccount, accountController];
     }