@openui5/sap.ui.fl 1.106.0 → 1.107.1

package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -124,7 +124,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @deprecated Since version 1.76
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorVariantFactory
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @deprecated Since version 1.73
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/initial/_internal/Storage.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.Storage
 	 * @since 1.67
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/initial/_internal/StorageUtils.js

@@ -9,13 +9,15 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
-	"sap/base/util/isEmptyObject"
+	"sap/base/util/isEmptyObject",
+	"sap/ui/core/Configuration"
 ], function (
 	encodeURLParameters,
 	Log,
 	Layer,
 	LayerUtils,
-	isEmptyObject
+	isEmptyObject,
+	Configuration
 ) {
 	"use strict";
 
@@ -25,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.StorageUtils
 	 * @since 1.74
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage, sap.ui.fl.write._internal.Storage,
 	 * 	sap.ui.fl.initial._internal.connectors.ObjectStorageConnector, sap.ui.fl.initial._internal.connectors.ObjectPathConnector
@@ -125,7 +127,7 @@ sap.ui.define([
 		 * @returns {Promise<map[]>} Resolving with a list of maps for all configured connectors and their requested modules
 		 */
 		getConnectors: function (sNameSpace, bLoadConnectors) {
-			var aConfiguredConnectors = sap.ui.getCore().getConfiguration().getFlexibilityServices();
+			var aConfiguredConnectors = Configuration.getFlexibilityServices();
 			var mConnectors = [];
 			if (bLoadConnectors) {
 				mConnectors = [STATIC_FILE_CONNECTOR_CONFIGURATION];
@@ -314,7 +316,7 @@ sap.ui.define([
 			if (!mParameters) {
 				mParameters = {};
 			}
-			mParameters["sap-language"] = sap.ui.getCore().getConfiguration().getLanguage();
+			mParameters["sap-language"] = Configuration.getLanguage();
 		}
 	};
 });

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js

@@ -84,7 +84,7 @@ sap.ui.define([
 		 * @alias sap.ui.fl.registry.ChangeHandlerRegistration
 		 *
 		 * @author SAP SE
-		 * @version 1.106.0
+		 * @version 1.107.1
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeHandlerStorage
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 *

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeRegistryItem.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeRegistryItem
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 *

package/src/sap/ui/fl/initial/_internal/connectors/BackendConnector.js

@@ -41,11 +41,11 @@ sap.ui.define([
 				InitialUtils.addLanguageInfo(mParameters);
 			}
 			var sDataUrl = InitialUtils.getUrl(this.ROUTES.DATA, mPropertyBag, mParameters);
-			return InitialUtils.sendRequest(sDataUrl, "GET", { xsrfToken: this.xsrfToken}).then(function (oResult) {
+			return InitialUtils.sendRequest(sDataUrl, "GET", {
+				initialConnector: this,
+				xsrfToken: this.xsrfToken}
+			).then(function (oResult) {
 				var oResponse = oResult.response;
-				if (oResult.xsrfToken) {
-					this.xsrfToken = oResult.xsrfToken;
-				}
 				if (oResult.etag) {
 					oResponse.cacheKey = oResult.etag;
 				}

package/src/sap/ui/fl/initial/_internal/connectors/LrepConnector.js

@@ -108,14 +108,12 @@ sap.ui.define([
 
 			var sDataUrl = Utils.getUrl(ROUTES.DATA, mPropertyBag, mParameters);
 			return Utils.sendRequest(sDataUrl, "GET", {
+				initialConnector: this,
 				xsrfToken: this.xsrfToken,
 				siteId: mPropertyBag.siteId,
 				sAppDescriptorId: sAppDescriptorId
 			}).then(function (oResult) {
 				var oResponse = oResult.response;
-				if (oResult.xsrfToken) {
-					this.xsrfToken = oResult.xsrfToken;
-				}
 				if (oResult.etag) {
 					oResponse.cacheKey = oResult.etag;
 				} else if (mPropertyBag.cacheKey) {

package/src/sap/ui/fl/initial/_internal/connectors/StaticFileConnector.js

@@ -6,17 +6,19 @@
 
 sap.ui.define([
 	"sap/base/Log",
-	"sap/base/util/LoaderExtensions"
+	"sap/base/util/LoaderExtensions",
+	"sap/ui/core/Configuration"
 ], function(
 	Log,
-	LoaderExtensions
+	LoaderExtensions,
+	Configuration
 ) {
 	"use strict";
 
 	function _getBundle(sReference, sBundleName) {
 		var sBundleResourcePath = sReference.replace(/\./g, "/") + "/changes/" + sBundleName + ".json";
 		var bBundleLoaded = !!sap.ui.loader._.getModuleState(sBundleResourcePath);
-		var oConfiguration = sap.ui.getCore().getConfiguration();
+		var oConfiguration = Configuration;
 		// the bundle is usually part of the component-preload
 		// if the preload is suppressed, we send a potentially failing request
 		if (bBundleLoaded || oConfiguration.getDebug() || oConfiguration.getComponentPreload() === "off") {

package/src/sap/ui/fl/initial/_internal/connectors/Utils.js

@@ -5,9 +5,11 @@
  */
 
 sap.ui.define([
-	"sap/base/security/encodeURLParameters"
+	"sap/base/security/encodeURLParameters",
+	"sap/ui/core/Configuration"
 ], function (
-	encodeURLParameters
+	encodeURLParameters,
+	Configuration
 ) {
 	"use strict";
 
@@ -16,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.connectors, sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */
@@ -58,7 +60,7 @@ sap.ui.define([
 			if (!mParameters) {
 				mParameters = {};
 			}
-			mParameters["sap-language"] = sap.ui.getCore().getConfiguration().getLanguage();
+			mParameters["sap-language"] = Configuration.getLanguage();
 		},
 
 		/**
@@ -71,7 +73,7 @@ sap.ui.define([
 			if (!mParameters) {
 				mParameters = {};
 			}
-			mParameters["sap-language"] = sap.ui.getCore().getConfiguration().getSAPLogonLanguage();
+			mParameters["sap-language"] = Configuration.getSAPLogonLanguage();
 		},
 
 		/**
@@ -127,7 +129,7 @@ sap.ui.define([
 		 * @param {string} sUrl Url of the sent request
 		 * @param {string} [sMethod="GET"] Desired action to be performed for a given resource
 		 * @param {object} [mPropertyBag] Object with parameters as properties
-		 * @param {string} [mPropertyBag.xsrfToken] Existing X-CSRF token of the connector which triggers the request
+		 * @param {object} [mPropertyBag.initialConnector] Corresponding initial connector which has an existing X-CSRF token or stores a new X-CSRF token
 		 * @param {string} [mPropertyBag.payload] Payload of the request
 		 * @param {string} [mPropertyBag.contentType] Content type of the request
 		 * @param {string} [mPropertyBag.dataType] Expected data type of the response
@@ -143,11 +145,11 @@ sap.ui.define([
 				var xhr = new XMLHttpRequest();
 				xhr.open(sMethod, sUrl);
 				xhr.timeout = TIMEOUT;
-				if ((sMethod === "GET" || sMethod === "HEAD") && (!mPropertyBag || !mPropertyBag.xsrfToken)) {
+				if ((sMethod === "GET" || sMethod === "HEAD") && (!mPropertyBag || !mPropertyBag.initialConnector || !mPropertyBag.initialConnector.xsrfToken)) {
 					xhr.setRequestHeader("X-CSRF-Token", "fetch");
 				}
-				if ((sMethod === "POST" || sMethod === "PUT" || sMethod === "DELETE") && mPropertyBag && mPropertyBag.xsrfToken) {
-					xhr.setRequestHeader("X-CSRF-Token", mPropertyBag.xsrfToken);
+				if ((sMethod === "POST" || sMethod === "PUT" || sMethod === "DELETE") && mPropertyBag && mPropertyBag.initialConnector && mPropertyBag.initialConnector.xsrfToken) {
+					xhr.setRequestHeader("X-CSRF-Token", mPropertyBag.initialConnector.xsrfToken);
 				}
 				if (mPropertyBag && mPropertyBag.contentType) {
 					xhr.setRequestHeader("Content-Type", mPropertyBag.contentType);
@@ -185,7 +187,13 @@ sap.ui.define([
 							}
 							oResult.status = xhr.status;
 							if (xhr.getResponseHeader("X-CSRF-Token")) {
-								oResult.xsrfToken = xhr.getResponseHeader("X-CSRF-Token");
+								//Only obtain token from non-cacheable request
+								if (!sUrl.match(/\/~.*~/g)) {
+									oResult.xsrfToken = xhr.getResponseHeader("X-CSRF-Token");
+									if (mPropertyBag && mPropertyBag.initialConnector) {
+										mPropertyBag.initialConnector.xsrfToken = oResult.xsrfToken;
+									}
+								}
 							}
 							if (xhr.getResponseHeader("Etag")) {
 								oResult.etag = xhr.getResponseHeader("Etag");

package/src/sap/ui/fl/initial/_internal/storageResultDisassemble.js

@@ -50,7 +50,7 @@ function(
 	/**
 	 * @namespace sap.ui.fl.initial._internal.StorageResultDisassemble
 	 * @since 1.70
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage
 	 * Disassembles a response with a variant section into one or more plain responses.

package/src/sap/ui/fl/interfaces/BaseLoadConnector.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @name sap.ui.fl.interfaces.BaseLoadConnector
 	 * @since 1.79
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @private
 	 * @ui5-restricted SAPUI5 visual editor, UX Tools

package/src/sap/ui/fl/interfaces/Delegate.js

@@ -108,7 +108,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 * @since 1.78
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @private
 	 * @ui5-restricted