@strapi/admin 5.53.0 → 5.55.0

package/dist/admin/admin/src/components/UpsellBanner.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"UpsellBanner.mjs","sources":["../../../../../admin/src/components/UpsellBanner.tsx"],"sourcesContent":["import { useEffect } from 'react';\n\nimport { useLicenseLimits } from '@strapi/admin/strapi-admin/ee';\nimport { Box, Flex, IconButton, LinkButton, Typography } from '@strapi/design-system';\nimport { ArrowsOut, Cross } from '@strapi/icons';\nimport { isAfter, isValid, subDays } from 'date-fns';\nimport { useIntl } from 'react-intl';\nimport { styled } from 'styled-components';\n\nimport { useGetLicenseTrialTimeLeftQuery } from '../../src/services/admin';\nimport { RESPONSIVE_DEFAULT_SPACING } from '../constants/theme';\nimport { useScopedPersistentState } from '../hooks/usePersistentState';\n\nconst BannerBackground = styled(Flex)`\n  background: linear-gradient(\n    90deg,\n    ${({ theme }) => theme.colors.primary600} 0%,\n    ${({ theme }) => theme.colors.alternative600} 121.48%\n  );\n  position: relative;\n`;\n\nconst FixedButtonWrapper = styled(Box)`\n  position: fixed;\n  display: flex;\n  flex-direction: column;\n  z-index: 11;\n  align-items: flex-end;\n  top: 9px;\n  right: 16px;\n`;\n\nconst Banner = ({\n  isTrialEndedRecently,\n  onDismiss,\n}: {\n  isTrialEndedRecently: boolean;\n  onDismiss: () => void;\n}) => {\n  const { formatMessage } = useIntl();\n\n  return (\n    <>\n      <BannerBackground width=\"100%\" justifyContent=\"center\">\n        <Flex\n          justifyContent=\"center\"\n          alignItems=\"center\"\n          width=\"100%\"\n          paddingTop={2}\n          paddingBottom={2}\n          paddingLeft={RESPONSIVE_DEFAULT_SPACING}\n          paddingRight={RESPONSIVE_DEFAULT_SPACING}\n          gap={2}\n        >\n          <Box>\n            <Typography\n              variant=\"delta\"\n              fontWeight=\"bold\"\n              textColor=\"neutral0\"\n              textAlign=\"center\"\n              fontSize={2}\n            >\n              {formatMessage(\n                isTrialEndedRecently\n                  ? {\n                      id: 'app.components.UpsellBanner.intro.ended',\n                      defaultMessage: 'Your trial has ended: ',\n                    }\n                  : {\n                      id: 'app.components.UpsellBanner.intro',\n                      defaultMessage: 'Access to Growth plan features: ',\n                    }\n              )}\n            </Typography>\n            <Typography\n              variant=\"delta\"\n              textColor=\"neutral0\"\n              textAlign=\"center\"\n              paddingRight={4}\n              fontSize={2}\n            >\n              {formatMessage(\n                isTrialEndedRecently\n                  ? {\n                      id: 'app.components.UpsellBanner.text.ended',\n                      defaultMessage: 'Keep access to Growth features by upgrading now.',\n                    }\n                  : {\n                      id: 'app.components.UpsellBanner.text',\n                      defaultMessage:\n                        'As part of your trial, you can explore premium tools such as Content History, Releases, and Single Sign-On (SSO).',\n                    }\n              )}\n            </Typography>\n          </Box>\n          <Box>\n            <LinkButton\n              width=\"max-content\"\n              variant=\"tertiary\"\n              href=\"https://billing.strapi.io\"\n              target=\"_blank\"\n            >\n              {formatMessage(\n                isTrialEndedRecently\n                  ? {\n                      id: 'app.components.UpsellBanner.button.ended',\n                      defaultMessage: 'Keep Growth plan',\n                    }\n                  : {\n                      id: 'app.components.UpsellBanner.button',\n                      defaultMessage: 'Upgrade now',\n                    }\n              )}\n            </LinkButton>\n          </Box>\n        </Flex>\n      </BannerBackground>\n      <FixedButtonWrapper>\n        <IconButton\n          withTooltip={false}\n          label={formatMessage({\n            id: 'app.components.UpsellBanner.close',\n            defaultMessage: 'Close',\n          })}\n          onClick={onDismiss}\n        >\n          <Cross />\n        </IconButton>\n      </FixedButtonWrapper>\n    </>\n  );\n};\n\nconst UpsellBanner = () => {\n  const { license } = useLicenseLimits();\n  const { formatMessage } = useIntl();\n\n  const [cachedTrialEndsAt, setCachedTrialEndsAt] = useScopedPersistentState<string | undefined>(\n    'STRAPI_FREE_TRIAL_ENDS_AT',\n    undefined\n  );\n\n  const [dismissedFor, setDismissedFor] = useScopedPersistentState<string | undefined>(\n    'STRAPI_UPSELL_BANNER_DISMISSED_FOR',\n    undefined\n  );\n\n  const sevenDaysAgo = subDays(new Date(), 7);\n\n  const timeLeftData = useGetLicenseTrialTimeLeftQuery(undefined, {\n    skip: !license?.isTrial,\n  });\n\n  useEffect(() => {\n    if (timeLeftData.data?.trialEndsAt) {\n      setCachedTrialEndsAt(timeLeftData.data.trialEndsAt);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [timeLeftData.data?.trialEndsAt]);\n\n  // When the license is not a trial + not EE, and the cached trial end date is found in the localstorage, that means the trial has ended\n  // We show the banner to encourage the user to upgrade (for 7 days after the trial ends)\n  const isTrialEndedRecently = Boolean(\n    !license?.isTrial &&\n      !window.strapi.isEE &&\n      cachedTrialEndsAt &&\n      isAfter(new Date(cachedTrialEndsAt), sevenDaysAgo)\n  );\n\n  const trialEndsAt = timeLeftData.data?.trialEndsAt ?? cachedTrialEndsAt;\n\n  const toCanonicalISO = (v: string | undefined): string | undefined => {\n    if (!v) return undefined;\n    const date = new Date(v);\n    return isValid(date) ? date.toISOString() : undefined;\n  };\n\n  const isDismissed = Boolean(\n    trialEndsAt && toCanonicalISO(dismissedFor) === toCanonicalISO(trialEndsAt)\n  );\n\n  const handleDismiss = () => setDismissedFor(toCanonicalISO(trialEndsAt));\n  const handleReopen = () => setDismissedFor(undefined);\n\n  if (!(timeLeftData.data?.trialEndsAt || isTrialEndedRecently)) {\n    return null;\n  }\n\n  if (isDismissed) {\n    return (\n      <FixedButtonWrapper>\n        <IconButton\n          withTooltip={false}\n          label={formatMessage({\n            id: 'app.components.UpsellBanner.reopen',\n            defaultMessage: 'Reopen banner',\n          })}\n          onClick={handleReopen}\n        >\n          <ArrowsOut />\n        </IconButton>\n      </FixedButtonWrapper>\n    );\n  }\n\n  return <Banner isTrialEndedRecently={isTrialEndedRecently} onDismiss={handleDismiss} />;\n};\n\nexport { UpsellBanner };\n"],"names":["BannerBackground","styled","Flex","theme","colors","primary600","alternative600","FixedButtonWrapper","Box","Banner","isTrialEndedRecently","onDismiss","formatMessage","useIntl","_jsxs","_Fragment","_jsx","width","justifyContent","alignItems","paddingTop","paddingBottom","paddingLeft","RESPONSIVE_DEFAULT_SPACING","paddingRight","gap","Typography","variant","fontWeight","textColor","textAlign","fontSize","id","defaultMessage","LinkButton","href","target","IconButton","withTooltip","label","onClick","Cross","UpsellBanner","license","useLicenseLimits","cachedTrialEndsAt","setCachedTrialEndsAt","useScopedPersistentState","undefined","dismissedFor","setDismissedFor","sevenDaysAgo","subDays","Date","timeLeftData","useGetLicenseTrialTimeLeftQuery","skip","isTrial","useEffect","data","trialEndsAt","Boolean","window","strapi","isEE","isAfter","toCanonicalISO","v","date","isValid","toISOString","isDismissed","handleDismiss","handleReopen","ArrowsOut"],"mappings":"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"}
+{"version":3,"file":"UpsellBanner.mjs","sources":["../../../../../admin/src/components/UpsellBanner.tsx"],"sourcesContent":["import { useEffect } from 'react';\n\nimport { useLicenseLimits } from '@strapi/admin/strapi-admin/ee';\nimport { Box, IconButton, LinkButton, Typography } from '@strapi/design-system';\nimport { ArrowsOut } from '@strapi/icons';\nimport { isAfter, isValid, subDays } from 'date-fns';\nimport { useIntl } from 'react-intl';\nimport { styled } from 'styled-components';\n\nimport { useGetLicenseTrialTimeLeftQuery } from '../../src/services/admin';\nimport { useScopedPersistentState } from '../hooks/usePersistentState';\n\nimport { DismissibleBanner } from './DismissibleBanner';\n\n/**\n * Unlike `DismissibleBanner`'s own close button, this has no banner box left to\n * anchor to once dismissed (the banner unmounts entirely), so it stays pinned\n * to the viewport instead.\n */\nconst FixedButtonWrapper = styled(Box)`\n  position: fixed;\n  display: flex;\n  flex-direction: column;\n  z-index: 1;\n  align-items: flex-end;\n  top: 9px;\n  right: 16px;\n`;\n\nconst Banner = ({\n  isTrialEndedRecently,\n  onDismiss,\n}: {\n  isTrialEndedRecently: boolean;\n  onDismiss: () => void;\n}) => {\n  const { formatMessage } = useIntl();\n\n  return (\n    <DismissibleBanner\n      onDismiss={onDismiss}\n      closeLabel={formatMessage({\n        id: 'app.components.UpsellBanner.close',\n        defaultMessage: 'Close',\n      })}\n      message={\n        <>\n          <Typography\n            variant=\"delta\"\n            fontWeight=\"bold\"\n            textColor=\"neutral0\"\n            textAlign=\"center\"\n            fontSize={2}\n          >\n            {formatMessage(\n              isTrialEndedRecently\n                ? {\n                    id: 'app.components.UpsellBanner.intro.ended',\n                    defaultMessage: 'Your trial has ended: ',\n                  }\n                : {\n                    id: 'app.components.UpsellBanner.intro',\n                    defaultMessage: 'Access to Growth plan features: ',\n                  }\n            )}\n          </Typography>\n          <Typography\n            variant=\"delta\"\n            textColor=\"neutral0\"\n            textAlign=\"center\"\n            paddingRight={4}\n            fontSize={2}\n          >\n            {formatMessage(\n              isTrialEndedRecently\n                ? {\n                    id: 'app.components.UpsellBanner.text.ended',\n                    defaultMessage: 'Keep access to Growth features by upgrading now.',\n                  }\n                : {\n                    id: 'app.components.UpsellBanner.text',\n                    defaultMessage:\n                      'As part of your trial, you can explore premium tools such as Content History, Releases, and Single Sign-On (SSO).',\n                  }\n            )}\n          </Typography>\n        </>\n      }\n      action={\n        <LinkButton\n          width=\"max-content\"\n          variant=\"tertiary\"\n          href=\"https://billing.strapi.io\"\n          target=\"_blank\"\n        >\n          {formatMessage(\n            isTrialEndedRecently\n              ? {\n                  id: 'app.components.UpsellBanner.button.ended',\n                  defaultMessage: 'Keep Growth plan',\n                }\n              : {\n                  id: 'app.components.UpsellBanner.button',\n                  defaultMessage: 'Upgrade now',\n                }\n          )}\n        </LinkButton>\n      }\n    />\n  );\n};\n\nconst UpsellBanner = () => {\n  const { license } = useLicenseLimits();\n  const { formatMessage } = useIntl();\n\n  const [cachedTrialEndsAt, setCachedTrialEndsAt] = useScopedPersistentState<string | undefined>(\n    'STRAPI_FREE_TRIAL_ENDS_AT',\n    undefined\n  );\n\n  const [dismissedFor, setDismissedFor] = useScopedPersistentState<string | undefined>(\n    'STRAPI_UPSELL_BANNER_DISMISSED_FOR',\n    undefined\n  );\n\n  const sevenDaysAgo = subDays(new Date(), 7);\n\n  const timeLeftData = useGetLicenseTrialTimeLeftQuery(undefined, {\n    skip: !license?.isTrial,\n  });\n\n  useEffect(() => {\n    if (timeLeftData.data?.trialEndsAt) {\n      setCachedTrialEndsAt(timeLeftData.data.trialEndsAt);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [timeLeftData.data?.trialEndsAt]);\n\n  // When the license is not a trial + not EE, and the cached trial end date is found in the localstorage, that means the trial has ended\n  // We show the banner to encourage the user to upgrade (for 7 days after the trial ends)\n  const isTrialEndedRecently = Boolean(\n    !license?.isTrial &&\n      !window.strapi.isEE &&\n      cachedTrialEndsAt &&\n      isAfter(new Date(cachedTrialEndsAt), sevenDaysAgo)\n  );\n\n  const trialEndsAt = timeLeftData.data?.trialEndsAt ?? cachedTrialEndsAt;\n\n  const toCanonicalISO = (v: string | undefined): string | undefined => {\n    if (!v) return undefined;\n    const date = new Date(v);\n    return isValid(date) ? date.toISOString() : undefined;\n  };\n\n  const isDismissed = Boolean(\n    trialEndsAt && toCanonicalISO(dismissedFor) === toCanonicalISO(trialEndsAt)\n  );\n\n  const handleDismiss = () => setDismissedFor(toCanonicalISO(trialEndsAt));\n  const handleReopen = () => setDismissedFor(undefined);\n\n  if (!(timeLeftData.data?.trialEndsAt || isTrialEndedRecently)) {\n    return null;\n  }\n\n  if (isDismissed) {\n    return (\n      <FixedButtonWrapper>\n        <IconButton\n          withTooltip={false}\n          label={formatMessage({\n            id: 'app.components.UpsellBanner.reopen',\n            defaultMessage: 'Reopen banner',\n          })}\n          onClick={handleReopen}\n        >\n          <ArrowsOut />\n        </IconButton>\n      </FixedButtonWrapper>\n    );\n  }\n\n  return <Banner isTrialEndedRecently={isTrialEndedRecently} onDismiss={handleDismiss} />;\n};\n\nexport { UpsellBanner };\n"],"names":["FixedButtonWrapper","styled","Box","Banner","isTrialEndedRecently","onDismiss","formatMessage","useIntl","_jsx","DismissibleBanner","closeLabel","id","defaultMessage","message","_jsxs","_Fragment","Typography","variant","fontWeight","textColor","textAlign","fontSize","paddingRight","action","LinkButton","width","href","target","UpsellBanner","license","useLicenseLimits","cachedTrialEndsAt","setCachedTrialEndsAt","useScopedPersistentState","undefined","dismissedFor","setDismissedFor","sevenDaysAgo","subDays","Date","timeLeftData","useGetLicenseTrialTimeLeftQuery","skip","isTrial","useEffect","data","trialEndsAt","Boolean","window","strapi","isEE","isAfter","toCanonicalISO","v","date","isValid","toISOString","isDismissed","handleDismiss","handleReopen","IconButton","withTooltip","label","onClick","ArrowsOut"],"mappings":";;;;;;;;;;;;AAcA;;;;AAIC,IACD,MAAMA,kBAAAA,GAAqBC,MAAAA,CAAOC,GAAAA,CAAI;;;;;;;;AAQtC,CAAC;AAED,MAAMC,SAAS,CAAC,EACdC,oBAAoB,EACpBC,SAAS,EAIV,GAAA;IACC,MAAM,EAAEC,aAAa,EAAE,GAAGC,OAAAA,EAAAA;AAE1B,IAAA,qBACEC,GAAA,CAACC,iBAAAA,EAAAA;QACCJ,SAAAA,EAAWA,SAAAA;AACXK,QAAAA,UAAAA,EAAYJ,aAAAA,CAAc;YACxBK,EAAAA,EAAI,mCAAA;YACJC,cAAAA,EAAgB;AAClB,SAAA,CAAA;QACAC,OAAAA,gBACEC,IAAA,CAAAC,QAAA,EAAA;;8BACEP,GAAA,CAACQ,UAAAA,EAAAA;oBACCC,OAAAA,EAAQ,OAAA;oBACRC,UAAAA,EAAW,MAAA;oBACXC,SAAAA,EAAU,UAAA;oBACVC,SAAAA,EAAU,QAAA;oBACVC,QAAAA,EAAU,CAAA;AAETf,oBAAAA,QAAAA,EAAAA,aAAAA,CACCF,oBAAAA,GACI;wBACEO,EAAAA,EAAI,yCAAA;wBACJC,cAAAA,EAAgB;qBAClB,GACA;wBACED,EAAAA,EAAI,mCAAA;wBACJC,cAAAA,EAAgB;AAClB,qBAAA;;8BAGRJ,GAAA,CAACQ,UAAAA,EAAAA;oBACCC,OAAAA,EAAQ,OAAA;oBACRE,SAAAA,EAAU,UAAA;oBACVC,SAAAA,EAAU,QAAA;oBACVE,YAAAA,EAAc,CAAA;oBACdD,QAAAA,EAAU,CAAA;AAETf,oBAAAA,QAAAA,EAAAA,aAAAA,CACCF,oBAAAA,GACI;wBACEO,EAAAA,EAAI,wCAAA;wBACJC,cAAAA,EAAgB;qBAClB,GACA;wBACED,EAAAA,EAAI,kCAAA;wBACJC,cAAAA,EACE;AACJ,qBAAA;;;;AAKZW,QAAAA,MAAAA,gBACEf,GAAA,CAACgB,UAAAA,EAAAA;YACCC,KAAAA,EAAM,aAAA;YACNR,OAAAA,EAAQ,UAAA;YACRS,IAAAA,EAAK,2BAAA;YACLC,MAAAA,EAAO,QAAA;AAENrB,YAAAA,QAAAA,EAAAA,aAAAA,CACCF,oBAAAA,GACI;gBACEO,EAAAA,EAAI,0CAAA;gBACJC,cAAAA,EAAgB;aAClB,GACA;gBACED,EAAAA,EAAI,oCAAA;gBACJC,cAAAA,EAAgB;AAClB,aAAA;;;AAMhB,CAAA;AAEA,MAAMgB,YAAAA,GAAe,IAAA;IACnB,MAAM,EAAEC,OAAO,EAAE,GAAGC,gBAAAA,EAAAA;IACpB,MAAM,EAAExB,aAAa,EAAE,GAAGC,OAAAA,EAAAA;AAE1B,IAAA,MAAM,CAACwB,iBAAAA,EAAmBC,oBAAAA,CAAqB,GAAGC,yBAChD,2BAAA,EACAC,SAAAA,CAAAA;AAGF,IAAA,MAAM,CAACC,YAAAA,EAAcC,eAAAA,CAAgB,GAAGH,yBACtC,oCAAA,EACAC,SAAAA,CAAAA;IAGF,MAAMG,YAAAA,GAAeC,OAAAA,CAAQ,IAAIC,IAAAA,EAAAA,EAAQ,CAAA,CAAA;IAEzC,MAAMC,YAAAA,GAAeC,gCAAgCP,SAAAA,EAAW;AAC9DQ,QAAAA,IAAAA,EAAM,CAACb,OAAAA,EAASc;AAClB,KAAA,CAAA;IAEAC,SAAAA,CAAU,IAAA;QACR,IAAIJ,YAAAA,CAAaK,IAAI,EAAEC,WAAAA,EAAa;YAClCd,oBAAAA,CAAqBQ,YAAAA,CAAaK,IAAI,CAACC,WAAW,CAAA;AACpD,QAAA;;IAEF,CAAA,EAAG;AAACN,QAAAA,YAAAA,CAAaK,IAAI,EAAEC;AAAY,KAAA,CAAA;;;AAInC,IAAA,MAAM1C,oBAAAA,GAAuB2C,OAAAA,CAC3B,CAAClB,OAAAA,EAASc,WACR,CAACK,MAAAA,CAAOC,MAAM,CAACC,IAAI,IACnBnB,iBAAAA,IACAoB,OAAAA,CAAQ,IAAIZ,KAAKR,iBAAAA,CAAAA,EAAoBM,YAAAA,CAAAA,CAAAA;AAGzC,IAAA,MAAMS,WAAAA,GAAcN,YAAAA,CAAaK,IAAI,EAAEC,WAAAA,IAAef,iBAAAA;AAEtD,IAAA,MAAMqB,iBAAiB,CAACC,CAAAA,GAAAA;QACtB,IAAI,CAACA,GAAG,OAAOnB,SAAAA;QACf,MAAMoB,IAAAA,GAAO,IAAIf,IAAAA,CAAKc,CAAAA,CAAAA;AACtB,QAAA,OAAOE,OAAAA,CAAQD,IAAAA,CAAAA,GAAQA,IAAAA,CAAKE,WAAW,EAAA,GAAKtB,SAAAA;AAC9C,IAAA,CAAA;AAEA,IAAA,MAAMuB,WAAAA,GAAcV,OAAAA,CAClBD,WAAAA,IAAeM,cAAAA,CAAejB,kBAAkBiB,cAAAA,CAAeN,WAAAA,CAAAA,CAAAA;IAGjE,MAAMY,aAAAA,GAAgB,IAAMtB,eAAAA,CAAgBgB,cAAAA,CAAeN,WAAAA,CAAAA,CAAAA;IAC3D,MAAMa,YAAAA,GAAe,IAAMvB,eAAAA,CAAgBF,SAAAA,CAAAA;AAE3C,IAAA,IAAI,EAAEM,YAAAA,CAAaK,IAAI,EAAEC,WAAAA,IAAe1C,oBAAmB,CAAA,EAAI;QAC7D,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,IAAIqD,WAAAA,EAAa;AACf,QAAA,qBACEjD,GAAA,CAACR,kBAAAA,EAAAA;AACC,YAAA,QAAA,gBAAAQ,GAAA,CAACoD,UAAAA,EAAAA;gBACCC,WAAAA,EAAa,KAAA;AACbC,gBAAAA,KAAAA,EAAOxD,aAAAA,CAAc;oBACnBK,EAAAA,EAAI,oCAAA;oBACJC,cAAAA,EAAgB;AAClB,iBAAA,CAAA;gBACAmD,OAAAA,EAASJ,YAAAA;AAET,gBAAA,QAAA,gBAAAnD,GAAA,CAACwD,SAAAA,EAAAA,EAAAA;;;AAIT,IAAA;AAEA,IAAA,qBAAOxD,GAAA,CAACL,MAAAA,EAAAA;QAAOC,oBAAAA,EAAsBA,oBAAAA;QAAsBC,SAAAA,EAAWqD;;AACxE;;;;"}

package/dist/admin/admin/src/core/store/configure.js

@@ -3,6 +3,7 @@
 var toolkit = require('@reduxjs/toolkit');
 var reducer = require('../../reducer.js');
 var api = require('../../services/api.js');
+var getFetchClient = require('../../utils/getFetchClient.js');
 var basename = require('../utils/basename.js');
 
 /**
@@ -60,9 +61,20 @@ const injectReducerStoreEnhancer = (appReducers)=>(next)=>(...args)=>{
     });
     return store;
 };
-const rtkQueryUnauthorizedMiddleware = ({ dispatch })=>(next)=>(action)=>{
+/**
+ * A 401 here means the fetch layer already tried to refresh the access token and
+ * the server refused: the session is over. Hand that to `AuthProvider`, which
+ * can warn about unsaved changes before clearing auth state. Reloading the page
+ * instead (as this used to) unmounts every form first, so the warning — and the
+ * user's edits — never make it to the screen. Falls back to the hard redirect
+ * when no provider is listening, so the user is never stranded on a dead page.
+ *
+ * `triggerSessionExpired` is idempotent per dead session (baseQuery often
+ * already called it for this 401). The `!` check is only the no-listener
+ * fallback; it must not run logout a second time.
+ */ const rtkQueryUnauthorizedMiddleware = ({ dispatch })=>(next)=>(action)=>{
             // isRejectedWithValue Or isRejected
-            if (toolkit.isRejected(action) && action.payload?.status === 401) {
+            if (toolkit.isRejected(action) && action.payload?.status === 401 && !getFetchClient.triggerSessionExpired()) {
                 dispatch(reducer.logout());
                 const basename$1 = basename.getBasename();
                 window.location.href = `${basename$1}/auth/login`;

package/dist/admin/admin/src/core/store/configure.js.map

@@ -1 +1 @@
-{"version":3,"file":"configure.js","sources":["../../../../../../admin/src/core/store/configure.ts"],"sourcesContent":["import {\n  configureStore,\n  StoreEnhancer,\n  Middleware,\n  Reducer,\n  combineReducers,\n  MiddlewareAPI,\n  isRejected,\n} from '@reduxjs/toolkit';\n\nimport { reducer as appReducer, AppState, logout } from '../../reducer';\nimport { adminApi } from '../../services/api';\nimport { getBasename } from '../utils/basename';\n\n/**\n * @description Static reducers are ones we know, they live in the admin package.\n */\nconst staticReducers = {\n  [adminApi.reducerPath]: adminApi.reducer,\n  admin_app: appReducer,\n} as const;\n\nconst injectReducerStoreEnhancer: (appReducers: Record<string, Reducer>) => StoreEnhancer =\n  (appReducers) =>\n  (next) =>\n  (...args) => {\n    const store = next(...args);\n\n    const asyncReducers: Record<string, Reducer> = {};\n\n    return {\n      ...store,\n      asyncReducers,\n      injectReducer: (key: string, asyncReducer: Reducer) => {\n        asyncReducers[key] = asyncReducer;\n        store.replaceReducer(\n          // @ts-expect-error we dynamically add reducers which makes the types uncomfortable.\n          combineReducers({\n            ...appReducers,\n            ...asyncReducers,\n          })\n        );\n      },\n    };\n  };\n\ntype PreloadState = Partial<{\n  admin_app: AppState;\n}>;\n\ntype DefaultMiddlewareOptions = {\n  serializableCheck?: boolean;\n  immutableCheck?: boolean;\n};\n\n/**\n * @description This is the main store configuration function, injected Reducers use our legacy app.addReducer API,\n * which we're trying to phase out. App Middlewares could potentially be improved...?\n */\nconst configureStoreImpl = (\n  preloadedState: PreloadState = {},\n  appMiddlewares: Array<() => Middleware> = [],\n  injectedReducers: Record<string, Reducer> = {}\n) => {\n  const coreReducers = { ...staticReducers, ...injectedReducers } as const;\n\n  const defaultMiddlewareOptions: DefaultMiddlewareOptions = {};\n\n  // These are already disabled in 'production' env but we also need to disable it in test environments\n  // However, we want to leave them on for development so any issues can still be caught\n  if (process.env.NODE_ENV === 'test') {\n    defaultMiddlewareOptions.serializableCheck = false;\n    defaultMiddlewareOptions.immutableCheck = false;\n  }\n\n  const store = configureStore({\n    preloadedState: {\n      admin_app: preloadedState.admin_app,\n    },\n    reducer: coreReducers,\n    devTools: process.env.NODE_ENV !== 'production',\n    middleware: (getDefaultMiddleware) => [\n      ...getDefaultMiddleware(defaultMiddlewareOptions),\n      rtkQueryUnauthorizedMiddleware,\n      adminApi.middleware,\n      ...appMiddlewares.map((m) => m()),\n    ],\n    enhancers: [injectReducerStoreEnhancer(coreReducers)],\n  });\n\n  return store;\n};\n\nconst rtkQueryUnauthorizedMiddleware: Middleware =\n  ({ dispatch }: MiddlewareAPI) =>\n  (next) =>\n  (action) => {\n    // isRejectedWithValue Or isRejected\n    if (isRejected(action) && action.payload?.status === 401) {\n      dispatch(logout());\n      const basename = getBasename();\n      window.location.href = `${basename}/auth/login`;\n      return;\n    }\n\n    return next(action);\n  };\n\ntype Store = ReturnType<typeof configureStoreImpl> & {\n  asyncReducers: Record<string, Reducer>;\n  injectReducer: (key: string, asyncReducer: Reducer) => void;\n};\n\ntype RootState = ReturnType<Store['getState']>;\n\ntype Dispatch = Store['dispatch'];\n\nexport { configureStoreImpl as configureStore };\nexport type { RootState, Dispatch, AppState, Store, PreloadState };\n"],"names":["staticReducers","adminApi","reducerPath","reducer","admin_app","appReducer","injectReducerStoreEnhancer","appReducers","next","args","store","asyncReducers","injectReducer","key","asyncReducer","replaceReducer","combineReducers","configureStoreImpl","preloadedState","appMiddlewares","injectedReducers","coreReducers","defaultMiddlewareOptions","process","env","NODE_ENV","serializableCheck","immutableCheck","configureStore","devTools","middleware","getDefaultMiddleware","rtkQueryUnauthorizedMiddleware","map","m","enhancers","dispatch","action","isRejected","payload","status","logout","basename","getBasename","window","location","href"],"mappings":";;;;;;;AAcA;;AAEC,IACD,MAAMA,cAAAA,GAAiB;AACrB,IAAA,CAACC,YAAAA,CAASC,WAAW,GAAGD,aAASE,OAAO;IACxCC,SAAAA,EAAWC;AACb,CAAA;AAEA,MAAMC,6BACJ,CAACC,WAAAA,GACD,CAACC,IAAAA,GACD,CAAC,GAAGC,IAAAA,GAAAA;AACF,YAAA,MAAMC,QAAQF,IAAAA,CAAAA,GAAQC,IAAAA,CAAAA;AAEtB,YAAA,MAAME,gBAAyC,EAAC;YAEhD,OAAO;AACL,gBAAA,GAAGD,KAAK;AACRC,gBAAAA,aAAAA;AACAC,gBAAAA,aAAAA,EAAe,CAACC,GAAAA,EAAaC,YAAAA,GAAAA;oBAC3BH,aAAa,CAACE,IAAI,GAAGC,YAAAA;oBACrBJ,KAAAA,CAAMK,cAAc;oBAElBC,uBAAAA,CAAgB;AACd,wBAAA,GAAGT,WAAW;AACd,wBAAA,GAAGI;AACL,qBAAA,CAAA,CAAA;AAEJ,gBAAA;AACF,aAAA;AACF,QAAA,CAAA;AAWF;;;AAGC,IACD,MAAMM,kBAAAA,GAAqB,CACzBC,cAAAA,GAA+B,EAAE,EACjCC,cAAAA,GAA0C,EAAE,EAC5CC,gBAAAA,GAA4C,EAAE,GAAA;AAE9C,IAAA,MAAMC,YAAAA,GAAe;AAAE,QAAA,GAAGrB,cAAc;AAAE,QAAA,GAAGoB;AAAiB,KAAA;AAE9D,IAAA,MAAME,2BAAqD,EAAC;;;AAI5D,IAAA,IAAIC,OAAAA,CAAQC,GAAG,CAACC,QAAQ,KAAK,MAAA,EAAQ;AACnCH,QAAAA,wBAAAA,CAAyBI,iBAAiB,GAAG,KAAA;AAC7CJ,QAAAA,wBAAAA,CAAyBK,cAAc,GAAG,KAAA;AAC5C,IAAA;AAEA,IAAA,MAAMjB,QAAQkB,sBAAAA,CAAe;QAC3BV,cAAAA,EAAgB;AACdd,YAAAA,SAAAA,EAAWc,eAAed;AAC5B,SAAA;QACAD,OAAAA,EAASkB,YAAAA;AACTQ,QAAAA,QAAAA,EAAUN,OAAAA,CAAQC,GAAG,CAACC,QAAQ,KAAK,YAAA;AACnCK,QAAAA,UAAAA,EAAY,CAACC,oBAAAA,GAAyB;mBACjCA,oBAAAA,CAAqBT,wBAAAA,CAAAA;AACxBU,gBAAAA,8BAAAA;AACA/B,gBAAAA,YAAAA,CAAS6B,UAAU;mBAChBX,cAAAA,CAAec,GAAG,CAAC,CAACC,CAAAA,GAAMA,CAAAA,EAAAA;AAC9B,aAAA;QACDC,SAAAA,EAAW;YAAC7B,0BAAAA,CAA2Be,YAAAA;AAAc;AACvD,KAAA,CAAA;IAEA,OAAOX,KAAAA;AACT;AAEA,MAAMsB,8BAAAA,GACJ,CAAC,EAAEI,QAAQ,EAAiB,GAC5B,CAAC5B,OACD,CAAC6B,MAAAA,GAAAA;;AAEC,YAAA,IAAIC,mBAAWD,MAAAA,CAAAA,IAAWA,MAAAA,CAAOE,OAAO,EAAEC,WAAW,GAAA,EAAK;gBACxDJ,QAAAA,CAASK,cAAAA,EAAAA,CAAAA;AACT,gBAAA,MAAMC,UAAAA,GAAWC,oBAAAA,EAAAA;AACjBC,gBAAAA,MAAAA,CAAOC,QAAQ,CAACC,IAAI,GAAG,CAAA,EAAGJ,UAAAA,CAAS,WAAW,CAAC;AAC/C,gBAAA;AACF,YAAA;AAEA,YAAA,OAAOlC,IAAAA,CAAK6B,MAAAA,CAAAA;AACd,QAAA,CAAA;;;;"}
+{"version":3,"file":"configure.js","sources":["../../../../../../admin/src/core/store/configure.ts"],"sourcesContent":["import {\n  configureStore,\n  StoreEnhancer,\n  Middleware,\n  Reducer,\n  combineReducers,\n  MiddlewareAPI,\n  isRejected,\n} from '@reduxjs/toolkit';\n\nimport { reducer as appReducer, AppState, logout } from '../../reducer';\nimport { adminApi } from '../../services/api';\nimport { triggerSessionExpired } from '../../utils/getFetchClient';\nimport { getBasename } from '../utils/basename';\n\n/**\n * @description Static reducers are ones we know, they live in the admin package.\n */\nconst staticReducers = {\n  [adminApi.reducerPath]: adminApi.reducer,\n  admin_app: appReducer,\n} as const;\n\nconst injectReducerStoreEnhancer: (appReducers: Record<string, Reducer>) => StoreEnhancer =\n  (appReducers) =>\n  (next) =>\n  (...args) => {\n    const store = next(...args);\n\n    const asyncReducers: Record<string, Reducer> = {};\n\n    return {\n      ...store,\n      asyncReducers,\n      injectReducer: (key: string, asyncReducer: Reducer) => {\n        asyncReducers[key] = asyncReducer;\n        store.replaceReducer(\n          // @ts-expect-error we dynamically add reducers which makes the types uncomfortable.\n          combineReducers({\n            ...appReducers,\n            ...asyncReducers,\n          })\n        );\n      },\n    };\n  };\n\ntype PreloadState = Partial<{\n  admin_app: AppState;\n}>;\n\ntype DefaultMiddlewareOptions = {\n  serializableCheck?: boolean;\n  immutableCheck?: boolean;\n};\n\n/**\n * @description This is the main store configuration function, injected Reducers use our legacy app.addReducer API,\n * which we're trying to phase out. App Middlewares could potentially be improved...?\n */\nconst configureStoreImpl = (\n  preloadedState: PreloadState = {},\n  appMiddlewares: Array<() => Middleware> = [],\n  injectedReducers: Record<string, Reducer> = {}\n) => {\n  const coreReducers = { ...staticReducers, ...injectedReducers } as const;\n\n  const defaultMiddlewareOptions: DefaultMiddlewareOptions = {};\n\n  // These are already disabled in 'production' env but we also need to disable it in test environments\n  // However, we want to leave them on for development so any issues can still be caught\n  if (process.env.NODE_ENV === 'test') {\n    defaultMiddlewareOptions.serializableCheck = false;\n    defaultMiddlewareOptions.immutableCheck = false;\n  }\n\n  const store = configureStore({\n    preloadedState: {\n      admin_app: preloadedState.admin_app,\n    },\n    reducer: coreReducers,\n    devTools: process.env.NODE_ENV !== 'production',\n    middleware: (getDefaultMiddleware) => [\n      ...getDefaultMiddleware(defaultMiddlewareOptions),\n      rtkQueryUnauthorizedMiddleware,\n      adminApi.middleware,\n      ...appMiddlewares.map((m) => m()),\n    ],\n    enhancers: [injectReducerStoreEnhancer(coreReducers)],\n  });\n\n  return store;\n};\n\n/**\n * A 401 here means the fetch layer already tried to refresh the access token and\n * the server refused: the session is over. Hand that to `AuthProvider`, which\n * can warn about unsaved changes before clearing auth state. Reloading the page\n * instead (as this used to) unmounts every form first, so the warning — and the\n * user's edits — never make it to the screen. Falls back to the hard redirect\n * when no provider is listening, so the user is never stranded on a dead page.\n *\n * `triggerSessionExpired` is idempotent per dead session (baseQuery often\n * already called it for this 401). The `!` check is only the no-listener\n * fallback; it must not run logout a second time.\n */\nconst rtkQueryUnauthorizedMiddleware: Middleware =\n  ({ dispatch }: MiddlewareAPI) =>\n  (next) =>\n  (action) => {\n    // isRejectedWithValue Or isRejected\n    if (isRejected(action) && action.payload?.status === 401 && !triggerSessionExpired()) {\n      dispatch(logout());\n      const basename = getBasename();\n      window.location.href = `${basename}/auth/login`;\n      return;\n    }\n\n    return next(action);\n  };\n\ntype Store = ReturnType<typeof configureStoreImpl> & {\n  asyncReducers: Record<string, Reducer>;\n  injectReducer: (key: string, asyncReducer: Reducer) => void;\n};\n\ntype RootState = ReturnType<Store['getState']>;\n\ntype Dispatch = Store['dispatch'];\n\nexport { configureStoreImpl as configureStore };\nexport type { RootState, Dispatch, AppState, Store, PreloadState };\n"],"names":["staticReducers","adminApi","reducerPath","reducer","admin_app","appReducer","injectReducerStoreEnhancer","appReducers","next","args","store","asyncReducers","injectReducer","key","asyncReducer","replaceReducer","combineReducers","configureStoreImpl","preloadedState","appMiddlewares","injectedReducers","coreReducers","defaultMiddlewareOptions","process","env","NODE_ENV","serializableCheck","immutableCheck","configureStore","devTools","middleware","getDefaultMiddleware","rtkQueryUnauthorizedMiddleware","map","m","enhancers","dispatch","action","isRejected","payload","status","triggerSessionExpired","logout","basename","getBasename","window","location","href"],"mappings":";;;;;;;;AAeA;;AAEC,IACD,MAAMA,cAAAA,GAAiB;AACrB,IAAA,CAACC,YAAAA,CAASC,WAAW,GAAGD,aAASE,OAAO;IACxCC,SAAAA,EAAWC;AACb,CAAA;AAEA,MAAMC,6BACJ,CAACC,WAAAA,GACD,CAACC,IAAAA,GACD,CAAC,GAAGC,IAAAA,GAAAA;AACF,YAAA,MAAMC,QAAQF,IAAAA,CAAAA,GAAQC,IAAAA,CAAAA;AAEtB,YAAA,MAAME,gBAAyC,EAAC;YAEhD,OAAO;AACL,gBAAA,GAAGD,KAAK;AACRC,gBAAAA,aAAAA;AACAC,gBAAAA,aAAAA,EAAe,CAACC,GAAAA,EAAaC,YAAAA,GAAAA;oBAC3BH,aAAa,CAACE,IAAI,GAAGC,YAAAA;oBACrBJ,KAAAA,CAAMK,cAAc;oBAElBC,uBAAAA,CAAgB;AACd,wBAAA,GAAGT,WAAW;AACd,wBAAA,GAAGI;AACL,qBAAA,CAAA,CAAA;AAEJ,gBAAA;AACF,aAAA;AACF,QAAA,CAAA;AAWF;;;AAGC,IACD,MAAMM,kBAAAA,GAAqB,CACzBC,cAAAA,GAA+B,EAAE,EACjCC,cAAAA,GAA0C,EAAE,EAC5CC,gBAAAA,GAA4C,EAAE,GAAA;AAE9C,IAAA,MAAMC,YAAAA,GAAe;AAAE,QAAA,GAAGrB,cAAc;AAAE,QAAA,GAAGoB;AAAiB,KAAA;AAE9D,IAAA,MAAME,2BAAqD,EAAC;;;AAI5D,IAAA,IAAIC,OAAAA,CAAQC,GAAG,CAACC,QAAQ,KAAK,MAAA,EAAQ;AACnCH,QAAAA,wBAAAA,CAAyBI,iBAAiB,GAAG,KAAA;AAC7CJ,QAAAA,wBAAAA,CAAyBK,cAAc,GAAG,KAAA;AAC5C,IAAA;AAEA,IAAA,MAAMjB,QAAQkB,sBAAAA,CAAe;QAC3BV,cAAAA,EAAgB;AACdd,YAAAA,SAAAA,EAAWc,eAAed;AAC5B,SAAA;QACAD,OAAAA,EAASkB,YAAAA;AACTQ,QAAAA,QAAAA,EAAUN,OAAAA,CAAQC,GAAG,CAACC,QAAQ,KAAK,YAAA;AACnCK,QAAAA,UAAAA,EAAY,CAACC,oBAAAA,GAAyB;mBACjCA,oBAAAA,CAAqBT,wBAAAA,CAAAA;AACxBU,gBAAAA,8BAAAA;AACA/B,gBAAAA,YAAAA,CAAS6B,UAAU;mBAChBX,cAAAA,CAAec,GAAG,CAAC,CAACC,CAAAA,GAAMA,CAAAA,EAAAA;AAC9B,aAAA;QACDC,SAAAA,EAAW;YAAC7B,0BAAAA,CAA2Be,YAAAA;AAAc;AACvD,KAAA,CAAA;IAEA,OAAOX,KAAAA;AACT;AAEA;;;;;;;;;;;IAYA,MAAMsB,iCACJ,CAAC,EAAEI,QAAQ,EAAiB,GAC5B,CAAC5B,IAAAA,GACD,CAAC6B,MAAAA,GAAAA;;YAEC,IAAIC,kBAAAA,CAAWD,WAAWA,MAAAA,CAAOE,OAAO,EAAEC,MAAAA,KAAW,GAAA,IAAO,CAACC,oCAAAA,EAAAA,EAAyB;gBACpFL,QAAAA,CAASM,cAAAA,EAAAA,CAAAA;AACT,gBAAA,MAAMC,UAAAA,GAAWC,oBAAAA,EAAAA;AACjBC,gBAAAA,MAAAA,CAAOC,QAAQ,CAACC,IAAI,GAAG,CAAA,EAAGJ,UAAAA,CAAS,WAAW,CAAC;AAC/C,gBAAA;AACF,YAAA;AAEA,YAAA,OAAOnC,IAAAA,CAAK6B,MAAAA,CAAAA;AACd,QAAA,CAAA;;;;"}

package/dist/admin/admin/src/core/store/configure.mjs

@@ -1,6 +1,7 @@
 import { configureStore, isRejected, combineReducers } from '@reduxjs/toolkit';
 import { reducer, logout } from '../../reducer.mjs';
 import { adminApi } from '../../services/api.mjs';
+import { triggerSessionExpired } from '../../utils/getFetchClient.mjs';
 import { getBasename } from '../utils/basename.mjs';
 
 /**
@@ -58,9 +59,20 @@ const injectReducerStoreEnhancer = (appReducers)=>(next)=>(...args)=>{
     });
     return store;
 };
-const rtkQueryUnauthorizedMiddleware = ({ dispatch })=>(next)=>(action)=>{
+/**
+ * A 401 here means the fetch layer already tried to refresh the access token and
+ * the server refused: the session is over. Hand that to `AuthProvider`, which
+ * can warn about unsaved changes before clearing auth state. Reloading the page
+ * instead (as this used to) unmounts every form first, so the warning — and the
+ * user's edits — never make it to the screen. Falls back to the hard redirect
+ * when no provider is listening, so the user is never stranded on a dead page.
+ *
+ * `triggerSessionExpired` is idempotent per dead session (baseQuery often
+ * already called it for this 401). The `!` check is only the no-listener
+ * fallback; it must not run logout a second time.
+ */ const rtkQueryUnauthorizedMiddleware = ({ dispatch })=>(next)=>(action)=>{
             // isRejectedWithValue Or isRejected
-            if (isRejected(action) && action.payload?.status === 401) {
+            if (isRejected(action) && action.payload?.status === 401 && !triggerSessionExpired()) {
                 dispatch(logout());
                 const basename = getBasename();
                 window.location.href = `${basename}/auth/login`;

package/dist/admin/admin/src/core/store/configure.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"configure.mjs","sources":["../../../../../../admin/src/core/store/configure.ts"],"sourcesContent":["import {\n  configureStore,\n  StoreEnhancer,\n  Middleware,\n  Reducer,\n  combineReducers,\n  MiddlewareAPI,\n  isRejected,\n} from '@reduxjs/toolkit';\n\nimport { reducer as appReducer, AppState, logout } from '../../reducer';\nimport { adminApi } from '../../services/api';\nimport { getBasename } from '../utils/basename';\n\n/**\n * @description Static reducers are ones we know, they live in the admin package.\n */\nconst staticReducers = {\n  [adminApi.reducerPath]: adminApi.reducer,\n  admin_app: appReducer,\n} as const;\n\nconst injectReducerStoreEnhancer: (appReducers: Record<string, Reducer>) => StoreEnhancer =\n  (appReducers) =>\n  (next) =>\n  (...args) => {\n    const store = next(...args);\n\n    const asyncReducers: Record<string, Reducer> = {};\n\n    return {\n      ...store,\n      asyncReducers,\n      injectReducer: (key: string, asyncReducer: Reducer) => {\n        asyncReducers[key] = asyncReducer;\n        store.replaceReducer(\n          // @ts-expect-error we dynamically add reducers which makes the types uncomfortable.\n          combineReducers({\n            ...appReducers,\n            ...asyncReducers,\n          })\n        );\n      },\n    };\n  };\n\ntype PreloadState = Partial<{\n  admin_app: AppState;\n}>;\n\ntype DefaultMiddlewareOptions = {\n  serializableCheck?: boolean;\n  immutableCheck?: boolean;\n};\n\n/**\n * @description This is the main store configuration function, injected Reducers use our legacy app.addReducer API,\n * which we're trying to phase out. App Middlewares could potentially be improved...?\n */\nconst configureStoreImpl = (\n  preloadedState: PreloadState = {},\n  appMiddlewares: Array<() => Middleware> = [],\n  injectedReducers: Record<string, Reducer> = {}\n) => {\n  const coreReducers = { ...staticReducers, ...injectedReducers } as const;\n\n  const defaultMiddlewareOptions: DefaultMiddlewareOptions = {};\n\n  // These are already disabled in 'production' env but we also need to disable it in test environments\n  // However, we want to leave them on for development so any issues can still be caught\n  if (process.env.NODE_ENV === 'test') {\n    defaultMiddlewareOptions.serializableCheck = false;\n    defaultMiddlewareOptions.immutableCheck = false;\n  }\n\n  const store = configureStore({\n    preloadedState: {\n      admin_app: preloadedState.admin_app,\n    },\n    reducer: coreReducers,\n    devTools: process.env.NODE_ENV !== 'production',\n    middleware: (getDefaultMiddleware) => [\n      ...getDefaultMiddleware(defaultMiddlewareOptions),\n      rtkQueryUnauthorizedMiddleware,\n      adminApi.middleware,\n      ...appMiddlewares.map((m) => m()),\n    ],\n    enhancers: [injectReducerStoreEnhancer(coreReducers)],\n  });\n\n  return store;\n};\n\nconst rtkQueryUnauthorizedMiddleware: Middleware =\n  ({ dispatch }: MiddlewareAPI) =>\n  (next) =>\n  (action) => {\n    // isRejectedWithValue Or isRejected\n    if (isRejected(action) && action.payload?.status === 401) {\n      dispatch(logout());\n      const basename = getBasename();\n      window.location.href = `${basename}/auth/login`;\n      return;\n    }\n\n    return next(action);\n  };\n\ntype Store = ReturnType<typeof configureStoreImpl> & {\n  asyncReducers: Record<string, Reducer>;\n  injectReducer: (key: string, asyncReducer: Reducer) => void;\n};\n\ntype RootState = ReturnType<Store['getState']>;\n\ntype Dispatch = Store['dispatch'];\n\nexport { configureStoreImpl as configureStore };\nexport type { RootState, Dispatch, AppState, Store, PreloadState };\n"],"names":["staticReducers","adminApi","reducerPath","reducer","admin_app","appReducer","injectReducerStoreEnhancer","appReducers","next","args","store","asyncReducers","injectReducer","key","asyncReducer","replaceReducer","combineReducers","configureStoreImpl","preloadedState","appMiddlewares","injectedReducers","coreReducers","defaultMiddlewareOptions","process","env","NODE_ENV","serializableCheck","immutableCheck","configureStore","devTools","middleware","getDefaultMiddleware","rtkQueryUnauthorizedMiddleware","map","m","enhancers","dispatch","action","isRejected","payload","status","logout","basename","getBasename","window","location","href"],"mappings":";;;;;AAcA;;AAEC,IACD,MAAMA,cAAAA,GAAiB;AACrB,IAAA,CAACC,QAAAA,CAASC,WAAW,GAAGD,SAASE,OAAO;IACxCC,SAAAA,EAAWC;AACb,CAAA;AAEA,MAAMC,6BACJ,CAACC,WAAAA,GACD,CAACC,IAAAA,GACD,CAAC,GAAGC,IAAAA,GAAAA;AACF,YAAA,MAAMC,QAAQF,IAAAA,CAAAA,GAAQC,IAAAA,CAAAA;AAEtB,YAAA,MAAME,gBAAyC,EAAC;YAEhD,OAAO;AACL,gBAAA,GAAGD,KAAK;AACRC,gBAAAA,aAAAA;AACAC,gBAAAA,aAAAA,EAAe,CAACC,GAAAA,EAAaC,YAAAA,GAAAA;oBAC3BH,aAAa,CAACE,IAAI,GAAGC,YAAAA;oBACrBJ,KAAAA,CAAMK,cAAc;oBAElBC,eAAAA,CAAgB;AACd,wBAAA,GAAGT,WAAW;AACd,wBAAA,GAAGI;AACL,qBAAA,CAAA,CAAA;AAEJ,gBAAA;AACF,aAAA;AACF,QAAA,CAAA;AAWF;;;AAGC,IACD,MAAMM,kBAAAA,GAAqB,CACzBC,cAAAA,GAA+B,EAAE,EACjCC,cAAAA,GAA0C,EAAE,EAC5CC,gBAAAA,GAA4C,EAAE,GAAA;AAE9C,IAAA,MAAMC,YAAAA,GAAe;AAAE,QAAA,GAAGrB,cAAc;AAAE,QAAA,GAAGoB;AAAiB,KAAA;AAE9D,IAAA,MAAME,2BAAqD,EAAC;;;AAI5D,IAAA,IAAIC,OAAAA,CAAQC,GAAG,CAACC,QAAQ,KAAK,MAAA,EAAQ;AACnCH,QAAAA,wBAAAA,CAAyBI,iBAAiB,GAAG,KAAA;AAC7CJ,QAAAA,wBAAAA,CAAyBK,cAAc,GAAG,KAAA;AAC5C,IAAA;AAEA,IAAA,MAAMjB,QAAQkB,cAAAA,CAAe;QAC3BV,cAAAA,EAAgB;AACdd,YAAAA,SAAAA,EAAWc,eAAed;AAC5B,SAAA;QACAD,OAAAA,EAASkB,YAAAA;AACTQ,QAAAA,QAAAA,EAAUN,OAAAA,CAAQC,GAAG,CAACC,QAAQ,KAAK,YAAA;AACnCK,QAAAA,UAAAA,EAAY,CAACC,oBAAAA,GAAyB;mBACjCA,oBAAAA,CAAqBT,wBAAAA,CAAAA;AACxBU,gBAAAA,8BAAAA;AACA/B,gBAAAA,QAAAA,CAAS6B,UAAU;mBAChBX,cAAAA,CAAec,GAAG,CAAC,CAACC,CAAAA,GAAMA,CAAAA,EAAAA;AAC9B,aAAA;QACDC,SAAAA,EAAW;YAAC7B,0BAAAA,CAA2Be,YAAAA;AAAc;AACvD,KAAA,CAAA;IAEA,OAAOX,KAAAA;AACT;AAEA,MAAMsB,8BAAAA,GACJ,CAAC,EAAEI,QAAQ,EAAiB,GAC5B,CAAC5B,OACD,CAAC6B,MAAAA,GAAAA;;AAEC,YAAA,IAAIC,WAAWD,MAAAA,CAAAA,IAAWA,MAAAA,CAAOE,OAAO,EAAEC,WAAW,GAAA,EAAK;gBACxDJ,QAAAA,CAASK,MAAAA,EAAAA,CAAAA;AACT,gBAAA,MAAMC,QAAAA,GAAWC,WAAAA,EAAAA;AACjBC,gBAAAA,MAAAA,CAAOC,QAAQ,CAACC,IAAI,GAAG,CAAA,EAAGJ,QAAAA,CAAS,WAAW,CAAC;AAC/C,gBAAA;AACF,YAAA;AAEA,YAAA,OAAOlC,IAAAA,CAAK6B,MAAAA,CAAAA;AACd,QAAA,CAAA;;;;"}
+{"version":3,"file":"configure.mjs","sources":["../../../../../../admin/src/core/store/configure.ts"],"sourcesContent":["import {\n  configureStore,\n  StoreEnhancer,\n  Middleware,\n  Reducer,\n  combineReducers,\n  MiddlewareAPI,\n  isRejected,\n} from '@reduxjs/toolkit';\n\nimport { reducer as appReducer, AppState, logout } from '../../reducer';\nimport { adminApi } from '../../services/api';\nimport { triggerSessionExpired } from '../../utils/getFetchClient';\nimport { getBasename } from '../utils/basename';\n\n/**\n * @description Static reducers are ones we know, they live in the admin package.\n */\nconst staticReducers = {\n  [adminApi.reducerPath]: adminApi.reducer,\n  admin_app: appReducer,\n} as const;\n\nconst injectReducerStoreEnhancer: (appReducers: Record<string, Reducer>) => StoreEnhancer =\n  (appReducers) =>\n  (next) =>\n  (...args) => {\n    const store = next(...args);\n\n    const asyncReducers: Record<string, Reducer> = {};\n\n    return {\n      ...store,\n      asyncReducers,\n      injectReducer: (key: string, asyncReducer: Reducer) => {\n        asyncReducers[key] = asyncReducer;\n        store.replaceReducer(\n          // @ts-expect-error we dynamically add reducers which makes the types uncomfortable.\n          combineReducers({\n            ...appReducers,\n            ...asyncReducers,\n          })\n        );\n      },\n    };\n  };\n\ntype PreloadState = Partial<{\n  admin_app: AppState;\n}>;\n\ntype DefaultMiddlewareOptions = {\n  serializableCheck?: boolean;\n  immutableCheck?: boolean;\n};\n\n/**\n * @description This is the main store configuration function, injected Reducers use our legacy app.addReducer API,\n * which we're trying to phase out. App Middlewares could potentially be improved...?\n */\nconst configureStoreImpl = (\n  preloadedState: PreloadState = {},\n  appMiddlewares: Array<() => Middleware> = [],\n  injectedReducers: Record<string, Reducer> = {}\n) => {\n  const coreReducers = { ...staticReducers, ...injectedReducers } as const;\n\n  const defaultMiddlewareOptions: DefaultMiddlewareOptions = {};\n\n  // These are already disabled in 'production' env but we also need to disable it in test environments\n  // However, we want to leave them on for development so any issues can still be caught\n  if (process.env.NODE_ENV === 'test') {\n    defaultMiddlewareOptions.serializableCheck = false;\n    defaultMiddlewareOptions.immutableCheck = false;\n  }\n\n  const store = configureStore({\n    preloadedState: {\n      admin_app: preloadedState.admin_app,\n    },\n    reducer: coreReducers,\n    devTools: process.env.NODE_ENV !== 'production',\n    middleware: (getDefaultMiddleware) => [\n      ...getDefaultMiddleware(defaultMiddlewareOptions),\n      rtkQueryUnauthorizedMiddleware,\n      adminApi.middleware,\n      ...appMiddlewares.map((m) => m()),\n    ],\n    enhancers: [injectReducerStoreEnhancer(coreReducers)],\n  });\n\n  return store;\n};\n\n/**\n * A 401 here means the fetch layer already tried to refresh the access token and\n * the server refused: the session is over. Hand that to `AuthProvider`, which\n * can warn about unsaved changes before clearing auth state. Reloading the page\n * instead (as this used to) unmounts every form first, so the warning — and the\n * user's edits — never make it to the screen. Falls back to the hard redirect\n * when no provider is listening, so the user is never stranded on a dead page.\n *\n * `triggerSessionExpired` is idempotent per dead session (baseQuery often\n * already called it for this 401). The `!` check is only the no-listener\n * fallback; it must not run logout a second time.\n */\nconst rtkQueryUnauthorizedMiddleware: Middleware =\n  ({ dispatch }: MiddlewareAPI) =>\n  (next) =>\n  (action) => {\n    // isRejectedWithValue Or isRejected\n    if (isRejected(action) && action.payload?.status === 401 && !triggerSessionExpired()) {\n      dispatch(logout());\n      const basename = getBasename();\n      window.location.href = `${basename}/auth/login`;\n      return;\n    }\n\n    return next(action);\n  };\n\ntype Store = ReturnType<typeof configureStoreImpl> & {\n  asyncReducers: Record<string, Reducer>;\n  injectReducer: (key: string, asyncReducer: Reducer) => void;\n};\n\ntype RootState = ReturnType<Store['getState']>;\n\ntype Dispatch = Store['dispatch'];\n\nexport { configureStoreImpl as configureStore };\nexport type { RootState, Dispatch, AppState, Store, PreloadState };\n"],"names":["staticReducers","adminApi","reducerPath","reducer","admin_app","appReducer","injectReducerStoreEnhancer","appReducers","next","args","store","asyncReducers","injectReducer","key","asyncReducer","replaceReducer","combineReducers","configureStoreImpl","preloadedState","appMiddlewares","injectedReducers","coreReducers","defaultMiddlewareOptions","process","env","NODE_ENV","serializableCheck","immutableCheck","configureStore","devTools","middleware","getDefaultMiddleware","rtkQueryUnauthorizedMiddleware","map","m","enhancers","dispatch","action","isRejected","payload","status","triggerSessionExpired","logout","basename","getBasename","window","location","href"],"mappings":";;;;;;AAeA;;AAEC,IACD,MAAMA,cAAAA,GAAiB;AACrB,IAAA,CAACC,QAAAA,CAASC,WAAW,GAAGD,SAASE,OAAO;IACxCC,SAAAA,EAAWC;AACb,CAAA;AAEA,MAAMC,6BACJ,CAACC,WAAAA,GACD,CAACC,IAAAA,GACD,CAAC,GAAGC,IAAAA,GAAAA;AACF,YAAA,MAAMC,QAAQF,IAAAA,CAAAA,GAAQC,IAAAA,CAAAA;AAEtB,YAAA,MAAME,gBAAyC,EAAC;YAEhD,OAAO;AACL,gBAAA,GAAGD,KAAK;AACRC,gBAAAA,aAAAA;AACAC,gBAAAA,aAAAA,EAAe,CAACC,GAAAA,EAAaC,YAAAA,GAAAA;oBAC3BH,aAAa,CAACE,IAAI,GAAGC,YAAAA;oBACrBJ,KAAAA,CAAMK,cAAc;oBAElBC,eAAAA,CAAgB;AACd,wBAAA,GAAGT,WAAW;AACd,wBAAA,GAAGI;AACL,qBAAA,CAAA,CAAA;AAEJ,gBAAA;AACF,aAAA;AACF,QAAA,CAAA;AAWF;;;AAGC,IACD,MAAMM,kBAAAA,GAAqB,CACzBC,cAAAA,GAA+B,EAAE,EACjCC,cAAAA,GAA0C,EAAE,EAC5CC,gBAAAA,GAA4C,EAAE,GAAA;AAE9C,IAAA,MAAMC,YAAAA,GAAe;AAAE,QAAA,GAAGrB,cAAc;AAAE,QAAA,GAAGoB;AAAiB,KAAA;AAE9D,IAAA,MAAME,2BAAqD,EAAC;;;AAI5D,IAAA,IAAIC,OAAAA,CAAQC,GAAG,CAACC,QAAQ,KAAK,MAAA,EAAQ;AACnCH,QAAAA,wBAAAA,CAAyBI,iBAAiB,GAAG,KAAA;AAC7CJ,QAAAA,wBAAAA,CAAyBK,cAAc,GAAG,KAAA;AAC5C,IAAA;AAEA,IAAA,MAAMjB,QAAQkB,cAAAA,CAAe;QAC3BV,cAAAA,EAAgB;AACdd,YAAAA,SAAAA,EAAWc,eAAed;AAC5B,SAAA;QACAD,OAAAA,EAASkB,YAAAA;AACTQ,QAAAA,QAAAA,EAAUN,OAAAA,CAAQC,GAAG,CAACC,QAAQ,KAAK,YAAA;AACnCK,QAAAA,UAAAA,EAAY,CAACC,oBAAAA,GAAyB;mBACjCA,oBAAAA,CAAqBT,wBAAAA,CAAAA;AACxBU,gBAAAA,8BAAAA;AACA/B,gBAAAA,QAAAA,CAAS6B,UAAU;mBAChBX,cAAAA,CAAec,GAAG,CAAC,CAACC,CAAAA,GAAMA,CAAAA,EAAAA;AAC9B,aAAA;QACDC,SAAAA,EAAW;YAAC7B,0BAAAA,CAA2Be,YAAAA;AAAc;AACvD,KAAA,CAAA;IAEA,OAAOX,KAAAA;AACT;AAEA;;;;;;;;;;;IAYA,MAAMsB,iCACJ,CAAC,EAAEI,QAAQ,EAAiB,GAC5B,CAAC5B,IAAAA,GACD,CAAC6B,MAAAA,GAAAA;;YAEC,IAAIC,UAAAA,CAAWD,WAAWA,MAAAA,CAAOE,OAAO,EAAEC,MAAAA,KAAW,GAAA,IAAO,CAACC,qBAAAA,EAAAA,EAAyB;gBACpFL,QAAAA,CAASM,MAAAA,EAAAA,CAAAA;AACT,gBAAA,MAAMC,QAAAA,GAAWC,WAAAA,EAAAA;AACjBC,gBAAAA,MAAAA,CAAOC,QAAQ,CAACC,IAAI,GAAG,CAAA,EAAGJ,QAAAA,CAAS,WAAW,CAAC;AAC/C,gBAAA;AACF,YAAA;AAEA,YAAA,OAAOnC,IAAAA,CAAK6B,MAAAA,CAAAA;AACd,QAAA,CAAA;;;;"}

package/dist/admin/admin/src/core/store/hooks.mjs

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useStore, useDispatch, useSelector } from 'react-redux';
+import { useStore, useSelector, useDispatch } from 'react-redux';
 
 const useTypedDispatch = useDispatch;
 const useTypedStore = useStore;

package/dist/admin/admin/src/features/Auth.js

@@ -2,18 +2,22 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
+var designSystem = require('@strapi/design-system');
+var reactIntl = require('react-intl');
 var reactRouterDom = require('react-router-dom');
+var ConfirmDialog = require('../components/ConfirmDialog.js');
 var Context = require('../components/Context.js');
 var hooks = require('../core/store/hooks.js');
 var StrapiApp = require('./StrapiApp.js');
-var useIdleSessionLogout = require('../hooks/useIdleSessionLogout.js');
 var useQueryParams = require('../hooks/useQueryParams.js');
+var useSessionKeepalive = require('../hooks/useSessionKeepalive.js');
 var reducer = require('../reducer.js');
 var api = require('../services/api.js');
 var auth = require('../services/auth.js');
 var normalizeAdminLocale = require('../translations/normalizeAdminLocale.js');
 var deviceId = require('../utils/deviceId.js');
 var getFetchClient = require('../utils/getFetchClient.js');
+var unsavedChangesRegistry = require('../utils/unsavedChangesRegistry.js');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -54,7 +58,32 @@ const [Provider, useAuth] = Context.createContext('Auth');
 const STORAGE_KEYS = {
     STATUS: 'isLoggedIn'
 };
+const isForcedLogout = (reason)=>reason === 'session-dead';
+/**
+ * Copy for the unsaved-changes prompt. A server-confirmed dead session needs to
+ * say *why* the dialog appeared, otherwise it reads as the usual navigation
+ * blocker and users confirm straight through it.
+ */ const LOGOUT_PROMPTS = {
+    voluntary: {
+        title: undefined,
+        body: {
+            id: 'global.prompt.unsaved',
+            defaultMessage: 'You have unsaved changes, are you sure you want to leave?'
+        }
+    },
+    'session-dead': {
+        title: {
+            id: 'app.session.ended.title',
+            defaultMessage: 'Session ended'
+        },
+        body: {
+            id: 'app.session.ended.unsaved',
+            defaultMessage: "Your session has ended and can't be resumed. Your unsaved changes will be lost when you log out."
+        }
+    }
+};
 const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken = false })=>{
+    const { formatMessage } = reactIntl.useIntl();
     const dispatch = hooks.useTypedDispatch();
     const runRbacMiddleware = StrapiApp.useStrapiApp('AuthProvider', (state)=>state.rbac.run);
     const location = reactRouterDom.useLocation();
@@ -79,7 +108,46 @@ const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken =
     const navigate = reactRouterDom.useNavigate();
     const [loginMutation] = auth.useLoginMutation();
     const [logoutMutation] = auth.useLogoutMutation();
-    const clearStateAndLogout = React__namespace.useCallback(()=>{
+    const pendingLogoutRef = React__namespace.useRef(null);
+    const logoutGuardOpenRef = React__namespace.useRef(false);
+    const logoutGuardReasonRef = React__namespace.useRef('voluntary');
+    const [isSessionLogoutDialogOpen, setIsSessionLogoutDialogOpen] = React__namespace.useState(false);
+    const [sessionLogoutReason, setSessionLogoutReason] = React__namespace.useState('voluntary');
+    /**
+   * Prompt before discarding unsaved edits, then run `logoutFn`.
+   *
+   * - `voluntary`: Cancel leaves the user logged in (server session intact).
+   * - `session-dead`: the session is already unusable — Cancel (or dismiss)
+   *   still runs `logoutFn` so the client cannot keep a stale token. While the
+   *   dialog is open, a later `session-dead` request upgrades the pending action.
+   */ const runLogoutWithGuard = React__namespace.useCallback((logoutFn, reason = 'voluntary')=>{
+        if (logoutGuardOpenRef.current) {
+            pendingLogoutRef.current = logoutFn;
+            if (isForcedLogout(reason)) {
+                logoutGuardReasonRef.current = reason;
+                setSessionLogoutReason(reason);
+            }
+            return;
+        }
+        if (!unsavedChangesRegistry.hasUnsavedChanges()) {
+            logoutFn();
+            return;
+        }
+        logoutGuardOpenRef.current = true;
+        logoutGuardReasonRef.current = reason;
+        pendingLogoutRef.current = logoutFn;
+        setSessionLogoutReason(reason);
+        setIsSessionLogoutDialogOpen(true);
+    }, []);
+    const performGlobalLogout = React__namespace.useCallback(()=>{
+        void (async ()=>{
+            try {
+                const { post } = getFetchClient.getFetchClient();
+                await post('/admin/logout');
+            } catch  {
+            // The session may already be invalid.
+            }
+        })();
         dispatch(api.adminApi.util.resetApiState());
         dispatch(reducer.logout());
         navigate('/auth/login');
@@ -87,22 +155,40 @@ const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken =
         dispatch,
         navigate
     ]);
-    /**
-   * Clear *only this tab's* session and redirect to login, without removing the
-   * shared `isLoggedIn`/`jwtToken` storage keys. Unlike `clearStateAndLogout`,
-   * this does not dispatch `logoutAction`, so it does not fire the cross-tab
-   * `storage` event that logs every tab out. Used by the speculative idle timer,
-   * which fires per-tab at the access token's `exp`: an idle tab must never tear
-   * down a session that another tab is still actively using. A genuine logout
-   * (user-initiated, or a server-confirmed 401 via `setOnSessionExpired`) still
-   * goes through `clearStateAndLogout` and broadcasts to all tabs.
-   */ const clearLocalSessionAndRedirect = React__namespace.useCallback(()=>{
-        dispatch(api.adminApi.util.resetApiState());
-        dispatch(reducer.setToken(null));
-        navigate('/auth/login');
+    const clearStateAndLogout = React__namespace.useCallback(()=>{
+        runLogoutWithGuard(performGlobalLogout, 'session-dead');
     }, [
-        dispatch,
-        navigate
+        performGlobalLogout,
+        runLogoutWithGuard
+    ]);
+    const handleConfirmSessionLogout = React__namespace.useCallback(()=>{
+        logoutGuardOpenRef.current = false;
+        logoutGuardReasonRef.current = 'voluntary';
+        setIsSessionLogoutDialogOpen(false);
+        setSessionLogoutReason('voluntary');
+        const logoutFn = pendingLogoutRef.current;
+        pendingLogoutRef.current = null;
+        logoutFn?.();
+    }, []);
+    const handleCancelSessionLogout = React__namespace.useCallback(()=>{
+        const forced = isForcedLogout(logoutGuardReasonRef.current);
+        const logoutFn = pendingLogoutRef.current;
+        logoutGuardOpenRef.current = false;
+        logoutGuardReasonRef.current = 'voluntary';
+        pendingLogoutRef.current = null;
+        setIsSessionLogoutDialogOpen(false);
+        setSessionLogoutReason('voluntary');
+        // Forced paths: session is already dead — dismiss must still clear client state.
+        if (forced) {
+            logoutFn?.();
+        }
+    }, []);
+    const handleSessionLogoutDialogOpenChange = React__namespace.useCallback((open)=>{
+        if (!open) {
+            handleCancelSessionLogout();
+        }
+    }, [
+        handleCancelSessionLogout
     ]);
     const resyncToken = React__namespace.useCallback((newToken)=>{
         dispatch(reducer.setToken(newToken));
@@ -111,10 +197,11 @@ const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken =
     ]);
     /**
    * Track the timestamp of the user's last interaction. This is the activity
-   * signal `useIdleSessionLogout` uses to tell an active user (silently renew
-   * their session) apart from a genuinely idle one (log out). Successful API
-   * calls don't refresh the short-lived access token on their own, so without
-   * this an actively-working user is logged out the moment the token expires.
+   * signal `useSessionKeepalive` uses to tell an active user (silently renew
+   * their session) apart from a genuinely idle one (leave the stale access
+   * token alone until the next request). Successful API calls don't refresh
+   * the short-lived access token on their own, so without this an
+   * actively-working user would hit a 401 the moment the token expires.
    */ const lastActivityRef = React__namespace.useRef(Date.now());
     React__namespace.useEffect(()=>{
         const markActivity = ()=>{
@@ -140,7 +227,7 @@ const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken =
     const getLastActivityAt = React__namespace.useCallback(()=>lastActivityRef.current, []);
     /**
    * Silently rotate the refresh token and mint a new access token. Returns
-   * `true` on success (the resulting `setToken` re-arms the idle timer) and
+   * `true` on success (the resulting `setToken` re-arms the renew timer) and
    * `false` when the server rejects it (session genuinely over).
    */ const renewSession = React__namespace.useCallback(async ()=>{
         try {
@@ -189,15 +276,15 @@ const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken =
         clearStateAndLogout
     ]);
     /**
-   * Session lifecycle at access-token expiry. The timer fires per-tab; the hook
-   * then either (1) re-syncs from a token another tab refreshed, (2) silently
-   * renews when the user has been active, or (3) logs out. Idle logout is local
-   * so an idle tab can't force-logout an actively-used one; a server-confirmed
-   * dead session (renewal rejected) broadcasts globally. See
-   * `useIdleSessionLogout` for the full rationale.
-   */ useIdleSessionLogout.useIdleSessionLogout({
+   * Session keepalive around access-token expiry. The timer fires per-tab; the
+   * hook then either (1) re-syncs from a token another tab refreshed, (2)
+   * silently renews when the user has been active, or (3) does nothing when
+   * idle — leaving the stale access token in place so unsaved form state
+   * survives until the next request refreshes it. A server-confirmed dead
+   * session (renewal rejected) broadcasts globally via `onSessionDead`. See
+   * `useSessionKeepalive` for the full rationale.
+   */ useSessionKeepalive.useSessionKeepalive({
         token,
-        onExpired: clearLocalSessionAndRedirect,
         onSessionDead: clearStateAndLogout,
         getStoredToken: reducer.getStoredToken,
         onResync: resyncToken,
@@ -229,6 +316,7 @@ const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken =
        * because if something fails, it will throw an error.
        */ if ('data' in res) {
             const { token } = res.data;
+            getFetchClient.resetSessionExpiredNotification();
             dispatch(reducer.login({
                 token,
                 persist: rememberMe
@@ -239,14 +327,26 @@ const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken =
         dispatch,
         loginMutation
     ]);
-    const logout = React__namespace.useCallback(async ()=>{
-        await logoutMutation({
-            deviceId: deviceId.getOrCreateDeviceId()
+    /**
+   * Explicit user logout. Confirm unsaved changes *before* `logoutMutation` so
+   * Cancel leaves the server session and client token intact.
+   */ const logout = React__namespace.useCallback(async ()=>{
+        runLogoutWithGuard(()=>{
+            void (async ()=>{
+                try {
+                    await logoutMutation({
+                        deviceId: deviceId.getOrCreateDeviceId()
+                    });
+                } catch  {
+                // The session may already be invalid.
+                }
+                performGlobalLogout();
+            })();
         });
-        clearStateAndLogout();
     }, [
-        clearStateAndLogout,
-        logoutMutation
+        logoutMutation,
+        performGlobalLogout,
+        runLogoutWithGuard
     ]);
     const refetchPermissions = React__namespace.useCallback(async ()=>{
         if (!isUninitialized) {
@@ -314,16 +414,32 @@ const AuthProvider = ({ children, _defaultPermissions = [], _disableRenewToken =
         userPermissions
     ]);
     const isLoading = isLoadingUser || isLoadingPermissions;
-    return /*#__PURE__*/ jsxRuntime.jsx(Provider, {
-        token: token,
-        user: user,
-        login: login,
-        logout: logout,
-        permissions: userPermissions,
-        checkUserHasPermissions: checkUserHasPermissions ?? NOOP_CHECK_USER_HAS_PERMISSIONS,
-        refetchPermissions: refetchPermissions,
-        isLoading: isLoading,
-        children: children
+    return /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [
+            /*#__PURE__*/ jsxRuntime.jsx(Provider, {
+                token: token,
+                user: user,
+                login: login,
+                logout: logout,
+                permissions: userPermissions,
+                checkUserHasPermissions: checkUserHasPermissions ?? NOOP_CHECK_USER_HAS_PERMISSIONS,
+                refetchPermissions: refetchPermissions,
+                isLoading: isLoading,
+                children: children
+            }),
+            /*#__PURE__*/ jsxRuntime.jsx(designSystem.Dialog.Root, {
+                open: isSessionLogoutDialogOpen,
+                onOpenChange: handleSessionLogoutDialogOpenChange,
+                children: /*#__PURE__*/ jsxRuntime.jsx(ConfirmDialog.ConfirmDialog, {
+                    onConfirm: handleConfirmSessionLogout,
+                    onCancel: handleCancelSessionLogout,
+                    title: LOGOUT_PROMPTS[sessionLogoutReason].title ? formatMessage(LOGOUT_PROMPTS[sessionLogoutReason].title) : undefined,
+                    // Forced session-dead: no Cancel that pretends the session is still valid.
+                    startAction: isForcedLogout(sessionLogoutReason) ? /*#__PURE__*/ jsxRuntime.jsx(jsxRuntime.Fragment, {}) : undefined,
+                    children: formatMessage(LOGOUT_PROMPTS[sessionLogoutReason].body)
+                })
+            })
+        ]
     });
 };