@sapui5/sap.ushell 1.124.3 → 1.126.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.124.3",
+    "version": "1.126.0",
     "description": "SAPUI5 Library sap.ushell",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

package/src/main/js/sap/ushell/.library

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell</name>
     <vendor>SAP SE</vendor>
-    <version>1.124.3</version>
+    <version>1.126.0</version>
     <copyright>Copyright (c) 2009-2023 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 

package/src/main/js/sap/ushell/AppInfoParameters.js

@@ -6,8 +6,9 @@ sap.ui.define([
     "sap/base/util/restricted/_curry",
     "sap/base/util/restricted/_zipObject",
     "sap/ui/VersionInfo",
-    "sap/ushell/Config"
-], function (Log, oAppConfiguration, _curry, _zipObject, VersionInfo, Config) {
+    "sap/ushell/Config",
+    "sap/ushell/Container"
+], function (Log, oAppConfiguration, _curry, _zipObject, VersionInfo, Config, Container) {
     "use strict";
     /*global */
 
@@ -192,7 +193,7 @@ sap.ui.define([
      * @returns {Promise<string>} The promise resolves the user parameter
      */
     function getUserEnv (sUserEnv) {
-        return sap.ushell.Container.getServiceAsync("ReferenceResolver")
+        return Container.getServiceAsync("ReferenceResolver")
             .then(function (oReferenceResolverService) {
                 return new Promise(function (fnResolve, fnReject) {
                     oReferenceResolverService.resolveReferences([sUserEnv])
@@ -340,33 +341,34 @@ sap.ui.define([
      * @returns {Promise} oPromise Promise that resolves to an object
      *    keeping the application info parameters with values
      */
-        function _getInfo (aParameters, oCurrentApplication, oApplicationContainer) {
-            var aPromises = aParameters.map(function (sParameter) {
-                if (isAttributeExist(sParameter)) {
-                    return Promise.resolve(getCustomValue(sParameter));
-                }
-                // add handler function in case of custom property
-                if (_isCustom(sParameter)) {
-                    oHandlers[sParameter] = _curry(getSystemContext)(sParameter);
-                }
-                if (!oHandlers[sParameter]) {
-                    Log.error(sParameter + " is not a valid app info parameter");
-                    return undefined;
-                }
-                return oHandlers[sParameter](oCurrentApplication, oApplicationContainer);
-            });
+    function _getInfo (aParameters, oCurrentApplication, oApplicationContainer) {
+        var oHandlersIncludingCustom = {...oHandlers};
+        var aPromises = aParameters.map(function (sParameter) {
+            if (isAttributeExist(sParameter)) {
+                return Promise.resolve(getCustomValue(sParameter));
+            }
+            // add handler function in case of custom property
+            if (_isCustom(sParameter)) {
+                oHandlersIncludingCustom[sParameter] = _curry(getSystemContext)(sParameter);
+            }
+            if (!oHandlersIncludingCustom[sParameter]) {
+                Log.error(sParameter + " is not a valid app info parameter");
+                return undefined;
+            }
+            return oHandlersIncludingCustom[sParameter](oCurrentApplication, oApplicationContainer);
+        });
 
-            return Promise.allSettled(aPromises).then(function (aValues) {
-                for (var i = 0; i < aValues.length; i++) {
-                    if (aValues[i].status === "fulfilled") {
-                        aValues[i] = aValues[i].value;
-                    } else {
-                        aValues[i] = undefined;
-                    }
+        return Promise.allSettled(aPromises).then(function (aValues) {
+            for (var i = 0; i < aValues.length; i++) {
+                if (aValues[i].status === "fulfilled") {
+                    aValues[i] = aValues[i].value;
+                } else {
+                    aValues[i] = undefined;
                 }
+            }
 
-                return _zipObject(aParameters, aValues);
-            });
+            return _zipObject(aParameters, aValues);
+        });
     }
 
     //object of all app info

package/src/main/js/sap/ushell/Container.js

@@ -94,6 +94,7 @@ sap.ui.define([
     var mPlatformPackages;
     var aAsyncLogoutEventFunctions = []; //async logout even functions that return a promise
     var oContainerInstance;
+    let aRegisteredLogoutHandlers = [];
 
     // Try to close window. Note: Most browsers do NOT allow closing windows by JS if they were opened manually.
     function closeWindow () {
@@ -133,9 +134,6 @@ sap.ui.define([
         // Special case: Notifications and NotificationsV2 configurations are interchangeable.
         // Notifications service configuration has priority
         if (sServiceName === "Notifications" || sServiceName === "NotificationsV2") {
-            if (oServices.Notifications && oServices.NotificationsV2) {
-                Log.error("Notifications and NotificationsV2 services should not be configured at the same time. NotificationsV2 configuration is ignored.");
-            }
             return oServices.Notifications || oServices.NotificationsV2 || {};
         }
         return oServices[sServiceName] || {};
@@ -229,7 +227,6 @@ sap.ui.define([
      *   });
      * </pre>
      *
-     * @see sap.ushell.bootstrap
      * @since 1.15.0
      * @public
      */
@@ -643,7 +640,7 @@ sap.ui.define([
          *
          * @since 1.30.0
          * @public
-         * @deprecated since 1.120.0
+         * @deprecated since 1.120. Use {@link sap.ushell.services.Extension} for shell extensions instead.
          * @alias sap.ushell.Container#getRenderer
          */
         this.getRenderer = function (sRendererName) {
@@ -1298,7 +1295,7 @@ sap.ui.define([
                 // Note: this might become really asynchronous once the remote adapter is loaded
                 // from the remote system itself
                 oDeferred.resolve(createAdapter(sServiceName, oSystem, sParameter));
-                sap.ushell.Container.addRemoteSystem(oSystem);
+                oContainerInstance.addRemoteSystem(oSystem);
                 return oDeferred.promise();
             }
 
@@ -1415,7 +1412,7 @@ sap.ui.define([
                 // Note: this might become really asynchronous once the remote adapter is loaded
                 // from the remote system itself
                 oDeferred.resolve(createAdapter(sServiceName, oSystem, sParameter));
-                sap.ushell.Container.addRemoteSystem(oSystem);
+                oContainerInstance.addRemoteSystem(oSystem);
                 return oDeferred.promise();
             }
 
@@ -1738,6 +1735,7 @@ sap.ui.define([
 
         /**
          * Logs out the current user from all relevant back-end systems, including the logon system itself.
+         * This method also iterates through all registered logout handlers and calls them before continuing with the default logout.
          *
          * @returns {jQuery.Promise} Resolves when logout is finished, even when it fails.
          *
@@ -1748,77 +1746,79 @@ sap.ui.define([
         this.defaultLogout = function () {
             var oDeferred = new jQuery.Deferred();
 
-            function resolve () {
-                oAdapter.logout(true).always(function () {
-                    oLocalStorage.removeItem(sSessionTerminationKey);
-                    oDeferred.resolve();
-                });
-            }
-
-            function logoutLogonSystem () {
-                var oDeferredAsyncLogoutEvent = new jQuery.Deferred();
-                var oPromiseAsyncLogoutEvent = oDeferredAsyncLogoutEvent.promise();
-                var arrLogoutEventsPromises = [];
+            this.callRegisteredLogoutHandlers().then(() => {
+                function resolve () {
+                    oAdapter.logout(true).always(function () {
+                        oLocalStorage.removeItem(sSessionTerminationKey);
+                        oDeferred.resolve();
+                    });
+                }
 
-                if (aAsyncLogoutEventFunctions.length > 0) {
-                    for (var i = 0; i < aAsyncLogoutEventFunctions.length; i++) {
-                        arrLogoutEventsPromises.push(aAsyncLogoutEventFunctions[i]());
-                    }
-                    Promise.all(arrLogoutEventsPromises).then(oDeferredAsyncLogoutEvent.resolve);
+                function logoutLogonSystem () {
+                    var oDeferredAsyncLogoutEvent = new jQuery.Deferred();
+                    var oPromiseAsyncLogoutEvent = oDeferredAsyncLogoutEvent.promise();
+                    var arrLogoutEventsPromises = [];
 
-                    //if after 4 seconds we did not get all the async callbacks
-                    //promises resolved, we will continue with the logout process
-                    setTimeout(oDeferredAsyncLogoutEvent.resolve, 4000);
-                } else {
-                    oDeferredAsyncLogoutEvent.resolve();
-                }
+                    if (aAsyncLogoutEventFunctions.length > 0) {
+                        for (var i = 0; i < aAsyncLogoutEventFunctions.length; i++) {
+                            arrLogoutEventsPromises.push(aAsyncLogoutEventFunctions[i]());
+                        }
+                        Promise.all(arrLogoutEventsPromises).then(oDeferredAsyncLogoutEvent.resolve);
 
-                oPromiseAsyncLogoutEvent.done(function () {
-                    if (oEventProvider.fireEvent("Logout", true)) {
-                        resolve();
+                        //if after 4 seconds we did not get all the async callbacks
+                        //promises resolved, we will continue with the logout process
+                        setTimeout(oDeferredAsyncLogoutEvent.resolve, 4000);
                     } else {
-                        // defer UShell redirect to let NWBC receive message asynchronously
-                        setTimeout(resolve, 1000);
+                        oDeferredAsyncLogoutEvent.resolve();
                     }
-                });
-            }
-
-            function federatedLogout () {
-                var aRemoteLogoutPromises = [];
 
-                if (fnStorageEventListener) {
-                    // IE sends localStorage events also to the issuing window, -
-                    // this is not needed hence we remove the listener in general at that point
-                    window.removeEventListener("storage", fnStorageEventListener);
+                    oPromiseAsyncLogoutEvent.done(function () {
+                        if (oEventProvider.fireEvent("Logout", true)) {
+                            resolve();
+                        } else {
+                            // defer UShell redirect to let NWBC receive message asynchronously
+                            setTimeout(resolve, 1000);
+                        }
+                    });
                 }
 
-                ushellUtils.localStorageSetItem(sSessionTerminationKey, "pending");
-                that._suppressOData();
-                var mSystems = that._getRemoteSystems();
-                Object.keys(mSystems).forEach(function (sAlias) {
-                    try {
-                        aRemoteLogoutPromises.push(
-                            createAdapter("Container", mSystems[sAlias]).logout(false)
-                        );
-                    } catch (e) {
-                        Log.warning("Could not create adapter for " + sAlias,
-                            e.toString(), "sap.ushell.Container");
+                function federatedLogout () {
+                    var aRemoteLogoutPromises = [];
+
+                    if (fnStorageEventListener) {
+                        // IE sends localStorage events also to the issuing window, -
+                        // this is not needed hence we remove the listener in general at that point
+                        window.removeEventListener("storage", fnStorageEventListener);
                     }
-                    oLocalStorage.removeItem(sRemoteSystemPrefix + sAlias);
-                });
-                // wait for all remote system logouts to be finished
-                // Note: We use done() and not always(), and we require all adapters to resolve their logout(false) in any case.
-                // If we use always() and any adapter's promise is rejected, the deferred object from when() is *immediately* rejected, too.
-                // Then the redirect happens before all remote logouts are finished.
-                // TODO force logoutLogonSystem after timeout?
-                jQuery.when.apply(jQuery, aRemoteLogoutPromises).done(logoutLogonSystem);
-            }
 
-            if (typeof oAdapter.addFurtherRemoteSystems === "function") {
-                oAdapter.addFurtherRemoteSystems().always(federatedLogout);
-            } else {
-                federatedLogout();
-            }
+                    ushellUtils.localStorageSetItem(sSessionTerminationKey, "pending");
+                    that._suppressOData();
+                    var mSystems = that._getRemoteSystems();
+                    Object.keys(mSystems).forEach(function (sAlias) {
+                        try {
+                            aRemoteLogoutPromises.push(
+                                createAdapter("Container", mSystems[sAlias]).logout(false)
+                            );
+                        } catch (e) {
+                            Log.warning("Could not create adapter for " + sAlias,
+                                e.toString(), "sap.ushell.Container");
+                        }
+                        oLocalStorage.removeItem(sRemoteSystemPrefix + sAlias);
+                    });
+                    // wait for all remote system logouts to be finished
+                    // Note: We use done() and not always(), and we require all adapters to resolve their logout(false) in any case.
+                    // If we use always() and any adapter's promise is rejected, the deferred object from when() is *immediately* rejected, too.
+                    // Then the redirect happens before all remote logouts are finished.
+                    // TODO force logoutLogonSystem after timeout?
+                    jQuery.when.apply(jQuery, aRemoteLogoutPromises).done(logoutLogonSystem);
+                }
+
+                if (typeof oAdapter.addFurtherRemoteSystems === "function") {
+                    oAdapter.addFurtherRemoteSystems().always(federatedLogout);
+                } else {
+                    federatedLogout();
+                }
+            });
 
             return oDeferred.promise();
         };
@@ -1843,14 +1843,85 @@ sap.ui.define([
          * with an extended SessionHandler function.
          * This is so that we can logout additional systems before we can logout from the Shell.
          * In this case we will register a substitute logout func from the SessionHandler.
+         * Handlers registered through this API need to return a promise that resolves when the logout process is finished.
+         *
          * @param {function} fnLogout function to be set
+         * @returns {boolean} true if the function was successfully registered, false otherwise
          *
          * @since 1.15.0
          * @private
          * @alias sap.ushell.Container#registerLogout
          */
         this.registerLogout = function (fnLogout) {
-            this.logout = fnLogout;
+            if (typeof fnLogout !== "function") {
+                Log.error("Container.registerLogout - Invalid logout handler function.");
+                return false;
+            }
+
+            if (aRegisteredLogoutHandlers.includes(fnLogout)) {
+                Log.warning("Container.registerLogout - This logout handler is already registered. Ignoring.");
+                return false;
+            }
+
+            aRegisteredLogoutHandlers.push(fnLogout);
+            return true;
+        };
+
+        /**
+         * Deregisters a previously registered logout handler function. If the specified handler is not found
+         * in the list of registered handlers, logs an error and returns false to indicate failure.
+         * This ensures that only registered handlers are removed, maintaining the integrity of the logout process.
+         *
+         * @param {function} fnLogout - The logout handler function to deregister.
+         * @returns {boolean} true if the handler was successfully deregistered, false otherwise.
+         * @since 1.126.0
+         * @private
+         * @alias sap.ushell.Container#deRegisterLogout
+         */
+        this.deRegisterLogout = function (fnLogout) {
+            const iIndex = aRegisteredLogoutHandlers.indexOf(fnLogout);
+            if (iIndex === -1) {
+                Log.error("Container.deRegisterLogout - Attempted to de-register a logout handler that was not registered.");
+                return false;
+            }
+            aRegisteredLogoutHandlers.splice(iIndex, 1);
+            return true;
+        };
+
+        /**
+         * Checks if a given logout handler function is currently registered.
+         * This can be used to verify if a specific logout handler has been added to the list of handlers
+         * that will be called during the logout process.
+         *
+         * @param {function} fnLogout - The logout handler function to check.
+         * @returns {boolean} true if the handler is registered, false otherwise.
+         * @since 1.126.0
+         * @private
+         * @alias sap.ushell.Container#isLogoutRegistered
+         */
+        this.isLogoutRegistered = function (fnLogout) {
+            return aRegisteredLogoutHandlers.includes(fnLogout);
+        };
+
+        /**
+         * Calls all registered logout handlers sequentially. If a logout handler throws an error,
+         * the error is logged, and the execution continues with the next handler. This ensures
+         * that all logout handlers are attempted, regardless of individual failures.
+         *
+         * @since 1.126.0
+         * @private
+         * @alias sap.ushell.Container#callRegisteredLogoutHandlers
+         */
+        this.callRegisteredLogoutHandlers = async function () {
+            if (aRegisteredLogoutHandlers.length > 0) {
+                for (const fnLogout of aRegisteredLogoutHandlers) {
+                    try {
+                        await fnLogout();
+                    } catch (error) {
+                        Log.error("Error executing logout handler:", error);
+                    }
+                }
+            }
         };
 
         /**
@@ -2175,7 +2246,7 @@ sap.ui.define([
 
                 function handleDarkMode (Config) {
                     if (Config.last("/core/darkMode/enabled")) {
-                        sap.ushell.Container.getServiceAsync("DarkModeSupport").then(function (DarkModeSupportService) {
+                        oContainerInstance.getServiceAsync("DarkModeSupport").then(function (DarkModeSupportService) {
                             if (DarkModeSupportService && DarkModeSupportService.setup) { // Many qUnits mock getServiceAsync without DarkModeSupport
                                 DarkModeSupportService.setup();
                             }
@@ -2186,7 +2257,7 @@ sap.ui.define([
                 function initUITracer (Config) {
                     var bTraceEnabled = !!(new URLSearchParams(window.location.search)).get("sap-ui-xx-ushell-UITraceEnabled");
                     if (Config.last("/core/uiTracer/enabled") || bTraceEnabled) {
-                        sap.ushell.Container.getServiceAsync("UITracer");
+                        oContainerInstance.getServiceAsync("UITracer");
                     }
                 }
             }.bind(this));
@@ -2208,7 +2279,7 @@ sap.ui.define([
                         that._redirectWindow();
                     }
 
-                    if (sap.ushell.Container !== that) {
+                    if (oContainerInstance !== that) {
                         // In integration test suite, old listeners remain which do not belong to the current sap.ushell.Container instance.
                         // IE sends events also to own window. Then these old listeners react as if a remote window logged out...
                         return;

package/src/main/js/sap/ushell/Fiori20Adapter.js

@@ -5,7 +5,7 @@
  *
  * The Fiori20 adapter automatically re-styles old (Fiori 1) applications to match Fiori2 design requirements.
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ui/base/Object",

package/src/main/js/sap/ushell/Fiori20AdapterTest.js

@@ -4,12 +4,11 @@
  * @fileOverview The purpose Fiori20AdapterTest in this file is to decide whether to load the Fiori20Adapter at all.
  * This file is kept small in size on purpose as it is always required in productive code even when Fiori 2 adaptation is not required.
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/isEmptyObject",
-    "sap/base/util/UriParameters",
     "sap/base/util/Version",
     "sap/ui/core/Configuration",
     "sap/ui/core/library",
@@ -19,7 +18,6 @@ sap.ui.define([
 ], function (
     Log,
     isEmptyObject,
-    UriParameters,
     Version,
     Configuration,
     coreLibrary,
@@ -77,7 +75,9 @@ sap.ui.define([
         ],
 
         getConfiguration: function (oComp) {
-            var oConfig = this._getURLParamConfiguration(); // highest priority
+            var oConfig;
+
+            oConfig = this._getURLParamConfiguration(); // highest priority
 
             if (!oConfig) {
                 oConfig = this._getMetadataConfiguration(oComp); // second source, if no URL config specified
@@ -102,11 +102,11 @@ sap.ui.define([
          * @private
          */
         _getURLParamConfiguration: function () {
-            if (typeof Configuration.getFiori2Adaptation !== "function") {
+            if (!Configuration || typeof Configuration.getFiori2Adaptation !== "function") {
                 return; // parameter is not defined in the Core
             }
 
-            var oUriParameters = UriParameters.fromQuery(window.location.search);
+            var oUriParameters = new URLSearchParams(window.location.search);
             if (!oUriParameters.get(Fiori20AdapterConfiguration.S_FIORI20ADAPTER_URL_PARAM_NAME)) {
                 return; // no param value specified in the URL
             }
@@ -200,6 +200,10 @@ sap.ui.define([
          * The allowlist is only used for applications with minUI5Version lower than 1.38 and for applications without
          * valid minUI5Version or valid app descriptor.
          * Any new/modified app with version 1.38 and higher is assumed to be built according to the Fiori 2.0 guidelines
+         *
+         * @param {sap.ui.core.UIComponent} oComp The component to check
+         * @param {string} sVersion The version to compare with
+         * @returns {boolean} Whether the component has a min version smaller than the given version
          */
         _hasMinVersionSmallerThan: function (oComp, sVersion) {
             var oInfo = oComp.getManifestEntry("sap.ui5");
@@ -253,9 +257,9 @@ sap.ui.define([
                 // check: ShellUIService is available
                 // this check is done after attaching onBeforeRendering since the service is obtained asynchronously
                 const oService = ServiceFactoryRegistry.get("sap.ushell.ui5service.ShellUIService"),
-                    oServiceInstance = oService && oService.createInstance();
+                    oServiceInstancePromise = oService && oService.createInstance();
 
-                if (!oService || !oServiceInstance) {
+                if (!oService || !oServiceInstancePromise) {
                     Log.warning(
                         "Fiori20Adapter not loaded because ShellUIService is not available",
                         "sap.ushell.ui5service.ShellUIService should be declared by configuration",
@@ -264,7 +268,7 @@ sap.ui.define([
                     return;
                 }
 
-                oServiceInstance.then(
+                oServiceInstancePromise.then(
                     (oServiceParam) => Fiori20Adapter.applyTo(oControl, oComponent, oConfig, oServiceParam),
                     (oError) => {
                         Log.warning(
@@ -274,7 +278,6 @@ sap.ui.define([
                         );
                     }
                 );
-
             }
         };
         oControl.addEventDelegate(oDelegate);

package/src/main/js/sap/ushell/Layout.js

@@ -10,7 +10,8 @@ sap.ui.define([
     "sap/ui/core/Element",
     "sap/ui/core/EventBus",
     "sap/ui/thirdparty/jquery",
-    "sap/ushell/Config"
+    "sap/ushell/Config",
+    "sap/ushell/Container"
 ], function (
     Localization,
     Extend,
@@ -18,7 +19,8 @@ sap.ui.define([
     Element,
     EventBus,
     jQuery,
-    Config
+    Config,
+    Container
 ) {
     "use strict";
 
@@ -1273,8 +1275,9 @@ sap.ui.define([
             this.oTabBarItemClickTimer = new Date();
             this.bTabBarModeActive = false;
             this.bOnTabBarElement = false;
-            if (sap.ushell.Container) {
-                sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
+            var oLaunchpageService = Container.getServiceAsync("FlpLaunchPage");
+            if (oLaunchpageService) {
+                oLaunchpageService.then(function (oLaunchPageService) {
                     this.oLaunchPageService = oLaunchPageService;
                     timeoutLayoutInfo();
                 }.bind(this));

package/src/main/js/sap/ushell/NWBCInterface.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/SessionHandler.js

@@ -844,46 +844,50 @@ sap.ui.define([
          *   2. Clear timeouts
          *   3. Show logout message
          *   4. Perform logout via sap.ushell.Container
+         *
+         * @returns {Promise<undefined>} A promise that resolves when the logout process is complete.
          */
         this.logout = function () {
-            Log.debug("SessionHandler.logout :: Logout initiated", "", "SessionHandler");
+            return new Promise(function (resolve) {
+                Log.debug("SessionHandler.logout :: Logout initiated", "", "SessionHandler");
 
-            function _logout (oLoading) {
-                if (bInitialized === true) {
-                    that.detachUserEvents();
-                    that.detachVisibilityEvents();
-                }
-                if (that.oUserActivityTimer) {
-                    clearTimeout(that.oUserActivityTimer);
-                }
-                if (that.remainingTimer) {
-                    clearTimeout(that.remainingTimer);
-                }
-                if (that.notifyServerTimer) {
-                    clearTimeout(that.notifyServerTimer);
+                function _logout (oLoading) {
+                    if (bInitialized === true) {
+                        that.detachUserEvents();
+                        that.detachVisibilityEvents();
+                    }
+                    if (that.oUserActivityTimer) {
+                        clearTimeout(that.oUserActivityTimer);
+                    }
+                    if (that.remainingTimer) {
+                        clearTimeout(that.remainingTimer);
+                    }
+                    if (that.notifyServerTimer) {
+                        clearTimeout(that.notifyServerTimer);
+                    }
+                    oLoading.openLoadingScreen();
+                    oLoading.showAppInfo(oResources.i18n.getText("beforeLogoutMsg"), null);
+                    Container.setDirtyFlag(false);
+                    resolve();
                 }
-                oLoading.openLoadingScreen();
-                oLoading.showAppInfo(oResources.i18n.getText("beforeLogoutMsg"), null);
-                Container.setDirtyFlag(false);
-                Container.defaultLogout();
-            }
 
-            var oLoading = new LoadingDialog({ text: "" });
-            var oTimeout;
+                var oLoading = new LoadingDialog({ text: "" });
+                var oTimeout;
 
-            // post the logout event to isolated
-            PostMessageUtils.postMessageToMultipleIframes("sap.ushell.sessionHandler", "logout", {}, true).then(function () {
-                if (bIsLogoutProcessStarted === false) {
+                // post the logout event to isolated
+                PostMessageUtils.postMessageToMultipleIframes("sap.ushell.sessionHandler", "logout", {}, true).then(async function () {
+                    if (bIsLogoutProcessStarted === false) {
+                        bIsLogoutProcessStarted = true;
+                        window.clearTimeout(oTimeout);
+                        _logout(oLoading);
+                    }
+                });
+
+                oTimeout = window.setTimeout(async function () {
                     bIsLogoutProcessStarted = true;
-                    window.clearTimeout(oTimeout);
                     _logout(oLoading);
-                }
+                }, 4000);
             });
-
-            oTimeout = window.setTimeout(function () {
-                bIsLogoutProcessStarted = true;
-                _logout(oLoading);
-            }, 4000);
         };
     };
 

package/src/main/js/sap/ushell/TechnicalParameters.js

@@ -31,16 +31,18 @@
  * Therefore, applications are encouraged to use
  * the <code>AppLifeCycle</code> service in the following way:
  * <pre>
- *    sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycle) {
+ * sap.ui.require(["sap/ushell/Container"], function(Container) {
+ *      Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycle) {
  *          oAppLifeCycle.getCurrentApplication().getTechnicalParameter("sap-fiori-id");
- *    });
+ *      });
+ * })
  * </pre>
  *
  * It is also possible to prevent applications from using the technical
  * parameters. If the application tries to access an internal parameter (e.g.,
  * sap-ui-app-id-hint) via the API, the application receives an error message.
  *
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([