@shipfox/client-shell 6.0.1 → 6.0.2
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/components/workspace-switcher.d.ts.map +1 -1
- package/dist/components/workspace-switcher.js +3 -2
- package/dist/components/workspace-switcher.js.map +1 -1
- package/dist/runtime/anchors.js +5 -5
- package/dist/runtime/anchors.js.map +1 -1
- package/dist/runtime/auth.d.ts +3 -2
- package/dist/runtime/auth.d.ts.map +1 -1
- package/dist/runtime/auth.js +69 -20
- package/dist/runtime/auth.js.map +1 -1
- package/dist/runtime/last-workspace.d.ts +6 -3
- package/dist/runtime/last-workspace.d.ts.map +1 -1
- package/dist/runtime/last-workspace.js +12 -21
- package/dist/runtime/last-workspace.js.map +1 -1
- package/dist/tsconfig.test.tsbuildinfo +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-switcher.d.ts","sourceRoot":"","sources":["../../src/components/workspace-switcher.tsx"],"names":[],"mappings":"AAeA,wBAAgB,iBAAiB,CAAC,EAChC,iBAAiB,EACjB,QAAQ,GACT,EAAE;IACD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,+
|
|
1
|
+
{"version":3,"file":"workspace-switcher.d.ts","sourceRoot":"","sources":["../../src/components/workspace-switcher.tsx"],"names":[],"mappings":"AAeA,wBAAgB,iBAAiB,CAAC,EAChC,iBAAiB,EACjB,QAAQ,GACT,EAAE;IACD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,+BAsDA"}
|
|
@@ -4,14 +4,15 @@ import { Icon } from '@shipfox/react-ui/icon';
|
|
|
4
4
|
import { useNavigate } from '@tanstack/react-router';
|
|
5
5
|
import { useSetAtom } from 'jotai';
|
|
6
6
|
import { useAuthState } from '#runtime/auth.js';
|
|
7
|
-
import { lastWorkspaceIdAtom } from '#runtime/last-workspace.js';
|
|
7
|
+
import { lastWorkspaceIdAtom, rememberLastWorkspaceId } from '#runtime/last-workspace.js';
|
|
8
8
|
export function WorkspaceSwitcher({ activeWorkspaceId, onSelect }) {
|
|
9
|
-
const { workspaces } = useAuthState();
|
|
9
|
+
const { user, workspaces } = useAuthState();
|
|
10
10
|
const navigate = useNavigate();
|
|
11
11
|
const setLastWorkspaceId = useSetAtom(lastWorkspaceIdAtom);
|
|
12
12
|
const selectWorkspace = (wid)=>{
|
|
13
13
|
try {
|
|
14
14
|
setLastWorkspaceId(wid);
|
|
15
|
+
if (user?.id) rememberLastWorkspaceId(user.id, wid);
|
|
15
16
|
} catch {
|
|
16
17
|
// Local storage is best effort.
|
|
17
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/components/workspace-switcher.tsx"],"sourcesContent":["import {\n Command,\n CommandEmpty,\n CommandGroup,\n CommandInput,\n CommandItem,\n CommandList,\n CommandSeparator,\n} from '@shipfox/react-ui/command';\nimport {Icon} from '@shipfox/react-ui/icon';\nimport {useNavigate} from '@tanstack/react-router';\nimport {useSetAtom} from 'jotai';\nimport {useAuthState} from '#runtime/auth.js';\nimport {lastWorkspaceIdAtom} from '#runtime/last-workspace.js';\n\nexport function WorkspaceSwitcher({\n activeWorkspaceId,\n onSelect,\n}: {\n activeWorkspaceId?: string;\n onSelect?: () => void;\n}) {\n const {workspaces} = useAuthState();\n const navigate = useNavigate();\n const setLastWorkspaceId = useSetAtom(lastWorkspaceIdAtom);\n const selectWorkspace = (wid: string) => {\n try {\n setLastWorkspaceId(wid);\n } catch {\n // Local storage is best effort.\n }\n navigate({to: '/workspaces/$wid', params: {wid}});\n onSelect?.();\n };\n return (\n <Command>\n <CommandInput placeholder=\"Search workspaces...\" />\n <CommandList className=\"max-h-none overflow-visible overflow-y-visible p-0\">\n <div className=\"max-h-300 overflow-y-auto overflow-x-hidden p-4 scrollbar\">\n <CommandEmpty>No workspaces found.</CommandEmpty>\n <CommandGroup heading=\"Workspaces\">\n {workspaces.map((workspace) => (\n <CommandItem\n key={workspace.id}\n value={workspace.id}\n keywords={[workspace.name]}\n onSelect={() => selectWorkspace(workspace.id)}\n >\n <Icon\n name=\"check\"\n className={`size-16 mr-8 ${activeWorkspaceId === workspace.id ? 'opacity-100' : 'opacity-0'}`}\n />\n {workspace.name}\n </CommandItem>\n ))}\n </CommandGroup>\n </div>\n <CommandSeparator alwaysRender className=\"mx-0\" />\n <CommandGroup forceMount className=\"p-4\">\n <CommandItem\n value=\"__create\"\n onSelect={() => {\n navigate({to: '/setup/workspaces/new' as never});\n onSelect?.();\n }}\n forceMount\n >\n <Icon name=\"addLine\" className=\"size-16\" />\n Create workspace\n </CommandItem>\n </CommandGroup>\n </CommandList>\n </Command>\n );\n}\n"],"names":["Command","CommandEmpty","CommandGroup","CommandInput","CommandItem","CommandList","CommandSeparator","Icon","useNavigate","useSetAtom","useAuthState","lastWorkspaceIdAtom","WorkspaceSwitcher","activeWorkspaceId","onSelect","workspaces","navigate","setLastWorkspaceId","selectWorkspace","wid","to","params","placeholder","className","div","heading","map","workspace","value","
|
|
1
|
+
{"version":3,"sources":["../../src/components/workspace-switcher.tsx"],"sourcesContent":["import {\n Command,\n CommandEmpty,\n CommandGroup,\n CommandInput,\n CommandItem,\n CommandList,\n CommandSeparator,\n} from '@shipfox/react-ui/command';\nimport {Icon} from '@shipfox/react-ui/icon';\nimport {useNavigate} from '@tanstack/react-router';\nimport {useSetAtom} from 'jotai';\nimport {useAuthState} from '#runtime/auth.js';\nimport {lastWorkspaceIdAtom, rememberLastWorkspaceId} from '#runtime/last-workspace.js';\n\nexport function WorkspaceSwitcher({\n activeWorkspaceId,\n onSelect,\n}: {\n activeWorkspaceId?: string;\n onSelect?: () => void;\n}) {\n const {user, workspaces} = useAuthState();\n const navigate = useNavigate();\n const setLastWorkspaceId = useSetAtom(lastWorkspaceIdAtom);\n const selectWorkspace = (wid: string) => {\n try {\n setLastWorkspaceId(wid);\n if (user?.id) rememberLastWorkspaceId(user.id, wid);\n } catch {\n // Local storage is best effort.\n }\n navigate({to: '/workspaces/$wid', params: {wid}});\n onSelect?.();\n };\n return (\n <Command>\n <CommandInput placeholder=\"Search workspaces...\" />\n <CommandList className=\"max-h-none overflow-visible overflow-y-visible p-0\">\n <div className=\"max-h-300 overflow-y-auto overflow-x-hidden p-4 scrollbar\">\n <CommandEmpty>No workspaces found.</CommandEmpty>\n <CommandGroup heading=\"Workspaces\">\n {workspaces.map((workspace) => (\n <CommandItem\n key={workspace.id}\n value={workspace.id}\n keywords={[workspace.name]}\n onSelect={() => selectWorkspace(workspace.id)}\n >\n <Icon\n name=\"check\"\n className={`size-16 mr-8 ${activeWorkspaceId === workspace.id ? 'opacity-100' : 'opacity-0'}`}\n />\n {workspace.name}\n </CommandItem>\n ))}\n </CommandGroup>\n </div>\n <CommandSeparator alwaysRender className=\"mx-0\" />\n <CommandGroup forceMount className=\"p-4\">\n <CommandItem\n value=\"__create\"\n onSelect={() => {\n navigate({to: '/setup/workspaces/new' as never});\n onSelect?.();\n }}\n forceMount\n >\n <Icon name=\"addLine\" className=\"size-16\" />\n Create workspace\n </CommandItem>\n </CommandGroup>\n </CommandList>\n </Command>\n );\n}\n"],"names":["Command","CommandEmpty","CommandGroup","CommandInput","CommandItem","CommandList","CommandSeparator","Icon","useNavigate","useSetAtom","useAuthState","lastWorkspaceIdAtom","rememberLastWorkspaceId","WorkspaceSwitcher","activeWorkspaceId","onSelect","user","workspaces","navigate","setLastWorkspaceId","selectWorkspace","wid","id","to","params","placeholder","className","div","heading","map","workspace","value","keywords","name","alwaysRender","forceMount"],"mappings":";AAAA,SACEA,OAAO,EACPC,YAAY,EACZC,YAAY,EACZC,YAAY,EACZC,WAAW,EACXC,WAAW,EACXC,gBAAgB,QACX,4BAA4B;AACnC,SAAQC,IAAI,QAAO,yBAAyB;AAC5C,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,UAAU,QAAO,QAAQ;AACjC,SAAQC,YAAY,QAAO,mBAAmB;AAC9C,SAAQC,mBAAmB,EAAEC,uBAAuB,QAAO,6BAA6B;AAExF,OAAO,SAASC,kBAAkB,EAChCC,iBAAiB,EACjBC,QAAQ,EAIT;IACC,MAAM,EAACC,IAAI,EAAEC,UAAU,EAAC,GAAGP;IAC3B,MAAMQ,WAAWV;IACjB,MAAMW,qBAAqBV,WAAWE;IACtC,MAAMS,kBAAkB,CAACC;QACvB,IAAI;YACFF,mBAAmBE;YACnB,IAAIL,MAAMM,IAAIV,wBAAwBI,KAAKM,EAAE,EAAED;QACjD,EAAE,OAAM;QACN,gCAAgC;QAClC;QACAH,SAAS;YAACK,IAAI;YAAoBC,QAAQ;gBAACH;YAAG;QAAC;QAC/CN;IACF;IACA,qBACE,MAACf;;0BACC,KAACG;gBAAasB,aAAY;;0BAC1B,MAACpB;gBAAYqB,WAAU;;kCACrB,MAACC;wBAAID,WAAU;;0CACb,KAACzB;0CAAa;;0CACd,KAACC;gCAAa0B,SAAQ;0CACnBX,WAAWY,GAAG,CAAC,CAACC,0BACf,MAAC1B;wCAEC2B,OAAOD,UAAUR,EAAE;wCACnBU,UAAU;4CAACF,UAAUG,IAAI;yCAAC;wCAC1BlB,UAAU,IAAMK,gBAAgBU,UAAUR,EAAE;;0DAE5C,KAACf;gDACC0B,MAAK;gDACLP,WAAW,CAAC,aAAa,EAAEZ,sBAAsBgB,UAAUR,EAAE,GAAG,gBAAgB,aAAa;;4CAE9FQ,UAAUG,IAAI;;uCATVH,UAAUR,EAAE;;;;kCAczB,KAAChB;wBAAiB4B,YAAY;wBAACR,WAAU;;kCACzC,KAACxB;wBAAaiC,UAAU;wBAACT,WAAU;kCACjC,cAAA,MAACtB;4BACC2B,OAAM;4BACNhB,UAAU;gCACRG,SAAS;oCAACK,IAAI;gCAAgC;gCAC9CR;4BACF;4BACAoB,UAAU;;8CAEV,KAAC5B;oCAAK0B,MAAK;oCAAUP,WAAU;;gCAAY;;;;;;;;AAOvD"}
|
package/dist/runtime/anchors.js
CHANGED
|
@@ -20,11 +20,6 @@ export function buildAnchorSkeleton({ navigation, settingsSections }) {
|
|
|
20
20
|
getParentRoute: ()=>rootRoute,
|
|
21
21
|
path: anchorPaths.workspaceLayout,
|
|
22
22
|
beforeLoad: async ({ context, params, location })=>{
|
|
23
|
-
try {
|
|
24
|
-
rememberLastWorkspaceId(params.wid);
|
|
25
|
-
} catch {
|
|
26
|
-
// Local storage is best effort.
|
|
27
|
-
}
|
|
28
23
|
const auth = context.auth;
|
|
29
24
|
if (!auth || auth.isLoading || !context.queryClient) return;
|
|
30
25
|
if (!auth.isAuthenticated) throw redirect({
|
|
@@ -36,6 +31,11 @@ export function buildAnchorSkeleton({ navigation, settingsSections }) {
|
|
|
36
31
|
if (!auth.workspaces.some((workspace)=>workspace.id === params.wid)) throw redirect({
|
|
37
32
|
to: '/'
|
|
38
33
|
});
|
|
34
|
+
try {
|
|
35
|
+
if (auth.user?.id) rememberLastWorkspaceId(auth.user.id, params.wid);
|
|
36
|
+
} catch {
|
|
37
|
+
// Local storage is best effort.
|
|
38
|
+
}
|
|
39
39
|
if (!context.workspaceSetup) throw new Error('Client composition includes workspace routes but no workspaceSetup gate.');
|
|
40
40
|
return await context.workspaceSetup({
|
|
41
41
|
queryClient: context.queryClient,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/runtime/anchors.tsx"],"sourcesContent":["import {ShipfoxLoader} from '@shipfox/react-ui/loader';\nimport {Header, Text} from '@shipfox/react-ui/typography';\nimport {createRootRouteWithContext, createRoute, Outlet, redirect} from '@tanstack/react-router';\nimport {MainLayout} from '#components/main-layout.js';\nimport {NotFoundPage} from '#components/not-found-page.js';\nimport {SettingsNav} from '#components/settings-nav.js';\nimport type {NavTabEntry, SettingsSectionEntry} from '#contract.js';\nimport {useActiveWorkspace} from './active-workspace.js';\nimport {anchorPaths} from './anchor-paths.js';\nimport {useChrome} from './chrome-context.js';\nimport {rememberLastWorkspaceId} from './last-workspace.js';\nimport type {RouterContext} from './router-context.js';\nimport {WorkspaceLayoutErrorRoute, WorkspaceSetupPending} from './workspace-setup.js';\n\nexport {routePathForAnchor} from './anchor-paths.js';\n\nexport function buildAnchorSkeleton({\n navigation,\n settingsSections,\n}: {\n navigation: readonly NavTabEntry[];\n settingsSections: readonly SettingsSectionEntry[];\n}) {\n const rootRoute = createRootRouteWithContext<RouterContext>()({\n component: Outlet,\n notFoundComponent: NotFoundPage,\n });\n const workspaceLayout = createRoute({\n getParentRoute: () => rootRoute,\n path: anchorPaths.workspaceLayout,\n beforeLoad: async ({context, params, location}) => {\n
|
|
1
|
+
{"version":3,"sources":["../../src/runtime/anchors.tsx"],"sourcesContent":["import {ShipfoxLoader} from '@shipfox/react-ui/loader';\nimport {Header, Text} from '@shipfox/react-ui/typography';\nimport {createRootRouteWithContext, createRoute, Outlet, redirect} from '@tanstack/react-router';\nimport {MainLayout} from '#components/main-layout.js';\nimport {NotFoundPage} from '#components/not-found-page.js';\nimport {SettingsNav} from '#components/settings-nav.js';\nimport type {NavTabEntry, SettingsSectionEntry} from '#contract.js';\nimport {useActiveWorkspace} from './active-workspace.js';\nimport {anchorPaths} from './anchor-paths.js';\nimport {useChrome} from './chrome-context.js';\nimport {rememberLastWorkspaceId} from './last-workspace.js';\nimport type {RouterContext} from './router-context.js';\nimport {WorkspaceLayoutErrorRoute, WorkspaceSetupPending} from './workspace-setup.js';\n\nexport {routePathForAnchor} from './anchor-paths.js';\n\nexport function buildAnchorSkeleton({\n navigation,\n settingsSections,\n}: {\n navigation: readonly NavTabEntry[];\n settingsSections: readonly SettingsSectionEntry[];\n}) {\n const rootRoute = createRootRouteWithContext<RouterContext>()({\n component: Outlet,\n notFoundComponent: NotFoundPage,\n });\n const workspaceLayout = createRoute({\n getParentRoute: () => rootRoute,\n path: anchorPaths.workspaceLayout,\n beforeLoad: async ({context, params, location}) => {\n const auth = context.auth;\n if (!auth || auth.isLoading || !context.queryClient) return;\n if (!auth.isAuthenticated)\n throw redirect({to: '/auth/login' as never, search: {redirect: location.href} as never});\n if (!auth.workspaces.some((workspace) => workspace.id === params.wid))\n throw redirect({to: '/'});\n try {\n if (auth.user?.id) rememberLastWorkspaceId(auth.user.id, params.wid);\n } catch {\n // Local storage is best effort.\n }\n if (!context.workspaceSetup)\n throw new Error('Client composition includes workspace routes but no workspaceSetup gate.');\n return await context.workspaceSetup({\n queryClient: context.queryClient,\n workspaceId: params.wid,\n pathname: location.pathname,\n });\n },\n pendingComponent: () => (\n <div className=\"flex h-screen items-center justify-center\">\n <ShipfoxLoader size={64} animation=\"circular\" color=\"orange\" background=\"dark\" />\n </div>\n ),\n errorComponent: WorkspaceLayoutErrorRoute,\n component: () => {\n const setupState = workspaceLayout.useRouteContext() as {hideProjectNavigation?: boolean};\n return setupState.hideProjectNavigation === undefined ? (\n <WorkspaceSetupPending />\n ) : (\n <MainLayout\n navigation={navigation}\n hideProjectNavigation={setupState.hideProjectNavigation}\n />\n );\n },\n });\n const projectLayout = createRoute({\n getParentRoute: () => workspaceLayout,\n path: '/projects/$pid',\n component: () => {\n const {ProjectLayoutGuard} = useChrome();\n return <ProjectLayoutGuard />;\n },\n });\n const workspaceSettings = createRoute({\n getParentRoute: () => workspaceLayout,\n path: '/settings',\n component: () => {\n const workspace = useActiveWorkspace();\n return (\n <div className=\"flex w-full flex-col gap-24\">\n <header className=\"flex flex-col gap-6\">\n <Header variant=\"h2\">Workspace settings</Header>\n <Text size=\"sm\" className=\"text-foreground-neutral-muted\">\n Configure {workspace.name}.\n </Text>\n </header>\n\n <div className=\"grid grid-cols-[180px_minmax(0,1fr)] gap-32 max-[760px]:grid-cols-1\">\n <SettingsNav entries={settingsSections} />\n <Outlet />\n </div>\n </div>\n );\n },\n });\n return {\n anchors: {root: rootRoute, workspaceLayout, projectLayout, workspaceSettings},\n rootRoute,\n workspaceLayout,\n projectLayout,\n workspaceSettings,\n };\n}\n"],"names":["ShipfoxLoader","Header","Text","createRootRouteWithContext","createRoute","Outlet","redirect","MainLayout","NotFoundPage","SettingsNav","useActiveWorkspace","anchorPaths","useChrome","rememberLastWorkspaceId","WorkspaceLayoutErrorRoute","WorkspaceSetupPending","routePathForAnchor","buildAnchorSkeleton","navigation","settingsSections","rootRoute","component","notFoundComponent","workspaceLayout","getParentRoute","path","beforeLoad","context","params","location","auth","isLoading","queryClient","isAuthenticated","to","search","href","workspaces","some","workspace","id","wid","user","workspaceSetup","Error","workspaceId","pathname","pendingComponent","div","className","size","animation","color","background","errorComponent","setupState","useRouteContext","hideProjectNavigation","undefined","projectLayout","ProjectLayoutGuard","workspaceSettings","header","variant","name","entries","anchors","root"],"mappings":"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"}
|
package/dist/runtime/auth.d.ts
CHANGED
|
@@ -23,8 +23,9 @@ export declare function useAuthState(): AuthStateValue;
|
|
|
23
23
|
export { authRefreshQueryKey, authRefreshQueryOptions, listUserWorkspaces, userWorkspacesQueryKey, userWorkspacesQueryOptions, } from '#hooks/api/session-auth.js';
|
|
24
24
|
export declare function getAuthRefreshDelayMs(token: string, nowMs?: number): number | undefined;
|
|
25
25
|
export declare function useAuthTransition(): {
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
beginAuthTransition: () => number;
|
|
27
|
+
enterAuthenticated: (session: AuthenticatedSession, transitionEpoch?: number) => Promise<boolean>;
|
|
28
|
+
enterGuest: (transitionEpoch?: number) => Promise<boolean>;
|
|
28
29
|
};
|
|
29
30
|
export declare function useRefreshAuth(): () => Promise<AuthenticatedSession>;
|
|
30
31
|
export interface AuthRuntimeProps extends PropsWithChildren {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/runtime/auth.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,OAAO,CAAC;AAE7C,OAAO,KAAK,EAAC,oBAAoB,EAAE,YAAY,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/runtime/auth.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,OAAO,CAAC;AAE7C,OAAO,KAAK,EAAC,oBAAoB,EAAE,YAAY,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAiB3F,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,eAAe,GAAG,OAAO,CAAC;AAE/D,MAAM,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAEzC,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,gBAAgB,EAAE,SAA+B,CAAC;AAC/D,eAAO,MAAM,aAAa;;CAAoC,CAAC;AAG/D,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,oBAAoB,EAC7B,UAAU,GAAE,gBAAgB,EAAO,GAClC,SAAS,CAOX;AAED,wBAAgB,YAAY,IAAI,cAAc,CAY7C;AAED,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AAoBpC,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,SAAa,GAAG,MAAM,GAAG,SAAS,CAG3F;AAED,wBAAgB,iBAAiB;;kCAkCb,oBAAoB,oBAAoB,MAAM;mCAhBrC,MAAM;EAiDlC;AAED,wBAAgB,cAAc,wCAuC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,WAAW,CAAC,EAAC,QAAQ,EAAE,OAAc,EAAC,EAAE,gBAAgB,6BAyEvE"}
|
package/dist/runtime/auth.js
CHANGED
|
@@ -3,12 +3,17 @@ import { useQueryClient } from '@tanstack/react-query';
|
|
|
3
3
|
import { atom, useAtomValue, useSetAtom, useStore } from 'jotai';
|
|
4
4
|
import { useCallback, useEffect, useMemo } from 'react';
|
|
5
5
|
import { authRefreshQueryKey, authRefreshQueryOptions, userWorkspacesQueryOptions } from '#hooks/api/session-auth.js';
|
|
6
|
+
import { lastWorkspaceIdAtom } from './last-workspace.js';
|
|
6
7
|
const REFRESH_EARLY_MS = 5 * 60 * 1000;
|
|
7
8
|
const REFRESH_RETRY_DELAY_MS = 60_000;
|
|
8
9
|
const BASE64_URL_REPLACEMENTS = {
|
|
9
10
|
dash: /-/g,
|
|
10
11
|
underscore: /_/g
|
|
11
12
|
};
|
|
13
|
+
const refreshPromises = new WeakMap();
|
|
14
|
+
function invalidateRefresh(queryClient) {
|
|
15
|
+
refreshPromises.delete(queryClient);
|
|
16
|
+
}
|
|
12
17
|
export const initialAuthState = {
|
|
13
18
|
status: 'loading'
|
|
14
19
|
};
|
|
@@ -57,32 +62,50 @@ export function useAuthTransition() {
|
|
|
57
62
|
const queryClient = useQueryClient();
|
|
58
63
|
const store = useStore();
|
|
59
64
|
const setState = useSetAtom(authStateAtom);
|
|
65
|
+
const setLastWorkspaceId = useSetAtom(lastWorkspaceIdAtom);
|
|
66
|
+
const beginAuthTransition = useCallback(()=>{
|
|
67
|
+
const transitionEpoch = store.get(authTransitionEpochAtom) + 1;
|
|
68
|
+
store.set(authTransitionEpochAtom, transitionEpoch);
|
|
69
|
+
return transitionEpoch;
|
|
70
|
+
}, [
|
|
71
|
+
store
|
|
72
|
+
]);
|
|
60
73
|
const clearPrivateState = useCallback(async ()=>{
|
|
61
74
|
await queryClient.cancelQueries();
|
|
62
75
|
queryClient.clear();
|
|
63
76
|
}, [
|
|
64
77
|
queryClient
|
|
65
78
|
]);
|
|
66
|
-
const enterGuest = useCallback(async ()=>{
|
|
67
|
-
const
|
|
68
|
-
|
|
79
|
+
const enterGuest = useCallback(async (transitionEpoch)=>{
|
|
80
|
+
const isExternalTransition = transitionEpoch === undefined;
|
|
81
|
+
const epoch = transitionEpoch ?? beginAuthTransition();
|
|
82
|
+
if (isExternalTransition) invalidateRefresh(queryClient);
|
|
83
|
+
if (store.get(authTransitionEpochAtom) !== epoch) return false;
|
|
69
84
|
await clearPrivateState();
|
|
70
|
-
if (store.get(authTransitionEpochAtom) !==
|
|
85
|
+
if (store.get(authTransitionEpochAtom) !== epoch) return false;
|
|
86
|
+
setLastWorkspaceId(undefined);
|
|
71
87
|
setState({
|
|
72
88
|
status: 'guest'
|
|
73
89
|
});
|
|
90
|
+
return true;
|
|
74
91
|
}, [
|
|
92
|
+
beginAuthTransition,
|
|
75
93
|
clearPrivateState,
|
|
94
|
+
queryClient,
|
|
95
|
+
setLastWorkspaceId,
|
|
76
96
|
setState,
|
|
77
97
|
store
|
|
78
98
|
]);
|
|
79
|
-
const enterAuthenticated = useCallback(async (session)=>{
|
|
80
|
-
const
|
|
81
|
-
|
|
99
|
+
const enterAuthenticated = useCallback(async (session, transitionEpoch)=>{
|
|
100
|
+
const isExternalTransition = transitionEpoch === undefined;
|
|
101
|
+
const epoch = transitionEpoch ?? beginAuthTransition();
|
|
102
|
+
if (isExternalTransition) invalidateRefresh(queryClient);
|
|
103
|
+
if (store.get(authTransitionEpochAtom) !== epoch) return false;
|
|
82
104
|
const previousState = store.get(authStateAtom);
|
|
83
|
-
const principalChanged = previousState.status
|
|
105
|
+
const principalChanged = previousState.status !== 'authenticated' || previousState.user?.id !== session.user.id;
|
|
84
106
|
if (principalChanged) await clearPrivateState();
|
|
85
|
-
if (store.get(authTransitionEpochAtom) !==
|
|
107
|
+
if (store.get(authTransitionEpochAtom) !== epoch) return false;
|
|
108
|
+
if (principalChanged) setLastWorkspaceId(undefined);
|
|
86
109
|
queryClient.setQueryData(authRefreshQueryKey, session);
|
|
87
110
|
let workspaces = [];
|
|
88
111
|
try {
|
|
@@ -91,32 +114,58 @@ export function useAuthTransition() {
|
|
|
91
114
|
} catch {
|
|
92
115
|
// The authenticated session remains usable while workspace hydration retries on the next route load.
|
|
93
116
|
}
|
|
94
|
-
if (store.get(authTransitionEpochAtom) !==
|
|
117
|
+
if (store.get(authTransitionEpochAtom) !== epoch) return false;
|
|
95
118
|
setState(toAuthenticatedState(session, workspaces));
|
|
119
|
+
return true;
|
|
96
120
|
}, [
|
|
121
|
+
beginAuthTransition,
|
|
97
122
|
clearPrivateState,
|
|
98
123
|
queryClient,
|
|
124
|
+
setLastWorkspaceId,
|
|
99
125
|
setState,
|
|
100
126
|
store
|
|
101
127
|
]);
|
|
102
128
|
return {
|
|
129
|
+
beginAuthTransition,
|
|
103
130
|
enterAuthenticated,
|
|
104
131
|
enterGuest
|
|
105
132
|
};
|
|
106
133
|
}
|
|
107
134
|
export function useRefreshAuth() {
|
|
108
135
|
const queryClient = useQueryClient();
|
|
109
|
-
const { enterAuthenticated, enterGuest } = useAuthTransition();
|
|
110
|
-
return useCallback(
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
136
|
+
const { beginAuthTransition, enterAuthenticated, enterGuest } = useAuthTransition();
|
|
137
|
+
return useCallback(()=>{
|
|
138
|
+
const existingRefresh = refreshPromises.get(queryClient);
|
|
139
|
+
if (existingRefresh) return existingRefresh;
|
|
140
|
+
const transitionEpoch = beginAuthTransition();
|
|
141
|
+
const refresh = (async ()=>{
|
|
142
|
+
try {
|
|
143
|
+
const result = await queryClient.fetchQuery(authRefreshQueryOptions());
|
|
144
|
+
const accepted = await enterAuthenticated(result, transitionEpoch);
|
|
145
|
+
if (!accepted) {
|
|
146
|
+
throw new ApiError({
|
|
147
|
+
message: 'Authentication refresh was superseded.',
|
|
148
|
+
code: 'unauthorized',
|
|
149
|
+
status: 401
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
return result;
|
|
153
|
+
} catch (error) {
|
|
154
|
+
if (error instanceof ApiError && error.status === 401) {
|
|
155
|
+
await enterGuest(transitionEpoch);
|
|
156
|
+
}
|
|
157
|
+
throw error;
|
|
158
|
+
}
|
|
159
|
+
})();
|
|
160
|
+
refreshPromises.set(queryClient, refresh);
|
|
161
|
+
void refresh.then(()=>{
|
|
162
|
+
if (refreshPromises.get(queryClient) === refresh) refreshPromises.delete(queryClient);
|
|
163
|
+
}, ()=>{
|
|
164
|
+
if (refreshPromises.get(queryClient) === refresh) refreshPromises.delete(queryClient);
|
|
165
|
+
});
|
|
166
|
+
return refresh;
|
|
119
167
|
}, [
|
|
168
|
+
beginAuthTransition,
|
|
120
169
|
enterAuthenticated,
|
|
121
170
|
enterGuest,
|
|
122
171
|
queryClient
|
package/dist/runtime/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/runtime/auth.tsx"],"sourcesContent":["import {ApiError, configureApiClient} from '@shipfox/client-api';\nimport {useQueryClient} from '@tanstack/react-query';\nimport {atom, useAtomValue, useSetAtom, useStore} from 'jotai';\nimport type {PropsWithChildren} from 'react';\nimport {useCallback, useEffect, useMemo} from 'react';\nimport type {AuthenticatedSession, UserIdentity, WorkspaceSummary} from '#core/session.js';\nimport {\n authRefreshQueryKey,\n authRefreshQueryOptions,\n userWorkspacesQueryOptions,\n} from '#hooks/api/session-auth.js';\n\nconst REFRESH_EARLY_MS = 5 * 60 * 1000;\nconst REFRESH_RETRY_DELAY_MS = 60_000;\nconst BASE64_URL_REPLACEMENTS = {dash: /-/g, underscore: /_/g} as const;\n\nexport type AuthStatus = 'loading' | 'authenticated' | 'guest';\n\nexport type Workspace = WorkspaceSummary;\n\nexport interface AuthState {\n status: AuthStatus;\n token?: string;\n user?: UserIdentity;\n workspaces?: Workspace[];\n}\n\nexport interface AuthStateValue extends AuthState {\n isLoading: boolean;\n isAuthenticated: boolean;\n workspaces: Workspace[];\n hasWorkspace: boolean;\n}\n\nexport const initialAuthState: AuthState = {status: 'loading'};\nexport const authStateAtom = atom<AuthState>(initialAuthState);\nconst authTransitionEpochAtom = atom(0);\n\nexport function toAuthenticatedState(\n session: AuthenticatedSession,\n workspaces: WorkspaceSummary[] = [],\n): AuthState {\n return {\n status: 'authenticated',\n token: session.accessToken,\n user: session.user,\n workspaces,\n };\n}\n\nexport function useAuthState(): AuthStateValue {\n const state = useAtomValue(authStateAtom);\n return useMemo(\n () => ({\n ...state,\n workspaces: state.workspaces ?? [],\n isLoading: state.status === 'loading',\n isAuthenticated: state.status === 'authenticated',\n hasWorkspace: (state.workspaces ?? []).length > 0,\n }),\n [state],\n );\n}\n\nexport {\n authRefreshQueryKey,\n authRefreshQueryOptions,\n listUserWorkspaces,\n userWorkspacesQueryKey,\n userWorkspacesQueryOptions,\n} from '#hooks/api/session-auth.js';\n\nfunction decodeBase64Url(value: string): string {\n const base64 = value\n .replace(BASE64_URL_REPLACEMENTS.dash, '+')\n .replace(BASE64_URL_REPLACEMENTS.underscore, '/');\n return atob(base64.padEnd(Math.ceil(base64.length / 4) * 4, '='));\n}\n\nfunction readJwtExp(token: string): number | undefined {\n const [, payload] = token.split('.');\n if (!payload) return undefined;\n try {\n const parsed = JSON.parse(decodeBase64Url(payload)) as {exp?: unknown};\n return typeof parsed.exp === 'number' && Number.isFinite(parsed.exp) ? parsed.exp : undefined;\n } catch {\n return undefined;\n }\n}\n\nexport function getAuthRefreshDelayMs(token: string, nowMs = Date.now()): number | undefined {\n const exp = readJwtExp(token);\n return exp === undefined ? undefined : exp * 1000 - nowMs - REFRESH_EARLY_MS;\n}\n\nexport function useAuthTransition() {\n const queryClient = useQueryClient();\n const store = useStore();\n const setState = useSetAtom(authStateAtom);\n\n const clearPrivateState = useCallback(async () => {\n await queryClient.cancelQueries();\n queryClient.clear();\n }, [queryClient]);\n\n const enterGuest = useCallback(async () => {\n const transitionEpoch = store.get(authTransitionEpochAtom) + 1;\n store.set(authTransitionEpochAtom, transitionEpoch);\n await clearPrivateState();\n if (store.get(authTransitionEpochAtom) !== transitionEpoch) return;\n setState({status: 'guest'});\n }, [clearPrivateState, setState, store]);\n\n const enterAuthenticated = useCallback(\n async (session: AuthenticatedSession) => {\n const transitionEpoch = store.get(authTransitionEpochAtom) + 1;\n store.set(authTransitionEpochAtom, transitionEpoch);\n const previousState = store.get(authStateAtom);\n const principalChanged =\n previousState.status === 'authenticated' && previousState.user?.id !== session.user.id;\n\n if (principalChanged) await clearPrivateState();\n if (store.get(authTransitionEpochAtom) !== transitionEpoch) return;\n\n queryClient.setQueryData(authRefreshQueryKey, session);\n let workspaces: WorkspaceSummary[] = [];\n try {\n const hydratedWorkspaces = await queryClient.fetchQuery(\n userWorkspacesQueryOptions(session.accessToken),\n );\n workspaces = hydratedWorkspaces.memberships;\n } catch {\n // The authenticated session remains usable while workspace hydration retries on the next route load.\n }\n if (store.get(authTransitionEpochAtom) !== transitionEpoch) return;\n\n setState(toAuthenticatedState(session, workspaces));\n },\n [clearPrivateState, queryClient, setState, store],\n );\n\n return {enterAuthenticated, enterGuest};\n}\n\nexport function useRefreshAuth() {\n const queryClient = useQueryClient();\n const {enterAuthenticated, enterGuest} = useAuthTransition();\n return useCallback(async () => {\n try {\n const result = await queryClient.fetchQuery(authRefreshQueryOptions());\n await enterAuthenticated(result);\n return result;\n } catch (error) {\n if (error instanceof ApiError && error.status === 401) await enterGuest();\n throw error;\n }\n }, [enterAuthenticated, enterGuest, queryClient]);\n}\n\nexport interface AuthRuntimeProps extends PropsWithChildren {\n effects?: boolean;\n}\n\nexport function AuthRuntime({children, effects = true}: AuthRuntimeProps) {\n const store = useStore();\n const authState = useAtomValue(authStateAtom);\n const refreshAuth = useRefreshAuth();\n\n useEffect(() => {\n if (!effects) return;\n configureApiClient({\n getAccessToken: () => store.get(authStateAtom).token,\n refreshAccessToken: async () => (await refreshAuth()).accessToken,\n });\n }, [effects, refreshAuth, store]);\n\n useEffect(() => {\n if (!effects) return;\n refreshAuth().catch(() => undefined);\n }, [effects, refreshAuth]);\n\n useEffect(() => {\n if (!effects || authState.status !== 'authenticated' || !authState.token) return;\n\n let timeout: ReturnType<typeof setTimeout> | undefined;\n let disposed = false;\n let refreshing = false;\n const clearRefreshTimer = () => {\n if (timeout !== undefined) clearTimeout(timeout);\n timeout = undefined;\n };\n const scheduleRefresh = (delayMs: number) => {\n clearRefreshTimer();\n timeout = setTimeout(runRefresh, Math.max(0, delayMs));\n };\n const retryIfStillDue = () => {\n const current = store.get(authStateAtom);\n if (current.status !== 'authenticated' || !current.token) return;\n const delay = getAuthRefreshDelayMs(current.token);\n if (delay !== undefined && delay <= 0) scheduleRefresh(REFRESH_RETRY_DELAY_MS);\n };\n function runRefresh() {\n if (disposed || refreshing) return;\n refreshing = true;\n clearRefreshTimer();\n refreshAuth()\n .catch(() => undefined)\n .finally(() => {\n refreshing = false;\n if (!disposed) retryIfStillDue();\n });\n }\n const refreshIfDue = () => {\n const current = store.get(authStateAtom);\n if (current.status !== 'authenticated' || !current.token) return;\n const delay = getAuthRefreshDelayMs(current.token);\n if (delay !== undefined && delay <= 0) runRefresh();\n };\n const refreshIfVisible = () => {\n if (document.visibilityState === 'visible') refreshIfDue();\n };\n const delay = getAuthRefreshDelayMs(authState.token);\n if (delay !== undefined) scheduleRefresh(delay);\n window.addEventListener('focus', refreshIfDue);\n window.addEventListener('online', refreshIfDue);\n document.addEventListener('visibilitychange', refreshIfVisible);\n return () => {\n disposed = true;\n clearRefreshTimer();\n window.removeEventListener('focus', refreshIfDue);\n window.removeEventListener('online', refreshIfDue);\n document.removeEventListener('visibilitychange', refreshIfVisible);\n };\n }, [authState.status, authState.token, effects, refreshAuth, store]);\n\n return children;\n}\n"],"names":["ApiError","configureApiClient","useQueryClient","atom","useAtomValue","useSetAtom","useStore","useCallback","useEffect","useMemo","authRefreshQueryKey","authRefreshQueryOptions","userWorkspacesQueryOptions","REFRESH_EARLY_MS","REFRESH_RETRY_DELAY_MS","BASE64_URL_REPLACEMENTS","dash","underscore","initialAuthState","status","authStateAtom","authTransitionEpochAtom","toAuthenticatedState","session","workspaces","token","accessToken","user","useAuthState","state","isLoading","isAuthenticated","hasWorkspace","length","listUserWorkspaces","userWorkspacesQueryKey","decodeBase64Url","value","base64","replace","atob","padEnd","Math","ceil","readJwtExp","payload","split","undefined","parsed","JSON","parse","exp","Number","isFinite","getAuthRefreshDelayMs","nowMs","Date","now","useAuthTransition","queryClient","store","setState","clearPrivateState","cancelQueries","clear","enterGuest","transitionEpoch","get","set","enterAuthenticated","previousState","principalChanged","id","setQueryData","hydratedWorkspaces","fetchQuery","memberships","useRefreshAuth","result","error","AuthRuntime","children","effects","authState","refreshAuth","getAccessToken","refreshAccessToken","catch","timeout","disposed","refreshing","clearRefreshTimer","clearTimeout","scheduleRefresh","delayMs","setTimeout","runRefresh","max","retryIfStillDue","current","delay","finally","refreshIfDue","refreshIfVisible","document","visibilityState","window","addEventListener","removeEventListener"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/runtime/auth.tsx"],"sourcesContent":["import {ApiError, configureApiClient} from '@shipfox/client-api';\nimport {type QueryClient, useQueryClient} from '@tanstack/react-query';\nimport {atom, useAtomValue, useSetAtom, useStore} from 'jotai';\nimport type {PropsWithChildren} from 'react';\nimport {useCallback, useEffect, useMemo} from 'react';\nimport type {AuthenticatedSession, UserIdentity, WorkspaceSummary} from '#core/session.js';\nimport {\n authRefreshQueryKey,\n authRefreshQueryOptions,\n userWorkspacesQueryOptions,\n} from '#hooks/api/session-auth.js';\nimport {lastWorkspaceIdAtom} from './last-workspace.js';\n\nconst REFRESH_EARLY_MS = 5 * 60 * 1000;\nconst REFRESH_RETRY_DELAY_MS = 60_000;\nconst BASE64_URL_REPLACEMENTS = {dash: /-/g, underscore: /_/g} as const;\nconst refreshPromises = new WeakMap<QueryClient, Promise<AuthenticatedSession>>();\n\nfunction invalidateRefresh(queryClient: QueryClient): void {\n refreshPromises.delete(queryClient);\n}\n\nexport type AuthStatus = 'loading' | 'authenticated' | 'guest';\n\nexport type Workspace = WorkspaceSummary;\n\nexport interface AuthState {\n status: AuthStatus;\n token?: string;\n user?: UserIdentity;\n workspaces?: Workspace[];\n}\n\nexport interface AuthStateValue extends AuthState {\n isLoading: boolean;\n isAuthenticated: boolean;\n workspaces: Workspace[];\n hasWorkspace: boolean;\n}\n\nexport const initialAuthState: AuthState = {status: 'loading'};\nexport const authStateAtom = atom<AuthState>(initialAuthState);\nconst authTransitionEpochAtom = atom(0);\n\nexport function toAuthenticatedState(\n session: AuthenticatedSession,\n workspaces: WorkspaceSummary[] = [],\n): AuthState {\n return {\n status: 'authenticated',\n token: session.accessToken,\n user: session.user,\n workspaces,\n };\n}\n\nexport function useAuthState(): AuthStateValue {\n const state = useAtomValue(authStateAtom);\n return useMemo(\n () => ({\n ...state,\n workspaces: state.workspaces ?? [],\n isLoading: state.status === 'loading',\n isAuthenticated: state.status === 'authenticated',\n hasWorkspace: (state.workspaces ?? []).length > 0,\n }),\n [state],\n );\n}\n\nexport {\n authRefreshQueryKey,\n authRefreshQueryOptions,\n listUserWorkspaces,\n userWorkspacesQueryKey,\n userWorkspacesQueryOptions,\n} from '#hooks/api/session-auth.js';\n\nfunction decodeBase64Url(value: string): string {\n const base64 = value\n .replace(BASE64_URL_REPLACEMENTS.dash, '+')\n .replace(BASE64_URL_REPLACEMENTS.underscore, '/');\n return atob(base64.padEnd(Math.ceil(base64.length / 4) * 4, '='));\n}\n\nfunction readJwtExp(token: string): number | undefined {\n const [, payload] = token.split('.');\n if (!payload) return undefined;\n try {\n const parsed = JSON.parse(decodeBase64Url(payload)) as {exp?: unknown};\n return typeof parsed.exp === 'number' && Number.isFinite(parsed.exp) ? parsed.exp : undefined;\n } catch {\n return undefined;\n }\n}\n\nexport function getAuthRefreshDelayMs(token: string, nowMs = Date.now()): number | undefined {\n const exp = readJwtExp(token);\n return exp === undefined ? undefined : exp * 1000 - nowMs - REFRESH_EARLY_MS;\n}\n\nexport function useAuthTransition() {\n const queryClient = useQueryClient();\n const store = useStore();\n const setState = useSetAtom(authStateAtom);\n const setLastWorkspaceId = useSetAtom(lastWorkspaceIdAtom);\n\n const beginAuthTransition = useCallback(() => {\n const transitionEpoch = store.get(authTransitionEpochAtom) + 1;\n store.set(authTransitionEpochAtom, transitionEpoch);\n return transitionEpoch;\n }, [store]);\n\n const clearPrivateState = useCallback(async () => {\n await queryClient.cancelQueries();\n queryClient.clear();\n }, [queryClient]);\n\n const enterGuest = useCallback(\n async (transitionEpoch?: number) => {\n const isExternalTransition = transitionEpoch === undefined;\n const epoch = transitionEpoch ?? beginAuthTransition();\n if (isExternalTransition) invalidateRefresh(queryClient);\n if (store.get(authTransitionEpochAtom) !== epoch) return false;\n\n await clearPrivateState();\n if (store.get(authTransitionEpochAtom) !== epoch) return false;\n setLastWorkspaceId(undefined);\n setState({status: 'guest'});\n return true;\n },\n [beginAuthTransition, clearPrivateState, queryClient, setLastWorkspaceId, setState, store],\n );\n\n const enterAuthenticated = useCallback(\n async (session: AuthenticatedSession, transitionEpoch?: number) => {\n const isExternalTransition = transitionEpoch === undefined;\n const epoch = transitionEpoch ?? beginAuthTransition();\n if (isExternalTransition) invalidateRefresh(queryClient);\n if (store.get(authTransitionEpochAtom) !== epoch) return false;\n\n const previousState = store.get(authStateAtom);\n const principalChanged =\n previousState.status !== 'authenticated' || previousState.user?.id !== session.user.id;\n\n if (principalChanged) await clearPrivateState();\n if (store.get(authTransitionEpochAtom) !== epoch) return false;\n if (principalChanged) setLastWorkspaceId(undefined);\n\n queryClient.setQueryData(authRefreshQueryKey, session);\n let workspaces: WorkspaceSummary[] = [];\n try {\n const hydratedWorkspaces = await queryClient.fetchQuery(\n userWorkspacesQueryOptions(session.accessToken),\n );\n workspaces = hydratedWorkspaces.memberships;\n } catch {\n // The authenticated session remains usable while workspace hydration retries on the next route load.\n }\n if (store.get(authTransitionEpochAtom) !== epoch) return false;\n\n setState(toAuthenticatedState(session, workspaces));\n return true;\n },\n [beginAuthTransition, clearPrivateState, queryClient, setLastWorkspaceId, setState, store],\n );\n\n return {beginAuthTransition, enterAuthenticated, enterGuest};\n}\n\nexport function useRefreshAuth() {\n const queryClient = useQueryClient();\n const {beginAuthTransition, enterAuthenticated, enterGuest} = useAuthTransition();\n\n return useCallback(() => {\n const existingRefresh = refreshPromises.get(queryClient);\n if (existingRefresh) return existingRefresh;\n\n const transitionEpoch = beginAuthTransition();\n const refresh = (async () => {\n try {\n const result = await queryClient.fetchQuery(authRefreshQueryOptions());\n const accepted = await enterAuthenticated(result, transitionEpoch);\n if (!accepted) {\n throw new ApiError({\n message: 'Authentication refresh was superseded.',\n code: 'unauthorized',\n status: 401,\n });\n }\n return result;\n } catch (error) {\n if (error instanceof ApiError && error.status === 401) {\n await enterGuest(transitionEpoch);\n }\n throw error;\n }\n })();\n refreshPromises.set(queryClient, refresh);\n void refresh.then(\n () => {\n if (refreshPromises.get(queryClient) === refresh) refreshPromises.delete(queryClient);\n },\n () => {\n if (refreshPromises.get(queryClient) === refresh) refreshPromises.delete(queryClient);\n },\n );\n return refresh;\n }, [beginAuthTransition, enterAuthenticated, enterGuest, queryClient]);\n}\n\nexport interface AuthRuntimeProps extends PropsWithChildren {\n effects?: boolean;\n}\n\nexport function AuthRuntime({children, effects = true}: AuthRuntimeProps) {\n const store = useStore();\n const authState = useAtomValue(authStateAtom);\n const refreshAuth = useRefreshAuth();\n\n useEffect(() => {\n if (!effects) return;\n configureApiClient({\n getAccessToken: () => store.get(authStateAtom).token,\n refreshAccessToken: async () => (await refreshAuth()).accessToken,\n });\n }, [effects, refreshAuth, store]);\n\n useEffect(() => {\n if (!effects) return;\n refreshAuth().catch(() => undefined);\n }, [effects, refreshAuth]);\n\n useEffect(() => {\n if (!effects || authState.status !== 'authenticated' || !authState.token) return;\n\n let timeout: ReturnType<typeof setTimeout> | undefined;\n let disposed = false;\n let refreshing = false;\n const clearRefreshTimer = () => {\n if (timeout !== undefined) clearTimeout(timeout);\n timeout = undefined;\n };\n const scheduleRefresh = (delayMs: number) => {\n clearRefreshTimer();\n timeout = setTimeout(runRefresh, Math.max(0, delayMs));\n };\n const retryIfStillDue = () => {\n const current = store.get(authStateAtom);\n if (current.status !== 'authenticated' || !current.token) return;\n const delay = getAuthRefreshDelayMs(current.token);\n if (delay !== undefined && delay <= 0) scheduleRefresh(REFRESH_RETRY_DELAY_MS);\n };\n function runRefresh() {\n if (disposed || refreshing) return;\n refreshing = true;\n clearRefreshTimer();\n refreshAuth()\n .catch(() => undefined)\n .finally(() => {\n refreshing = false;\n if (!disposed) retryIfStillDue();\n });\n }\n const refreshIfDue = () => {\n const current = store.get(authStateAtom);\n if (current.status !== 'authenticated' || !current.token) return;\n const delay = getAuthRefreshDelayMs(current.token);\n if (delay !== undefined && delay <= 0) runRefresh();\n };\n const refreshIfVisible = () => {\n if (document.visibilityState === 'visible') refreshIfDue();\n };\n const delay = getAuthRefreshDelayMs(authState.token);\n if (delay !== undefined) scheduleRefresh(delay);\n window.addEventListener('focus', refreshIfDue);\n window.addEventListener('online', refreshIfDue);\n document.addEventListener('visibilitychange', refreshIfVisible);\n return () => {\n disposed = true;\n clearRefreshTimer();\n window.removeEventListener('focus', refreshIfDue);\n window.removeEventListener('online', refreshIfDue);\n document.removeEventListener('visibilitychange', refreshIfVisible);\n };\n }, [authState.status, authState.token, effects, refreshAuth, store]);\n\n return children;\n}\n"],"names":["ApiError","configureApiClient","useQueryClient","atom","useAtomValue","useSetAtom","useStore","useCallback","useEffect","useMemo","authRefreshQueryKey","authRefreshQueryOptions","userWorkspacesQueryOptions","lastWorkspaceIdAtom","REFRESH_EARLY_MS","REFRESH_RETRY_DELAY_MS","BASE64_URL_REPLACEMENTS","dash","underscore","refreshPromises","WeakMap","invalidateRefresh","queryClient","delete","initialAuthState","status","authStateAtom","authTransitionEpochAtom","toAuthenticatedState","session","workspaces","token","accessToken","user","useAuthState","state","isLoading","isAuthenticated","hasWorkspace","length","listUserWorkspaces","userWorkspacesQueryKey","decodeBase64Url","value","base64","replace","atob","padEnd","Math","ceil","readJwtExp","payload","split","undefined","parsed","JSON","parse","exp","Number","isFinite","getAuthRefreshDelayMs","nowMs","Date","now","useAuthTransition","store","setState","setLastWorkspaceId","beginAuthTransition","transitionEpoch","get","set","clearPrivateState","cancelQueries","clear","enterGuest","isExternalTransition","epoch","enterAuthenticated","previousState","principalChanged","id","setQueryData","hydratedWorkspaces","fetchQuery","memberships","useRefreshAuth","existingRefresh","refresh","result","accepted","message","code","error","then","AuthRuntime","children","effects","authState","refreshAuth","getAccessToken","refreshAccessToken","catch","timeout","disposed","refreshing","clearRefreshTimer","clearTimeout","scheduleRefresh","delayMs","setTimeout","runRefresh","max","retryIfStillDue","current","delay","finally","refreshIfDue","refreshIfVisible","document","visibilityState","window","addEventListener","removeEventListener"],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
export declare
|
|
3
|
-
|
|
1
|
+
/** The current workspace selection for consumers that need in-memory UI state. */
|
|
2
|
+
export declare const lastWorkspaceIdAtom: import("jotai").PrimitiveAtom<string | undefined> & {
|
|
3
|
+
init: string | undefined;
|
|
4
|
+
};
|
|
5
|
+
export declare function getLastWorkspaceId(principalId: string): string | undefined;
|
|
6
|
+
export declare function rememberLastWorkspaceId(principalId: string, workspaceId: string): void;
|
|
4
7
|
//# sourceMappingURL=last-workspace.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"last-workspace.d.ts","sourceRoot":"","sources":["../../src/runtime/last-workspace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"last-workspace.d.ts","sourceRoot":"","sources":["../../src/runtime/last-workspace.ts"],"names":[],"mappings":"AAkBA,kFAAkF;AAClF,eAAO,MAAM,mBAAmB;;CAAsC,CAAC;AAEvE,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAEtF"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { createTypedBrowserStorage, localStorageOrUndefined } from '@shipfox/client-ui';
|
|
2
2
|
import { atom } from 'jotai';
|
|
3
|
-
const lastWorkspaceStorageKey =
|
|
4
|
-
|
|
5
|
-
key: lastWorkspaceStorageKey,
|
|
3
|
+
const lastWorkspaceStorageKey = {
|
|
4
|
+
key: 'shipfox.lastWorkspaceId',
|
|
6
5
|
lifetime: 'persistent',
|
|
7
6
|
principalScope: 'principal',
|
|
8
7
|
serialize: (workspaceId)=>JSON.stringify(workspaceId),
|
|
@@ -14,26 +13,18 @@ const lastWorkspaceStorage = createTypedBrowserStorage(localStorageOrUndefined,
|
|
|
14
13
|
return undefined;
|
|
15
14
|
}
|
|
16
15
|
}
|
|
17
|
-
});
|
|
18
|
-
const storedLastWorkspaceIdAtom = atom(getLastWorkspaceId());
|
|
19
|
-
storedLastWorkspaceIdAtom.onMount = (setLastWorkspaceId)=>{
|
|
20
|
-
if (typeof window === 'undefined') return undefined;
|
|
21
|
-
const syncFromStorage = (event)=>{
|
|
22
|
-
if (event.key === lastWorkspaceStorageKey) setLastWorkspaceId(getLastWorkspaceId());
|
|
23
|
-
};
|
|
24
|
-
window.addEventListener('storage', syncFromStorage);
|
|
25
|
-
return ()=>window.removeEventListener('storage', syncFromStorage);
|
|
26
16
|
};
|
|
27
|
-
export const lastWorkspaceIdAtom = atom(
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
else lastWorkspaceStorage.write(workspaceId);
|
|
31
|
-
});
|
|
32
|
-
export function getLastWorkspaceId() {
|
|
33
|
-
return lastWorkspaceStorage.read();
|
|
17
|
+
/** The current workspace selection for consumers that need in-memory UI state. */ export const lastWorkspaceIdAtom = atom(undefined);
|
|
18
|
+
export function getLastWorkspaceId(principalId) {
|
|
19
|
+
return lastWorkspaceStorage(principalId).read();
|
|
34
20
|
}
|
|
35
|
-
export function rememberLastWorkspaceId(workspaceId) {
|
|
36
|
-
lastWorkspaceStorage.write(workspaceId);
|
|
21
|
+
export function rememberLastWorkspaceId(principalId, workspaceId) {
|
|
22
|
+
lastWorkspaceStorage(principalId).write(workspaceId);
|
|
23
|
+
}
|
|
24
|
+
function lastWorkspaceStorage(principalId) {
|
|
25
|
+
return createTypedBrowserStorage(localStorageOrUndefined, lastWorkspaceStorageKey, {
|
|
26
|
+
principalId
|
|
27
|
+
});
|
|
37
28
|
}
|
|
38
29
|
|
|
39
30
|
//# sourceMappingURL=last-workspace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/runtime/last-workspace.ts"],"sourcesContent":["import {createTypedBrowserStorage, localStorageOrUndefined} from '@shipfox/client-ui';\nimport {atom} from 'jotai';\n\nconst lastWorkspaceStorageKey =
|
|
1
|
+
{"version":3,"sources":["../../src/runtime/last-workspace.ts"],"sourcesContent":["import {createTypedBrowserStorage, localStorageOrUndefined} from '@shipfox/client-ui';\nimport {atom} from 'jotai';\n\nconst lastWorkspaceStorageKey = {\n key: 'shipfox.lastWorkspaceId',\n lifetime: 'persistent',\n principalScope: 'principal',\n serialize: (workspaceId: string) => JSON.stringify(workspaceId),\n parse: (raw: string) => {\n try {\n const parsed: unknown = JSON.parse(raw);\n return typeof parsed === 'string' ? parsed : undefined;\n } catch {\n return undefined;\n }\n },\n} as const;\n\n/** The current workspace selection for consumers that need in-memory UI state. */\nexport const lastWorkspaceIdAtom = atom<string | undefined>(undefined);\n\nexport function getLastWorkspaceId(principalId: string): string | undefined {\n return lastWorkspaceStorage(principalId).read();\n}\n\nexport function rememberLastWorkspaceId(principalId: string, workspaceId: string): void {\n lastWorkspaceStorage(principalId).write(workspaceId);\n}\n\nfunction lastWorkspaceStorage(principalId: string) {\n return createTypedBrowserStorage(localStorageOrUndefined, lastWorkspaceStorageKey, {\n principalId,\n });\n}\n"],"names":["createTypedBrowserStorage","localStorageOrUndefined","atom","lastWorkspaceStorageKey","key","lifetime","principalScope","serialize","workspaceId","JSON","stringify","parse","raw","parsed","undefined","lastWorkspaceIdAtom","getLastWorkspaceId","principalId","lastWorkspaceStorage","read","rememberLastWorkspaceId","write"],"mappings":"AAAA,SAAQA,yBAAyB,EAAEC,uBAAuB,QAAO,qBAAqB;AACtF,SAAQC,IAAI,QAAO,QAAQ;AAE3B,MAAMC,0BAA0B;IAC9BC,KAAK;IACLC,UAAU;IACVC,gBAAgB;IAChBC,WAAW,CAACC,cAAwBC,KAAKC,SAAS,CAACF;IACnDG,OAAO,CAACC;QACN,IAAI;YACF,MAAMC,SAAkBJ,KAAKE,KAAK,CAACC;YACnC,OAAO,OAAOC,WAAW,WAAWA,SAASC;QAC/C,EAAE,OAAM;YACN,OAAOA;QACT;IACF;AACF;AAEA,gFAAgF,GAChF,OAAO,MAAMC,sBAAsBb,KAAyBY,WAAW;AAEvE,OAAO,SAASE,mBAAmBC,WAAmB;IACpD,OAAOC,qBAAqBD,aAAaE,IAAI;AAC/C;AAEA,OAAO,SAASC,wBAAwBH,WAAmB,EAAET,WAAmB;IAC9EU,qBAAqBD,aAAaI,KAAK,CAACb;AAC1C;AAEA,SAASU,qBAAqBD,WAAmB;IAC/C,OAAOjB,0BAA0BC,yBAAyBE,yBAAyB;QACjFc;IACF;AACF"}
|