@nmshd/app-runtime 2.0.0-beta.1 → 2.0.0-beta.10

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

@@ -100,44 +100,38 @@ 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);
         this._nativeEnvironment = _nativeEnvironment;
-        this._availableSessions = [];
+        this.sessionStorage = new SessionStorage_1.SessionStorage();
         this.translationProvider = {
             translate: (key) => Promise.resolve(ts_utils_1.Result.ok(key))
         };
     }
-    uiBridge() {
+    async uiBridge() {
         if (this._uiBridge)
-            return Promise.resolve(this._uiBridge);
-        if (this._uiBridgePromise)
-            return this._uiBridgePromise;
-        this._uiBridgePromise = new Promise((resolve) => {
-            this._uiBridgeResolveFunction = resolve;
-        });
-        this._uiBridgePromise
-            .then(() => {
-            this._uiBridgePromise = undefined;
-            this._uiBridgeResolveFunction = undefined;
-        })
-            .catch((e) => {
-            this._uiBridgePromise = undefined;
-            this._uiBridgeResolveFunction = undefined;
-            this.logger.error(e);
-        });
-        return this._uiBridgePromise;
+            return this._uiBridge;
+        if (this._uiBridgeResolver)
+            return await this._uiBridgeResolver.promise;
+        let resolve = () => "";
+        const promise = new Promise((r) => (resolve = r));
+        this._uiBridgeResolver = { promise, resolve };
+        try {
+            return await this._uiBridgeResolver.promise;
+        }
+        finally {
+            this._uiBridgeResolver = undefined;
+        }
     }
     registerUIBridge(uiBridge) {
-        if (this._uiBridge) {
+        var _a;
+        if (this._uiBridge)
             return UserfriendlyResult_1.UserfriendlyResult.fail(AppRuntimeErrors_1.AppRuntimeErrors.startup.uiBridgeAlreadyRegistered());
-        }
         this._uiBridge = uiBridge;
-        if (this._uiBridgePromise && this._uiBridgeResolveFunction) {
-            this._uiBridgeResolveFunction();
-        }
+        (_a = this._uiBridgeResolver) === null || _a === void 0 ? void 0 : _a.resolve(uiBridge);
         return UserfriendlyResult_1.UserfriendlyResult.ok(undefined);
     }
     get multiAccountController() {
@@ -150,28 +144,22 @@ class AppRuntime extends runtime_1.Runtime {
         return this._nativeEnvironment;
     }
     get currentAccount() {
-        if (!this._currentSession) {
-            throw AppRuntimeErrors_1.AppRuntimeErrors.general.currentSessionUnavailable();
-        }
-        return this._currentSession.account;
+        return this.sessionStorage.currentSession.account;
+    }
+    get currentSession() {
+        return this.sessionStorage.currentSession;
+    }
+    getSessions() {
+        return this.sessionStorage.getSessions();
     }
     async login(accountController, consumptionController) {
         const services = await super.login(accountController, consumptionController);
         const appServices = new extensibility_1.AppServices(this, services.transportServices, services.consumptionServices, services.dataViewExpander);
         return { ...services, appServices };
     }
-    get currentSession() {
-        if (!this._currentSession) {
-            throw AppRuntimeErrors_1.AppRuntimeErrors.general.currentSessionUnavailable();
-        }
-        return this._currentSession;
-    }
-    getServices(address) {
+    async getServices(address) {
         const addressString = typeof address === "string" ? address : address.toString();
-        const session = this._availableSessions.find((session) => session.address === addressString);
-        if (!session) {
-            throw new Error(`Account ${addressString} not logged in.`);
-        }
+        const session = await this.getOrCreateSession(addressString);
         return {
             transportServices: session.transportServices,
             consumptionServices: session.consumptionServices,
@@ -179,70 +167,43 @@ class AppRuntime extends runtime_1.Runtime {
             dataViewExpander: session.expander
         };
     }
-    getSessions() {
-        return this._availableSessions.map((session) => session.account);
-    }
-    getSession(accountId) {
-        const session = this.findSession(accountId);
-        if (session)
-            return session.account;
-        return undefined;
-    }
-    findSession(accountId) {
-        return this._availableSessions.find((item) => item.account.id === accountId);
-    }
-    findSessionByAddress(address) {
-        return this._availableSessions.find((item) => item.address === address);
+    async selectAccount(accountAddress, _password) {
+        const session = await this.getOrCreateSession(accountAddress);
+        this.sessionStorage.currentSession = session;
+        this.eventBus.publish(new events_1.AccountSelectedEvent(session.address, session.account.id));
+        return session;
     }
-    async selectAccountByAddress(address, password) {
-        if (this._currentSession && this._currentSession.address === address) {
-            return this._currentSession.account;
+    async getOrCreateSession(accountReference) {
+        const existingSession = this.sessionStorage.findSession(accountReference);
+        if (existingSession) {
+            return existingSession;
         }
-        const availableSession = this.findSessionByAddress(address);
-        let accountId = availableSession === null || availableSession === void 0 ? void 0 : availableSession.account.id;
-        if (!accountId) {
-            accountId = (await this.multiAccountController.getAccountByAddress(address)).id.toString();
-        }
-        return await this.selectAccount(accountId, password);
+        return await this.createSession(accountReference);
     }
-    async selectAccount(accountId, password) {
-        if (this._currentSession && this._currentSession.account.id === accountId) {
-            return this._currentSession.account;
-        }
-        const availableSession = this.findSession(accountId);
-        // If there is any select promise, we have to await it, even before returning an available session
-        if (this._accountIdToPromise && this._accountIdToPromise !== accountId) {
-            if (!availableSession) {
-                // Another account is currently logging in and we also need to log in -> error
-                throw AppRuntimeErrors_1.AppRuntimeErrors.multiAccount.concurrentLoginOfDifferentAccounts();
-            }
-            else {
-                // Another account is currently logging in and we already have an open session -> await login of the other account but do not return
-                await this._selectAccountPromise;
-            }
-        }
-        else if (this._selectAccountPromise) {
-            // Same account is currently logging in -> await login and return
-            return await this._selectAccountPromise;
-        }
-        if (availableSession) {
-            await this.login(availableSession.accountController, availableSession.consumptionController);
-            this._currentSession = availableSession;
-            this.eventBus.publish(new events_1.AccountSelectedEvent(availableSession.address, availableSession.account.id));
-            return availableSession.account;
+    async createSession(accountReference, masterPassword = "") {
+        var _a;
+        const accountId = accountReference.length === 20
+            ? accountReference
+            : (await this.multiAccountController.getAccountByAddress(accountReference)).id.toString();
+        if (((_a = this.currentSessionPromise) === null || _a === void 0 ? void 0 : _a.accountId) === accountId) {
+            return await this.currentSessionPromise.promise;
+        }
+        if (this.currentSessionPromise) {
+            await this.currentSessionPromise.promise.catch(() => {
+                // ignore
+            });
+            return await this.createSession(accountId, masterPassword);
         }
-        this._selectAccountPromise = this._selectAccount(accountId, password);
+        this.currentSessionPromise = { promise: this._createSession(accountId, masterPassword), accountId };
         try {
-            return await this._selectAccountPromise;
+            return await this.currentSessionPromise.promise;
         }
         finally {
-            this._selectAccountPromise = undefined;
-            this._accountIdToPromise = undefined;
+            this.currentSessionPromise = undefined;
         }
     }
-    async _selectAccount(accountId, password) {
-        this._accountIdToPromise = accountId;
-        const [localAccount, accountController] = await this._multiAccountController.selectAccount(transport_1.CoreId.from(accountId), password);
+    async _createSession(accountId, masterPassword) {
+        const [localAccount, accountController] = await this._multiAccountController.selectAccount(transport_1.CoreId.from(accountId), masterPassword);
         if (!localAccount.address) {
             throw AppRuntimeErrors_1.AppRuntimeErrors.general.addressUnavailable().logWith(this.logger);
         }
@@ -259,10 +220,8 @@ class AppRuntime extends runtime_1.Runtime {
             accountController,
             consumptionController
         };
-        this._availableSessions.push(session);
-        this._currentSession = session;
-        this.eventBus.publish(new events_1.AccountSelectedEvent(session.address, session.account.id));
-        return session.account;
+        this.sessionStorage.addSession(session);
+        return session;
     }
     async queryAccount(title = "i18n://uibridge.accountSelection.title", description = "i18n://uibridge.accountSelection.description") {
         let selectedAccount;
@@ -284,20 +243,16 @@ class AppRuntime extends runtime_1.Runtime {
         return UserfriendlyResult_1.UserfriendlyResult.ok(selectedAccount);
     }
     async selectRelationship(id) {
-        if (!this._currentSession) {
-            throw AppRuntimeErrors_1.AppRuntimeErrors.general.currentSessionUnavailable().logWith(this.logger);
-        }
         if (!id) {
-            this._currentSession.selectedRelationship = undefined;
+            this.currentSession.selectedRelationship = undefined;
             return;
         }
         const result = await this.currentSession.appServices.relationships.renderRelationship(id);
-        if (result.isError) {
+        if (result.isError)
             throw result.error;
-        }
         const relationship = result.value;
-        this._currentSession.selectedRelationship = relationship;
-        this.eventBus.publish(new events_1.RelationshipSelectedEvent(this._currentSession.address, relationship));
+        this.currentSession.selectedRelationship = relationship;
+        this.eventBus.publish(new events_1.RelationshipSelectedEvent(this.currentSession.address, relationship));
     }
     getHealth() {
         const health = {
@@ -338,9 +293,6 @@ class AppRuntime extends runtime_1.Runtime {
         runtime.logger.trace("Runtime started");
         return runtime;
     }
-    createLoggerFactory() {
-        return this.nativeEnvironment.loggerFactory;
-    }
     createDatabaseConnection() {
         this.logger.trace("Creating DatabaseConnection to LokiJS");
         this.lokiConnection = new docdb_access_loki_1.LokiJsConnection("./data", this.nativeEnvironment.databaseFactory);
@@ -469,9 +421,6 @@ class MultiAccount {
     wrongRealm() {
         return new UserfriendlyApplicationError_1.UserfriendlyApplicationError("error.runtime.MultiAccount.WrongRealm", "The given realm is invalid.");
     }
-    concurrentLoginOfDifferentAccounts() {
-        return new UserfriendlyApplicationError_1.UserfriendlyApplicationError("error.runtime.MultiAccount.ParallelLoginOfDifferentAccounts", "You cannot login different accounts concurrently. Please wait until the login is completed.");
-    }
 }
 class Modules {
     constructor() {
@@ -489,6 +438,47 @@ AppRuntimeErrors.multiAccount = new MultiAccount();
 
 /***/ }),
 
+/***/ "./dist/SessionStorage.js":
+/*!********************************!*\
+  !*** ./dist/SessionStorage.js ***!
+  \********************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SessionStorage = void 0;
+const AppRuntimeErrors_1 = __webpack_require__(/*! ./AppRuntimeErrors */ "./dist/AppRuntimeErrors.js");
+class SessionStorage {
+    constructor() {
+        this._availableSessions = [];
+    }
+    set currentSession(session) {
+        this._currentSession = session;
+    }
+    get currentSession() {
+        if (!this._currentSession) {
+            throw AppRuntimeErrors_1.AppRuntimeErrors.general.currentSessionUnavailable();
+        }
+        return this._currentSession;
+    }
+    getSessions() {
+        return this._availableSessions;
+    }
+    findSession(accountReference) {
+        return this._availableSessions.find((item) => item.account.address === accountReference || item.account.id === accountReference);
+    }
+    addSession(session) {
+        if (this.findSession(session.account.id))
+            throw new Error("Session already exists");
+        this._availableSessions.push(session);
+    }
+}
+exports.SessionStorage = SessionStorage;
+//# sourceMappingURL=SessionStorage.js.map
+
+/***/ }),
+
 /***/ "./dist/UserfriendlyApplicationError.js":
 /*!**********************************************!*\
   !*** ./dist/UserfriendlyApplicationError.js ***!
@@ -552,11 +542,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: "2.0.0-beta.1",
-    build: "18",
-    date: "2022-07-26T13:34:15+00:00",
-    commit: "759a2353d512c735290e3e8853079a029c72fc65",
-    dependencies: {"@js-soft/docdb-access-loki":"^1.0.3","@js-soft/native-abstractions":"^1.2.0","@nmshd/runtime":"2.0.0-beta.9","lodash":"^4.17.21"},
+    version: "2.0.0-beta.10",
+    build: "27",
+    date: "2022-08-25T12:04:58+00:00",
+    commit: "316eb6de4a2f76523d837aefcf0aa520d1d29542",
+    dependencies: {"@js-soft/docdb-access-loki":"^1.0.3","@js-soft/native-abstractions":"^1.2.0","@nmshd/runtime":"2.0.0-beta.20","lodash":"^4.17.21"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         crypto: crypto_1.buildInformation,
@@ -713,31 +703,6 @@ RelationshipSelectedEvent.namespace = "app.relationshipSelected";
 
 /***/ }),
 
-/***/ "./dist/events/RequestReceivedEvent.js":
-/*!*********************************************!*\
-  !*** ./dist/events/RequestReceivedEvent.js ***!
-  \*********************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RequestReceivedEvent = void 0;
-const runtime_1 = __webpack_require__(/*! @nmshd/runtime */ "@nmshd/runtime");
-class RequestReceivedEvent extends runtime_1.DataEvent {
-    constructor(address, request, message) {
-        super(RequestReceivedEvent.namespace, address, {
-            request,
-            message
-        });
-    }
-}
-exports.RequestReceivedEvent = RequestReceivedEvent;
-RequestReceivedEvent.namespace = "app.requestReceived";
-//# sourceMappingURL=RequestReceivedEvent.js.map
-
-/***/ }),
-
 /***/ "./dist/events/index.js":
 /*!******************************!*\
   !*** ./dist/events/index.js ***!
@@ -767,7 +732,6 @@ __exportStar(__webpack_require__(/*! ./ExternalEventReceivedEvent */ "./dist/eve
 __exportStar(__webpack_require__(/*! ./MailReceivedEvent */ "./dist/events/MailReceivedEvent.js"), exports);
 __exportStar(__webpack_require__(/*! ./OnboardingChangeReceivedEvent */ "./dist/events/OnboardingChangeReceivedEvent.js"), exports);
 __exportStar(__webpack_require__(/*! ./RelationshipSelectedEvent */ "./dist/events/RelationshipSelectedEvent.js"), exports);
-__exportStar(__webpack_require__(/*! ./RequestReceivedEvent */ "./dist/events/RequestReceivedEvent.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -1217,12 +1181,8 @@ class MailReceivedModule extends AppRuntimeModule_1.AppRuntimeModule {
         this.subscribeToEvent(events_1.MailReceivedEvent, this.handleMailReceived.bind(this));
     }
     async handleMailReceived(event) {
+        const session = await this.runtime.getOrCreateSession(event.eventTargetAddress);
         const mail = event.data;
-        const session = this.runtime.findSessionByAddress(event.eventTargetAddress);
-        if (!session) {
-            this.logger.error(`No session found for address ${event.eventTargetAddress}`);
-            return;
-        }
         const sender = mail.createdBy;
         await this.runtime.nativeEnvironment.notificationAccess.schedule(mail.name, mail.createdBy.name, {
             callback: async () => {
@@ -1268,11 +1228,7 @@ class OnboardingChangeReceivedModule extends AppRuntimeModule_1.AppRuntimeModule
         const identity = event.data.identity;
         let title = "";
         let text = "";
-        const session = this.runtime.findSessionByAddress(event.eventTargetAddress);
-        if (!session) {
-            this.logger.error(`No session found for address ${event.eventTargetAddress}`);
-            return;
-        }
+        const session = await this.runtime.getOrCreateSession(event.eventTargetAddress);
         switch (change.status) {
             case runtime_1.RelationshipChangeStatus.Accepted:
                 title = "Kontaktanfrage genehmigt";
@@ -1366,8 +1322,7 @@ class AppSyncModule extends AppRuntimeModule_1.AppRuntimeModule {
     }
     async sync() {
         for (const session of this.runtime.getSessions()) {
-            const services = this.runtime.getServices(session.address);
-            const result = await services.transportServices.account.syncEverything();
+            const result = await session.transportServices.account.syncEverything();
             if (result.isError) {
                 this.logger.error(result.error);
             }
@@ -1495,28 +1450,23 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
         const notification = event.notification;
         const content = notification.content;
         try {
-            const account = await this.runtime.selectAccountByAddress(content.accRef, "");
-            const session = this.runtime.findSession(account.id.toString());
-            if (!session) {
-                this.logger.error(`No session found for account ref ${content.accRef}`);
-                return;
-            }
+            const services = await this.runtime.getServices(content.accRef);
             switch (content.eventName) {
                 case IBackboneEventContent_1.BackboneEventName.DatawalletModificationsCreated:
-                    const walletResult = await session.transportServices.account.syncDatawallet();
+                    const walletResult = await services.transportServices.account.syncDatawallet();
                     if (walletResult.isError) {
                         this.logger.error(walletResult);
                         return;
                     }
-                    this.runtime.eventBus.publish(new events_1.DatawalletSynchronizedEvent(session.address));
+                    this.runtime.eventBus.publish(new events_1.DatawalletSynchronizedEvent(content.accRef));
                     break;
                 case IBackboneEventContent_1.BackboneEventName.ExternalEventCreated:
-                    const syncResult = await session.transportServices.account.syncEverything();
+                    const syncResult = await services.transportServices.account.syncEverything();
                     if (syncResult.isError) {
                         this.logger.error(syncResult);
                         return;
                     }
-                    this.runtime.eventBus.publish(new events_1.ExternalEventReceivedEvent(session.address, syncResult.value.messages, syncResult.value.relationships));
+                    this.runtime.eventBus.publish(new events_1.ExternalEventReceivedEvent(content.accRef, syncResult.value.messages, syncResult.value.relationships));
                     break;
                 default:
                     break;
@@ -1529,8 +1479,8 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
     async handleTokenRegistration(event) {
         try {
             this.logger.trace("PushNotificationModule.handleTokenRegistration", event);
-            for (const account of this.runtime.getSessions()) {
-                await this.registerPushTokenForLocalAccount(account.id, event.token);
+            for (const session of this.runtime.getSessions()) {
+                await this.registerPushTokenForLocalAccount(session.account.address, event.token);
             }
         }
         catch (e) {
@@ -1538,33 +1488,22 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
         }
     }
     async handleAccountSelected(event) {
-        try {
-            this.logger.trace("PushNotificationModule.handleAccountSelected", event);
-            const tokenResult = this.getNotificationTokenFromConfig();
-            if (tokenResult.isSuccess) {
-                await this.registerPushTokenForLocalAccount(event.data.localAccountId, tokenResult.value);
-            }
-            else {
-                this.logger.error(tokenResult.error);
-            }
-        }
-        catch (e) {
-            this.logger.error(e);
+        this.logger.trace("PushNotificationModule.handleAccountSelected", event);
+        const tokenResult = this.getNotificationTokenFromConfig();
+        if (tokenResult.isError) {
+            this.logger.error(tokenResult.error);
+            return;
         }
+        await this.registerPushTokenForLocalAccount(event.data.address, tokenResult.value);
     }
-    async registerPushTokenForLocalAccount(id, token) {
+    async registerPushTokenForLocalAccount(address, token) {
         if (!token) {
             throw AppRuntimeErrors_1.AppRuntimeErrors.modules.pushNotificationModule
                 .tokenRegistrationNotPossible("The registered token was empty. This might be the case if you did not allow push notifications.")
                 .logWith(this.logger);
         }
-        const session = this.runtime.findSession(id);
-        if (!session) {
-            throw AppRuntimeErrors_1.AppRuntimeErrors.modules.pushNotificationModule
-                .tokenRegistrationNotPossible("No session for this account found")
-                .logWith(this.logger);
-        }
-        const deviceResult = await session.transportServices.account.getDeviceInfo();
+        const services = await this.runtime.getServices(address);
+        const deviceResult = await services.transportServices.account.getDeviceInfo();
         if (deviceResult.isError) {
             throw AppRuntimeErrors_1.AppRuntimeErrors.modules.pushNotificationModule
                 .tokenRegistrationNotPossible("No device for this account found", deviceResult.error)
@@ -1574,7 +1513,7 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
         const platform = this.runtime.nativeEnvironment.deviceInfoAccess.deviceInfo.pushService;
         const handle = token;
         const installationId = device.id;
-        const result = await session.transportServices.account.registerPushNotificationToken({
+        const result = await services.transportServices.account.registerPushNotificationToken({
             platform,
             handle,
             installationId
@@ -1585,7 +1524,7 @@ class PushNotificationModule extends AppRuntimeModule_1.AppRuntimeModule {
                 .logWith(this.logger);
         }
         else {
-            this.logger.trace(`PushNotificationModule.registerPushTokenForLocalAccount: Token ${handle} registered for account ${id} on platform ${platform} and installationId ${installationId}`);
+            this.logger.trace(`PushNotificationModule.registerPushTokenForLocalAccount: Token ${handle} registered for account ${address} on platform ${platform} and installationId ${installationId}`);
         }
     }
     getNotificationTokenFromConfig() {
@@ -1658,17 +1597,9 @@ class MessageReceivedModule extends AppRuntimeModule_1.AppRuntimeModule {
         this.subscribeToEvent(runtime_1.MessageReceivedEvent, this.handleMessageReceived.bind(this));
     }
     async handleMessageReceived(event) {
-        const message = event.data;
-        const session = this.runtime.findSessionByAddress(event.eventTargetAddress);
-        if (!session) {
-            this.logger.error(`No session found for address ${event.eventTargetAddress}`);
-            return;
-        }
-        const messageDVO = await session.expander.expandMessageDTO(message);
+        const services = await this.runtime.getServices(event.eventTargetAddress);
+        const messageDVO = await services.dataViewExpander.expandMessageDTO(event.data);
         switch (messageDVO.type) {
-            case "RequestMessageDVO":
-                this.runtime.eventBus.publish(new events_1.RequestReceivedEvent(event.eventTargetAddress, messageDVO.request, messageDVO));
-                break;
             case "MailDVO":
                 const mail = messageDVO;
                 this.runtime.eventBus.publish(new events_1.MailReceivedEvent(event.eventTargetAddress, mail));
@@ -1712,21 +1643,19 @@ class RelationshipChangedModule extends AppRuntimeModule_1.AppRuntimeModule {
     }
     async handleRelationshipChanged(event) {
         const relationship = event.data;
-        const session = this.runtime.findSessionByAddress(event.eventTargetAddress);
-        if (!session) {
-            this.logger.error(`No session found for address ${event.eventTargetAddress}`);
+        // Only listen for the creation change (the first one)
+        if (relationship.changes.length !== 1)
             return;
-        }
-        // The very first change is the onboarding change
-        if (relationship.changes.length === 1) {
-            const change = relationship.changes[0];
-            // Only fire received events if the current session did not create it
-            if ((!change.response && change.request.createdBy !== session.address) ||
-                (change.response && change.response.createdBy !== session.address)) {
-                const relationshipDVO = await session.expander.expandRelationshipDTO(relationship);
-                this.runtime.eventBus.publish(new events_1.OnboardingChangeReceivedEvent(session.address, relationship.changes[0], relationship, relationshipDVO));
-            }
-        }
+        const change = relationship.changes[0];
+        // response exits and created by the current identity
+        if (!change.response && change.request.createdBy === event.eventTargetAddress)
+            return;
+        // response exits and created by the current identity
+        if (change.response && change.response.createdBy === event.eventTargetAddress)
+            return;
+        const services = await this.runtime.getServices(event.eventTargetAddress);
+        const relationshipDVO = await services.dataViewExpander.expandRelationshipDTO(relationship);
+        this.runtime.eventBus.publish(new events_1.OnboardingChangeReceivedEvent(event.eventTargetAddress, change, relationship, relationshipDVO));
     }
     stop() {
         this.unsubscribeFromAllEvents();
@@ -3537,7 +3466,7 @@ class ApplicationError extends Error {
         return this.code === error.code;
     }
     toString() {
-        return JSON.stringify(this, undefined, 2);
+        return JSON.stringify({ code: this.code, message: this.message, data: this.data }, undefined, 2);
     }
 }
 exports.ApplicationError = ApplicationError;