@sapui5/sap.ushell 1.120.8 → 1.120.10

package/src/main/js/sap/ushell/services/NotificationsV2.js

@@ -133,6 +133,7 @@ sap.ui.define([
         let bInvalidCsrfTokenRecoveryMode = false;
         let bCsrfDataSet = false;
         let aDismissNotifications = [];
+        let oInitialRequestPromise;
 
         // *************************************************************************************************
         // ************************************* Service API - Begin ***************************************
@@ -178,6 +179,7 @@ sap.ui.define([
         this.init = function () {
             if (!bInitialized && this.isEnabled()) {
                 Core.getEventBus().subscribe("launchpad", "sessionTimeout", this.destroy, this);
+                oInitialRequestPromise = this.fireInitialRequest();
                 this.lastNotificationDate = new Date();
                 this._setWorkingMode();
                 bInitialized = true;
@@ -189,6 +191,66 @@ sap.ui.define([
             Core.getEventBus().subscribe("launchpad", "setConnectionToServer", this._onSetConnectionToServer, this);
         };
 
+        /**
+         * Fires an ODataRequest to prevent multiple CSRF tokens getting fetched in parallel.
+         * @private
+         */
+        this.fireInitialRequest = async function () {
+            return new Promise((resolve) => {
+                const oRequestObject = {
+                    requestUri: oServiceConfig.serviceUrl + "/GetBadgeNumber()",
+                    headers: {
+                        "X-CSRF-Token": sHeaderXcsrfToken
+                    }
+                };
+                OData.request(
+                    oRequestObject,
+                    (oResult) => {
+                        if (oResult.response) {
+                            this._updateCSRF(oResult.response);
+                        }
+                        resolve();
+                    },
+                    (oResult) => {
+                        if (oResult.response) {
+                            this._updateCSRF(oResult.response);
+                        }
+                        resolve();
+                    }
+                );
+            });
+        };
+
+        /**
+         * Fires an ODataRequest, after making sure that a pervious initial request has been done.
+         * This is done to prevent multiple CSRF tokens getting fetched in parallel.
+         *
+         * @param {object} oRequestObject contains all the read request information.
+         * @private
+         */
+        this.fireODataRequest = async function (oRequestObject) {
+            await oInitialRequestPromise;
+            if (oRequestObject.headers && oRequestObject.headers["X-CSRF-Token"]) {
+                oRequestObject.headers["X-CSRF-Token"] = sHeaderXcsrfToken;
+            }
+            OData.request.apply(this, arguments);
+        };
+
+        /**
+         * Fires an ODataRead, after making sure that a pervious initial request has been done.
+         * This is done to prevent multiple CSRF tokens getting fetched in parallel.
+         *
+         * @param {object} oRequestObject contains all the request information.
+         * @private
+         */
+        this.fireODataRead = async function (oRequestObject) {
+            await oInitialRequestPromise;
+            if (oRequestObject.headers && oRequestObject.headers["X-CSRF-Token"]) {
+                oRequestObject.headers["X-CSRF-Token"] = sHeaderXcsrfToken;
+            }
+            OData.read.apply(this, arguments);
+        };
+
         /**
          * This event handler enables or disables the connection to the server
          *
@@ -252,7 +314,7 @@ sap.ui.define([
             const oRequest = this._createRequest(this._getRequestURI(oOperationEnum.NOTIFICATIONS_BY_TYPE));
 
             return new Promise((resolve, reject) => {
-                OData.request(oRequest, resolve, (oMessage) => {
+                this.fireODataRequest(oRequest, resolve, (oMessage) => {
                     if (oMessage.response && oMessage.response.statusCode === 200 && oMessage.response.body) {
                         resolve(oMessage.response.body);
                     } else {
@@ -274,7 +336,7 @@ sap.ui.define([
             const oRequest = this._createRequest(this._getRequestURI(oOperationEnum.NOTIFICATIONS_GROUP_HEADERS));
 
             return new Promise((resolve, reject) => {
-                OData.request(oRequest, resolve, (oMessage) => {
+                this.fireODataRequest(oRequest, resolve, (oMessage) => {
                     if (oMessage.response && oMessage.response.statusCode === 200 && oMessage.response.body) {
                         resolve(oMessage.response.body);
                     } else {
@@ -308,7 +370,7 @@ sap.ui.define([
             const oRequest = this._createRequest(this._getRequestURI(oOperationEnum.NOTIFICATIONS_IN_GROUP, oArgs));
 
             return new Promise((resolve, reject) => {
-                OData.request(oRequest,
+                this.fireODataRequest(oRequest,
                     (oResult) => {
                         oNotificationsService._updateCSRF(oResult.response);
                         resolve(oResult.value);
@@ -343,7 +405,7 @@ sap.ui.define([
             const oRequestObject = this._createRequest(this._getRequestURI(sSortingType, oArgs));
 
             return new Promise((resolve, reject) => {
-                OData.request(oRequestObject,
+                this.fireODataRequest(oRequestObject,
                     (oResult) => {
                         oNotificationsService._updateCSRF(oResult.response);
                         resolve(oResult.value);
@@ -438,7 +500,7 @@ sap.ui.define([
                 }
             };
             return new Promise((resolve, reject) => {
-                OData.request(
+                this.fireODataRequest(
                     oRequestObject,
                     (oResult) => {
                         const responseAck = { isSucessfull: true, message: "" };
@@ -484,7 +546,7 @@ sap.ui.define([
             };
 
             return new Promise((resolve, reject) => {
-                OData.request(
+                this.fireODataRequest(
                     oRequestObject,
                     (oResult) => {
                         let responseAck;
@@ -526,7 +588,7 @@ sap.ui.define([
             };
 
             return new Promise((resolve, reject) => {
-                OData.request(oRequestObject, () => resolve(), (oResult) => {
+                this.fireODataRequest(oRequestObject, () => resolve(), (oResult) => {
                     if (oResult.response && oResult.response.statusCode === 200) {
                         resolve();
                     } else if (oNotificationsService._csrfTokenInvalid(oResult) && (bInvalidCsrfTokenRecoveryMode === false)) {
@@ -566,7 +628,7 @@ sap.ui.define([
             };
 
             return new Promise((resolve, reject) => {
-                OData.request(oRequestObject, () => resolve(), (oMessage) => {
+                this.fireODataRequest(oRequestObject, () => resolve(), (oMessage) => {
                     if (oNotificationsService._csrfTokenInvalid(oMessage) && (bInvalidCsrfTokenRecoveryMode === false)) {
                         oNotificationsService._invalidCsrfTokenRecovery(resolve, reject, oNotificationsService.markRead, [sNotificationId]);
                     } else {
@@ -602,7 +664,7 @@ sap.ui.define([
             };
 
             return new Promise((resolve, reject) => {
-                OData.request(
+                this.fireODataRequest(
                     oRequestObject,
                     () => {
                         oNotificationsService._addDismissNotifications(sNotificationId);
@@ -762,7 +824,7 @@ sap.ui.define([
             const oRequestObject = this._createRequest(this._getRequestURI(oOperationEnum.GET_BADGE_NUMBER));
 
             return new Promise((resolve, reject) => {
-                OData.read(
+                this.fireODataRead(
                     oRequestObject,
                     (oResult, oResponseData) => {
                         oModel.setProperty("/UnseenCount", oResponseData.data.GetBadgeNumber.Number);
@@ -791,7 +853,7 @@ sap.ui.define([
         this.readNotificationsCount = function () {
             const oRequestObject = this._createRequest(this._getRequestURI(oOperationEnum.GET_NOTIFICATIONS_COUNT));
             return new Promise((resolve, reject) => {
-                OData.read(
+                this.fireODataRead(
                     oRequestObject,
                     (oResult, oResponseData) => resolve(oResponseData.data),
                     (oMessage) => {
@@ -841,7 +903,7 @@ sap.ui.define([
             }
 
             return new Promise((resolve, reject) => {
-                OData.request(
+                this.fireODataRequest(
                     oRequestObject,
                     resolve,
                     function (oMessage) {
@@ -1057,7 +1119,7 @@ sap.ui.define([
             const oRequestObject = this._createRequest(this._getRequestURI(oOperationEnum.GET_SETTINGS));
 
             return new Promise((resolve, reject) => {
-                OData.request(
+                this.fireODataRequest(
                     oRequestObject,
                     (oResult) => resolve(oResult.results),
                     (oMessage) => {
@@ -1098,7 +1160,7 @@ sap.ui.define([
             let sUpdatedResponseString;
 
             return new Promise((resolve) => {
-                OData.request(
+                this.fireODataRequest(
                     oRequestObject,
                     (oResult) => {
                         if (typeof (oResult.results) === "string") {
@@ -1136,7 +1198,7 @@ sap.ui.define([
         this._checkWebSocketActivity = function () {
             const oRequestObject = this._createRequest(this._getRequestURI(oOperationEnum.VALIDATE_WEBSOCKET_CHANNEL));
             return new Promise((resolve) => {
-                OData.request(
+                this.fireODataRequest(
                     oRequestObject,
                     (oResult) => {
                         if (typeof (oResult.results) === "string") {
@@ -1182,7 +1244,7 @@ sap.ui.define([
             oRequestObject.data["@odata.context"] = "$metadata#NotificationTypePersonalizationSet/$entity";
 
             return new Promise((resolve, reject) => {
-                OData.request(
+                this.fireODataRequest(
                     oRequestObject,
                     resolve,
                     (oMessage) => {
@@ -1760,7 +1822,7 @@ sap.ui.define([
                 return;
             }
             if (this._getHeaderXcsrfToken() === "fetch") {
-                sHeaderXcsrfToken = oResponseData.headers["x-csrf-token"] || oResponseData.headers["X-CSRF-Token"] || oResponseData.headers["X-Csrf-Token"];
+                sHeaderXcsrfToken = oResponseData.headers["x-csrf-token"] || oResponseData.headers["X-CSRF-Token"] || oResponseData.headers["X-Csrf-Token"] || "fetch";
             }
             if (!this._getDataServiceVersion()) {
                 sDataServiceVersion = oResponseData.headers.DataServiceVersion || oResponseData.headers["odata-version"];

package/src/main/js/sap/ushell/services/PageBuilding.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's page building service.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery"

package/src/main/js/sap/ushell/services/PagePersistence.js

@@ -6,7 +6,7 @@
  * It provides the layout and tile data of pages in the pages runtime.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/services/PageReferencing.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module deals with page related referencing and dereferencing.
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/services/_PageReferencing/PageReferencer"

package/src/main/js/sap/ushell/services/Pages.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes a model containing the pages hierarchy to its clients.
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/Personalization.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's personalization service, which provides generic read and write access to the currently logged on user's
  * personalization settings for the app currently executed in the shell.
  *
- * @version 1.120.8
+ * @version 1.120.10
  * @deprecated since 1.120 Please use {@link sap.ushell.services.PersonalizationV2} instead
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/PersonalizationV2.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's personalization service, which provides generic read and write access to the currently logged on user's
  * personalization settings for the app currently executed in the shell.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/PluginManager.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's PluginManager service. Allows handling the loading of Fiori Launchpad plugins.
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/ReferenceResolver.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview resolves references
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/Search.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's search service which provides Enterprise Search via SINA.
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/services/SearchCEP.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Search for myHome.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/SearchableContent.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes the searchable content.
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/SmartNavigation.js

@@ -12,7 +12,7 @@
  * it is pertinent that the API user employs this service's version of <code>toExternal()</code> for cross application
  * navigation (instead) of using the one provided by CrossApplicationNavigation service.</p>
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell/services/SpaceContent.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview APIs for the S/4 MyHome
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/UITracer.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's UI tracing service.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/services/URLShortening.js

@@ -6,7 +6,7 @@
  * Service wrapper for the sap/ushell/utils/UrlShortening module.
  * @deprecated since 1.118. Please use the UrlShortening module directly.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
  sap.ui.define(["sap/ushell/utils/UrlShortening"], function (UrlShortening) {
     "use strict";

package/src/main/js/sap/ushell/services/URLTemplate.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview The URLTemplate service provides utilities when working with URL templates
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/services/Ui5ComponentLoader.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's UI5 component loader service.
  * This is a shell-internal service and no public or application facing API!
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/UserDefaultParameterPersistence.js

@@ -14,7 +14,7 @@
  *
  * This is *not* an application facing service, but for Shell Internal usage.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/UserDefaultParameters.js

@@ -7,7 +7,7 @@
  *               This service should be accessed by the application
  *               via the CrossApplicationNavigation service.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/UserInfo.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's user information service. Allows retrieving information about the logged-in user.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/UserRecents.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's user activity service.
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/services/VisualizationDataProvider.js

@@ -7,7 +7,7 @@
  *
  * Configured with the LaunchPageAdapter.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/resources",

package/src/main/js/sap/ushell/services/VisualizationInstantiation.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module deals with the instantiation of visualizations in a platform independent way.
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/services/_VisualizationInstantiation/VizInstance",

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/Formatter.js

@@ -13,7 +13,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/InboundIndex.js

@@ -27,7 +27,7 @@
  *
  * @private
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
 "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/InboundProvider.js

@@ -34,7 +34,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds",

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/PrelaunchOperations.js

@@ -4,7 +4,7 @@
  * @file PrelaunchOperations are executed just before launching the application (post parameter mapping and app state merging) if the
  * <code>sap-prelaunch-operations</code> parameter is specified as a technical parameter.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/Search.js

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/StagedLogger.js

@@ -39,7 +39,7 @@
  *
  * This is a dependency of ClientSideTargetResolution. Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/SystemContext.js

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution. Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/Utils.js

@@ -6,7 +6,7 @@
  * This is a dependency of ClientSideTargetResolution.
  * Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/util/deepExtend"

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds.js

@@ -12,7 +12,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces
  * exposed by this module may change at any time without notice.</p>
  *
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/XAppStateProcessing.js

@@ -6,7 +6,7 @@
  * Operations in this module are assumed to be executed after the target mapping has been identified (post search).
  *
  * @private
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/services/_ClientSideTargetResolution/Utils",

package/src/main/js/sap/ushell/services/_CommonDataModel/SiteConverter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Because the personalization processor only works with a CDM 3.0 site, this converter is used to transform a dedicated
  * CDM 3.1 site object into a CDM 3.0 site and backwards.
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log"

package/src/main/js/sap/ushell/services/_ContentExtensionAdapterFactory/ContentExtensionAdapterConfig.js

@@ -7,7 +7,7 @@
  *  config handler which is called by the factory to generate an explicit
  *  Adapter configuration
  *
- * @version 1.120.8
+ * @version 1.120.10
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/_ContentExtensionAdapterFactory/FeaturedGroupConfig.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provide mock feature group data
  *
- * @version 1.120.8
+ * @version 1.120.10
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/_CrossApplicationNavigation/utils.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Cross Application Navigation utility functions
  *
- * @version 1.120.8
+ * @version 1.120.10
  * @deprecated since 1.120.0
  */
 

package/src/main/js/sap/ushell/services/_MessageBroker/MessageBrokerEngine.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module contains the implementation of the message broker
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/_PageReferencing/PageReferencer.js

@@ -4,7 +4,7 @@
  * @file This module is responsible to create reference pages,
  * which are shareable JSON representations of layout and navigation targets in the specific format.
  *
- * @version 1.120.8
+ * @version 1.120.10
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/_PluginManager/Extensions.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The extensions which plugins can use to customise the launchpad
  *
- * @version 1.120.8
+ * @version 1.120.10
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/_PluginManager/HeaderExtensions.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The extensions for the ShellHeader
- * @version 1.120.8
+ * @version 1.120.10
  */
 sap.ui.define([
     "sap/ushell/EventHub"