@sapui5/sap.ushell 1.139.0 → 1.140.0

package/src/main/js/sap/ushell/appRuntime/ui5/AppCommunicationMgr.js

@@ -1,54 +1,60 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/base/util/deepExtend",
     "sap/base/util/Deferred",
     "sap/base/util/ObjectPath",
     "sap/base/Log",
+    "sap/ui/thirdparty/jquery",
+    "sap/ushell/appIntegration/PostMessagePluginInterface",
     "sap/ushell/utils"
 ], (
-    deepExtend,
     Deferred,
     ObjectPath,
     Log,
+    jQuery,
+    PostMessagePluginInterface,
     ushellUtils
 ) => {
     "use strict";
 
     const CURR_OBJ_ID = "sap.ushell.appRuntime.ui5.AppCommunicationMgr";
 
-    const oPostMessageAPIs = {};
+    const oPostMessageRequestHandler = {};
     const arrPostResultPromises = [];
     let iPostIDCount = 0;
 
     function AppCommunicationMgr () {
         this.init = async function (bInitIframeValidMsg) {
-            const that = this;
-
-            that.handleMessageEvent = AppCommunicationMgr.prototype._handleMessageEvent.bind(that, that);
-            addEventListener("message", that.handleMessageEvent);
+            this._fnHandleMessageEvent = this._handleMessageEvent.bind(this);
+            addEventListener("message", this._fnHandleMessageEvent);
 
             if (bInitIframeValidMsg === true) {
-                that.sendMessageToOuterShell("sap.ushell.appRuntime.iframeIsValid");
+                this._sendMessageToOuterShell("sap.ushell.appRuntime.iframeIsValid");
                 setInterval(() => {
-                    that.sendMessageToOuterShell("sap.ushell.appRuntime.iframeIsValid");
+                    this._sendMessageToOuterShell("sap.ushell.appRuntime.iframeIsValid");
                 }, 2500);
             }
-            const oModule = await this._getPostMessageInterface();
-            oModule.init(false, this.registerCommHandlers.bind(this));
-        };
 
-        this._getPostMessageInterface = async function () {
-            const [PostMessagePluginInterface] = await ushellUtils.requireAsync(["sap/ushell/appIntegration/PostMessagePluginInterface"]);
-            return PostMessagePluginInterface;
+            PostMessagePluginInterface.init(
+                this._sendMessageToOuterShell.bind(this),
+                this.setRequestHandler.bind(this),
+                () => {}, // fnSetDistributionPolicy
+                false // bRunsInOuterShell
+            );
         };
 
         this.destroy = function () {
-            removeEventListener("message", this.handleMessageEvent);
+            removeEventListener("message", this._fnHandleMessageEvent);
         };
 
-        this.registerCommHandlers = function (oCommunication) {
-            deepExtend(oPostMessageAPIs, oCommunication);
+        this.setRequestHandler = function (sServiceRequest, fnHandler) {
+            if (oPostMessageRequestHandler[sServiceRequest]) {
+                Log.error(`Request handler for service ${sServiceRequest} is already defined. Overwriting the existing handler.`);
+            }
+
+            oPostMessageRequestHandler[sServiceRequest] = {
+                handler: fnHandler
+            };
         };
 
         this._handleMessageResponse = function (oMessageData) {
@@ -74,16 +80,14 @@ sap.ui.define([
             }
         };
 
-        this._handleMessageRequest = function (oContainer, oMessage, oMessageData) {
+        this._handleMessageRequest = async function (oMessageEvent, oMessageData) {
             const oPostMessageServiceConfig = ObjectPath.create("sap-ushell-config.services.PostMessage.config");
             let sService = oMessageData && oMessageData.service;
             let arrServiceNameParts;
             let sServiceName;
             let sServiceAction;
-            let oMatchHandler;
-            let oServiceCall;
 
-            Log.debug(`App Runtime received post message request from origin '${oMessage.origin}': ${
+            Log.debug(`App Runtime received post message request from origin '${oMessageEvent.origin}': ${
                 JSON.stringify(oMessageData)}`,
             null,
             CURR_OBJ_ID);
@@ -101,9 +105,9 @@ sap.ui.define([
                 return;
             }
 
-            if (!this._isTrustedPostMessageSource(oContainer, oMessage)) {
-                Log.warning(`App Runtime received message from untrusted origin '${oMessage.origin}': ${
-                    JSON.stringify(oMessage.data)}`,
+            if (!this._isTrustedPostMessageSource(oMessageEvent)) {
+                Log.warning(`App Runtime received message from untrusted origin '${oMessageEvent.origin}': ${
+                    JSON.stringify(oMessageEvent.data)}`,
                 null,
                 CURR_OBJ_ID);
                 return;
@@ -119,53 +123,47 @@ sap.ui.define([
                 sServiceName = sService.substr(0, sService.length - sServiceAction.length - 1);
             } else {
                 Log.warning(`App Runtime received message with invalid service name (${sService}) :${
-                    JSON.stringify(oMessage.data)}`,
+                    JSON.stringify(oMessageEvent.data)}`,
                 null,
                 CURR_OBJ_ID);
                 return;
             }
 
-            const oServiceParams = {
-                oMessage: oMessage,
-                oMessageData: oMessageData,
-                oContainer: oContainer
-            };
-
             try {
-                oMatchHandler = oPostMessageAPIs[sServiceName];
-                oServiceCall = oMatchHandler && oMatchHandler.oServiceCalls[sServiceAction];
-                if (oServiceCall && oServiceCall.executeServiceCallFn) {
-                    try {
-                        oServiceCall.executeServiceCallFn(oServiceParams)
-                            .then((oResult) => {
-                                // eslint-disable-next-line no-unneeded-ternary
-                                const bNoPostmessageResponse = (oResult && oResult.hasOwnProperty("_noresponse_") ? true : false);
-                                if (!bNoPostmessageResponse) {
-                                    this.sendResponseMessage(oMessage, oMessageData, "success", {result: oResult});
-                                }
-                            }, (vMessage) => {
-                                let sStack;
-                                let sMessage = vMessage;
-                                if (vMessage instanceof Error) {
-                                    sMessage = vMessage.message;
-                                    sStack = vMessage.stack;
-                                }
-                                this.sendResponseMessage(oMessage, oMessageData, "error", { message: sMessage, stack: sStack });
-                            });
-                    } catch (oError) {
-                        this.sendResponseMessage(oMessage, oMessageData, "error", { message: oError.message, stack: oError.stack });
+                const oRequestHandler = oPostMessageRequestHandler[`${sServiceName}.${sServiceAction}`];
+                if (!oRequestHandler || !oRequestHandler.handler) {
+                    Log.warning(
+                        `App Runtime received message with unknown service name (${oMessageData.service}) :${JSON.stringify(oMessageEvent.data)}`,
+                        null,
+                        CURR_OBJ_ID
+                    );
+                    return;
+                }
+
+                try {
+                    await ushellUtils.promisify(oRequestHandler.handler(oMessageData.body || {}, oMessageEvent))
+                        .then((oResult) => {
+                            // eslint-disable-next-line no-unneeded-ternary
+                            const bNoPostmessageResponse = (oResult && oResult.hasOwnProperty("_noresponse_") ? true : false);
+                            if (!bNoPostmessageResponse) {
+                                this.sendResponseMessage(oMessageEvent, oMessageData, "success", { result: oResult });
+                            }
+                        });
+                } catch (vMessage) {
+                    let sStack;
+                    let sMessage = vMessage;
+                    if (vMessage instanceof Error) {
+                        sMessage = vMessage.message;
+                        sStack = vMessage.stack;
                     }
-                } else {
-                    Log.warning(`App Runtime received message with unknown service name (${oMessageData.service}) :${
-                        JSON.stringify(oMessage.data)}`,
-                    null,
-                    CURR_OBJ_ID);
+                    this.sendResponseMessage(oMessageEvent, oMessageData, "error", { message: sMessage, stack: sStack });
                 }
             } catch (oError) {
-                Log.warning(`Error in processing message: ${oError.message}) :${
-                    JSON.stringify(oMessage.data)}`,
-                null,
-                CURR_OBJ_ID);
+                Log.warning(
+                    `Error in processing message: ${oError.message}) :${JSON.stringify(oMessageEvent.data)}`,
+                    null,
+                    CURR_OBJ_ID
+                );
             }
         };
 
@@ -177,17 +175,15 @@ sap.ui.define([
          * Determine if the source of a received postMessage can be considered as trusted. We consider
          * the content window of the application container's iframe as trusted
          *
-         * @param {object} oContainer
-         *   the application container instance
          * @param {object} oMessage
          *   the postMessage event object
          * @returns {boolean}
          *   true if source is considered to be trustworthy
          * @private
          */
-        this._isTrustedPostMessageSource = function (oContainer, oMessage) {
+        this._isTrustedPostMessageSource = function (oMessage) {
             let bTrusted = false;
-            const oParent = oContainer._getCFLPWindow();
+            const oParent = this._getCFLPWindow();
 
             if (oParent) {
                 bTrusted = (oMessage.source === oParent);
@@ -245,12 +241,12 @@ sap.ui.define([
             }
         };
 
-        this.sendMessageToOuterShell = function (sMessageId, oParams, sRequestId, nTimeout, oDefaultVal) {
+        this._sendMessageToOuterShell = function (sServiceRequest, oBody, sRequestId, nTimeout, oDefaultVal) {
             const oDeferred = new Deferred();
             const oMsg = {
                 type: "request",
-                service: sMessageId,
-                body: (oParams || {}),
+                service: sServiceRequest,
+                body: (oBody || {}),
                 request_id: sRequestId
             };
 
@@ -264,26 +260,51 @@ sap.ui.define([
             return oDeferred.promise;
         };
 
+        /**
+         * Sends a message to the outer shell.
+         * @param {string} sServiceRequest the service to send the message for.
+         * @param {object} oBody parameter object.
+         * @param {string} sRequestId the request id.
+         * @param {int} nTimeout the timeout.
+         * @param {object} oDefaultVal the default value.
+         * @returns {jQuery.Promise<any>} Resolves with the response from the outer shell.
+         *
+         * @private
+         * @deprecated since 1.120
+         */
+        this.sendMessageToOuterShell = function (sServiceRequest, oBody, sRequestId, nTimeout, oDefaultVal) {
+            const oDeferred = new jQuery.Deferred();
+            this._sendMessageToOuterShell(sServiceRequest, oBody, sRequestId, nTimeout, oDefaultVal)
+                .then(oDeferred.resolve.bind(oDeferred))
+                .catch(oDeferred.reject.bind(oDeferred));
+            return oDeferred.promise();
+        };
+
+        // for 2.0 - returns native Promise
+        this.postMessageToFLP = function (sServiceRequest, oBody, sRequestId, nTimeout, oDefaultVal) {
+            return this._sendMessageToOuterShell(sServiceRequest, oBody, sRequestId, nTimeout, oDefaultVal);
+        };
+
         this.getId = function () {
             return `SAPUI5_APPRUNTIME_MSGID_${++iPostIDCount}`;
         };
     }
 
-    AppCommunicationMgr.prototype._handleMessageEvent = function (oContainer, oMessage) {
-        if (oMessage === undefined) {
+    AppCommunicationMgr.prototype._handleMessageEvent = function (oMessageEvent) {
+        if (!oMessageEvent && !oMessageEvent?.data) {
             return;
         }
 
-        let oMessageData = oMessage.data;
+        let oMessageData = oMessageEvent.data;
 
         if (typeof oMessageData === "string") {
             // it's possible that the data attribute is passed as string (IE9)
             try {
-                oMessageData = JSON.parse(oMessage.data, this);
+                oMessageData = JSON.parse(oMessageEvent.data, this);
             } catch (e) {
                 // could be some message which is not meant for us, so we just log with debug level
                 Log.debug(
-                    `Message received from origin '${oMessage.origin}' cannot be parsed: ${e}`,
+                    `Message received from origin '${oMessageEvent.origin}' cannot be parsed: ${e}`,
                     oMessageData,
                     CURR_OBJ_ID
                 );
@@ -292,9 +313,9 @@ sap.ui.define([
         }
 
         if (oMessageData.type === "request") {
-            return oContainer._handleMessageRequest(oContainer, oMessage, oMessageData);
+            return this._handleMessageRequest(oMessageEvent, oMessageData);
         } else if (oMessageData.type === "response") {
-            return oContainer._handleMessageResponse(oMessageData);
+            return this._handleMessageResponse(oMessageData);
         }
     };
 

package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntime.js

@@ -152,7 +152,6 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ui/thirdparty/URI",
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ushell/appRuntime/ui5/performance/FesrEnhancer",
     "sap/ushell/appRuntime/ui5/renderers/fiori2/AccessKeysAgent",
     "sap/ushell/appRuntime/ui5/services/AppConfiguration", // must be included, do not remove
@@ -184,7 +183,6 @@ sap.ui.define([
     jQuery,
     URI,
     AppCommunicationMgr,
-    AppRuntimeService,
     FesrEnhancer,
     AccessKeysAgent,
     AppConfiguration,
@@ -389,7 +387,7 @@ sap.ui.define([
             const arrPrimisesInit = _that.loadAdditionalLibs();
 
             if (oUrlData.hasOwnProperty("sap-remote-intent")) {
-                oLocaleDataPromise = AppRuntimeService.postMessageToFLP("sap.ushell.services.UserInfo.getLocaleData", undefined, undefined, 3000, {});
+                oLocaleDataPromise = AppCommunicationMgr.postMessageToFLP("sap.ushell.services.UserInfo.getLocaleData", undefined, undefined, 3000, {});
             }
 
             AppRuntimeContext.setAppLifeCycleAgent(AppLifeCycleAgent);
@@ -484,7 +482,7 @@ sap.ui.define([
         this._setInitialAppRoute = function () {
             const oHash = UrlParsing.parseShellHash(hasher.getHash());
             if (oHash && oHash.appSpecificRoute && oHash.appSpecificRoute.length > 0) {
-                AppRuntimeService.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.setInnerAppRoute", {
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.setInnerAppRoute", {
                     appSpecificRoute: oHash.appSpecificRoute
                 });
             }
@@ -512,85 +510,81 @@ sap.ui.define([
          * @private
          */
         this.initPostMessages = function () {
-            AppCommunicationMgr.registerCommHandlers({
-                "sap.ushell.appRuntime": {
-                    oServiceCalls: {
-                        hashChange: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                const sHash = oServiceParams.oMessageData.body.sHash;
-                                if (typeof sHash === "string") {
-                                    const oNewHash = UrlParsing.parseShellHash(sHash);
-                                    const oOldHash = UrlParsing.parseShellHash(hasher.getHash());
-                                    if (oNewHash && oOldHash && oNewHash.semanticObject === oOldHash.semanticObject && oNewHash.action === oOldHash.action) {
-                                        hasher.replaceHash(sHash);
-                                    }
-                                }
-                            }
-                        },
-                        innerAppRouteChange: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                const sHash = oServiceParams?.oMessageData?.body?.oHash?.fullHash;
-                                if (typeof sHash === "string") {
-                                    hasher.replaceHash(sHash);
-                                }
-                            }
-                        },
-                        setDirtyFlag: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                const bIsDirty = oServiceParams.oMessageData.body.bIsDirty;
-                                if (bIsDirty !== Container.getDirtyFlag()) {
-                                    Container.setDirtyFlag(bIsDirty);
-                                }
-                            }
-                        },
-                        getDirtyFlag: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                return Container.getDirtyFlag();
-                            }
-                        },
-                        themeChange: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                const currentThemeId = oServiceParams.oMessageData.body.currentThemeId;
-                                Container.getUser().setTheme(currentThemeId);
-                            }
-                        },
-                        buttonClick: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                Renderer.handleHeaderButtonClick(
-                                    oServiceParams.oMessageData.body.buttonId
-                                );
-                            }
-                        },
-                        executeLogoutFunctions: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                await Container.executeAsyncAndSyncLogoutFunctions();
-                            }
-                        },
-                        uiDensityChange: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                const isTouch = oServiceParams.oMessageData.body.isTouch;
-                                jQuery("body")
-                                    .toggleClass("sapUiSizeCompact", (isTouch === "0"))
-                                    .toggleClass("sapUiSizeCozy", (isTouch === "1"));
-                            }
-                        },
-                        handleDirtyStateProvider: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                return Container.handleDirtyStateProvider(oServiceParams.oMessageData.body.oNavigationContext);
+            const oRequestHandlers = {
+                "sap.ushell.appRuntime.hashChange": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        const sHash = oMessageBody.sHash;
+                        if (typeof sHash === "string") {
+                            const oNewHash = UrlParsing.parseShellHash(sHash);
+                            const oOldHash = UrlParsing.parseShellHash(hasher.getHash());
+                            if (oNewHash && oOldHash && oNewHash.semanticObject === oOldHash.semanticObject && oNewHash.action === oOldHash.action) {
+                                hasher.replaceHash(sHash);
                             }
                         }
                     }
                 },
-                "sap.ushell.services.MessageBroker": {
-                    oServiceCalls: {
-                        _execute: {
-                            executeServiceCallFn: async function (oServiceParams) {
-                                const oMessageBrokerService = await Container.getServiceAsync("MessageBroker");
-                                await oMessageBrokerService.handleMessage(oServiceParams.oMessageData.body);
-                            }
+                "sap.ushell.appRuntime.innerAppRouteChange": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        const sHash = oMessageBody.oHash?.fullHash;
+                        if (typeof sHash === "string") {
+                            hasher.replaceHash(sHash);
+                        }
+                    }
+                },
+                "sap.ushell.appRuntime.setDirtyFlag": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        const bIsDirty = oMessageBody.bIsDirty;
+                        if (bIsDirty !== Container.getDirtyFlag()) {
+                            Container.setDirtyFlag(bIsDirty);
                         }
                     }
+                },
+                "sap.ushell.appRuntime.getDirtyFlag": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        return Container.getDirtyFlag();
+                    }
+                },
+                "sap.ushell.appRuntime.themeChange": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        const currentThemeId = oMessageBody.currentThemeId;
+                        Container.getUser().setTheme(currentThemeId);
+                    }
+                },
+                "sap.ushell.appRuntime.buttonClick": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        Renderer.handleHeaderButtonClick(
+                            oMessageBody.buttonId
+                        );
+                    }
+                },
+                "sap.ushell.appRuntime.executeLogoutFunctions": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        await Container.executeAsyncAndSyncLogoutFunctions();
+                    }
+                },
+                "sap.ushell.appRuntime.uiDensityChange": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        const isTouch = oMessageBody.isTouch;
+                        jQuery("body")
+                            .toggleClass("sapUiSizeCompact", (isTouch === "0"))
+                            .toggleClass("sapUiSizeCozy", (isTouch === "1"));
+                    }
+                },
+                "sap.ushell.appRuntime.handleDirtyStateProvider": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        return Container.handleDirtyStateProvider(oMessageBody.oNavigationContext);
+                    }
+                },
+                "sap.ushell.services.MessageBroker._execute": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        const oMessageBrokerService = await Container.getServiceAsync("MessageBroker");
+                        await oMessageBrokerService.handleMessage(oMessageBody);
+                    }
                 }
+            };
+
+            Object.keys(oRequestHandlers).forEach((sServiceRequest) => {
+                AppCommunicationMgr.setRequestHandler(sServiceRequest, oRequestHandlers[sServiceRequest].handler);
             });
         };
 
@@ -835,7 +829,7 @@ sap.ui.define([
                         return;
                     }
                 }
-                AppRuntimeService.postMessageToFLP("sap.ushell.appRuntime.hashChange", {
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.appRuntime.hashChange", {
                     newHash: newHash,
                     direction: History.getInstance().getDirection()
                 });
@@ -941,7 +935,7 @@ sap.ui.define([
                                         sAppTitle = oResolutionResultWithComponentHandle.componentHandle.getInstance().getManifestEntry("/sap.app/title");
                                         if (typeof sAppTitle === "string") {
                                             setTimeout(() => {
-                                                AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.setTitle", { sTitle: sAppTitle });
+                                                AppCommunicationMgr.postMessageToFLP("sap.ushell.services.ShellUIService.setTitle", { sTitle: sAppTitle });
                                             }, 2000);
                                         }
                                     }
@@ -1002,7 +996,7 @@ sap.ui.define([
                 }
                 AppLifeCycleAgent.setCurrentAppAttributes(oAppInfo);
                 setTimeout(() => {
-                    AppRuntimeService.postMessageToFLP("sap.ushell.services.AppLifeCycle.updateCurrentAppInfo", { info: oAppInfo });
+                    AppCommunicationMgr.postMessageToFLP("sap.ushell.services.AppLifeCycle.updateCurrentAppInfo", { info: oAppInfo });
                 }, 500);
             });
         };
@@ -1042,7 +1036,7 @@ sap.ui.define([
 
             if (URLHelper) {
                 URLHelper.triggerEmail = function (sTo, sSubject, sBody, sCc, sBcc) {
-                    AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.sendEmail", {
+                    AppCommunicationMgr.postMessageToFLP("sap.ushell.services.ShellUIService.sendEmail", {
                         sTo: sTo,
                         sSubject: sSubject,
                         sBody: sBody,

package/src/main/js/sap/ushell/appRuntime/ui5/SessionHandlerAgent.js

@@ -2,40 +2,44 @@
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/services/Container",
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ui/thirdparty/URI",
     "sap/base/Log"
-], (Container, AppCommunicationMgr, AppRuntimeService, URI, Log) => {
+], (
+    Container,
+    AppCommunicationMgr,
+    URI,
+    Log
+) => {
     "use strict";
 
     function SessionHandlerAgent () {
         this.init = function () {
             // register for logout event from the shell
-            AppCommunicationMgr.registerCommHandlers({
-                "sap.ushell.sessionHandler": {
-                    oServiceCalls: {
-                        beforeApplicationHide: {
-                            executeServiceCallFn: (oMessageData) => {
-                                return Promise.resolve();
-                            }
-                        },
-                        afterApplicationShow: {
-                            executeServiceCallFn: (oMessageData) => {
-                                return Promise.resolve();
-                            }
-                        },
-                        logout: {
-                            executeServiceCallFn: (oMessageData) => {
-                                return this.handleLogoutEvent(oMessageData);
-                            }
-                        },
-                        extendSessionEvent: {
-                            executeServiceCallFn: (oMessageData) => {
-                                return this.handleExtendSessionEvent(oMessageData);
-                            }
-                        }
+            const oRequestHandlers = {
+                "sap.ushell.sessionHandler.beforeApplicationHide": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        // no action needed
+                    }
+                },
+                "sap.ushell.sessionHandler.afterApplicationShow": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        // no action needed
+                    }
+                },
+                "sap.ushell.sessionHandler.logout": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        return this.handleLogoutEvent();
+                    }
+                },
+                "sap.ushell.sessionHandler.extendSessionEvent": {
+                    async handler (oMessageBody, oMessageEvent) {
+                        return this.handleExtendSessionEvent();
                     }
                 }
+            };
+
+            Object.keys(oRequestHandlers).forEach((sServiceRequest) => {
+                AppCommunicationMgr.setRequestHandler(sServiceRequest, oRequestHandlers[sServiceRequest].handler);
             });
 
             this.attachUserEvents();
@@ -108,7 +112,7 @@ sap.ui.define([
 
             this.oUserActivityTimer = setTimeout(() => {
                 // send notify extend session to the Shell
-                AppRuntimeService.postMessageToFLP("sap.ushell.sessionHandler.notifyUserActive", {});
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.sessionHandler.notifyUserActive", {});
                 this.oUserActivityTimer = undefined;
             }, 10000);
         };