@commercetools-frontend/application-shell 21.8.0 → 21.10.0

package/dist/{application-entry-point-f22a0ec9.cjs.dev.js → application-entry-point-4de6686c.cjs.dev.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-bf2e1d68.cjs.dev.js');
+var constants$1 = require('./constants-d9a5241e.cjs.dev.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');
@@ -101,7 +101,7 @@ var _pt__default = /*#__PURE__*/_interopDefault(_pt);
 var invariant__default = /*#__PURE__*/_interopDefault(invariant);
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "21.8.0";
+var version = "21.10.0";
 
 var isAddNotificationErrorAction = function isAddNotificationErrorAction(action) {
   var errorAction = action;
@@ -699,6 +699,30 @@ var getAppliedForwardToHeaders = function getAppliedForwardToHeaders(apolloConte
 
   return {};
 };
+
+var extractSessionTokenFromResponse = function extractSessionTokenFromResponse(context) {
+  var _context$response, _context$response$hea, _context$restResponse;
+
+  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');
+
+  if (refreshedSessionToken) {
+    return refreshedSessionToken !== null && refreshedSessionToken !== void 0 ? refreshedSessionToken : null;
+  }
+
+  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.
 
@@ -712,7 +736,7 @@ var headerLink = new client.ApolloLink(function (operation, forward) {
   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, "\""));
   /**
    * 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
@@ -731,10 +755,8 @@ var headerLink = new client.ApolloLink(function (operation, forward) {
     })), _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;
-
     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);
@@ -762,8 +784,6 @@ 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; }
@@ -783,16 +803,28 @@ var httpLink = client.createHttpLink({
     '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;
@@ -827,7 +859,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
@@ -1020,9 +1052,11 @@ exports.clearSession = clearSession;
 exports.createApolloClient = createApolloClient;
 exports.createReduxStore = createReduxStore;
 exports.getActiveProjectKey = getActiveProjectKey;
+exports.getCorrelationId = getCorrelationId;
 exports.getMcApiUrl = getMcApiUrl;
 exports.getSessionScope = getSessionScope;
 exports.getSessionState = getSessionState;
+exports.getSessionToken = getSessionToken;
 exports.internalReduxStore = internalReduxStore;
 exports.location = location;
 exports.logger = logger;

package/dist/{application-entry-point-dc4da815.cjs.prod.js → application-entry-point-9a23a345.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');
@@ -100,7 +100,7 @@ var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var invariant__default = /*#__PURE__*/_interopDefault(invariant);
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "21.8.0";
+var version = "21.10.0";
 
 var isAddNotificationErrorAction = function isAddNotificationErrorAction(action) {
   var errorAction = action;
@@ -690,6 +690,30 @@ var getAppliedForwardToHeaders = function getAppliedForwardToHeaders(apolloConte
 
   return {};
 };
+
+var extractSessionTokenFromResponse = function extractSessionTokenFromResponse(context) {
+  var _context$response, _context$response$hea, _context$restResponse;
+
+  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');
+
+  if (refreshedSessionToken) {
+    return refreshedSessionToken !== null && refreshedSessionToken !== void 0 ? refreshedSessionToken : null;
+  }
+
+  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.
 
@@ -703,7 +727,7 @@ var headerLink = new client.ApolloLink(function (operation, forward) {
   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, "\""));
   /**
    * 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
@@ -722,10 +746,8 @@ var headerLink = new client.ApolloLink(function (operation, forward) {
     })), _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;
-
     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,8 +775,6 @@ 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; }
@@ -774,16 +794,28 @@ var httpLink = client.createHttpLink({
     '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 +850,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
@@ -995,9 +1027,11 @@ exports.clearSession = clearSession;
 exports.createApolloClient = createApolloClient;
 exports.createReduxStore = createReduxStore;
 exports.getActiveProjectKey = getActiveProjectKey;
+exports.getCorrelationId = getCorrelationId;
 exports.getMcApiUrl = getMcApiUrl;
 exports.getSessionScope = getSessionScope;
 exports.getSessionState = getSessionState;
+exports.getSessionToken = getSessionToken;
 exports.internalReduxStore = internalReduxStore;
 exports.location = location;
 exports.logger = logger;

package/dist/{application-entry-point-14c74303.esm.js → application-entry-point-a5b662f7.esm.js}

@@ -20,7 +20,7 @@ import omitEmpty from 'omit-empty-es';
 import { ADD_NOTIFICATION, removeNotification, REMOVE_NOTIFICATION, reducer, middleware } from '@commercetools-frontend/notifications';
 import { createMiddleware } from '@commercetools-frontend/sdk';
 import { HIDE_ALL_PAGE_NOTIFICATIONS, NOTIFICATION_KINDS_PAGE, SHOW_LOADING, HIDE_LOADING, GRAPHQL_TARGETS, STATUS_CODES, LOGOUT_REASONS } from '@commercetools-frontend/constants';
-import { S as STORAGE_KEYS, L as LOGIN_STRATEGY_OIDC, c as SUPPORTED_HEADERS } from './constants-3cf6ed64.esm.js';
+import { S as STORAGE_KEYS, L as LOGIN_STRATEGY_OIDC, c as SUPPORTED_HEADERS } from './constants-a3c850be.esm.js';
 import { selectPageNotifications } from '@commercetools-frontend/react-notifications';
 import _startsWithInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/starts-with';
 import _includesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/includes';
@@ -35,7 +35,7 @@ import _sliceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instan
 import { reportErrorToSentry } from '@commercetools-frontend/sentry';
 import _URL from '@babel/runtime-corejs3/core-js-stable/url';
 import _findInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/find';
-import { ApolloLink, createHttpLink, from, ApolloClient, InMemoryCache } from '@apollo/client';
+import { ApolloLink, createHttpLink, ApolloClient, from, InMemoryCache } from '@apollo/client';
 import createHttpUserAgent from '@commercetools/http-user-agent';
 import loggerLink from 'apollo-link-logger';
 import _Array$from from '@babel/runtime-corejs3/core-js-stable/array/from';
@@ -60,7 +60,7 @@ import { entryPointUriPathToPermissionKeys } from '@commercetools-frontend/appli
 import { useApplicationContext } from '@commercetools-frontend/application-shell-connectors';
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "21.8.0";
+var version = "21.10.0";
 
 var isAddNotificationErrorAction = function isAddNotificationErrorAction(action) {
   var errorAction = action;
@@ -658,6 +658,30 @@ var getAppliedForwardToHeaders = function getAppliedForwardToHeaders(apolloConte
 
   return {};
 };
+
+var extractSessionTokenFromResponse = function extractSessionTokenFromResponse(context) {
+  var _context$response, _context$response$hea, _context$restResponse;
+
+  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');
+
+  if (refreshedSessionToken) {
+    return refreshedSessionToken !== null && refreshedSessionToken !== void 0 ? refreshedSessionToken : null;
+  }
+
+  var restResponseWithRefreshTokenHeader = (_context$restResponse = context.restResponses) === null || _context$restResponse === void 0 ? void 0 : _findInstanceProperty(_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.
 
@@ -671,7 +695,7 @@ var headerLink = new ApolloLink(function (operation, forward) {
   if (!apolloContext.skipGraphQlTargetCheck && !isKnownGraphQlTarget(graphQlTarget)) throw new Error(_concatInstanceProperty(_context3 = "GraphQL target \"".concat(graphQlTarget, "\" is missing (or is not supported) in operation \"")).call(_context3, 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
@@ -690,10 +714,8 @@ var headerLink = new ApolloLink(function (operation, forward) {
     })), _defineProperty(_objectSpread4, SUPPORTED_HEADERS.X_GRAPHQL_TARGET, graphQlTarget), _defineProperty(_objectSpread4, SUPPORTED_HEADERS.X_GRAPHQL_OPERATION_NAME, operation.operationName), _defineProperty(_objectSpread4, SUPPORTED_HEADERS.X_TEAM_ID, teamId), _defineProperty(_objectSpread4, SUPPORTED_HEADERS.X_APPLICATION_ID, window.app.applicationId), _defineProperty(_objectSpread4, SUPPORTED_HEADERS.X_FEATURE_FLAG, featureFlag), _objectSpread4), getAppliedForwardToHeaders(apolloContext)))
   });
   return _mapInstanceProperty(_context4 = forward(operation)).call(_context4, function (response) {
-    var _context$response, _context$response$hea;
-
     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);
@@ -721,8 +743,6 @@ var tokenRetryLink = new RetryLink({
   }
 });
 
-var _context;
-
 function ownKeys$1(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(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(_context4 = ownKeys$1(Object(source), !0)).call(_context4, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context5 = ownKeys$1(Object(source))).call(_context5, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -742,16 +762,28 @@ var httpLink = createHttpLink({
     '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 = from(_concatInstanceProperty(_context = [headerLink, errorLink]).call(_context, _toConsumableArray(isLoggerEnabled() ? [loggerLink] : []), [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.
+    from(_concatInstanceProperty(_context = [headerLink]).call(_context, _toConsumableArray(options.restLink ? [options.restLink] : []), [// Must be before `tokenRetryLink`.
+    errorLink], _toConsumableArray(isLoggerEnabled() ? [loggerLink] : []), [// 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;
@@ -786,7 +818,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 ApolloClient({
-    link: link,
+    link: createApolloLink(options),
     // https://www.apollographql.com/docs/react/caching/cache-configuration/
     cache: new InMemoryCache(_objectSpread$1(_objectSpread$1({}, customCacheConfig), {}, {
       // https://www.apollographql.com/docs/react/caching/cache-configuration/#generating-unique-identifiers
@@ -970,4 +1002,4 @@ ApplicationEntryPoint.propTypes = process.env.NODE_ENV !== "production" ? {
   children: _pt.node
 } : {};
 
-export { ApplicationEntryPoint as A, REQUESTS_IN_FLIGHT_LOADER_DOM_ID as R, getActiveProjectKey as a, getSessionScope as b, location as c, getSessionState as d, setActiveSession as e, createApolloClient as f, getMcApiUrl as g, setCachedApolloClient as h, internalReduxStore as i, setSessionScope as j, setSessionState as k, logger as l, clearSession as m, selectProjectKeyFromUrl as n, RequestsInFlightLoader as o, RouteCatchAll as p, applyDefaultMiddlewares as q, removeActiveProjectKey as r, setActiveProjectKey as s, selectUserId as t, useIsServedByProxy as u, version as v, createReduxStore as w };
+export { ApplicationEntryPoint as A, REQUESTS_IN_FLIGHT_LOADER_DOM_ID as R, getActiveProjectKey as a, getSessionScope as b, location as c, getSessionState as d, setActiveSession as e, createApolloClient as f, getMcApiUrl as g, setCachedApolloClient as h, internalReduxStore as i, setSessionScope as j, setSessionState as k, logger as l, clearSession as m, selectProjectKeyFromUrl as n, RequestsInFlightLoader as o, RouteCatchAll as p, getSessionToken as q, removeActiveProjectKey as r, setActiveProjectKey as s, selectUserId as t, useIsServedByProxy as u, version as v, getCorrelationId as w, applyDefaultMiddlewares as x, createReduxStore as y };

package/dist/commercetools-frontend-application-shell.cjs.dev.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var applicationEntryPoint = require('./application-entry-point-f22a0ec9.cjs.dev.js');
-var dist_commercetoolsFrontendApplicationShell = require('./index-b67a270d.cjs.dev.js');
+var applicationEntryPoint = require('./application-entry-point-4de6686c.cjs.dev.js');
+var dist_commercetoolsFrontendApplicationShell = require('./index-f576ae07.cjs.dev.js');
 require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 require('uuid');
 require('@babel/runtime-corejs3/core-js-stable/url');
@@ -31,7 +31,7 @@ require('omit-empty-es');
 require('@commercetools-frontend/notifications');
 require('@commercetools-frontend/sdk');
 require('@commercetools-frontend/constants');
-require('./constants-bf2e1d68.cjs.dev.js');
+require('./constants-d9a5241e.cjs.dev.js');
 require('@commercetools-frontend/react-notifications');
 require('@babel/runtime-corejs3/core-js-stable/instance/starts-with');
 require('@babel/runtime-corejs3/core-js-stable/instance/includes');
@@ -73,7 +73,7 @@ require('perfume.js');
 require('@babel/runtime-corejs3/core-js-stable/instance/reverse');
 require('lodash/camelCase');
 require('@apollo/client/react');
-require('./oidc-ff089e6f.cjs.dev.js');
+require('./oidc-9134face.cjs.dev.js');
 require('qss');
 require('jwt-decode');
 require('@commercetools-frontend/assets/images/locked-diamond.svg');
@@ -116,6 +116,8 @@ require('@commercetools-frontend/assets/images/diagonal-line.svg');
 require('lodash/throttle');
 require('@commercetools-frontend/url-utils');
 require('@commercetools-frontend/actions-global');
+require('@babel/runtime-corejs3/helpers/assertThisInitialized');
+require('@babel/runtime-corejs3/helpers/wrapNativeSuper');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -137,7 +139,10 @@ exports.GtmUserLogoutTracker = dist_commercetoolsFrontendApplicationShell.GtmUse
 exports.InjectReducers = dist_commercetoolsFrontendApplicationShell.InjectReducers;
 exports.SetupFlopFlipProvider = dist_commercetoolsFrontendApplicationShell.SetupFlopFlipProvider;
 exports.SuspendedRoute = dist_commercetoolsFrontendApplicationShell.SuspendedRoute;
+exports.buildApiUrl = dist_commercetoolsFrontendApplicationShell.buildApiUrl;
 exports.createApolloContextForProxyForwardTo = dist_commercetoolsFrontendApplicationShell.createApolloContextForProxyForwardTo;
+exports.createHttpClientOptions = dist_commercetoolsFrontendApplicationShell.createHttpClientOptions;
+exports.executeHttpClientRequest = dist_commercetoolsFrontendApplicationShell.executeHttpClientRequest;
 exports.setupGlobalErrorListener = dist_commercetoolsFrontendApplicationShell.setupGlobalErrorListener;
 exports.useMcLazyQuery = dist_commercetoolsFrontendApplicationShell.useMcLazyQuery;
 exports.useMcMutation = dist_commercetoolsFrontendApplicationShell.useMcMutation;

package/dist/commercetools-frontend-application-shell.cjs.prod.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var applicationEntryPoint = require('./application-entry-point-dc4da815.cjs.prod.js');
-var dist_commercetoolsFrontendApplicationShell = require('./index-b937ebec.cjs.prod.js');
+var applicationEntryPoint = require('./application-entry-point-9a23a345.cjs.prod.js');
+var dist_commercetoolsFrontendApplicationShell = require('./index-e96ff96a.cjs.prod.js');
 require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 require('uuid');
 require('@babel/runtime-corejs3/core-js-stable/url');
@@ -31,7 +31,7 @@ require('omit-empty-es');
 require('@commercetools-frontend/notifications');
 require('@commercetools-frontend/sdk');
 require('@commercetools-frontend/constants');
-require('./constants-f34da47c.cjs.prod.js');
+require('./constants-c2c238ff.cjs.prod.js');
 require('@commercetools-frontend/react-notifications');
 require('@babel/runtime-corejs3/core-js-stable/instance/starts-with');
 require('@babel/runtime-corejs3/core-js-stable/instance/includes');
@@ -73,7 +73,7 @@ require('perfume.js');
 require('@babel/runtime-corejs3/core-js-stable/instance/reverse');
 require('lodash/camelCase');
 require('@apollo/client/react');
-require('./oidc-82e151f9.cjs.prod.js');
+require('./oidc-5b507512.cjs.prod.js');
 require('qss');
 require('jwt-decode');
 require('@commercetools-frontend/assets/images/locked-diamond.svg');
@@ -116,6 +116,8 @@ require('@commercetools-frontend/assets/images/diagonal-line.svg');
 require('lodash/throttle');
 require('@commercetools-frontend/url-utils');
 require('@commercetools-frontend/actions-global');
+require('@babel/runtime-corejs3/helpers/assertThisInitialized');
+require('@babel/runtime-corejs3/helpers/wrapNativeSuper');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -137,7 +139,10 @@ exports.GtmUserLogoutTracker = dist_commercetoolsFrontendApplicationShell.GtmUse
 exports.InjectReducers = dist_commercetoolsFrontendApplicationShell.InjectReducers;
 exports.SetupFlopFlipProvider = dist_commercetoolsFrontendApplicationShell.SetupFlopFlipProvider;
 exports.SuspendedRoute = dist_commercetoolsFrontendApplicationShell.SuspendedRoute;
+exports.buildApiUrl = dist_commercetoolsFrontendApplicationShell.buildApiUrl;
 exports.createApolloContextForProxyForwardTo = dist_commercetoolsFrontendApplicationShell.createApolloContextForProxyForwardTo;
+exports.createHttpClientOptions = dist_commercetoolsFrontendApplicationShell.createHttpClientOptions;
+exports.executeHttpClientRequest = dist_commercetoolsFrontendApplicationShell.executeHttpClientRequest;
 exports.setupGlobalErrorListener = dist_commercetoolsFrontendApplicationShell.setupGlobalErrorListener;
 exports.useMcLazyQuery = dist_commercetoolsFrontendApplicationShell.useMcLazyQuery;
 exports.useMcMutation = dist_commercetoolsFrontendApplicationShell.useMcMutation;

package/dist/commercetools-frontend-application-shell.esm.js

@@ -1,5 +1,5 @@
-export { p as RouteCatchAll, q as applyDefaultMiddlewares, f as createApolloClient, n as selectProjectKeyFromUrl, t as selectUserId, v as version } from './application-entry-point-14c74303.esm.js';
-export { A as ApplicationShell, a as ApplicationShellProvider, C as ConfigureIntlProvider, G as GtmContext, b as GtmUserLogoutTracker, I as InjectReducers, S as SetupFlopFlipProvider, d as SuspendedRoute, c as createApolloContextForProxyForwardTo, s as setupGlobalErrorListener, e as useMcLazyQuery, f as useMcMutation, u as useMcQuery } from './index-691497c4.esm.js';
+export { p as RouteCatchAll, x as applyDefaultMiddlewares, f as createApolloClient, n as selectProjectKeyFromUrl, t as selectUserId, v as version } from './application-entry-point-a5b662f7.esm.js';
+export { A as ApplicationShell, a as ApplicationShellProvider, C as ConfigureIntlProvider, G as GtmContext, b as GtmUserLogoutTracker, I as InjectReducers, S as SetupFlopFlipProvider, d as SuspendedRoute, g as buildApiUrl, c as createApolloContextForProxyForwardTo, h as createHttpClientOptions, i as executeHttpClientRequest, s as setupGlobalErrorListener, e as useMcLazyQuery, f as useMcMutation, u as useMcQuery } from './index-5062ecc2.esm.js';
 import '@babel/runtime-corejs3/core-js-stable/instance/filter';
 import 'uuid';
 import '@babel/runtime-corejs3/core-js-stable/url';
@@ -27,7 +27,7 @@ import 'omit-empty-es';
 import '@commercetools-frontend/notifications';
 import '@commercetools-frontend/sdk';
 import '@commercetools-frontend/constants';
-import './constants-3cf6ed64.esm.js';
+import './constants-a3c850be.esm.js';
 import '@commercetools-frontend/react-notifications';
 import '@babel/runtime-corejs3/core-js-stable/instance/starts-with';
 import '@babel/runtime-corejs3/core-js-stable/instance/includes';
@@ -69,7 +69,7 @@ import 'perfume.js';
 import '@babel/runtime-corejs3/core-js-stable/instance/reverse';
 import 'lodash/camelCase';
 import '@apollo/client/react';
-import './oidc-8af521ca.esm.js';
+import './oidc-5cae2dba.esm.js';
 import 'qss';
 import 'jwt-decode';
 import '@commercetools-frontend/assets/images/locked-diamond.svg';
@@ -112,3 +112,5 @@ import '@commercetools-frontend/assets/images/diagonal-line.svg';
 import 'lodash/throttle';
 import '@commercetools-frontend/url-utils';
 import '@commercetools-frontend/actions-global';
+import '@babel/runtime-corejs3/helpers/assertThisInitialized';
+import '@babel/runtime-corejs3/helpers/wrapNativeSuper';

package/dist/{constants-3cf6ed64.esm.js → constants-a3c850be.esm.js}

@@ -4,8 +4,10 @@ var DIMENSIONS = {
   navMenuExpanded: '200px'
 };
 var SUPPORTED_HEADERS = {
+  ACCEPT: 'Accept',
   ACCEPT_VERSION: 'Accept-version',
   AUTHORIZATION: 'Authorization',
+  CONTENT_TYPE: 'Content-Type',
   X_APPLICATION_ID: 'X-Application-Id',
   X_CORRELATION_ID: 'X-Correlation-Id',
   X_FEATURE_FLAG: 'X-Feature-Flag',
@@ -15,7 +17,8 @@ var SUPPORTED_HEADERS = {
   X_GRAPHQL_OPERATION_NAME: 'X-Graphql-Operation-Name',
   X_PROJECT_KEY: 'X-Project-Key',
   X_TEAM_ID: 'X-Team-Id',
-  X_TOKEN_RETRY: 'X-Force-Token'
+  X_TOKEN_RETRY: 'X-Force-Token',
+  X_USER_AGENT: 'X-User-Agent'
 };
 var CONTAINERS = {
   LOCALE_SWITCHER: 'locale-switcher-container'

package/dist/{constants-bf2e1d68.cjs.dev.js → constants-c2c238ff.cjs.prod.js}

@@ -6,8 +6,10 @@ var DIMENSIONS = {
   navMenuExpanded: '200px'
 };
 var SUPPORTED_HEADERS = {
+  ACCEPT: 'Accept',
   ACCEPT_VERSION: 'Accept-version',
   AUTHORIZATION: 'Authorization',
+  CONTENT_TYPE: 'Content-Type',
   X_APPLICATION_ID: 'X-Application-Id',
   X_CORRELATION_ID: 'X-Correlation-Id',
   X_FEATURE_FLAG: 'X-Feature-Flag',
@@ -17,7 +19,8 @@ var SUPPORTED_HEADERS = {
   X_GRAPHQL_OPERATION_NAME: 'X-Graphql-Operation-Name',
   X_PROJECT_KEY: 'X-Project-Key',
   X_TEAM_ID: 'X-Team-Id',
-  X_TOKEN_RETRY: 'X-Force-Token'
+  X_TOKEN_RETRY: 'X-Force-Token',
+  X_USER_AGENT: 'X-User-Agent'
 };
 var CONTAINERS = {
   LOCALE_SWITCHER: 'locale-switcher-container'

package/dist/{constants-f34da47c.cjs.prod.js → constants-d9a5241e.cjs.dev.js}

@@ -6,8 +6,10 @@ var DIMENSIONS = {
   navMenuExpanded: '200px'
 };
 var SUPPORTED_HEADERS = {
+  ACCEPT: 'Accept',
   ACCEPT_VERSION: 'Accept-version',
   AUTHORIZATION: 'Authorization',
+  CONTENT_TYPE: 'Content-Type',
   X_APPLICATION_ID: 'X-Application-Id',
   X_CORRELATION_ID: 'X-Correlation-Id',
   X_FEATURE_FLAG: 'X-Feature-Flag',
@@ -17,7 +19,8 @@ var SUPPORTED_HEADERS = {
   X_GRAPHQL_OPERATION_NAME: 'X-Graphql-Operation-Name',
   X_PROJECT_KEY: 'X-Project-Key',
   X_TEAM_ID: 'X-Team-Id',
-  X_TOKEN_RETRY: 'X-Force-Token'
+  X_TOKEN_RETRY: 'X-Force-Token',
+  X_USER_AGENT: 'X-User-Agent'
 };
 var CONTAINERS = {
   LOCALE_SWITCHER: 'locale-switcher-container'

package/dist/declarations/src/components/requests-in-flight-loader/reducer.d.ts

@@ -1,4 +1,4 @@
 import type { Action } from 'redux';
 import type { TRequestsInFlightState } from './types';
-declare const _default: (requestsInFlight?: TRequestsInFlightState | undefined, action?: Action<any> | undefined) => string[];
+declare const _default: (requestsInFlight?: TRequestsInFlightState, action?: Action) => string[];
 export default _default;

package/dist/declarations/src/configure-apollo.d.ts

@@ -1,7 +1,8 @@
 import type { NormalizedCacheObject, InMemoryCacheConfig } from '@apollo/client';
-import { ApolloClient } from '@apollo/client';
+import { ApolloClient, ApolloLink } from '@apollo/client';
 declare type TApolloClientOptions = {
     cache?: InMemoryCacheConfig;
+    restLink?: ApolloLink;
 };
 declare const createApolloClient: (options?: TApolloClientOptions) => ApolloClient<NormalizedCacheObject>;
 export default createApolloClient;