@sapui5/sap.ushell 1.114.0 → 1.114.2

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

@@ -111,7 +111,7 @@ sap.ui.define([
                 bValue: true
             });
 
-            this.getPageConfig();
+            this.getPageConfig(oUrlData);
             _that.setModulePaths();
             arrPrimisesInit = _that.loadAdditionalLibs();
 
@@ -287,6 +287,11 @@ sap.ui.define([
                                 return new jQuery.Deferred().resolve().promise();
                             }
                         },
+                        executeLogoutFunctions: {
+                            executeServiceCallFn: function (oServiceParams) {
+                                return sap.ushell.Container.executeAsyncAndSyncLogoutFunctions();
+                            }
+                        },
                         uiDensityChange: {
                             executeServiceCallFn: function (oServiceParams) {
                                 var isTouch = oServiceParams.oMessageData.body.isTouch;
@@ -337,7 +342,7 @@ sap.ui.define([
                             // and we will be the one to handle the opening of the link (with 'window.open').
                             event.preventDefault();
                         }
-                    } else if (oTarget.target === undefined || oTarget.target === "") {
+                    } else if (oTarget.target === undefined || oTarget.target === "" || (AppRuntimeContext.getIsScube() && (oTarget.target === "_top" || oTarget.target === "_self"))) {
                         //if the new hash is different than the current one, this is a cross application navigation
                         // and we will use the ushell service for that in order to properly create a new browser history
                         // entry
@@ -381,7 +386,7 @@ sap.ui.define([
         /**
          * @private
          */
-        this.getPageConfig = function () {
+        this.getPageConfig = function (oUrlData) {
             var metaData,
                 shellConfig = {};
 
@@ -399,6 +404,15 @@ sap.ui.define([
                 }
             }
             window["sap-ushell-config"] = deepExtend({}, getDefaultShellConfig(), shellConfig);
+
+            //temp code for allways loading the web assistance plugin in the
+            //scube scenario. will be removed in the next release of s4 hana cloud
+            if (oUrlData.hasOwnProperty("sap-remote-intent")) {
+                var oPlugins = window["sap-ushell-config"].bootstrapPlugins;
+                if (oPlugins && oPlugins.hasOwnProperty("WAPluginAgent") && oPlugins["WAPluginAgent"].hasOwnProperty("config")) {
+                    delete oPlugins["WAPluginAgent"].config["sap-plugin-agent"];
+                }
+            }
         };
 
         /**
@@ -625,7 +639,14 @@ sap.ui.define([
                 (AppRuntimeContext.getIsScube() ? Promise.resolve("") : AppLifeCycleAgent.getApplicationParameters(oURLParameters)).then(function (sParams) {
                     oAppInfo.url += sParams;
                     _that.setHashChangedCallback();
-                    sap.ushell.Container.getServiceAsync("Ui5ComponentLoader").then(function (oUi5ComponentLoader) {
+
+                    Promise.all([
+                        sap.ushell.Container.getServiceAsync("Ui5ComponentLoader"),
+                        sap.ushell.Container.getServiceAsync("AppLifeCycle")
+                    ]).then(function (values) {
+                        var oUi5ComponentLoader = values[0];
+                        var oAppLifeCycleService = values[1];
+
                         //remove the "sap.ushell" from libs to be loaded as it is not needed (its already
                         //loaded as part of the appruntime bundle)
                         if (oAppInfo.asyncHints && Array.isArray(oAppInfo.asyncHints.libs)) {
@@ -657,7 +678,9 @@ sap.ui.define([
                                     if (sHash && sHash.indexOf("Shell-startIntent") === 0) {
                                         sAppTitle = oResolutionResultWithComponentHandle.componentHandle.getMetadata().getManifestEntry("/sap.app/title");
                                         if (typeof sAppTitle === "string") {
-                                            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellUIService.setTitle", {sTitle: sAppTitle});
+                                            setTimeout(function () {
+                                                AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellUIService.setTitle", {sTitle: sAppTitle});
+                                            }, 2000);
                                         }
                                     }
                                 } catch (error) {
@@ -665,29 +688,30 @@ sap.ui.define([
                                 }
                             }
                             oComponentContainer.setComponent(oResolutionResultWithComponentHandle.componentHandle.getInstance());
-                            AppLifeCycleAgent.setComponent(oComponentContainer);
+                            AppLifeCycleAgent.setCurrentApp(oComponentContainer, sAppIntent || "", oAppProperties.ui5ComponentName);
                             FesrEnhancer.setAppShortId(oResolutionResultWithComponentHandle.componentHandle);
-                            sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
-                                oAppLifeCycleService.prepareCurrentAppObject(
-                                    "UI5",
-                                    oResolutionResultWithComponentHandle.componentHandle.getInstance(),
-                                    false,
-                                    undefined
-                                );
-                                var oCurrentApp = oAppLifeCycleService.getCurrentApplication();
-                                oCurrentApp.getInfo(["appFrameworkVersion", "appSupportInfo", "appId", "appVersion"]).then(function (oAppInfo) {
-                                    for (var sParameter in oAppInfo) {
-                                        if (oAppInfo[sParameter] === undefined || oAppInfo[sParameter] === "") {
-                                            delete (oAppInfo[sParameter]);
-                                        }
+                            oAppLifeCycleService.prepareCurrentAppObject(
+                                "UI5",
+                                oResolutionResultWithComponentHandle.componentHandle.getInstance(),
+                                false,
+                                undefined
+                            );
+                            var oCurrentApp = oAppLifeCycleService.getCurrentApplication();
+                            oCurrentApp.getInfo(["appFrameworkVersion", "appSupportInfo", "appId", "appVersion"]).then(function (oAppInfo) {
+                                for (var sParameter in oAppInfo) {
+                                    if (oAppInfo[sParameter] === undefined || oAppInfo[sParameter] === "") {
+                                        delete (oAppInfo[sParameter]);
                                     }
-                                    oAppInfo.appFrameworkId = "UI5";
-                                    oAppInfo.technicalAppComponentId = oAppProperties.ui5ComponentName;
-                                    if (typeof sAppTitle === "string") {
-                                        oAppInfo.appTitle = sAppTitle;
-                                    }
-                                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.setNewAppInfo", {info: oAppInfo});
-                                });
+                                }
+                                oAppInfo.appFrameworkId = "UI5";
+                                oAppInfo.technicalAppComponentId = oAppProperties.ui5ComponentName;
+                                if (typeof sAppTitle === "string") {
+                                    oAppInfo.appTitle = sAppTitle;
+                                }
+                                AppLifeCycleAgent.setCurrentAppAttributes(oAppInfo);
+                                setTimeout(function () {
+                                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.updateCurrentAppInfo", {info: oAppInfo});
+                                }, 500);
                             });
                             _that.considerChangingTheDefaultFullWidthVal(oResolutionResultWithComponentHandle);
                             _that.overrideUrlHelperFuncs();

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

@@ -1,7 +1,9 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/base/assert"
-], function (assert) {
+    "sap/base/assert",
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/utils/clone"
+], function (assert, UrlParsing, clone) {
     "use strict";
 
     function AppRuntimeContext () {
@@ -32,6 +34,45 @@ sap.ui.define([
         this.checkDataLossAndContinue = function () {
             return (_AppLifeCycleAgent ? _AppLifeCycleAgent.checkDataLossAndContinue() : true);
         };
+
+        this.checkIntentsConversionForScube = function (aAppsIntents) {
+            var that = this;
+
+            if (!this.getIsScube() || !aAppsIntents || aAppsIntents.length === 0) {
+                return Promise.resolve(aAppsIntents);
+            }
+
+            return new Promise(function (fnResolve) {
+                var aAppsIntentsCopy = clone(aAppsIntents);
+                var aIntents = [];
+                var oParsedHash;
+
+                aIntents = aAppsIntentsCopy.map(function (oApp) {
+                    return {
+                        target: {
+                            shellHash: oApp.intent
+                        }
+                    };
+                });
+
+                sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                    oCrossAppNavService.isNavigationSupported(aIntents, undefined, true).then(function (aIntentsSupported) {
+                        for (var i = 0; i < aIntentsSupported.length; i++) {
+                            if (!aIntentsSupported[i].supported) {
+                                oParsedHash = UrlParsing.parseShellHash(aAppsIntentsCopy[i].intent);
+                                oParsedHash.params["sap-shell-so"] = oParsedHash.semanticObject;
+                                oParsedHash.params["sap-shell-action"] = oParsedHash.action;
+                                oParsedHash.params["sap-remote-system"] = that.getRemoteSystemId();
+                                oParsedHash.semanticObject = "Shell";
+                                oParsedHash.action = "startIntent";
+                                aAppsIntentsCopy[i].intent = "#" + UrlParsing.constructShellHash(oParsedHash);
+                            }
+                        }
+                        fnResolve(aAppsIntentsCopy);
+                    });
+                });
+            });
+        };
     }
 
     return new AppRuntimeContext();

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/baseRta/Trigger.js

@@ -258,7 +258,7 @@ sap.ui.define([
 			) {
 				return false;
 			}
-			return this._oRTA.canUndo();
+			return this._oRTA.canSave();
 		}
 		return false;
 	};

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/scriptAgent/Component.js

@@ -11,6 +11,14 @@ function (
 	"use strict";
 
 	return Component.extend("sap.ushell.appRuntime.ui5.plugins.scriptAgent.Component", {
+        metadata: {
+            version: "1.0.0",
+            dependencies: {
+                libs: [ "sap.m" ],
+                components: []
+            }
+        },
+
 		init: function () {
 			var mConfig = this.getComponentData(),
                 oPageUriParams = new URI().search(true),
@@ -32,19 +40,11 @@ function (
                 scriptURL = mConfig.config.url;
             }
 
-			jQuery.ajaxSetup({
-				cache: true
-			});
-
 			try {
 				jQuery.getScript(scriptURL);
 			} catch (ex) {
 				Log.error(ex);
 			}
-
-			jQuery.ajaxSetup({
-				cache: false
-			});
 		}
 	});
 });

package/src/main/js/sap/ushell/appRuntime/ui5/renderers/fiori2/RendererExtensions.js

@@ -5,13 +5,15 @@ sap.ui.define([
     "sap/base/util/uid",
     "sap/ushell/EventHub",
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
-    "sap/ui/core/Core"
+    "sap/ui/core/Core",
+    "sap/ushell/appRuntime/ui5/AppRuntimeContext"
 ], function (
     ObjectPath,
     fnGetUid,
     EventHub,
     AppRuntimeService,
-    Core
+    Core,
+    AppRuntimeContext
 ) {
     "use strict";
 
@@ -104,7 +106,11 @@ sap.ui.define([
         //sap.ushell.Container.getRenderer("fiori2").hideHeaderEndItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
     function _getConfiguration () {
-        //return sap.ushell.Container.getRenderer("fiori2").getModelConfiguration();
+        if (AppRuntimeContext.getIsScube()) {
+            return {
+                enablePersonalization: true
+            };
+        }
         return {};
     }
     function _setHeaderItemVisibility (sItem, sLaunchpadState, bToLocal, bIsVisible) {

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppLifeCycleAgent.js

@@ -59,6 +59,7 @@ sap.ui.define([
          * @private
          */
         this.init = function (sModule, ofnCreateApplication, ofnRenderApp, bEnableCache, sAppId, oAppInfo) {
+            this.resetCurrentApp();
             sAppResolutionModule = sModule;
             fnCreateApplication = ofnCreateApplication;
             fnRenderApp = ofnRenderApp;
@@ -133,7 +134,10 @@ sap.ui.define([
             return new Promise(function (fnResolve, fnReject) {
                 var sUrl,
                     sAppId,
-                    sAppIntent;
+                    sAppIntent,
+                    oParsedShellIntent,
+                    sScubeAppIntent = "",
+                    sKeepAliveAppKey;
 
                 AppRuntimeService.sendMessageToOuterShell(
                     "sap.ushell.appRuntime.iframeIsBusy", {
@@ -145,6 +149,10 @@ sap.ui.define([
                 if (AppRuntimeContext.getIsScube()) {
                     sAppIntent = UriParameters.fromURL(sUrl).get("sap-remote-intent");
                     assert(typeof sAppIntent === "string", "AppLifeCycleAgent::create - sAppIntent must be string");
+                    if (oMsg.body.sHash.indexOf("Shell-startIntent") === 0) {
+                        oParsedShellIntent = oUrlParsing.parseShellHash(oMsg.body.sHash);
+                        sScubeAppIntent = oParsedShellIntent.params["sap-shell-so"] + "-" + oParsedShellIntent.params["sap-shell-action"];
+                    }
                 } else {
                     sAppId = UriParameters.fromURL(sUrl).get("sap-ui-app-id");
                     assert(typeof sAppId === "string", "AppLifeCycleAgent::create - sAppId must be string");
@@ -163,6 +171,18 @@ sap.ui.define([
                 }
                 Core.getEventBus().publish("launchpad", "appOpening", {});
                 that.getAppInfo(sAppId, sUrl, sAppIntent).then(function (values) {
+                    if (AppRuntimeContext.getIsScube() && sScubeAppIntent.length > 0) {
+                        sKeepAliveAppKey = Object.keys(oCachedApplications).find(function (sCachedKey) {
+                            return oCachedApplications[sCachedKey].sAppIntent === sScubeAppIntent && oCachedApplications[sCachedKey].ui5ComponentName === values.oResolvedHashFragment.ui5ComponentName;
+                        });
+                        if (sKeepAliveAppKey) {
+                            that.destroy({
+                                body: {
+                                    sCacheId: sKeepAliveAppKey
+                                }
+                            }, true);
+                        }
+                    }
                     that.expandSapIntentParams(new URI(sUrl).query(true)).then(function (oURLParameters) {
                         fnCreateApplication(sAppId, oURLParameters, values.oResolvedHashFragment, sAppIntent, values.oParsedHash)
                             .then(function (oResolutionResult) {
@@ -172,7 +192,9 @@ sap.ui.define([
                                         bValue: false
                                     });
                                 Core.getEventBus().publish("sap.ushell", "appOpened", {});
-                                fnResolve();
+                                fnResolve({
+                                    deletedKeepAliveId: sKeepAliveAppKey
+                                });
                             });
                     });
                 });
@@ -182,7 +204,7 @@ sap.ui.define([
         /**
          * @private
          */
-        this.destroy = function (oMsg) {
+        this.destroy = function (oMsg, bDestroyKeepAlive) {
             function appDestroy (oApplication) {
                 var sAppId = oApplication.sId || "<unkown>";
                 try {
@@ -196,7 +218,7 @@ sap.ui.define([
                 }
             }
 
-            if (oRunningApp === undefined) {
+            if (oRunningApp.oApp === undefined && bDestroyKeepAlive !== true) {
                 AppRuntimeService.sendMessageToOuterShell("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
                 return Promise.resolve();
             }
@@ -204,16 +226,16 @@ sap.ui.define([
             var sStorageKey = oMsg.body.sCacheId;
 
             if (sStorageKey && oCachedApplications[sStorageKey]) {
-                if (oCachedApplications[sStorageKey] === oRunningApp) {
-                    oRunningApp = undefined;
+                if (oCachedApplications[sStorageKey].oApp === oRunningApp.oApp) {
+                    this.resetCurrentApp();
                 }
-                delete oRouterDisableRetriggerApplications[oCachedApplications[sStorageKey].sId];
-                appDestroy(oCachedApplications[sStorageKey]);
+                delete oRouterDisableRetriggerApplications[oCachedApplications[sStorageKey].oApp.sId];
+                appDestroy(oCachedApplications[sStorageKey].oApp);
                 delete oCachedApplications[sStorageKey];
-            } else if (oRunningApp) {
-                delete oRouterDisableRetriggerApplications[oRunningApp.sId];
-                appDestroy(oRunningApp);
-                oRunningApp = undefined;
+            } else if (oRunningApp.oApp) {
+                delete oRouterDisableRetriggerApplications[oRunningApp.oApp.sId];
+                appDestroy(oRunningApp.oApp);
+                this.resetCurrentApp();
             }
             sap.ushell.Container.cleanDirtyStateProviderArray();
             if (oShellUIService) {
@@ -230,10 +252,10 @@ sap.ui.define([
          */
         this.store = function (oMsg) {
             var sStorageKey = oMsg.body.sCacheId,
-                oCachedEntry = oRunningApp,
+                oCachedEntry = this.cloneCurrentAppEntry(oRunningApp),
                 oApp;
 
-            if (oRunningApp === undefined) {
+            if (oRunningApp.oApp === undefined) {
                 AppRuntimeService.sendMessageToOuterShell("sap.ushell.appRuntime.isInvalidIframe", {bValue: true});
                 return Promise.resolve();
             }
@@ -243,8 +265,8 @@ sap.ui.define([
                 oAppBackNavigationFunc[sStorageKey] = oShellUIService._getBackNavigationCallback();
             }
 
-            oApp = oCachedEntry.getComponentInstance();
-            oCachedEntry.setVisible(false);
+            oApp = oCachedEntry.oApp.getComponentInstance();
+            oCachedEntry.oApp.setVisible(false);
 
             // keep application's dirty state providers when stored
             if (sap.ushell.Container) {
@@ -275,15 +297,15 @@ sap.ui.define([
         this.restore = function (oMsg) {
             var sStorageKey = oMsg.body.sCacheId,
                 oCachedEntry = oCachedApplications[sStorageKey],
-                oApp = oCachedEntry.getComponentInstance(),
-                bRouterDisableRetrigger = oRouterDisableRetriggerApplications[oCachedEntry.sId];
+                oApp = oCachedEntry.oApp.getComponentInstance(),
+                bRouterDisableRetrigger = oRouterDisableRetriggerApplications[oCachedEntry.oApp.sId];
 
             hasher.disableCFLPUpdate = true;
             hasher.replaceHash(oMsg.body.sHash);
             hasher.disableCFLPUpdate = false;
 
             Core.getEventBus().publish("launchpad", "appOpening", {});
-            oCachedEntry.setVisible(true);
+            oCachedEntry.oApp.setVisible(true);
 
             // re-register application's dirty state providers when restored
             if (oAppDirtyStateProviders[sStorageKey] && sap.ushell.Container) {
@@ -309,10 +331,14 @@ sap.ui.define([
                     }
                 }
 
-                oRunningApp = oCachedEntry;
+                oRunningApp = this.cloneCurrentAppEntry(oCachedEntry);
             }
             Core.getEventBus().publish("sap.ushell", "appOpened", {});
 
+            setTimeout(function () {
+                AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.setNewAppInfo", {info: oCachedEntry.oAppAttributes});
+            }, 500);
+
             return Promise.resolve();
         };
 
@@ -460,14 +486,45 @@ sap.ui.define([
         /**
          * @private
          */
-        this.setComponent = function (oApp) {
-            oRunningApp = oApp;
+        this.setCurrentApp = function (oApp, sAppIntent, ui5ComponentName) {
+            this.resetCurrentApp();
+            oRunningApp.oApp = oApp;
+            oRunningApp.sAppIntent = sAppIntent;
+            oRunningApp.ui5ComponentName = ui5ComponentName;
             // Initializing the disableKeepAliveRestoreRouterRetrigger flag to true
-            if (oRunningApp) {
-                oRouterDisableRetriggerApplications[oRunningApp.sId] = true;
+            if (oRunningApp.oApp) {
+                oRouterDisableRetriggerApplications[oRunningApp.oApp.sId] = true;
             }
         };
 
+        /**
+         * @private
+         */
+        this.setCurrentAppAttributes = function (oAppInfo) {
+            oRunningApp.oAppAttributes = oAppInfo;
+        };
+
+        /**
+         * @private
+         */
+        this.resetCurrentApp = function () {
+            oRunningApp = {
+                oApp: undefined,
+                sAppIntent: undefined,
+                ui5ComponentName: undefined,
+                oAppAttributes: {}
+            };
+        };
+
+        this.cloneCurrentAppEntry = function (oEntry) {
+            return {
+                oApp: oEntry.oApp,
+                sAppIntent: oEntry.sAppIntent,
+                ui5ComponentName: oEntry.ui5ComponentName,
+                oAppAttributes: oEntry.oAppAttributes
+            };
+        };
+
         /**
          * @private
          */

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppState.js

@@ -5,8 +5,9 @@ sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ushell/services/_AppState/AppState",
     "sap/ushell/utils",
-    "sap/ui/thirdparty/jquery"
-], function (AppState, AppRuntimeService, AppStateAppState, utils, jQuery) {
+    "sap/ui/thirdparty/jquery",
+    "sap/ushell/appRuntime/ui5/AppRuntimeContext"
+], function (AppState, AppRuntimeService, AppStateAppState, utils, jQuery, AppRuntimeContext) {
     "use strict";
 
     function AppStateProxy (oAdapter, oContainerInterface, sParameter, oConfig) {
@@ -14,6 +15,9 @@ sap.ui.define([
 
         this.createEmptyAppStateOrig = this.createEmptyAppState;
         this.createEmptyAppState = function (oComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings) {
+            if (AppRuntimeContext.getIsScube()) {
+                bTransientEnforced = false;
+            }
             var oAppState = this.createEmptyAppStateOrig(oComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings);
             if (typeof bTransientEnforced === "boolean" && oAppState._bTransient !== bTransientEnforced) {
                 oAppState._bTransient = bTransientEnforced;

package/src/main/js/sap/ushell/appRuntime/ui5/services/Bookmark.js

@@ -2,8 +2,9 @@
 
 sap.ui.define([
     "sap/ushell/services/Bookmark",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService"
-], function (Bookmark, AppRuntimeService) {
+    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppRuntimeContext"
+], function (Bookmark, AppRuntimeService, AppRuntimeContext) {
     "use strict";
 
     function BookmarkProxy (oContainerInterface, sParameters, oServiceConfiguration) {
@@ -12,11 +13,21 @@ sap.ui.define([
         //addBookmark(oParameters, vContainer?) : object - jQuery.Deferred promise
         //Adds a bookmark tile to one of the user's classic homepage groups or to multiple provided content nodes.
         this.addBookmark = function (oParameters, vContainer) {
-            return AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.Bookmark.addBookmarkUI5", {
-                oParameters: oParameters,
-                vContainer: vContainer
-            });
+            var fnAddBookmark = function () {
+                return AppRuntimeService.sendMessageToOuterShell(
+                    "sap.ushell.services.Bookmark.addBookmarkUI5", {
+                        oParameters: oParameters,
+                        vContainer: vContainer
+                    });
+            };
+
+            if (oParameters.url.startsWith("#")) {
+                return AppRuntimeContext.checkIntentsConversionForScube([{ intent: oParameters.url }]).then(function (aIntentResult) {
+                    oParameters.url = aIntentResult[0].intent;
+                    return fnAddBookmark();
+                });
+            }
+            return fnAddBookmark();
         };
 
         this.getShellGroupIDs = function () {

package/src/main/js/sap/ushell/appRuntime/ui5/services/Container.js

@@ -4,14 +4,18 @@ sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ushell/appRuntime/ui5/renderers/fiori2/Renderer",
     "sap/ushell/appRuntime/ui5/ui/UIProxy",
-    "sap/ushell/appRuntime/ui5/SessionHandlerAgent"
-], function (oContainer, AppRuntimeService, Renderer, UIProxy, SessionHandlerAgent) {
+    "sap/ushell/appRuntime/ui5/SessionHandlerAgent",
+    "sap/base/assert"
+], function (oContainer, AppRuntimeService, Renderer, UIProxy, SessionHandlerAgent, assert) {
     "use strict";
 
     function ContainerProxy () {
         var oAdapter,
             isDirty = false,
-            aRegisteredDirtyMethods = [];
+            aRegisteredDirtyMethods = [],
+            aAsyncLogoutEventFunctions = [],
+            aSyncLogoutEventFunctions = [],
+            bRegistered = false;
 
         this.bootstrap = function (sPlatform, mAdapterPackagesByPlatform) {
             return sap.ushell.bootstrap(sPlatform, mAdapterPackagesByPlatform).then(function (Container) {
@@ -115,6 +119,98 @@ sap.ui.define([
                 sap.ushell.Container.setAsyncDirtyStateProviders = function (aDirtyStateProviders) {
                     aRegisteredDirtyMethods = aDirtyStateProviders;
                 };
+
+                function _insertFunction(aFunctionsArray, fnFunction) {
+                    var bFound = false;
+
+                    for (var i = 0; i < aFunctionsArray.length; i++) {
+                        if (aFunctionsArray[i] === fnFunction) {
+                            bFound = true;
+                            break;
+                        }
+                    }
+                    if (!bFound) {
+                        aFunctionsArray.push(fnFunction);
+                    }
+                }
+
+                // Attaches a listener to the logout event.
+                // The fnFunction must return a promise. FLP will wait for the promise
+                // to be resolved before doing the actual logout.
+                sap.ushell.Container.attachLogoutEvent = function (fnFunction, bAsyncFunction) {
+                    assert(typeof (fnFunction) === "function", "Container.attachLogoutEvent: fnFunction must be a function");
+
+                    if (bAsyncFunction === true) {
+                        _insertFunction(aAsyncLogoutEventFunctions, fnFunction);
+                    } else {
+                        _insertFunction(aSyncLogoutEventFunctions, fnFunction);
+                    }
+
+                    if (!bRegistered) {
+                        bRegistered = true;
+
+                        return AppRuntimeService.sendMessageToOuterShell(
+                            "sap.ushell.services.Container.attachLogoutEvent", {});
+                    }
+                };
+
+                sap.ushell.Container._getAsyncFunctionsArray = function () {
+                    return aAsyncLogoutEventFunctions;
+                };
+
+                sap.ushell.Container._getSyncFunctionsArray = function () {
+                    return aAsyncLogoutEventFunctions;
+                };
+
+                sap.ushell.Container.executeAsyncAndSyncLogoutFunctions = function () {
+                   return new Promise(function (fnResolve, fnReject) {
+                       var arrAsyncLogoutEventsPromises = [];
+
+                       if (aSyncLogoutEventFunctions.length > 0) {
+                           for (var i = 0; i < aSyncLogoutEventFunctions.length; i++) {
+                               aSyncLogoutEventFunctions[i]();
+                           }
+                       }
+
+                       if (aAsyncLogoutEventFunctions.length > 0) {
+                           for (var j = 0; j < aAsyncLogoutEventFunctions.length; j++) {
+                               arrAsyncLogoutEventsPromises.push(aAsyncLogoutEventFunctions[j]());
+                           }
+                       }
+
+                       Promise.all(arrAsyncLogoutEventsPromises).then(fnResolve);
+                   });
+                };
+
+                function _detachFunction (aFunctionArray, fnFunction) {
+                    for (var i = 0; i < aFunctionArray.length; i++) {
+                        if (aFunctionArray[i] === fnFunction) {
+                            aFunctionArray.splice(i, 1);
+                            break;
+                        }
+                    }
+                }
+
+                sap.ushell.Container.detachLogoutEvent = function (fnFunction) {
+                    _detachFunction(aSyncLogoutEventFunctions, fnFunction);
+                    _detachFunction(aAsyncLogoutEventFunctions, fnFunction);
+                };
+
+                sap.ushell.Container._getAsyncFunctionsArray = function () {
+                  return aAsyncLogoutEventFunctions;
+                };
+
+                sap.ushell.Container._getSyncFunctionsArray = function () {
+                    return aSyncLogoutEventFunctions;
+                };
+
+                sap.ushell.Container._clearAsyncFunctionsArray = function () {
+                    aAsyncLogoutEventFunctions = [];
+                };
+
+                sap.ushell.Container._clearSyncFunctionsArray = function () {
+                    aSyncLogoutEventFunctions = [];
+                };
             });
         };
     }