@commercetools-frontend/application-shell 20.12.0 → 20.12.1

package/dist/{application-entry-point-ae4c00f2.cjs.dev.js → application-entry-point-140f92f2.cjs.dev.js}

@@ -55,8 +55,8 @@ var _pt = require('prop-types');
 var react = require('react');
 var reactRouterDom = require('react-router-dom');
 var invariant = require('tiny-invariant');
-var applicationShellConnectors = require('@commercetools-frontend/application-shell-connectors');
 var applicationComponents = require('@commercetools-frontend/application-components');
+var applicationShellConnectors = require('@commercetools-frontend/application-shell-connectors');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -98,7 +98,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 = "20.12.0";
+var version = "20.12.1";
 
 var SUPPORTED_HEADERS = {
   ACCEPT_VERSION: 'Accept-version',
@@ -932,6 +932,13 @@ var location = {
   reload: reload
 };
 
+var useIsServedByProxy = function useIsServedByProxy() {
+  var servedByProxy = applicationShellConnectors.useApplicationContext(function (context) {
+    return context.environment.servedByProxy;
+  });
+  return servedByProxy;
+};
+
 var ForcePageReload = function ForcePageReload() {
   react.useEffect(function () {
     location.reload();
@@ -941,9 +948,7 @@ var ForcePageReload = function ForcePageReload() {
 
 var RouteCatchAll = function RouteCatchAll() {
   // NOTE: it's important that the return value is a `Route` component!
-  var servedByProxy = applicationShellConnectors.useApplicationContext(function (context) {
-    return context.environment.servedByProxy;
-  }); // In case the application is served by a proxy server, we assume that
+  var servedByProxy = useIsServedByProxy(); // In case the application is served by a proxy server, we assume that
   // the reverse proxy router handles requests forwarding to the specified
   // service.
   // For example, if the current "loaded" app is products and I click
@@ -1033,4 +1038,5 @@ exports.setActiveSession = setActiveSession;
 exports.setCachedApolloClient = setCachedApolloClient;
 exports.setSessionScope = setSessionScope;
 exports.setSessionState = setSessionState;
+exports.useIsServedByProxy = useIsServedByProxy;
 exports.version = version;

package/dist/{application-entry-point-a7199847.esm.js → application-entry-point-21cef8e6.esm.js}

@@ -53,11 +53,11 @@ import _pt from 'prop-types';
 import { useEffect, Children } from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
 import invariant from 'tiny-invariant';
-import { useApplicationContext } from '@commercetools-frontend/application-shell-connectors';
 import { PageNotFound } from '@commercetools-frontend/application-components';
+import { useApplicationContext } from '@commercetools-frontend/application-shell-connectors';
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "20.12.0";
+var version = "20.12.1";
 
 var SUPPORTED_HEADERS = {
   ACCEPT_VERSION: 'Accept-version',
@@ -891,6 +891,13 @@ var location = {
   reload: reload
 };
 
+var useIsServedByProxy = function useIsServedByProxy() {
+  var servedByProxy = useApplicationContext(function (context) {
+    return context.environment.servedByProxy;
+  });
+  return servedByProxy;
+};
+
 var ForcePageReload = function ForcePageReload() {
   useEffect(function () {
     location.reload();
@@ -900,9 +907,7 @@ var ForcePageReload = function ForcePageReload() {
 
 var RouteCatchAll = function RouteCatchAll() {
   // NOTE: it's important that the return value is a `Route` component!
-  var servedByProxy = useApplicationContext(function (context) {
-    return context.environment.servedByProxy;
-  }); // In case the application is served by a proxy server, we assume that
+  var servedByProxy = useIsServedByProxy(); // In case the application is served by a proxy server, we assume that
   // the reverse proxy router handles requests forwarding to the specified
   // service.
   // For example, if the current "loaded" app is products and I click
@@ -964,4 +969,4 @@ ApplicationEntryPoint.propTypes = process.env.NODE_ENV !== "production" ? {
   children: _pt.node
 } : {};
 
-export { ApplicationEntryPoint as A, CONTAINERS as C, OIDC_CLAIMS as O, REQUESTS_IN_FLIGHT_LOADER_DOM_ID as R, STORAGE_KEYS as S, 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, SUSPENSION_REASONS as j, setSessionScope as k, logger as l, OIDC_RESPONSE_TYPES as m, setSessionState as n, clearSession as o, selectProjectKeyFromUrl as p, RequestsInFlightLoader as q, removeActiveProjectKey as r, setActiveProjectKey as s, RouteCatchAll as t, applyDefaultMiddlewares as u, version as v, selectUserId as w, createReduxStore as x };
+export { ApplicationEntryPoint as A, CONTAINERS as C, OIDC_CLAIMS as O, REQUESTS_IN_FLIGHT_LOADER_DOM_ID as R, STORAGE_KEYS as S, 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, SUSPENSION_REASONS as j, setSessionScope as k, logger as l, OIDC_RESPONSE_TYPES as m, setSessionState as n, clearSession as o, selectProjectKeyFromUrl as p, RequestsInFlightLoader as q, removeActiveProjectKey as r, setActiveProjectKey as s, RouteCatchAll as t, useIsServedByProxy as u, version as v, applyDefaultMiddlewares as w, selectUserId as x, createReduxStore as y };

package/dist/{application-entry-point-52f79266.cjs.prod.js → application-entry-point-aa870890.cjs.prod.js}

@@ -55,8 +55,8 @@ require('prop-types');
 var react = require('react');
 var reactRouterDom = require('react-router-dom');
 var invariant = require('tiny-invariant');
-var applicationShellConnectors = require('@commercetools-frontend/application-shell-connectors');
 var applicationComponents = require('@commercetools-frontend/application-components');
+var applicationShellConnectors = require('@commercetools-frontend/application-shell-connectors');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -97,7 +97,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 = "20.12.0";
+var version = "20.12.1";
 
 var SUPPORTED_HEADERS = {
   ACCEPT_VERSION: 'Accept-version',
@@ -923,6 +923,13 @@ var location = {
   reload: reload
 };
 
+var useIsServedByProxy = function useIsServedByProxy() {
+  var servedByProxy = applicationShellConnectors.useApplicationContext(function (context) {
+    return context.environment.servedByProxy;
+  });
+  return servedByProxy;
+};
+
 var ForcePageReload = function ForcePageReload() {
   react.useEffect(function () {
     location.reload();
@@ -932,9 +939,7 @@ var ForcePageReload = function ForcePageReload() {
 
 var RouteCatchAll = function RouteCatchAll() {
   // NOTE: it's important that the return value is a `Route` component!
-  var servedByProxy = applicationShellConnectors.useApplicationContext(function (context) {
-    return context.environment.servedByProxy;
-  }); // In case the application is served by a proxy server, we assume that
+  var servedByProxy = useIsServedByProxy(); // In case the application is served by a proxy server, we assume that
   // the reverse proxy router handles requests forwarding to the specified
   // service.
   // For example, if the current "loaded" app is products and I click
@@ -1017,4 +1022,5 @@ exports.setActiveSession = setActiveSession;
 exports.setCachedApolloClient = setCachedApolloClient;
 exports.setSessionScope = setSessionScope;
 exports.setSessionState = setSessionState;
+exports.useIsServedByProxy = useIsServedByProxy;
 exports.version = version;

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-ae4c00f2.cjs.dev.js');
-var dist_commercetoolsFrontendApplicationShell = require('./index-fd0e0765.cjs.dev.js');
+var applicationEntryPoint = require('./application-entry-point-140f92f2.cjs.dev.js');
+var dist_commercetoolsFrontendApplicationShell = require('./index-91dc2ebb.cjs.dev.js');
 require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 require('uuid');
 require('@babel/runtime-corejs3/core-js-stable/url');
@@ -61,8 +61,8 @@ require('prop-types');
 require('react');
 require('react-router-dom');
 require('tiny-invariant');
-require('@commercetools-frontend/application-shell-connectors');
 require('@commercetools-frontend/application-components');
+require('@commercetools-frontend/application-shell-connectors');
 require('@emotion/styled/base');
 require('@emotion/react');
 require('@commercetools-frontend/i18n');

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-52f79266.cjs.prod.js');
-var dist_commercetoolsFrontendApplicationShell = require('./index-b2a644f6.cjs.prod.js');
+var applicationEntryPoint = require('./application-entry-point-aa870890.cjs.prod.js');
+var dist_commercetoolsFrontendApplicationShell = require('./index-473958c5.cjs.prod.js');
 require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 require('uuid');
 require('@babel/runtime-corejs3/core-js-stable/url');
@@ -61,8 +61,8 @@ require('prop-types');
 require('react');
 require('react-router-dom');
 require('tiny-invariant');
-require('@commercetools-frontend/application-shell-connectors');
 require('@commercetools-frontend/application-components');
+require('@commercetools-frontend/application-shell-connectors');
 require('@emotion/styled/base');
 require('@emotion/react');
 require('@commercetools-frontend/i18n');

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

@@ -1,5 +1,5 @@
-export { t as RouteCatchAll, u as applyDefaultMiddlewares, f as createApolloClient, p as selectProjectKeyFromUrl, w as selectUserId, v as version } from './application-entry-point-a7199847.esm.js';
-export { A as ApplicationShell, a as ApplicationShellProvider, C as ConfigureIntlProvider, G as GtmContext, b as GtmUserLogoutTracker, I as InjectReducers, S as SetupFlopFlipProvider, c as createApolloContextForProxyForwardTo, s as setupGlobalErrorListener, d as useMcLazyQuery, e as useMcMutation, u as useMcQuery } from './index-1d2a788a.esm.js';
+export { t as RouteCatchAll, w as applyDefaultMiddlewares, f as createApolloClient, p as selectProjectKeyFromUrl, x as selectUserId, v as version } from './application-entry-point-21cef8e6.esm.js';
+export { A as ApplicationShell, a as ApplicationShellProvider, C as ConfigureIntlProvider, G as GtmContext, b as GtmUserLogoutTracker, I as InjectReducers, S as SetupFlopFlipProvider, c as createApolloContextForProxyForwardTo, s as setupGlobalErrorListener, d as useMcLazyQuery, e as useMcMutation, u as useMcQuery } from './index-eebc40b6.esm.js';
 import '@babel/runtime-corejs3/core-js-stable/instance/filter';
 import 'uuid';
 import '@babel/runtime-corejs3/core-js-stable/url';
@@ -57,8 +57,8 @@ import 'prop-types';
 import 'react';
 import 'react-router-dom';
 import 'tiny-invariant';
-import '@commercetools-frontend/application-shell-connectors';
 import '@commercetools-frontend/application-components';
+import '@commercetools-frontend/application-shell-connectors';
 import '@emotion/styled/base';
 import '@emotion/react';
 import '@commercetools-frontend/i18n';

package/dist/declarations/src/apollo-links/utils.d.ts

@@ -5,6 +5,6 @@ import type { TApolloContext } from '../utils/apollo-context';
 declare const getSkipTokenRetry: (context: TApolloContext) => boolean;
 declare const forwardTokenRetryHeader: (headers: TApolloContext['headers']) => TApolloContext['headers'];
 declare const getDoesGraphQLTargetSupportTokenRetry: (context: TApolloContext) => boolean;
-declare const isHttpError: (error: ErrorResponse['networkError']) => error is ServerError | ServerParseError;
+declare const isHttpError: (error: ErrorResponse['networkError']) => error is ServerParseError | ServerError;
 declare const isGraphQLError: (error: ErrorResponse['graphQLErrors']) => error is GraphQLError[];
 export { getSkipTokenRetry, forwardTokenRetryHeader, getDoesGraphQLTargetSupportTokenRetry, isHttpError, isGraphQLError, };

package/dist/declarations/src/components/application-shell/helpers.d.ts

@@ -0,0 +1 @@
+export declare function getMcOrigin(mcApiUrl: string, actualWindow?: Window & typeof globalThis): string;

package/dist/declarations/src/hooks/use-is-served-by-proxy/index.d.ts

@@ -0,0 +1 @@
+export { default } from './use-is-served-by-proxy';

package/dist/declarations/src/hooks/use-is-served-by-proxy/use-is-served-by-proxy.d.ts

@@ -0,0 +1,2 @@
+declare const useIsServedByProxy: () => boolean;
+export default useIsServedByProxy;

package/dist/{index-b2a644f6.cjs.prod.js → index-473958c5.cjs.prod.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var applicationEntryPoint = require('./application-entry-point-52f79266.cjs.prod.js');
+var applicationEntryPoint = require('./application-entry-point-aa870890.cjs.prod.js');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _styled = require('@emotion/styled/base');
 var _pt = require('prop-types');
@@ -2435,27 +2435,25 @@ var LocaleSwitcher = function LocaleSwitcher(props) {
 LocaleSwitcher.propTypes = {};
 
 var ProjectNotFound = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./project-not-found-19312707.cjs.prod.js'
+  return Promise.resolve().then(function () { return require('./project-not-found-6bdfc28d.cjs.prod.js'
   /* webpackChunkName: "project-not-found" */
   ); });
 });
 
 var ProjectExpired = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./project-expired-6f5d474a.cjs.prod.js'
+  return Promise.resolve().then(function () { return require('./project-expired-a0163148.cjs.prod.js'
   /* webpackChunkName: "project-expired" */
   ); });
 });
 
 var ProjectNotInitialized = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./project-not-initialized-10a1ce69.cjs.prod.js'
+  return Promise.resolve().then(function () { return require('./project-not-initialized-e07d2b6b.cjs.prod.js'
   /* webpackChunkName: "project-not-initialized" */
   ); });
 });
 
 var RedirectToProjectCreate = function RedirectToProjectCreate() {
-  var servedByProxy = applicationShellConnectors.useApplicationContext(function (context) {
-    return context.environment.servedByProxy;
-  });
+  var servedByProxy = applicationEntryPoint.useIsServedByProxy();
   /**
    * NOTE:
    *   This looks a bit unusual: redirecting in render.
@@ -2496,7 +2494,7 @@ var RedirectToProjectCreate = function RedirectToProjectCreate() {
 RedirectToProjectCreate.displayName = 'RedirectToProjectCreate';
 
 var ProjectSuspended = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./project-suspended-da1d5c10.cjs.prod.js'
+  return Promise.resolve().then(function () { return require('./project-suspended-08625b77.cjs.prod.js'
   /* webpackChunkName: "project-suspended" */
   ); });
 });
@@ -2652,9 +2650,7 @@ var getDefaultedFeatureToggles = function getDefaultedFeatureToggles(allFeatureT
 };
 
 var useAllMenuFeatureToggles = function useAllMenuFeatureToggles() {
-  var servedByProxy = applicationShellConnectors.useApplicationContext(function (applicationContext) {
-    return applicationContext.environment.servedByProxy;
-  });
+  var servedByProxy = applicationEntryPoint.useIsServedByProxy();
   var mcProxyApiUrl = applicationShellConnectors.useApplicationContext(function (applicationContext) {
     return applicationContext.environment.mcProxyApiUrl;
   });
@@ -3712,7 +3708,7 @@ var pimIndexerStates = {
 };
 
 var QuickAccess = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./quick-access-592bdd5b.cjs.prod.js'
+  return Promise.resolve().then(function () { return require('./quick-access-0a31b56f.cjs.prod.js'
   /* webpackChunkName: "quick-access" */
   ); });
 });
@@ -3809,6 +3805,51 @@ var QuickAccessTrigger = function QuickAccessTrigger(props) {
 QuickAccessTrigger.propTypes = {};
 QuickAccessTrigger.displayName = 'QuickAccessTrigger';
 
+/**
+ * Get the "real" Merchant Center frontend URL to redirect the user
+ * to the login page.
+ * We use an explicit full URL so that if a user tries to access the
+ * Custom Applications directly to its domain, it will always redirect
+ * the user to the login page.
+ *
+ * To determine the "real" URL, we need to check if the current location
+ * is a Merchant Center domain, or if it's a custom user domain.
+ * For the latter, we can derive the URL from the Merchant Center API URL.
+ *
+ * A Merchant Center hostname is composed by the following parts:
+ *    https://<mc-prefix>.<region>.<provider>.<ct-domain>.<tld>
+ * We neeed to check if at least the first 4 parts (right-to-left) are
+ * the same.
+ */
+function getMcOrigin(mcApiUrl) {
+  var _context, _context2;
+
+  var actualWindow = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : window;
+  var mcApiUrlObject = new _URL__default["default"](mcApiUrl);
+
+  var _mcApiUrlObject$hostn = _reverseInstanceProperty__default["default"](_context = mcApiUrlObject.hostname.split('.')).call(_context),
+      _mcApiUrlObject$hostn2 = _slicedToArray(_mcApiUrlObject$hostn, 4),
+      tldMcApi = _mcApiUrlObject$hostn2[0],
+      ctDomainMcApi = _mcApiUrlObject$hostn2[1],
+      providerMcApi = _mcApiUrlObject$hostn2[2],
+      regionMcApi = _mcApiUrlObject$hostn2[3];
+
+  var _actualWindow$locatio = _reverseInstanceProperty__default["default"](_context2 = actualWindow.location.hostname.split('.')).call(_context2),
+      _actualWindow$locatio2 = _slicedToArray(_actualWindow$locatio, 4),
+      tldMc = _actualWindow$locatio2[0],
+      ctDomainMc = _actualWindow$locatio2[1],
+      providerMc = _actualWindow$locatio2[2],
+      regionMc = _actualWindow$locatio2[3];
+
+  var isMatching = tldMcApi === tldMc && ctDomainMcApi === ctDomainMc && providerMcApi === providerMc && regionMcApi === regionMc;
+
+  if (isMatching) {
+    return actualWindow.location.origin;
+  }
+
+  return mcApiUrlObject.origin.replace('mc-api', 'mc');
+}
+
 var generateAndCacheNonceWithState = function generateAndCacheNonceWithState(state) {
   var nonce = uuid.v4(); // We store additional information within the given `nonce`
   // to then retrieve it later when the IdP redirects back
@@ -3825,6 +3866,7 @@ var RedirectToLogin = function RedirectToLogin() {
   var _window$app$__DEVELOP, _window$app$__DEVELOP2;
 
   var location = reactRouterDom.useLocation();
+  var servedByProxy = applicationEntryPoint.useIsServedByProxy();
 
   if ((_window$app$__DEVELOP = window.app.__DEVELOPMENT__) !== null && _window$app$__DEVELOP !== void 0 && (_window$app$__DEVELOP2 = _window$app$__DEVELOP.oidc) !== null && _window$app$__DEVELOP2 !== void 0 && _window$app$__DEVELOP2.authorizeUrl) {
     var _window$app$__DEVELOP3, _window$app$__DEVELOP4, _window$app$__DEVELOP5, _window$app$__DEVELOP6, _window$app$__DEVELOP7, _window$app$__DEVELOP8;
@@ -3875,8 +3917,10 @@ var RedirectToLogin = function RedirectToLogin() {
     });
   }
 
+  var mcOrigin = servedByProxy ? getMcOrigin(window.app.mcApiUrl) : undefined;
   return jsxRuntime.jsx(Redirector, {
     to: "login",
+    origin: mcOrigin,
     location: location,
     queryParams: {
       reason: constants.LOGOUT_REASONS.UNAUTHORIZED,
@@ -3897,9 +3941,7 @@ var RedirectToLogout = function RedirectToLogout(props) {
   var _window$app$__DEVELOP, _window$app$__DEVELOP2, _props$reason;
 
   var location = reactRouterDom.useLocation();
-  var servedByProxy = applicationShellConnectors.useApplicationContext(function (context) {
-    return context.environment.servedByProxy;
-  });
+  var servedByProxy = applicationEntryPoint.useIsServedByProxy();
 
   if ((_window$app$__DEVELOP = window.app.__DEVELOPMENT__) !== null && _window$app$__DEVELOP !== void 0 && (_window$app$__DEVELOP2 = _window$app$__DEVELOP.oidc) !== null && _window$app$__DEVELOP2 !== void 0 && _window$app$__DEVELOP2.authorizeUrl) {
     // Remove the `sessionToken` from storage, so that the AppShell can initiate
@@ -3908,8 +3950,10 @@ var RedirectToLogout = function RedirectToLogout(props) {
     return jsxRuntime.jsx(RedirectToLogin, {});
   }
 
+  var mcOrigin = servedByProxy ? getMcOrigin(window.app.mcApiUrl) : undefined;
   return jsxRuntime.jsx(Redirector, {
     to: "logout",
+    origin: mcOrigin,
     location: location,
     queryParams: _objectSpread$1({
       reason: (_props$reason = props.reason) !== null && _props$reason !== void 0 ? _props$reason : constants.LOGOUT_REASONS.USER

package/dist/{index-fd0e0765.cjs.dev.js → index-91dc2ebb.cjs.dev.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var applicationEntryPoint = require('./application-entry-point-ae4c00f2.cjs.dev.js');
+var applicationEntryPoint = require('./application-entry-point-140f92f2.cjs.dev.js');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _styled = require('@emotion/styled/base');
 var _pt = require('prop-types');
@@ -2532,27 +2532,25 @@ LocaleSwitcher.propTypes = process.env.NODE_ENV !== "production" ? {
 } : {};
 
 var ProjectNotFound = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./project-not-found-7bdc583e.cjs.dev.js'
+  return Promise.resolve().then(function () { return require('./project-not-found-4f1e5015.cjs.dev.js'
   /* webpackChunkName: "project-not-found" */
   ); });
 });
 
 var ProjectExpired = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./project-expired-8a630330.cjs.dev.js'
+  return Promise.resolve().then(function () { return require('./project-expired-d0c9a419.cjs.dev.js'
   /* webpackChunkName: "project-expired" */
   ); });
 });
 
 var ProjectNotInitialized = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./project-not-initialized-2f2ee69f.cjs.dev.js'
+  return Promise.resolve().then(function () { return require('./project-not-initialized-84372c36.cjs.dev.js'
   /* webpackChunkName: "project-not-initialized" */
   ); });
 });
 
 var RedirectToProjectCreate = function RedirectToProjectCreate() {
-  var servedByProxy = applicationShellConnectors.useApplicationContext(function (context) {
-    return context.environment.servedByProxy;
-  });
+  var servedByProxy = applicationEntryPoint.useIsServedByProxy();
   /**
    * NOTE:
    *   This looks a bit unusual: redirecting in render.
@@ -2570,7 +2568,7 @@ var RedirectToProjectCreate = function RedirectToProjectCreate() {
   }
 
   return jsxRuntime.jsx("div", {
-    css: /*#__PURE__*/react$2.css("align-self:center;margin-top:", designSystem.customProperties.spacingXl, ";max-width:", designSystem.customProperties.constraint10, ";" + (process.env.NODE_ENV === "production" ? "" : ";label:RedirectToProjectCreate;"), process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInJlZGlyZWN0LXRvLXByb2plY3QtY3JlYXRlLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUErQmMiLCJmaWxlIjoicmVkaXJlY3QtdG8tcHJvamVjdC1jcmVhdGUudHN4Iiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3NzIH0gZnJvbSAnQGVtb3Rpb24vcmVhY3QnO1xuaW1wb3J0IFNwYWNpbmdzIGZyb20gJ0Bjb21tZXJjZXRvb2xzLXVpa2l0L3NwYWNpbmdzJztcbmltcG9ydCB7IENvbnRlbnROb3RpZmljYXRpb24gfSBmcm9tICdAY29tbWVyY2V0b29scy11aWtpdC9ub3RpZmljYXRpb25zJztcbmltcG9ydCBUZXh0IGZyb20gJ0Bjb21tZXJjZXRvb2xzLXVpa2l0L3RleHQnO1xuaW1wb3J0IENhcmQgZnJvbSAnQGNvbW1lcmNldG9vbHMtdWlraXQvY2FyZCc7XG5pbXBvcnQgeyBjdXN0b21Qcm9wZXJ0aWVzIH0gZnJvbSAnQGNvbW1lcmNldG9vbHMtdWlraXQvZGVzaWduLXN5c3RlbSc7XG5pbXBvcnQgeyB1c2VBcHBsaWNhdGlvbkNvbnRleHQgfSBmcm9tICdAY29tbWVyY2V0b29scy1mcm9udGVuZC9hcHBsaWNhdGlvbi1zaGVsbC1jb25uZWN0b3JzJztcbmltcG9ydCB7IGxvY2F0aW9uIH0gZnJvbSAnLi4vLi4vdXRpbHMvbG9jYXRpb24nO1xuXG5leHBvcnQgY29uc3QgUmVkaXJlY3RUb1Byb2plY3RDcmVhdGUgPSAoKSA9PiB7XG4gIGNvbnN0IHNlcnZlZEJ5UHJveHkgPSB1c2VBcHBsaWNhdGlvbkNvbnRleHQoXG4gICAgKGNvbnRleHQpID0+IGNvbnRleHQuZW52aXJvbm1lbnQuc2VydmVkQnlQcm94eVxuICApO1xuICAvKipcbiAgICogTk9URTpcbiAgICogICBUaGlzIGxvb2tzIGEgYml0IHVudXN1YWw6IHJlZGlyZWN0aW5nIGluIHJlbmRlci5cbiAgICogICBIb3dldmVyLCB3aGVuIGRvaW5nIGl0IGluIGBjRE1gIHdlIGxvb3NlIHRpbWVcbiAgICogICB3ZSB3ZSBhY3R1YWxseSBkbyBuZXZlciB3YW50IHRvIHJlbmRlciBhbnl0aGluZyBvclxuICAgKiAgIGludGVyYWN0IHdpdGggYW55dGhpbmcgcmVuZGVyZWQuIEluc3RlYWQgd2Ugc2hvdWxkIHNob3VsZFxuICAgKiAgIHJlZGlyZWN0IGF3YXkuIFVzaW5nIGEgY29uc3RydWN0b3Igd291bGQgcmVzdWx0IGluIHRoZSBzYW1lLlxuICAgKiAgIEluIHR1cm4gdGhpcyBpbnRlbmRzIHdvIG1ha2UgZXhwbGljaXQgdGhhdCB3ZSBuZXZlciB3YW50IHRvXG4gICAqICAgcmVuZGVyIGFuZCBpbnN0ZWFkIGp1c3QgbmF2aWdhdGUgYXdheS5cbiAgICovXG4gIGlmIChzZXJ2ZWRCeVByb3h5ID09PSB0cnVlKSB7XG4gICAgbG9jYXRpb24ucmVwbGFjZSgnL2FjY291bnQvcHJvamVjdHMvbmV3Jyk7XG5cbiAgICByZXR1cm4gbnVsbDtcbiAgfVxuXG4gIHJldHVybiAoXG4gICAgPGRpdlxuICAgICAgY3NzPXtjc3NgXG4gICAgICAgIGFsaWduLXNlbGY6IGNlbnRlcjtcbiAgICAgICAgbWFyZ2luLXRvcDogJHtjdXN0b21Qcm9wZXJ0aWVzLnNwYWNpbmdYbH07XG4gICAgICAgIG1heC13aWR0aDogJHtjdXN0b21Qcm9wZXJ0aWVzLmNvbnN0cmFpbnQxMH07XG4gICAgICBgfVxuICAgID5cbiAgICAgIDxDYXJkIHR5cGU9XCJmbGF0XCIgdGhlbWU9XCJkYXJrXCI+XG4gICAgICAgIDxTcGFjaW5ncy5TdGFjaz5cbiAgICAgICAgICA8VGV4dC5IZWFkbGluZSBhcz1cImgxXCI+UGxlYXNlIGNyZWF0ZSBhIHByb2plY3QhPC9UZXh0LkhlYWRsaW5lPlxuICAgICAgICAgIDxDb250ZW50Tm90aWZpY2F0aW9uIHR5cGU9XCJpbmZvXCI+XG4gICAgICAgICAgICBZb3UgYXJlIHJ1bm5pbmcgaW4gZGV2ZWxvcG1lbnQgbW9kZVxuICAgICAgICAgIDwvQ29udGVudE5vdGlmaWNhdGlvbj5cbiAgICAgICAgICA8VGV4dC5Cb2R5PlxuICAgICAgICAgICAgVGhlIEN1c3RvbSBBcHBsaWNhdGlvbiBpcyBub3QgcnVubmluZyBiZWhpbmQgdGhlIE1lcmNoYW50IENlbnRlclxuICAgICAgICAgICAgUHJveHkuIFRoZXJlZm9yZSwgeW91IGFyZSBub3QgYmVpbmcgcmVkaXJlY3RlZCB0byB0aGUgYWNjb3VudFxuICAgICAgICAgICAgc2VjdGlvbiB0byBjcmVhdGUgYSBuZXcgcHJvamVjdC5cbiAgICAgICAgICA8L1RleHQuQm9keT5cbiAgICAgICAgICA8VGV4dC5Cb2R5PlxuICAgICAgICAgICAgSWYgeW91IGRvIG5lZWQgdG8gY3JlYXRlIGEgcHJvamVjdCwgd2UgcmVjb21tZW5kIHRvIGdvIHRvIHRoZVxuICAgICAgICAgICAgTWVyY2hhbnQgQ2VudGVyIHByb2R1Y3Rpb24gVVJMIGFuZCBjcmVhdGUgYSBwcm9qZWN0IHRoZXJlLiBBZnRlclxuICAgICAgICAgICAgdGhhdCwgeW91IGNhbiBhY2Nlc3MgeW91ciBuZXcgcHJvamVjdCBmcm9tIHlvdXIgbG9jYWwgZW52aXJvbm1lbnQuXG4gICAgICAgICAgPC9UZXh0LkJvZHk+XG4gICAgICAgIDwvU3BhY2luZ3MuU3RhY2s+XG4gICAgICA8L0NhcmQ+XG4gICAgPC9kaXY+XG4gICk7XG59O1xuUmVkaXJlY3RUb1Byb2plY3RDcmVhdGUuZGlzcGxheU5hbWUgPSAnUmVkaXJlY3RUb1Byb2plY3RDcmVhdGUnO1xuXG5leHBvcnQgZGVmYXVsdCBSZWRpcmVjdFRvUHJvamVjdENyZWF0ZTtcbiJdfQ== */"),
+    css: /*#__PURE__*/react$2.css("align-self:center;margin-top:", designSystem.customProperties.spacingXl, ";max-width:", designSystem.customProperties.constraint10, ";" + (process.env.NODE_ENV === "production" ? "" : ";label:RedirectToProjectCreate;"), process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInJlZGlyZWN0LXRvLXByb2plY3QtY3JlYXRlLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUE2QmMiLCJmaWxlIjoicmVkaXJlY3QtdG8tcHJvamVjdC1jcmVhdGUudHN4Iiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3NzIH0gZnJvbSAnQGVtb3Rpb24vcmVhY3QnO1xuaW1wb3J0IFNwYWNpbmdzIGZyb20gJ0Bjb21tZXJjZXRvb2xzLXVpa2l0L3NwYWNpbmdzJztcbmltcG9ydCB7IENvbnRlbnROb3RpZmljYXRpb24gfSBmcm9tICdAY29tbWVyY2V0b29scy11aWtpdC9ub3RpZmljYXRpb25zJztcbmltcG9ydCBUZXh0IGZyb20gJ0Bjb21tZXJjZXRvb2xzLXVpa2l0L3RleHQnO1xuaW1wb3J0IENhcmQgZnJvbSAnQGNvbW1lcmNldG9vbHMtdWlraXQvY2FyZCc7XG5pbXBvcnQgeyBjdXN0b21Qcm9wZXJ0aWVzIH0gZnJvbSAnQGNvbW1lcmNldG9vbHMtdWlraXQvZGVzaWduLXN5c3RlbSc7XG5pbXBvcnQgdXNlSXNTZXJ2ZWRCeVByb3h5IGZyb20gJy4uLy4uL2hvb2tzL3VzZS1pcy1zZXJ2ZWQtYnktcHJveHknO1xuaW1wb3J0IHsgbG9jYXRpb24gfSBmcm9tICcuLi8uLi91dGlscy9sb2NhdGlvbic7XG5cbmV4cG9ydCBjb25zdCBSZWRpcmVjdFRvUHJvamVjdENyZWF0ZSA9ICgpID0+IHtcbiAgY29uc3Qgc2VydmVkQnlQcm94eSA9IHVzZUlzU2VydmVkQnlQcm94eSgpO1xuICAvKipcbiAgICogTk9URTpcbiAgICogICBUaGlzIGxvb2tzIGEgYml0IHVudXN1YWw6IHJlZGlyZWN0aW5nIGluIHJlbmRlci5cbiAgICogICBIb3dldmVyLCB3aGVuIGRvaW5nIGl0IGluIGBjRE1gIHdlIGxvb3NlIHRpbWVcbiAgICogICB3ZSB3ZSBhY3R1YWxseSBkbyBuZXZlciB3YW50IHRvIHJlbmRlciBhbnl0aGluZyBvclxuICAgKiAgIGludGVyYWN0IHdpdGggYW55dGhpbmcgcmVuZGVyZWQuIEluc3RlYWQgd2Ugc2hvdWxkIHNob3VsZFxuICAgKiAgIHJlZGlyZWN0IGF3YXkuIFVzaW5nIGEgY29uc3RydWN0b3Igd291bGQgcmVzdWx0IGluIHRoZSBzYW1lLlxuICAgKiAgIEluIHR1cm4gdGhpcyBpbnRlbmRzIHdvIG1ha2UgZXhwbGljaXQgdGhhdCB3ZSBuZXZlciB3YW50IHRvXG4gICAqICAgcmVuZGVyIGFuZCBpbnN0ZWFkIGp1c3QgbmF2aWdhdGUgYXdheS5cbiAgICovXG4gIGlmIChzZXJ2ZWRCeVByb3h5ID09PSB0cnVlKSB7XG4gICAgbG9jYXRpb24ucmVwbGFjZSgnL2FjY291bnQvcHJvamVjdHMvbmV3Jyk7XG5cbiAgICByZXR1cm4gbnVsbDtcbiAgfVxuXG4gIHJldHVybiAoXG4gICAgPGRpdlxuICAgICAgY3NzPXtjc3NgXG4gICAgICAgIGFsaWduLXNlbGY6IGNlbnRlcjtcbiAgICAgICAgbWFyZ2luLXRvcDogJHtjdXN0b21Qcm9wZXJ0aWVzLnNwYWNpbmdYbH07XG4gICAgICAgIG1heC13aWR0aDogJHtjdXN0b21Qcm9wZXJ0aWVzLmNvbnN0cmFpbnQxMH07XG4gICAgICBgfVxuICAgID5cbiAgICAgIDxDYXJkIHR5cGU9XCJmbGF0XCIgdGhlbWU9XCJkYXJrXCI+XG4gICAgICAgIDxTcGFjaW5ncy5TdGFjaz5cbiAgICAgICAgICA8VGV4dC5IZWFkbGluZSBhcz1cImgxXCI+UGxlYXNlIGNyZWF0ZSBhIHByb2plY3QhPC9UZXh0LkhlYWRsaW5lPlxuICAgICAgICAgIDxDb250ZW50Tm90aWZpY2F0aW9uIHR5cGU9XCJpbmZvXCI+XG4gICAgICAgICAgICBZb3UgYXJlIHJ1bm5pbmcgaW4gZGV2ZWxvcG1lbnQgbW9kZVxuICAgICAgICAgIDwvQ29udGVudE5vdGlmaWNhdGlvbj5cbiAgICAgICAgICA8VGV4dC5Cb2R5PlxuICAgICAgICAgICAgVGhlIEN1c3RvbSBBcHBsaWNhdGlvbiBpcyBub3QgcnVubmluZyBiZWhpbmQgdGhlIE1lcmNoYW50IENlbnRlclxuICAgICAgICAgICAgUHJveHkuIFRoZXJlZm9yZSwgeW91IGFyZSBub3QgYmVpbmcgcmVkaXJlY3RlZCB0byB0aGUgYWNjb3VudFxuICAgICAgICAgICAgc2VjdGlvbiB0byBjcmVhdGUgYSBuZXcgcHJvamVjdC5cbiAgICAgICAgICA8L1RleHQuQm9keT5cbiAgICAgICAgICA8VGV4dC5Cb2R5PlxuICAgICAgICAgICAgSWYgeW91IGRvIG5lZWQgdG8gY3JlYXRlIGEgcHJvamVjdCwgd2UgcmVjb21tZW5kIHRvIGdvIHRvIHRoZVxuICAgICAgICAgICAgTWVyY2hhbnQgQ2VudGVyIHByb2R1Y3Rpb24gVVJMIGFuZCBjcmVhdGUgYSBwcm9qZWN0IHRoZXJlLiBBZnRlclxuICAgICAgICAgICAgdGhhdCwgeW91IGNhbiBhY2Nlc3MgeW91ciBuZXcgcHJvamVjdCBmcm9tIHlvdXIgbG9jYWwgZW52aXJvbm1lbnQuXG4gICAgICAgICAgPC9UZXh0LkJvZHk+XG4gICAgICAgIDwvU3BhY2luZ3MuU3RhY2s+XG4gICAgICA8L0NhcmQ+XG4gICAgPC9kaXY+XG4gICk7XG59O1xuUmVkaXJlY3RUb1Byb2plY3RDcmVhdGUuZGlzcGxheU5hbWUgPSAnUmVkaXJlY3RUb1Byb2plY3RDcmVhdGUnO1xuXG5leHBvcnQgZGVmYXVsdCBSZWRpcmVjdFRvUHJvamVjdENyZWF0ZTtcbiJdfQ== */"),
     children: jsxRuntime.jsx(Card__default["default"], {
       type: "flat",
       theme: "dark",
@@ -2593,7 +2591,7 @@ var RedirectToProjectCreate = function RedirectToProjectCreate() {
 RedirectToProjectCreate.displayName = 'RedirectToProjectCreate';
 
 var ProjectSuspended = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./project-suspended-f541ad12.cjs.dev.js'
+  return Promise.resolve().then(function () { return require('./project-suspended-bee672c3.cjs.dev.js'
   /* webpackChunkName: "project-suspended" */
   ); });
 });
@@ -2752,9 +2750,7 @@ var getDefaultedFeatureToggles = function getDefaultedFeatureToggles(allFeatureT
 };
 
 var useAllMenuFeatureToggles = function useAllMenuFeatureToggles() {
-  var servedByProxy = applicationShellConnectors.useApplicationContext(function (applicationContext) {
-    return applicationContext.environment.servedByProxy;
-  });
+  var servedByProxy = applicationEntryPoint.useIsServedByProxy();
   var mcProxyApiUrl = applicationShellConnectors.useApplicationContext(function (applicationContext) {
     return applicationContext.environment.mcProxyApiUrl;
   });
@@ -3909,7 +3905,7 @@ var pimIndexerStates = {
 };
 
 var QuickAccess = /*#__PURE__*/react.lazy(function () {
-  return Promise.resolve().then(function () { return require('./quick-access-8e4582e8.cjs.dev.js'
+  return Promise.resolve().then(function () { return require('./quick-access-a50256b3.cjs.dev.js'
   /* webpackChunkName: "quick-access" */
   ); });
 });
@@ -4008,6 +4004,51 @@ QuickAccessTrigger.propTypes = process.env.NODE_ENV !== "production" ? {
 } : {};
 QuickAccessTrigger.displayName = 'QuickAccessTrigger';
 
+/**
+ * Get the "real" Merchant Center frontend URL to redirect the user
+ * to the login page.
+ * We use an explicit full URL so that if a user tries to access the
+ * Custom Applications directly to its domain, it will always redirect
+ * the user to the login page.
+ *
+ * To determine the "real" URL, we need to check if the current location
+ * is a Merchant Center domain, or if it's a custom user domain.
+ * For the latter, we can derive the URL from the Merchant Center API URL.
+ *
+ * A Merchant Center hostname is composed by the following parts:
+ *    https://<mc-prefix>.<region>.<provider>.<ct-domain>.<tld>
+ * We neeed to check if at least the first 4 parts (right-to-left) are
+ * the same.
+ */
+function getMcOrigin(mcApiUrl) {
+  var _context, _context2;
+
+  var actualWindow = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : window;
+  var mcApiUrlObject = new _URL__default["default"](mcApiUrl);
+
+  var _mcApiUrlObject$hostn = _reverseInstanceProperty__default["default"](_context = mcApiUrlObject.hostname.split('.')).call(_context),
+      _mcApiUrlObject$hostn2 = _slicedToArray(_mcApiUrlObject$hostn, 4),
+      tldMcApi = _mcApiUrlObject$hostn2[0],
+      ctDomainMcApi = _mcApiUrlObject$hostn2[1],
+      providerMcApi = _mcApiUrlObject$hostn2[2],
+      regionMcApi = _mcApiUrlObject$hostn2[3];
+
+  var _actualWindow$locatio = _reverseInstanceProperty__default["default"](_context2 = actualWindow.location.hostname.split('.')).call(_context2),
+      _actualWindow$locatio2 = _slicedToArray(_actualWindow$locatio, 4),
+      tldMc = _actualWindow$locatio2[0],
+      ctDomainMc = _actualWindow$locatio2[1],
+      providerMc = _actualWindow$locatio2[2],
+      regionMc = _actualWindow$locatio2[3];
+
+  var isMatching = tldMcApi === tldMc && ctDomainMcApi === ctDomainMc && providerMcApi === providerMc && regionMcApi === regionMc;
+
+  if (isMatching) {
+    return actualWindow.location.origin;
+  }
+
+  return mcApiUrlObject.origin.replace('mc-api', 'mc');
+}
+
 var generateAndCacheNonceWithState = function generateAndCacheNonceWithState(state) {
   var nonce = uuid.v4(); // We store additional information within the given `nonce`
   // to then retrieve it later when the IdP redirects back
@@ -4024,6 +4065,7 @@ var RedirectToLogin = function RedirectToLogin() {
   var _window$app$__DEVELOP, _window$app$__DEVELOP2;
 
   var location = reactRouterDom.useLocation();
+  var servedByProxy = applicationEntryPoint.useIsServedByProxy();
 
   if ((_window$app$__DEVELOP = window.app.__DEVELOPMENT__) !== null && _window$app$__DEVELOP !== void 0 && (_window$app$__DEVELOP2 = _window$app$__DEVELOP.oidc) !== null && _window$app$__DEVELOP2 !== void 0 && _window$app$__DEVELOP2.authorizeUrl) {
     var _window$app$__DEVELOP3, _window$app$__DEVELOP4, _window$app$__DEVELOP5, _window$app$__DEVELOP6, _window$app$__DEVELOP7, _window$app$__DEVELOP8;
@@ -4074,8 +4116,10 @@ var RedirectToLogin = function RedirectToLogin() {
     });
   }
 
+  var mcOrigin = servedByProxy ? getMcOrigin(window.app.mcApiUrl) : undefined;
   return jsxRuntime.jsx(Redirector, {
     to: "login",
+    origin: mcOrigin,
     location: location,
     queryParams: {
       reason: constants.LOGOUT_REASONS.UNAUTHORIZED,
@@ -4096,9 +4140,7 @@ var RedirectToLogout = function RedirectToLogout(props) {
   var _window$app$__DEVELOP, _window$app$__DEVELOP2, _props$reason;
 
   var location = reactRouterDom.useLocation();
-  var servedByProxy = applicationShellConnectors.useApplicationContext(function (context) {
-    return context.environment.servedByProxy;
-  });
+  var servedByProxy = applicationEntryPoint.useIsServedByProxy();
 
   if ((_window$app$__DEVELOP = window.app.__DEVELOPMENT__) !== null && _window$app$__DEVELOP !== void 0 && (_window$app$__DEVELOP2 = _window$app$__DEVELOP.oidc) !== null && _window$app$__DEVELOP2 !== void 0 && _window$app$__DEVELOP2.authorizeUrl) {
     // Remove the `sessionToken` from storage, so that the AppShell can initiate
@@ -4107,8 +4149,10 @@ var RedirectToLogout = function RedirectToLogout(props) {
     return jsxRuntime.jsx(RedirectToLogin, {});
   }
 
+  var mcOrigin = servedByProxy ? getMcOrigin(window.app.mcApiUrl) : undefined;
   return jsxRuntime.jsx(Redirector, {
     to: "logout",
+    origin: mcOrigin,
     location: location,
     queryParams: _objectSpread$1({
       reason: (_props$reason = props.reason) !== null && _props$reason !== void 0 ? _props$reason : constants.LOGOUT_REASONS.USER