@commercetools-frontend/application-shell 21.9.0 → 21.12.0

package/dist/{application-entry-point-0650332e.cjs.prod.js → application-entry-point-93ad5f12.cjs.prod.js}

@@ -22,7 +22,7 @@ var omitEmpty = require('omit-empty-es');
 var notifications = require('@commercetools-frontend/notifications');
 var sdk = require('@commercetools-frontend/sdk');
 var constants = require('@commercetools-frontend/constants');
-var constants$1 = require('./constants-f34da47c.cjs.prod.js');
+var constants$1 = require('./constants-c2c238ff.cjs.prod.js');
 var reactNotifications = require('@commercetools-frontend/react-notifications');
 var _startsWithInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/starts-with');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
@@ -38,7 +38,6 @@ var sentry = require('@commercetools-frontend/sentry');
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
 var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
 var client = require('@apollo/client');
-var createHttpUserAgent = require('@commercetools/http-user-agent');
 var loggerLink = require('apollo-link-logger');
 var _Array$from = require('@babel/runtime-corejs3/core-js-stable/array/from');
 var _Symbol = require('@babel/runtime-corejs3/core-js-stable/symbol');
@@ -49,8 +48,19 @@ var history = require('@commercetools-frontend/browser-history');
 var _someInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/some');
 var _Object$values = require('@babel/runtime-corejs3/core-js-stable/object/values');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
+var createHttpUserAgent = require('@commercetools/http-user-agent');
 var uuid = require('uuid');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
+var _Reflect$construct = require('@babel/runtime-corejs3/core-js-stable/reflect/construct');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _createClass = require('@babel/runtime-corejs3/helpers/createClass');
+var _classCallCheck = require('@babel/runtime-corejs3/helpers/classCallCheck');
+var _assertThisInitialized = require('@babel/runtime-corejs3/helpers/assertThisInitialized');
+var _inherits = require('@babel/runtime-corejs3/helpers/inherits');
+var _possibleConstructorReturn = require('@babel/runtime-corejs3/helpers/possibleConstructorReturn');
+var _getPrototypeOf = require('@babel/runtime-corejs3/helpers/getPrototypeOf');
+var _wrapNativeSuper = require('@babel/runtime-corejs3/helpers/wrapNativeSuper');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var retry = require('@apollo/client/link/retry');
 require('prop-types');
 var react = require('react');
@@ -86,7 +96,6 @@ var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfIns
 var _sliceInstanceProperty__default = /*#__PURE__*/_interopDefault(_sliceInstanceProperty);
 var _URL__default = /*#__PURE__*/_interopDefault(_URL);
 var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
-var createHttpUserAgent__default = /*#__PURE__*/_interopDefault(createHttpUserAgent);
 var loggerLink__default = /*#__PURE__*/_interopDefault(loggerLink);
 var _Array$from__default = /*#__PURE__*/_interopDefault(_Array$from);
 var _Symbol__default = /*#__PURE__*/_interopDefault(_Symbol);
@@ -96,11 +105,14 @@ var history__default = /*#__PURE__*/_interopDefault(history);
 var _someInstanceProperty__default = /*#__PURE__*/_interopDefault(_someInstanceProperty);
 var _Object$values__default = /*#__PURE__*/_interopDefault(_Object$values);
 var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
+var createHttpUserAgent__default = /*#__PURE__*/_interopDefault(createHttpUserAgent);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
+var _Reflect$construct__default = /*#__PURE__*/_interopDefault(_Reflect$construct);
+var _regeneratorRuntime__default = /*#__PURE__*/_interopDefault(_regeneratorRuntime);
 var invariant__default = /*#__PURE__*/_interopDefault(invariant);
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "21.9.0";
+var version = "21.12.0";
 
 var isAddNotificationErrorAction = function isAddNotificationErrorAction(action) {
   var errorAction = action;
@@ -227,9 +239,9 @@ var messages = reactIntl.defineMessages({
   }
 });
 
-function ownKeys$5(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$6(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$5(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$5(Object(source))).call(_context2, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
+function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$6(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$6(Object(source))).call(_context2, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
 
 var getPortalContainer = function getPortalContainer() {
   return document.querySelector("#".concat(REQUESTS_IN_FLIGHT_LOADER_DOM_ID));
@@ -241,7 +253,7 @@ var RequestsInFlightLoader = function RequestsInFlightLoader() {
   });
   if (!hasRequestsInFlight) return null;
   return /*#__PURE__*/ReactDOM__default["default"].createPortal(jsxRuntime.jsx(LoadingSpinner__default["default"], {
-    children: jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$5({}, messages.labelLoading))
+    children: jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$6({}, messages.labelLoading))
   }), getPortalContainer());
 };
 
@@ -347,52 +359,47 @@ function getCorrelationId() {
   return _filterInstanceProperty__default["default"](_context = ['mc', selectProjectKeyFromUrl(), userId, uuid.v4()]).call(_context, skipMalformedPart).join('/');
 }
 
-var removeMcPrefix = function removeMcPrefix(host) {
-  return host.replace(/^mc(-(\d){4,})?\.(.*)$/, '$3');
+// NOTE: Copied from `@application-shell-connectors`.
+// TODO: Remove this version once the change in the connectors has been released.
+var mcHostnameRegex = /^mc(-(\d){4,})?\.(.*)$/;
+var mcPreviewHostnameRegex = /^.*\.mc-preview\.(.*)$/;
+
+var getMcOriginTld = function getMcOriginTld(host) {
+  if (host.match(mcPreviewHostnameRegex)) {
+    return host.replace(mcPreviewHostnameRegex, '$1');
+  }
+
+  return host.replace(mcHostnameRegex, '$3');
 };
-/**
- * NOTE:
- *    Given the Merchant Center or Custom Application runs behind the proxy
- *    then the `mcApiUrl` should be build using the origin on the window.
- *
- *    This allows the Merchant Center (or any Custom Appliction) to automatically
- *    use an `mcApiUrl` which matches the respective url of the deployment.
- *
- *    This is particularily useful with the new and old hostnames for the Merchant Center.
- *    When using the origin, it will be made sure that the authorization cookie will
- *    always be sent as the appropriate API url is used.
- *
- *    1. MC: mc.commercetools.com with API: mc-api.europe-west1.gcp.commercetools.com
- *       -> Will not work as urls differ
- *    2. MC: mc.europe-west1.gcp.commercetools.com with API: mc-api.commercetools.com
- *       -> Will not work as urls differ
- *
- *    Using the origin ensures that urls always match with the cookie sent. Otherwise,
- *    the application shell will rightfully redirect to the logout page.
- */
-
-
-var getMcApiUrlFromOrigin = function getMcApiUrlFromOrigin(actualWindow) {
+
+var getMcApiUrlFromOrigin = function getMcApiUrlFromOrigin(origin) {
   var _context;
 
-  var url = new _URL__default["default"](actualWindow.origin);
-  var originTld = removeMcPrefix(url.host);
+  var url = new _URL__default["default"](origin);
+  var originTld = getMcOriginTld(url.host);
   return _concatInstanceProperty__default["default"](_context = "".concat(url.protocol, "//mc-api.")).call(_context, originTld);
 };
 
-var isEnvironmentConfigurationEnabled = function isEnvironmentConfigurationEnabled(environmentConfiguration) {
-  return environmentConfiguration === true || environmentConfiguration === 'true';
+var parseAsBoolean = function parseAsBoolean(value) {
+  return value === true || value === 'true';
 };
 
 function getMcApiUrl() {
-  var actualWindow = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : window;
-  var isServedByProxy = isEnvironmentConfigurationEnabled(actualWindow.app.servedByProxy);
+  var environment = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : window.app;
+  var origin = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : window.origin;
+  var isServedByProxy = parseAsBoolean(environment.servedByProxy);
+  /**
+   * Prefer using the origin URL for the MC API based on the origin value
+   * of the browser's `window.location`.
+   * This ensures that the application always uses the correct URL associated
+   * with that environment, instead of relying on the config value.
+   */
 
   if (isServedByProxy) {
-    return getMcApiUrlFromOrigin(actualWindow);
+    return getMcApiUrlFromOrigin(origin);
   }
 
-  return actualWindow.app.mcApiUrl;
+  return environment.mcApiUrl;
 }
 
 var getSessionToken = function getSessionToken() {
@@ -461,9 +468,9 @@ var setSessionState = function setSessionState(stateId, state) {
   window.sessionStorage.setItem(sessionStateKey, _JSON$stringify__default["default"](state));
 };
 
-function ownKeys$4(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$5(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context3 = ownKeys$4(Object(source), !0)).call(_context3, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context4 = ownKeys$4(Object(source))).call(_context4, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
+function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context3 = ownKeys$5(Object(source), !0)).call(_context3, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context4 = ownKeys$5(Object(source))).call(_context4, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
 
 var identityStoreEnhancer = function identityStoreEnhancer(noop) {
   return noop;
@@ -476,7 +483,7 @@ var mergeObjectValues = function mergeObjectValues(object) {
     var _ref2 = _slicedToArray(_ref, 2),
         value = _ref2[1];
 
-    return _objectSpread$4(_objectSpread$4({}, acc), value);
+    return _objectSpread$5(_objectSpread$5({}, acc), value);
   }, {});
 };
 
@@ -521,7 +528,7 @@ var createInternalReducer = function createInternalReducer() {
   }); // NOTE: since we don't know in advance which reducers will be injected,
   // we pass an `unknown` type to express this uncertainty and make the compiler happy.
 
-  return redux.combineReducers(_objectSpread$4(_objectSpread$4({
+  return redux.combineReducers(_objectSpread$5(_objectSpread$5({
     requestsInFlight: requestsInFlightReducer,
     notifications: notifications.reducer
   }, injectedReducers), preloadedStateReducers));
@@ -564,9 +571,9 @@ var createReduxStore = function createReduxStore() {
 };
 var internalReduxStore = createReduxStore();
 
-function ownKeys$3(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$4(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context2 = ownKeys$3(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context3 = ownKeys$3(Object(source))).call(_context3, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
+function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context2 = ownKeys$4(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context3 = ownKeys$4(Object(source))).call(_context3, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
 
 var getSkipTokenRetry = function getSkipTokenRetry(context) {
   var skipTokenRetry = Boolean(context.skipTokenRetry);
@@ -574,7 +581,7 @@ var getSkipTokenRetry = function getSkipTokenRetry(context) {
 };
 
 var forwardTokenRetryHeader = function forwardTokenRetryHeader(headers) {
-  return _objectSpread$3(_objectSpread$3({}, headers), {}, _defineProperty({}, constants$1.SUPPORTED_HEADERS.X_TOKEN_RETRY, 'true'));
+  return _objectSpread$4(_objectSpread$4({}, headers), {}, _defineProperty({}, constants$1.SUPPORTED_HEADERS.X_TOKEN_RETRY, 'true'));
 }; // This link retries requests to the CTP API that have been rejected
 // because of an invalid/expired oauth token.
 // To do so, we resend the request with the header "X-Force-Token: true"
@@ -665,9 +672,184 @@ var errorLink = error.onError(function (_ref) {
   return;
 });
 
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct__default["default"](Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_Reflect$construct__default["default"]) return false; if (_Reflect$construct__default["default"].sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(_Reflect$construct__default["default"](Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function ownKeys$3(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var _context5, _context6; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context5 = ownKeys$3(Object(source), !0)).call(_context5, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context6 = ownKeys$3(Object(source))).call(_context6, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
+var defaultUserAgent = createHttpUserAgent__default["default"]({
+  name: 'unknown-http-client',
+  libraryName: window.app.applicationName
+});
+var defaultForwardToVersion = 'v2';
+var defaultForwardToAudiencePolicy = 'forward-url-full-path';
+
+function buildApiUrl(endpoint) {
+  var _context;
+
+  var apiUrl = getMcApiUrl().replace(/\/$/, '');
+  return _concatInstanceProperty__default["default"](_context = "".concat(apiUrl)).call(_context, endpoint);
+}
+
+var getAppliedForwardToHeaders = function getAppliedForwardToHeaders(forwardToConfig) {
+  var _context2, _forwardToConfig$head, _forwardToConfig$vers, _forwardToConfig$audi, _objectSpread3;
+
+  if (!forwardToConfig) {
+    return {};
+  }
+
+  return _objectSpread$3(_objectSpread$3({}, _reduceInstanceProperty__default["default"](_context2 = _Object$entries__default["default"]((_forwardToConfig$head = forwardToConfig.headers) !== null && _forwardToConfig$head !== void 0 ? _forwardToConfig$head : {})).call(_context2, function (customForwardHeaders, _ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+        headerName = _ref2[0],
+        headerValue = _ref2[1];
+
+    return _objectSpread$3(_objectSpread$3({}, customForwardHeaders), {}, _defineProperty({}, "x-forward-header-".concat(headerName), headerValue));
+  }, {})), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, constants$1.SUPPORTED_HEADERS.ACCEPT_VERSION, (_forwardToConfig$vers = forwardToConfig.version) !== null && _forwardToConfig$vers !== void 0 ? _forwardToConfig$vers : defaultForwardToVersion), _defineProperty(_objectSpread3, constants$1.SUPPORTED_HEADERS.X_FORWARD_TO, forwardToConfig.uri), _defineProperty(_objectSpread3, constants$1.SUPPORTED_HEADERS.X_FORWARD_TO_AUDIENCE_POLICY, (_forwardToConfig$audi = forwardToConfig.audiencePolicy) !== null && _forwardToConfig$audi !== void 0 ? _forwardToConfig$audi : defaultForwardToAudiencePolicy), _objectSpread3));
+};
+
+function createHttpClientOptions() {
+  var _config$projectKey, _objectSpread4;
+
+  var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var sessionToken = getSessionToken();
+  var projectKey = (_config$projectKey = config.projectKey) !== null && _config$projectKey !== void 0 ? _config$projectKey : selectProjectKeyFromUrl();
+  var userId = selectUserId();
+  var userAgent = (config === null || config === void 0 ? void 0 : config.userAgent) || defaultUserAgent;
+  return {
+    credentials: 'include',
+    headers: omitEmpty__default["default"](_objectSpread$3(_objectSpread$3({}, config.headers), {}, (_objectSpread4 = {}, _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.ACCEPT, 'application/json'), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.AUTHORIZATION, sessionToken ? "Bearer ".concat(sessionToken) : undefined), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_APPLICATION_ID, window.app.applicationId), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_CORRELATION_ID, getCorrelationId({
+      userId: userId
+    })), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_PROJECT_KEY, projectKey), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_USER_AGENT, userAgent), _objectSpread4), getAppliedForwardToHeaders(config.forwardToConfig)))
+  };
+}
+
+var RenewTokenError = /*#__PURE__*/function (_Error) {
+  _inherits(RenewTokenError, _Error);
+
+  var _super = _createSuper(RenewTokenError);
+
+  function RenewTokenError(message) {
+    var _this;
+
+    _classCallCheck(this, RenewTokenError);
+
+    _this = _super.call(this, message);
+
+    _Object$defineProperty__default["default"](_assertThisInitialized(_this), 'name', {
+      value: 'RenewTokenError'
+    });
+
+    return _this;
+  }
+
+  return _createClass(RenewTokenError);
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
+function executeHttpClientRequest(_x) {
+  return _executeHttpClientRequest.apply(this, arguments);
+}
+
+function _executeHttpClientRequest() {
+  _executeHttpClientRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(fetcher) {
+    var config,
+        sendRequest,
+        _sendRequest,
+        _args2 = arguments;
+
+    return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            _sendRequest = function _sendRequest3() {
+              _sendRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
+                var _ref3,
+                    shouldRenewToken,
+                    requestOptions,
+                    response,
+                    refreshedSessionToken,
+                    _args = arguments;
+
+                return _regeneratorRuntime__default["default"].wrap(function _callee$(_context3) {
+                  while (1) {
+                    switch (_context3.prev = _context3.next) {
+                      case 0:
+                        _ref3 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, shouldRenewToken = _ref3.shouldRenewToken;
+                        requestOptions = createHttpClientOptions(config);
+                        _context3.next = 4;
+                        return fetcher(_objectSpread$3(_objectSpread$3({}, requestOptions), {}, {
+                          headers: omitEmpty__default["default"](_objectSpread$3(_objectSpread$3({}, requestOptions.headers), {}, _defineProperty({}, constants$1.SUPPORTED_HEADERS.X_TOKEN_RETRY, shouldRenewToken)))
+                        }));
+
+                      case 4:
+                        response = _context3.sent;
+
+                        if (!(response.statusCode === constants.STATUS_CODES.UNAUTHORIZED)) {
+                          _context3.next = 7;
+                          break;
+                        }
+
+                        throw new RenewTokenError("Unauthorized response, attempting retry.");
+
+                      case 7:
+                        // In case a new session token is returned from the server, save it.
+                        refreshedSessionToken = response.getHeader('x-refreshed-session-token');
+
+                        if (refreshedSessionToken) {
+                          setActiveSession(refreshedSessionToken);
+                        }
+
+                        return _context3.abrupt("return", response.data);
+
+                      case 10:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+              return _sendRequest.apply(this, arguments);
+            };
+
+            sendRequest = function _sendRequest2() {
+              return _sendRequest.apply(this, arguments);
+            };
+
+            config = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
+            return _context4.abrupt("return", sendRequest().catch(function (error) {
+              if (error instanceof RenewTokenError) {
+                // Retry the request and ask to renew the token.
+                return sendRequest({
+                  shouldRenewToken: true
+                });
+              }
+
+              throw error;
+            }));
+
+          case 4:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _executeHttpClientRequest.apply(this, arguments);
+}
+
 function ownKeys$2(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var _context5, _context6; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context5 = ownKeys$2(Object(source), !0)).call(_context5, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context6 = ownKeys$2(Object(source))).call(_context6, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
+function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var _context4, _context5; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context4 = ownKeys$2(Object(source), !0)).call(_context4, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context5 = ownKeys$2(Object(source))).call(_context5, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
+var userAgent = createHttpUserAgent__default["default"]({
+  name: 'apollo-client',
+  // version: apolloVersion,
+  libraryName: [window.app.applicationName, 'application-shell'].join('/'),
+  libraryVersion: version,
+  contactUrl: 'https://git.io/fjuyC',
+  // points to the appkit repo issues
+  contactEmail: 'support@commercetools.com'
+});
 
 var isKnownGraphQlTarget = function isKnownGraphQlTarget(target) {
   var _context;
@@ -675,35 +857,43 @@ var isKnownGraphQlTarget = function isKnownGraphQlTarget(target) {
   return target ? _includesInstanceProperty__default["default"](_context = _Object$values__default["default"](constants.GRAPHQL_TARGETS)).call(_context, target) : false;
 };
 
-var getAppliedForwardToHeaders = function getAppliedForwardToHeaders(apolloContext) {
-  if (apolloContext.forwardToConfig) {
-    var _context2, _apolloContext$forwar, _objectSpread3;
+var extractSessionTokenFromResponse = function extractSessionTokenFromResponse(context) {
+  var _context$response, _context$response$hea, _context$restResponse;
 
-    return _objectSpread$2(_objectSpread$2({}, _reduceInstanceProperty__default["default"](_context2 = _Object$entries__default["default"]((_apolloContext$forwar = apolloContext.forwardToConfig.headers) !== null && _apolloContext$forwar !== void 0 ? _apolloContext$forwar : {})).call(_context2, function (customForwardHeaders, _ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-          headerName = _ref2[0],
-          headerValue = _ref2[1];
+  var refreshedSessionToken = (_context$response = context.response) === null || _context$response === void 0 ? void 0 : (_context$response$hea = _context$response.headers) === null || _context$response$hea === void 0 ? void 0 : _context$response$hea.get('x-refreshed-session-token');
 
-      return _objectSpread$2(_objectSpread$2({}, customForwardHeaders), {}, _defineProperty({}, "x-forward-header-".concat(headerName), headerValue));
-    }, {})), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, constants$1.SUPPORTED_HEADERS.ACCEPT_VERSION, apolloContext.forwardToConfig.version), _defineProperty(_objectSpread3, constants$1.SUPPORTED_HEADERS.X_FORWARD_TO, apolloContext.forwardToConfig.uri), _defineProperty(_objectSpread3, constants$1.SUPPORTED_HEADERS.X_FORWARD_TO_AUDIENCE_POLICY, apolloContext.forwardToConfig.audiencePolicy), _objectSpread3));
+  if (refreshedSessionToken) {
+    return refreshedSessionToken !== null && refreshedSessionToken !== void 0 ? refreshedSessionToken : null;
   }
 
-  return {};
+  var restResponseWithRefreshTokenHeader = (_context$restResponse = context.restResponses) === null || _context$restResponse === void 0 ? void 0 : _findInstanceProperty__default["default"](_context$restResponse).call(_context$restResponse, function (response) {
+    var _response$headers;
+
+    return (_response$headers = response.headers) === null || _response$headers === void 0 ? void 0 : _response$headers.has('x-refreshed-session-token');
+  });
+
+  if (restResponseWithRefreshTokenHeader) {
+    var _restResponseWithRefr;
+
+    return (_restResponseWithRefr = restResponseWithRefreshTokenHeader.headers.get('x-refreshed-session-token')) !== null && _restResponseWithRefr !== void 0 ? _restResponseWithRefr : null;
+  }
+
+  return null;
 };
 /* eslint-disable import/prefer-default-export */
 // Use a middleware to update the request headers with the correct params.
 
 
 var headerLink = new client.ApolloLink(function (operation, forward) {
-  var _context3, _objectSpread4, _context4;
+  var _context2, _objectSpread2, _context3;
 
   var apolloContext = operation.getContext();
   var variables = operation.variables;
   var graphQlTarget = apolloContext.target || variables.target;
-  if (!apolloContext.skipGraphQlTargetCheck && !isKnownGraphQlTarget(graphQlTarget)) throw new Error(_concatInstanceProperty__default["default"](_context3 = "GraphQL target \"".concat(graphQlTarget, "\" is missing (or is not supported) in operation \"")).call(_context3, operation.operationName, "\""));
+  if (!apolloContext.skipGraphQlTargetCheck && !isKnownGraphQlTarget(graphQlTarget)) throw new Error(_concatInstanceProperty__default["default"](_context2 = "GraphQL target \"".concat(graphQlTarget, "\" is missing (or is not supported) in operation \"")).call(_context2, operation.operationName, "\""));
   /**
    * NOTE:
-   *   The project key is read from the url in a project related appliation context.
+   *   The project key is read from the url in a project related application context.
    *   This holds for most applications like `application-categories`, `application-discounts` etc.
    *   However, the `application-account` does not run with the project key being part of the url.
    *   As a result we allow passing the project key as a variable on the operation allowing
@@ -712,20 +902,16 @@ var headerLink = new client.ApolloLink(function (operation, forward) {
 
   var projectKey = apolloContext.projectKey || variables.projectKey || selectProjectKeyFromUrl();
   var teamId = apolloContext.teamId || variables.teamId || selectTeamIdFromLocalStorage();
-  var userId = selectUserId();
   var featureFlag = apolloContext.featureFlag || variables.featureFlag;
-  var sessionToken = getSessionToken();
-  operation.setContext({
-    credentials: 'include',
-    headers: omitEmpty__default["default"](_objectSpread$2(_objectSpread$2({}, apolloContext.headers), {}, (_objectSpread4 = {}, _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.AUTHORIZATION, sessionToken ? "Bearer ".concat(sessionToken) : undefined), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_PROJECT_KEY, projectKey), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_CORRELATION_ID, getCorrelationId({
-      userId: userId
-    })), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_GRAPHQL_TARGET, graphQlTarget), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_GRAPHQL_OPERATION_NAME, operation.operationName), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_TEAM_ID, teamId), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_APPLICATION_ID, window.app.applicationId), _defineProperty(_objectSpread4, constants$1.SUPPORTED_HEADERS.X_FEATURE_FLAG, featureFlag), _objectSpread4), getAppliedForwardToHeaders(apolloContext)))
-  });
-  return _mapInstanceProperty__default["default"](_context4 = forward(operation)).call(_context4, function (response) {
-    var _context$response, _context$response$hea;
-
+  operation.setContext(createHttpClientOptions({
+    userAgent: userAgent,
+    headers: omitEmpty__default["default"](_objectSpread$2(_objectSpread$2({}, apolloContext.headers), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, constants$1.SUPPORTED_HEADERS.X_GRAPHQL_TARGET, graphQlTarget), _defineProperty(_objectSpread2, constants$1.SUPPORTED_HEADERS.X_GRAPHQL_OPERATION_NAME, operation.operationName), _defineProperty(_objectSpread2, constants$1.SUPPORTED_HEADERS.X_TEAM_ID, teamId), _defineProperty(_objectSpread2, constants$1.SUPPORTED_HEADERS.X_FEATURE_FLAG, featureFlag), _objectSpread2))),
+    forwardToConfig: apolloContext.forwardToConfig,
+    projectKey: projectKey
+  }));
+  return _mapInstanceProperty__default["default"](_context3 = forward(operation)).call(_context3, function (response) {
     var context = operation.getContext();
-    var refreshedSessionToken = (_context$response = context.response) === null || _context$response === void 0 ? void 0 : (_context$response$hea = _context$response.headers) === null || _context$response$hea === void 0 ? void 0 : _context$response$hea.get('x-refreshed-session-token');
+    var refreshedSessionToken = extractSessionTokenFromResponse(context);
 
     if (refreshedSessionToken) {
       setActiveSession(refreshedSessionToken);
@@ -753,37 +939,34 @@ var tokenRetryLink = new retry.RetryLink({
   }
 });
 
-var _context;
-
 function ownKeys$1(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var _context4, _context5; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context4 = ownKeys$1(Object(source), !0)).call(_context4, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context5 = ownKeys$1(Object(source))).call(_context5, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
-var userAgent = createHttpUserAgent__default["default"]({
-  name: 'apollo-client',
-  // version: apolloVersion,
-  libraryName: [window.app.applicationName, 'application-shell'].join('/'),
-  libraryVersion: version,
-  contactUrl: 'https://git.io/fjuyC',
-  // points to the appkit repo issues
-  contactEmail: 'support@commercetools.com'
-});
 var httpLink = client.createHttpLink({
   uri: "".concat(getMcApiUrl(), "/graphql"),
-  headers: {
-    accept: 'application/json',
-    'x-user-agent': userAgent
-  },
   fetch: fetch
-}); // order of links is relevant here
-// in the request-phase they are executed top to bottom
-// in the response/phase they are executed bottom to top
-// `tokenRetryLink` needs to stay after `errorLink` in order to be executed before `errorLink` for responses
+});
+
+var createApolloLink = function createApolloLink() {
+  var _context;
 
-var link = client.from(_concatInstanceProperty__default["default"](_context = [headerLink, errorLink]).call(_context, _toConsumableArray(isLoggerEnabled() ? [loggerLink__default["default"]] : []), [tokenRetryLink, httpLink])); // This custom merge function allows to merge two arrays of objects.
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return (// The order of links is IMPORTANT!
+    // In the request-phase they are executed top to bottom.
+    // In the response/phase they are executed bottom to top.
+    // The `httpLink` is terminating so it must be last, while `tokenRetryLink` and `errorLink`
+    // wrap the links the their right.
+    client.from(_concatInstanceProperty__default["default"](_context = [headerLink]).call(_context, _toConsumableArray(options.restLink ? [options.restLink] : []), [// Must be before `tokenRetryLink`.
+    errorLink], _toConsumableArray(isLoggerEnabled() ? [loggerLink__default["default"]] : []), [// Must be after `errorLink`.
+    tokenRetryLink, // Must be last.
+    httpLink]))
+  );
+}; // This custom merge function allows to merge two arrays of objects.
 // The incoming list is what we need to update to, but we still need
 // to ensure that existing cache elements are not removed but updated.
 // This is usually the case when elements get removed.
 
+
 var mergeArraysObjects = function mergeArraysObjects() {
   var existing = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var incoming = arguments.length > 1 ? arguments[1] : undefined;
@@ -818,7 +1001,7 @@ var createApolloClient = function createApolloClient() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var customCacheConfig = (_options$cache = options === null || options === void 0 ? void 0 : options.cache) !== null && _options$cache !== void 0 ? _options$cache : {};
   return new client.ApolloClient({
-    link: link,
+    link: createApolloLink(options),
     // https://www.apollographql.com/docs/react/caching/cache-configuration/
     cache: new client.InMemoryCache(_objectSpread$1(_objectSpread$1({}, customCacheConfig), {}, {
       // https://www.apollographql.com/docs/react/caching/cache-configuration/#generating-unique-identifiers
@@ -991,9 +1174,12 @@ exports.REQUESTS_IN_FLIGHT_LOADER_DOM_ID = REQUESTS_IN_FLIGHT_LOADER_DOM_ID;
 exports.RequestsInFlightLoader = RequestsInFlightLoader;
 exports.RouteCatchAll = RouteCatchAll;
 exports.applyDefaultMiddlewares = applyDefaultMiddlewares;
+exports.buildApiUrl = buildApiUrl;
 exports.clearSession = clearSession;
 exports.createApolloClient = createApolloClient;
+exports.createHttpClientOptions = createHttpClientOptions;
 exports.createReduxStore = createReduxStore;
+exports.executeHttpClientRequest = executeHttpClientRequest;
 exports.getActiveProjectKey = getActiveProjectKey;
 exports.getMcApiUrl = getMcApiUrl;
 exports.getSessionScope = getSessionScope;