@strapi/admin 5.53.0 → 5.55.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/admin/admin/src/App.js +1 -1
- package/dist/admin/admin/src/App.js.map +1 -1
- package/dist/admin/admin/src/App.mjs +1 -1
- package/dist/admin/admin/src/App.mjs.map +1 -1
- package/dist/admin/admin/src/components/DismissibleBanner.js +60 -0
- package/dist/admin/admin/src/components/DismissibleBanner.js.map +1 -0
- package/dist/admin/admin/src/components/DismissibleBanner.mjs +58 -0
- package/dist/admin/admin/src/components/DismissibleBanner.mjs.map +1 -0
- package/dist/admin/admin/src/components/Form.js +11 -2
- package/dist/admin/admin/src/components/Form.js.map +1 -1
- package/dist/admin/admin/src/components/Form.mjs +11 -2
- package/dist/admin/admin/src/components/Form.mjs.map +1 -1
- package/dist/admin/admin/src/components/FormInputs/DateTime.js +1 -1
- package/dist/admin/admin/src/components/FormInputs/DateTime.js.map +1 -1
- package/dist/admin/admin/src/components/FormInputs/DateTime.mjs +1 -1
- package/dist/admin/admin/src/components/FormInputs/DateTime.mjs.map +1 -1
- package/dist/admin/admin/src/components/FormInputs/Time.js +1 -1
- package/dist/admin/admin/src/components/FormInputs/Time.js.map +1 -1
- package/dist/admin/admin/src/components/FormInputs/Time.mjs +1 -1
- package/dist/admin/admin/src/components/FormInputs/Time.mjs.map +1 -1
- package/dist/admin/admin/src/components/LanguageProvider.js +35 -1
- package/dist/admin/admin/src/components/LanguageProvider.js.map +1 -1
- package/dist/admin/admin/src/components/LanguageProvider.mjs +17 -2
- package/dist/admin/admin/src/components/LanguageProvider.mjs.map +1 -1
- package/dist/admin/admin/src/components/MainNav/NavUser.js +1 -2
- package/dist/admin/admin/src/components/MainNav/NavUser.js.map +1 -1
- package/dist/admin/admin/src/components/MainNav/NavUser.mjs +1 -2
- package/dist/admin/admin/src/components/MainNav/NavUser.mjs.map +1 -1
- package/dist/admin/admin/src/components/MediaLibraryBanner.js +85 -0
- package/dist/admin/admin/src/components/MediaLibraryBanner.js.map +1 -0
- package/dist/admin/admin/src/components/MediaLibraryBanner.mjs +83 -0
- package/dist/admin/admin/src/components/MediaLibraryBanner.mjs.map +1 -0
- package/dist/admin/admin/src/components/Providers.js +6 -6
- package/dist/admin/admin/src/components/Providers.js.map +1 -1
- package/dist/admin/admin/src/components/Providers.mjs +6 -6
- package/dist/admin/admin/src/components/Providers.mjs.map +1 -1
- package/dist/admin/admin/src/components/SubNav.js +113 -35
- package/dist/admin/admin/src/components/SubNav.js.map +1 -1
- package/dist/admin/admin/src/components/SubNav.mjs +115 -37
- package/dist/admin/admin/src/components/SubNav.mjs.map +1 -1
- package/dist/admin/admin/src/components/SubNavFolder.js +188 -0
- package/dist/admin/admin/src/components/SubNavFolder.js.map +1 -0
- package/dist/admin/admin/src/components/SubNavFolder.mjs +186 -0
- package/dist/admin/admin/src/components/SubNavFolder.mjs.map +1 -0
- package/dist/admin/admin/src/components/UpsellBanner.js +56 -86
- package/dist/admin/admin/src/components/UpsellBanner.js.map +1 -1
- package/dist/admin/admin/src/components/UpsellBanner.mjs +58 -88
- package/dist/admin/admin/src/components/UpsellBanner.mjs.map +1 -1
- package/dist/admin/admin/src/core/store/configure.js +14 -2
- package/dist/admin/admin/src/core/store/configure.js.map +1 -1
- package/dist/admin/admin/src/core/store/configure.mjs +14 -2
- package/dist/admin/admin/src/core/store/configure.mjs.map +1 -1
- package/dist/admin/admin/src/core/store/hooks.mjs +1 -1
- package/dist/admin/admin/src/features/Auth.js +162 -46
- package/dist/admin/admin/src/features/Auth.js.map +1 -1
- package/dist/admin/admin/src/features/Auth.mjs +164 -48
- package/dist/admin/admin/src/features/Auth.mjs.map +1 -1
- package/dist/admin/admin/src/features/Tracking.js.map +1 -1
- package/dist/admin/admin/src/features/Tracking.mjs.map +1 -1
- package/dist/admin/admin/src/hooks/useRegisterUnsavedChanges.js +19 -0
- package/dist/admin/admin/src/hooks/useRegisterUnsavedChanges.js.map +1 -0
- package/dist/admin/admin/src/hooks/useRegisterUnsavedChanges.mjs +17 -0
- package/dist/admin/admin/src/hooks/useRegisterUnsavedChanges.mjs.map +1 -0
- package/dist/admin/admin/src/hooks/{useIdleSessionLogout.js → useSessionKeepalive.js} +34 -27
- package/dist/admin/admin/src/hooks/useSessionKeepalive.js.map +1 -0
- package/dist/admin/admin/src/hooks/{useIdleSessionLogout.mjs → useSessionKeepalive.mjs} +34 -27
- package/dist/admin/admin/src/hooks/useSessionKeepalive.mjs.map +1 -0
- package/dist/admin/admin/src/layouts/AuthenticatedLayout.js +2 -0
- package/dist/admin/admin/src/layouts/AuthenticatedLayout.js.map +1 -1
- package/dist/admin/admin/src/layouts/AuthenticatedLayout.mjs +2 -0
- package/dist/admin/admin/src/layouts/AuthenticatedLayout.mjs.map +1 -1
- package/dist/admin/admin/src/pages/SessionsPage.js +2 -5
- package/dist/admin/admin/src/pages/SessionsPage.js.map +1 -1
- package/dist/admin/admin/src/pages/SessionsPage.mjs +2 -5
- package/dist/admin/admin/src/pages/SessionsPage.mjs.map +1 -1
- package/dist/admin/admin/src/render.js +6 -1
- package/dist/admin/admin/src/render.js.map +1 -1
- package/dist/admin/admin/src/render.mjs +6 -1
- package/dist/admin/admin/src/render.mjs.map +1 -1
- package/dist/admin/admin/src/translations/en.json.js +16 -0
- package/dist/admin/admin/src/translations/en.json.js.map +1 -1
- package/dist/admin/admin/src/translations/en.json.mjs +16 -0
- package/dist/admin/admin/src/translations/en.json.mjs.map +1 -1
- package/dist/admin/admin/src/utils/baseQuery.js +3 -13
- package/dist/admin/admin/src/utils/baseQuery.js.map +1 -1
- package/dist/admin/admin/src/utils/baseQuery.mjs +3 -13
- package/dist/admin/admin/src/utils/baseQuery.mjs.map +1 -1
- package/dist/admin/admin/src/utils/getFetchClient.js +34 -5
- package/dist/admin/admin/src/utils/getFetchClient.js.map +1 -1
- package/dist/admin/admin/src/utils/getFetchClient.mjs +34 -6
- package/dist/admin/admin/src/utils/getFetchClient.mjs.map +1 -1
- package/dist/admin/admin/src/utils/unsavedChangesRegistry.js +25 -0
- package/dist/admin/admin/src/utils/unsavedChangesRegistry.js.map +1 -0
- package/dist/admin/admin/src/utils/unsavedChangesRegistry.mjs +22 -0
- package/dist/admin/admin/src/utils/unsavedChangesRegistry.mjs.map +1 -0
- package/dist/admin/admin/tests/utils.js +14 -14
- package/dist/admin/admin/tests/utils.js.map +1 -1
- package/dist/admin/admin/tests/utils.mjs +14 -14
- package/dist/admin/admin/tests/utils.mjs.map +1 -1
- package/dist/admin/ee/admin/src/hooks/useAIAvailability.js +1 -6
- package/dist/admin/ee/admin/src/hooks/useAIAvailability.js.map +1 -1
- package/dist/admin/ee/admin/src/hooks/useAIAvailability.mjs +1 -6
- package/dist/admin/ee/admin/src/hooks/useAIAvailability.mjs.map +1 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/ApplicationInfoPage/components/AIUsage.js +7 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/ApplicationInfoPage/components/AIUsage.js.map +1 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/ApplicationInfoPage/components/AIUsage.mjs +7 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/ApplicationInfoPage/components/AIUsage.mjs.map +1 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/AuditLogs/utils/getActionTypesDefaultMessages.js +9 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/AuditLogs/utils/getActionTypesDefaultMessages.js.map +1 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/AuditLogs/utils/getActionTypesDefaultMessages.mjs +9 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/AuditLogs/utils/getActionTypesDefaultMessages.mjs.map +1 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/SingleSignOnPage.js +0 -4
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/SingleSignOnPage.js.map +1 -1
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/SingleSignOnPage.mjs +0 -4
- package/dist/admin/ee/admin/src/pages/SettingsPage/pages/SingleSignOnPage.mjs.map +1 -1
- package/dist/admin/index.js +1 -0
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +1 -1
- package/dist/admin/src/components/DismissibleBanner.d.ts +8 -0
- package/dist/admin/src/components/MediaLibraryBanner.d.ts +2 -0
- package/dist/admin/src/components/SubNav.d.ts +27 -8
- package/dist/admin/src/components/SubNavFolder.d.ts +15 -0
- package/dist/admin/src/features/Tracking.d.ts +2 -1
- package/dist/admin/src/hooks/useRegisterUnsavedChanges.d.ts +6 -0
- package/dist/admin/src/hooks/useSessionKeepalive.d.ts +88 -0
- package/dist/admin/src/services/admin.d.ts +1 -0
- package/dist/admin/src/utils/getFetchClient.d.ts +14 -6
- package/dist/admin/src/utils/unsavedChangesRegistry.d.ts +11 -0
- package/dist/ee/admin/src/pages/SettingsPage/pages/AuditLogs/utils/getActionTypesDefaultMessages.d.ts +8 -0
- package/dist/ee/server/src/controllers/admin.d.ts.map +1 -1
- package/dist/ee/server/src/index.d.ts.map +1 -1
- package/dist/server/ee/server/src/controllers/admin.js +1 -5
- package/dist/server/ee/server/src/controllers/admin.js.map +1 -1
- package/dist/server/ee/server/src/controllers/admin.mjs +1 -5
- package/dist/server/ee/server/src/controllers/admin.mjs.map +1 -1
- package/dist/server/ee/server/src/index.js +2 -0
- package/dist/server/ee/server/src/index.js.map +1 -1
- package/dist/server/ee/server/src/index.mjs +2 -0
- package/dist/server/ee/server/src/index.mjs.map +1 -1
- package/dist/server/server/src/ai/controllers/ai.js +3 -3
- package/dist/server/server/src/ai/controllers/ai.js.map +1 -1
- package/dist/server/server/src/ai/controllers/ai.mjs +3 -3
- package/dist/server/server/src/ai/controllers/ai.mjs.map +1 -1
- package/dist/server/server/src/ai/services/ai.js +37 -12
- package/dist/server/server/src/ai/services/ai.js.map +1 -1
- package/dist/server/server/src/ai/services/ai.mjs +37 -12
- package/dist/server/server/src/ai/services/ai.mjs.map +1 -1
- package/dist/server/server/src/audit-logs/tokens.js +106 -0
- package/dist/server/server/src/audit-logs/tokens.js.map +1 -0
- package/dist/server/server/src/audit-logs/tokens.mjs +99 -0
- package/dist/server/server/src/audit-logs/tokens.mjs.map +1 -0
- package/dist/server/server/src/controllers/admin.js +10 -1
- package/dist/server/server/src/controllers/admin.js.map +1 -1
- package/dist/server/server/src/controllers/admin.mjs +10 -1
- package/dist/server/server/src/controllers/admin.mjs.map +1 -1
- package/dist/server/server/src/services/api-token.js +106 -4
- package/dist/server/server/src/services/api-token.js.map +1 -1
- package/dist/server/server/src/services/api-token.mjs +107 -5
- package/dist/server/server/src/services/api-token.mjs.map +1 -1
- package/dist/server/server/src/services/transfer/token.js +56 -4
- package/dist/server/server/src/services/transfer/token.js.map +1 -1
- package/dist/server/server/src/services/transfer/token.mjs +57 -5
- package/dist/server/server/src/services/transfer/token.mjs.map +1 -1
- package/dist/server/src/ai/services/ai.d.ts +3 -1
- package/dist/server/src/ai/services/ai.d.ts.map +1 -1
- package/dist/server/src/audit-logs/tokens.d.ts +86 -0
- package/dist/server/src/audit-logs/tokens.d.ts.map +1 -0
- package/dist/server/src/controllers/admin.d.ts +1 -0
- package/dist/server/src/controllers/admin.d.ts.map +1 -1
- package/dist/server/src/controllers/index.d.ts +1 -0
- package/dist/server/src/controllers/index.d.ts.map +1 -1
- package/dist/server/src/index.d.ts +1 -0
- package/dist/server/src/index.d.ts.map +1 -1
- package/dist/server/src/services/api-token.d.ts.map +1 -1
- package/dist/server/src/services/transfer/token.d.ts.map +1 -1
- package/dist/shared/contracts/admin.d.ts +1 -0
- package/dist/shared/contracts/admin.d.ts.map +1 -1
- package/dist/shared/contracts/shared.d.ts +1 -0
- package/dist/shared/contracts/shared.d.ts.map +1 -1
- package/package.json +7 -7
- package/dist/admin/admin/src/hooks/useIdleSessionLogout.js.map +0 -1
- package/dist/admin/admin/src/hooks/useIdleSessionLogout.mjs.map +0 -1
- package/dist/admin/src/hooks/useIdleSessionLogout.d.ts +0 -87
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@strapi/admin",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.55.0",
|
|
4
4
|
"description": "Strapi Admin",
|
|
5
5
|
"homepage": "https://strapi.io",
|
|
6
6
|
"bugs": {
|
|
@@ -91,10 +91,10 @@
|
|
|
91
91
|
"@reduxjs/toolkit": "1.9.7",
|
|
92
92
|
"@strapi/design-system": "2.2.4",
|
|
93
93
|
"@strapi/icons": "2.2.4",
|
|
94
|
-
"@strapi/permissions": "5.
|
|
95
|
-
"@strapi/types": "5.
|
|
96
|
-
"@strapi/typescript-utils": "5.
|
|
97
|
-
"@strapi/utils": "5.
|
|
94
|
+
"@strapi/permissions": "5.55.0",
|
|
95
|
+
"@strapi/types": "5.55.0",
|
|
96
|
+
"@strapi/typescript-utils": "5.55.0",
|
|
97
|
+
"@strapi/utils": "5.55.0",
|
|
98
98
|
"@testing-library/dom": "10.4.1",
|
|
99
99
|
"@testing-library/react": "16.3.2",
|
|
100
100
|
"@testing-library/user-event": "14.6.1",
|
|
@@ -148,8 +148,8 @@
|
|
|
148
148
|
"zod": "4.4.3"
|
|
149
149
|
},
|
|
150
150
|
"devDependencies": {
|
|
151
|
-
"@strapi/admin-test-utils": "5.
|
|
152
|
-
"@strapi/data-transfer": "5.
|
|
151
|
+
"@strapi/admin-test-utils": "5.55.0",
|
|
152
|
+
"@strapi/data-transfer": "5.55.0",
|
|
153
153
|
"@testing-library/jest-dom": "6.9.1",
|
|
154
154
|
"@types/codemirror5": "npm:@types/codemirror@^5.60.15",
|
|
155
155
|
"@types/fs-extra": "11.0.4",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useIdleSessionLogout.js","sources":["../../../../../admin/src/hooks/useIdleSessionLogout.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { decodeAccessTokenExpiry } from '../utils/jwt';\n\nconst SESSION_EXPIRY_BUFFER_MS = 1000;\n/**\n * How long before the access token's `exp` an active tab renews. Renewing\n * ahead of expiry (rather than at it) means the refreshed token is already in\n * shared storage by the time any *other* tab's logout timer fires — so an idle\n * sibling re-syncs instead of racing the refresh and logging itself out.\n */\nconst SESSION_RENEW_MARGIN_MS = 10_000;\n\ninterface UseIdleSessionLogoutOptions {\n /**\n * The current admin access JWT (from Redux), or `null` when logged out.\n */\n token: string | null;\n /**\n * Called when the timer fires and the user is genuinely idle. Should clear\n * *this tab's* local auth state and navigate to /auth/login. It must NOT\n * broadcast a global logout (e.g. by removing the shared `isLoggedIn` key),\n * otherwise an idle tab firing on a stale token would log out other tabs that\n * are still active — see the cross-tab handling below.\n */\n onExpired: () => void;\n /**\n * Called when a renewal attempt is rejected by the server (the session is\n * truly over: refresh token idle/max window elapsed). This is a\n * server-confirmed end of session, so unlike `onExpired` it SHOULD broadcast\n * a global logout to every tab. Falls back to `onExpired` when omitted.\n */\n onSessionDead?: () => void;\n /**\n * Read the access token currently in shared storage (localStorage/cookie).\n * Because every open tab shares the same refresh cookie, an active tab that\n * refreshes writes a newer access token here. When omitted, the hook never\n * re-syncs across tabs.\n */\n getStoredToken?: () => string | null;\n /**\n * Adopt a newer shared token instead of expiring. Typically dispatches\n * `setToken`, which updates Redux and causes this hook to re-arm against the\n * later `exp`. Only called when `getStoredToken` returns a token whose `exp`\n * is later than the in-memory one.\n */\n onResync?: (token: string) => void;\n /**\n * Epoch ms of the user's last interaction (pointer, key, scroll, …). Used to\n * decide whether to silently renew (active) or log out (idle) when the access\n * token expires. When omitted, the hook always treats expiry as idle.\n */\n getLastActivityAt?: () => number;\n /**\n * Silently renew the session (rotate the refresh token + mint a new access\n * token). Resolves `true` on success — the resulting `setToken` re-arms this\n * hook against the new `exp` — or `false` when the server rejects it. Only\n * called when the user was active during the current token's lifetime.\n */\n renewSession?: () => Promise<boolean>;\n /**\n * Escape hatch for tests / dev environments where we don't want the\n * automatic logout behavior. Mirrors the existing `_disableRenewToken`\n * prop on `<AuthProvider>`.\n */\n disabled?: boolean;\n}\n\n/**\n * Keep the admin session alive while the user is active, and end it when they\n * are genuinely idle — without one tab tearing down another.\n *\n * The access token is short-lived (`accessTokenLifespan`, e.g. 30 min) and is\n * meant to be refreshed, not to be the session length. Two timers are armed per\n * token:\n *\n * - Renew (at `exp` minus a margin): if the user interacted during this token's\n * lifetime, silently renew *ahead* of expiry. The new `setToken` re-arms the\n * hook; a server rejection (`onSessionDead`) ends the session globally.\n * Renewing early guarantees the refreshed token reaches shared storage before\n * any sibling tab's logout timer fires.\n * - Logout (just after `exp`): the fallback when this tab did not renew. It\n * first re-syncs from a token another tab refreshed (so an idle tab rides on\n * an active sibling), then renews if activity arrived late, and only otherwise\n * logs out — locally, so idle tabs never force-logout active ones.\n *\n * If the JWT can't be decoded (malformed, missing `exp`), the timers are skipped\n * silently — the active-tab redirect on 401 still covers the symptom on the next\n * user-initiated request.\n */\nconst useIdleSessionLogout = ({\n token,\n onExpired,\n onSessionDead,\n getStoredToken,\n onResync,\n getLastActivityAt,\n renewSession,\n disabled = false,\n}: UseIdleSessionLogoutOptions): void => {\n React.useEffect(() => {\n if (!token || disabled) {\n return undefined;\n }\n\n const expiry = decodeAccessTokenExpiry(token);\n if (expiry === null) {\n return undefined;\n }\n\n // When this token became active. Activity recorded after this point means\n // the user was present during the token's lifetime.\n const armedAt = Date.now();\n const wasActive = () =>\n typeof getLastActivityAt === 'function' && getLastActivityAt() >= armedAt;\n\n // Adopt a fresher token another tab wrote to shared storage. Returns true\n // when it re-synced (caller should stop).\n const tryResync = (): boolean => {\n const storedToken = getStoredToken?.() ?? null;\n if (storedToken && storedToken !== token && onResync) {\n const storedExpiry = decodeAccessTokenExpiry(storedToken);\n if (storedExpiry !== null && storedExpiry > expiry) {\n onResync(storedToken);\n return true;\n }\n }\n return false;\n };\n\n const renew = () => {\n renewSession!().then((renewed) => {\n if (!renewed) {\n // Server rejected the refresh: the session is truly over.\n (onSessionDead ?? onExpired)();\n }\n // On success, storeToken -> setToken updates the token prop, which\n // re-runs this effect and re-arms against the new exp.\n });\n };\n\n // Renew ahead of expiry while the user is active.\n const renewDelay = Math.max(expiry - armedAt - SESSION_RENEW_MARGIN_MS, 0);\n const renewTimeoutId = window.setTimeout(() => {\n if (tryResync()) {\n return;\n }\n if (wasActive() && renewSession) {\n renew();\n }\n }, renewDelay);\n\n // Fallback decision just after expiry, for tabs that did not renew.\n const logoutDelay = Math.max(expiry - armedAt + SESSION_EXPIRY_BUFFER_MS, 0);\n const logoutTimeoutId = window.setTimeout(() => {\n if (tryResync()) {\n return;\n }\n if (wasActive() && renewSession) {\n renew();\n return;\n }\n // Genuinely idle: log out only this tab.\n onExpired();\n }, logoutDelay);\n\n return () => {\n window.clearTimeout(renewTimeoutId);\n window.clearTimeout(logoutTimeoutId);\n };\n }, [\n token,\n onExpired,\n onSessionDead,\n getStoredToken,\n onResync,\n getLastActivityAt,\n renewSession,\n disabled,\n ]);\n};\n\nexport { useIdleSessionLogout, SESSION_EXPIRY_BUFFER_MS, SESSION_RENEW_MARGIN_MS };\nexport type { UseIdleSessionLogoutOptions };\n"],"names":["SESSION_EXPIRY_BUFFER_MS","SESSION_RENEW_MARGIN_MS","useIdleSessionLogout","token","onExpired","onSessionDead","getStoredToken","onResync","getLastActivityAt","renewSession","disabled","React","useEffect","undefined","expiry","decodeAccessTokenExpiry","armedAt","Date","now","wasActive","tryResync","storedToken","storedExpiry","renew","then","renewed","renewDelay","Math","max","renewTimeoutId","window","setTimeout","logoutDelay","logoutTimeoutId","clearTimeout"],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useIdleSessionLogout.mjs","sources":["../../../../../admin/src/hooks/useIdleSessionLogout.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { decodeAccessTokenExpiry } from '../utils/jwt';\n\nconst SESSION_EXPIRY_BUFFER_MS = 1000;\n/**\n * How long before the access token's `exp` an active tab renews. Renewing\n * ahead of expiry (rather than at it) means the refreshed token is already in\n * shared storage by the time any *other* tab's logout timer fires — so an idle\n * sibling re-syncs instead of racing the refresh and logging itself out.\n */\nconst SESSION_RENEW_MARGIN_MS = 10_000;\n\ninterface UseIdleSessionLogoutOptions {\n /**\n * The current admin access JWT (from Redux), or `null` when logged out.\n */\n token: string | null;\n /**\n * Called when the timer fires and the user is genuinely idle. Should clear\n * *this tab's* local auth state and navigate to /auth/login. It must NOT\n * broadcast a global logout (e.g. by removing the shared `isLoggedIn` key),\n * otherwise an idle tab firing on a stale token would log out other tabs that\n * are still active — see the cross-tab handling below.\n */\n onExpired: () => void;\n /**\n * Called when a renewal attempt is rejected by the server (the session is\n * truly over: refresh token idle/max window elapsed). This is a\n * server-confirmed end of session, so unlike `onExpired` it SHOULD broadcast\n * a global logout to every tab. Falls back to `onExpired` when omitted.\n */\n onSessionDead?: () => void;\n /**\n * Read the access token currently in shared storage (localStorage/cookie).\n * Because every open tab shares the same refresh cookie, an active tab that\n * refreshes writes a newer access token here. When omitted, the hook never\n * re-syncs across tabs.\n */\n getStoredToken?: () => string | null;\n /**\n * Adopt a newer shared token instead of expiring. Typically dispatches\n * `setToken`, which updates Redux and causes this hook to re-arm against the\n * later `exp`. Only called when `getStoredToken` returns a token whose `exp`\n * is later than the in-memory one.\n */\n onResync?: (token: string) => void;\n /**\n * Epoch ms of the user's last interaction (pointer, key, scroll, …). Used to\n * decide whether to silently renew (active) or log out (idle) when the access\n * token expires. When omitted, the hook always treats expiry as idle.\n */\n getLastActivityAt?: () => number;\n /**\n * Silently renew the session (rotate the refresh token + mint a new access\n * token). Resolves `true` on success — the resulting `setToken` re-arms this\n * hook against the new `exp` — or `false` when the server rejects it. Only\n * called when the user was active during the current token's lifetime.\n */\n renewSession?: () => Promise<boolean>;\n /**\n * Escape hatch for tests / dev environments where we don't want the\n * automatic logout behavior. Mirrors the existing `_disableRenewToken`\n * prop on `<AuthProvider>`.\n */\n disabled?: boolean;\n}\n\n/**\n * Keep the admin session alive while the user is active, and end it when they\n * are genuinely idle — without one tab tearing down another.\n *\n * The access token is short-lived (`accessTokenLifespan`, e.g. 30 min) and is\n * meant to be refreshed, not to be the session length. Two timers are armed per\n * token:\n *\n * - Renew (at `exp` minus a margin): if the user interacted during this token's\n * lifetime, silently renew *ahead* of expiry. The new `setToken` re-arms the\n * hook; a server rejection (`onSessionDead`) ends the session globally.\n * Renewing early guarantees the refreshed token reaches shared storage before\n * any sibling tab's logout timer fires.\n * - Logout (just after `exp`): the fallback when this tab did not renew. It\n * first re-syncs from a token another tab refreshed (so an idle tab rides on\n * an active sibling), then renews if activity arrived late, and only otherwise\n * logs out — locally, so idle tabs never force-logout active ones.\n *\n * If the JWT can't be decoded (malformed, missing `exp`), the timers are skipped\n * silently — the active-tab redirect on 401 still covers the symptom on the next\n * user-initiated request.\n */\nconst useIdleSessionLogout = ({\n token,\n onExpired,\n onSessionDead,\n getStoredToken,\n onResync,\n getLastActivityAt,\n renewSession,\n disabled = false,\n}: UseIdleSessionLogoutOptions): void => {\n React.useEffect(() => {\n if (!token || disabled) {\n return undefined;\n }\n\n const expiry = decodeAccessTokenExpiry(token);\n if (expiry === null) {\n return undefined;\n }\n\n // When this token became active. Activity recorded after this point means\n // the user was present during the token's lifetime.\n const armedAt = Date.now();\n const wasActive = () =>\n typeof getLastActivityAt === 'function' && getLastActivityAt() >= armedAt;\n\n // Adopt a fresher token another tab wrote to shared storage. Returns true\n // when it re-synced (caller should stop).\n const tryResync = (): boolean => {\n const storedToken = getStoredToken?.() ?? null;\n if (storedToken && storedToken !== token && onResync) {\n const storedExpiry = decodeAccessTokenExpiry(storedToken);\n if (storedExpiry !== null && storedExpiry > expiry) {\n onResync(storedToken);\n return true;\n }\n }\n return false;\n };\n\n const renew = () => {\n renewSession!().then((renewed) => {\n if (!renewed) {\n // Server rejected the refresh: the session is truly over.\n (onSessionDead ?? onExpired)();\n }\n // On success, storeToken -> setToken updates the token prop, which\n // re-runs this effect and re-arms against the new exp.\n });\n };\n\n // Renew ahead of expiry while the user is active.\n const renewDelay = Math.max(expiry - armedAt - SESSION_RENEW_MARGIN_MS, 0);\n const renewTimeoutId = window.setTimeout(() => {\n if (tryResync()) {\n return;\n }\n if (wasActive() && renewSession) {\n renew();\n }\n }, renewDelay);\n\n // Fallback decision just after expiry, for tabs that did not renew.\n const logoutDelay = Math.max(expiry - armedAt + SESSION_EXPIRY_BUFFER_MS, 0);\n const logoutTimeoutId = window.setTimeout(() => {\n if (tryResync()) {\n return;\n }\n if (wasActive() && renewSession) {\n renew();\n return;\n }\n // Genuinely idle: log out only this tab.\n onExpired();\n }, logoutDelay);\n\n return () => {\n window.clearTimeout(renewTimeoutId);\n window.clearTimeout(logoutTimeoutId);\n };\n }, [\n token,\n onExpired,\n onSessionDead,\n getStoredToken,\n onResync,\n getLastActivityAt,\n renewSession,\n disabled,\n ]);\n};\n\nexport { useIdleSessionLogout, SESSION_EXPIRY_BUFFER_MS, SESSION_RENEW_MARGIN_MS };\nexport type { UseIdleSessionLogoutOptions };\n"],"names":["SESSION_EXPIRY_BUFFER_MS","SESSION_RENEW_MARGIN_MS","useIdleSessionLogout","token","onExpired","onSessionDead","getStoredToken","onResync","getLastActivityAt","renewSession","disabled","React","useEffect","undefined","expiry","decodeAccessTokenExpiry","armedAt","Date","now","wasActive","tryResync","storedToken","storedExpiry","renew","then","renewed","renewDelay","Math","max","renewTimeoutId","window","setTimeout","logoutDelay","logoutTimeoutId","clearTimeout"],"mappings":"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"}
|
|
@@ -1,87 +0,0 @@
|
|
|
1
|
-
declare const SESSION_EXPIRY_BUFFER_MS = 1000;
|
|
2
|
-
/**
|
|
3
|
-
* How long before the access token's `exp` an active tab renews. Renewing
|
|
4
|
-
* ahead of expiry (rather than at it) means the refreshed token is already in
|
|
5
|
-
* shared storage by the time any *other* tab's logout timer fires — so an idle
|
|
6
|
-
* sibling re-syncs instead of racing the refresh and logging itself out.
|
|
7
|
-
*/
|
|
8
|
-
declare const SESSION_RENEW_MARGIN_MS = 10000;
|
|
9
|
-
interface UseIdleSessionLogoutOptions {
|
|
10
|
-
/**
|
|
11
|
-
* The current admin access JWT (from Redux), or `null` when logged out.
|
|
12
|
-
*/
|
|
13
|
-
token: string | null;
|
|
14
|
-
/**
|
|
15
|
-
* Called when the timer fires and the user is genuinely idle. Should clear
|
|
16
|
-
* *this tab's* local auth state and navigate to /auth/login. It must NOT
|
|
17
|
-
* broadcast a global logout (e.g. by removing the shared `isLoggedIn` key),
|
|
18
|
-
* otherwise an idle tab firing on a stale token would log out other tabs that
|
|
19
|
-
* are still active — see the cross-tab handling below.
|
|
20
|
-
*/
|
|
21
|
-
onExpired: () => void;
|
|
22
|
-
/**
|
|
23
|
-
* Called when a renewal attempt is rejected by the server (the session is
|
|
24
|
-
* truly over: refresh token idle/max window elapsed). This is a
|
|
25
|
-
* server-confirmed end of session, so unlike `onExpired` it SHOULD broadcast
|
|
26
|
-
* a global logout to every tab. Falls back to `onExpired` when omitted.
|
|
27
|
-
*/
|
|
28
|
-
onSessionDead?: () => void;
|
|
29
|
-
/**
|
|
30
|
-
* Read the access token currently in shared storage (localStorage/cookie).
|
|
31
|
-
* Because every open tab shares the same refresh cookie, an active tab that
|
|
32
|
-
* refreshes writes a newer access token here. When omitted, the hook never
|
|
33
|
-
* re-syncs across tabs.
|
|
34
|
-
*/
|
|
35
|
-
getStoredToken?: () => string | null;
|
|
36
|
-
/**
|
|
37
|
-
* Adopt a newer shared token instead of expiring. Typically dispatches
|
|
38
|
-
* `setToken`, which updates Redux and causes this hook to re-arm against the
|
|
39
|
-
* later `exp`. Only called when `getStoredToken` returns a token whose `exp`
|
|
40
|
-
* is later than the in-memory one.
|
|
41
|
-
*/
|
|
42
|
-
onResync?: (token: string) => void;
|
|
43
|
-
/**
|
|
44
|
-
* Epoch ms of the user's last interaction (pointer, key, scroll, …). Used to
|
|
45
|
-
* decide whether to silently renew (active) or log out (idle) when the access
|
|
46
|
-
* token expires. When omitted, the hook always treats expiry as idle.
|
|
47
|
-
*/
|
|
48
|
-
getLastActivityAt?: () => number;
|
|
49
|
-
/**
|
|
50
|
-
* Silently renew the session (rotate the refresh token + mint a new access
|
|
51
|
-
* token). Resolves `true` on success — the resulting `setToken` re-arms this
|
|
52
|
-
* hook against the new `exp` — or `false` when the server rejects it. Only
|
|
53
|
-
* called when the user was active during the current token's lifetime.
|
|
54
|
-
*/
|
|
55
|
-
renewSession?: () => Promise<boolean>;
|
|
56
|
-
/**
|
|
57
|
-
* Escape hatch for tests / dev environments where we don't want the
|
|
58
|
-
* automatic logout behavior. Mirrors the existing `_disableRenewToken`
|
|
59
|
-
* prop on `<AuthProvider>`.
|
|
60
|
-
*/
|
|
61
|
-
disabled?: boolean;
|
|
62
|
-
}
|
|
63
|
-
/**
|
|
64
|
-
* Keep the admin session alive while the user is active, and end it when they
|
|
65
|
-
* are genuinely idle — without one tab tearing down another.
|
|
66
|
-
*
|
|
67
|
-
* The access token is short-lived (`accessTokenLifespan`, e.g. 30 min) and is
|
|
68
|
-
* meant to be refreshed, not to be the session length. Two timers are armed per
|
|
69
|
-
* token:
|
|
70
|
-
*
|
|
71
|
-
* - Renew (at `exp` minus a margin): if the user interacted during this token's
|
|
72
|
-
* lifetime, silently renew *ahead* of expiry. The new `setToken` re-arms the
|
|
73
|
-
* hook; a server rejection (`onSessionDead`) ends the session globally.
|
|
74
|
-
* Renewing early guarantees the refreshed token reaches shared storage before
|
|
75
|
-
* any sibling tab's logout timer fires.
|
|
76
|
-
* - Logout (just after `exp`): the fallback when this tab did not renew. It
|
|
77
|
-
* first re-syncs from a token another tab refreshed (so an idle tab rides on
|
|
78
|
-
* an active sibling), then renews if activity arrived late, and only otherwise
|
|
79
|
-
* logs out — locally, so idle tabs never force-logout active ones.
|
|
80
|
-
*
|
|
81
|
-
* If the JWT can't be decoded (malformed, missing `exp`), the timers are skipped
|
|
82
|
-
* silently — the active-tab redirect on 401 still covers the symptom on the next
|
|
83
|
-
* user-initiated request.
|
|
84
|
-
*/
|
|
85
|
-
declare const useIdleSessionLogout: ({ token, onExpired, onSessionDead, getStoredToken, onResync, getLastActivityAt, renewSession, disabled, }: UseIdleSessionLogoutOptions) => void;
|
|
86
|
-
export { useIdleSessionLogout, SESSION_EXPIRY_BUFFER_MS, SESSION_RENEW_MARGIN_MS };
|
|
87
|
-
export type { UseIdleSessionLogoutOptions };
|