The /api/me call races with TokenSync — fires before the token provider is set. Removed the hard window.location redirect on 401 from the API client. React Query retries with backoff instead. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
122 lines
3.5 KiB
TypeScript
122 lines
3.5 KiB
TypeScript
import React, { useState, useEffect } from 'react';
|
|
import ReactDOM from 'react-dom/client';
|
|
import { LogtoProvider, UserScope, useLogto } from '@logto/react';
|
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
|
import { BrowserRouter } from 'react-router';
|
|
import { ThemeProvider, ToastProvider, BreadcrumbProvider, GlobalFilterProvider, CommandPaletteProvider, Spinner } from '@cameleer/design-system';
|
|
import '@cameleer/design-system/style.css';
|
|
import { AppRouter } from './router';
|
|
import { fetchConfig } from './config';
|
|
import { setTokenProvider } from './api/client';
|
|
import { useOrgStore } from './auth/useOrganization';
|
|
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: {
|
|
queries: {
|
|
retry: 1,
|
|
staleTime: 10_000,
|
|
},
|
|
},
|
|
});
|
|
|
|
function TokenSync({ resource }: { resource: string }) {
|
|
const { getAccessToken, isAuthenticated, fetchUserInfo } = useLogto();
|
|
const { currentOrgId, setCurrentOrg, setOrganizations } = useOrgStore();
|
|
|
|
// After auth, resolve user's organizations from Logto
|
|
useEffect(() => {
|
|
if (!isAuthenticated) {
|
|
setOrganizations([]);
|
|
setCurrentOrg(null);
|
|
return;
|
|
}
|
|
|
|
fetchUserInfo().then((info) => {
|
|
const orgData = (info as Record<string, unknown>)?.organization_data as
|
|
Array<{ id: string; name: string }> | undefined;
|
|
const orgs = orgData ?? [];
|
|
setOrganizations(orgs.map((o) => ({ id: o.id, name: o.name })));
|
|
|
|
// Auto-select if user has exactly one org
|
|
if (orgs.length === 1 && !currentOrgId) {
|
|
setCurrentOrg(orgs[0].id);
|
|
}
|
|
}).catch(() => {
|
|
// fetchUserInfo may fail if token is being refreshed
|
|
});
|
|
}, [isAuthenticated]);
|
|
|
|
// Set token provider — org-scoped if org selected, plain otherwise
|
|
useEffect(() => {
|
|
if (isAuthenticated && resource) {
|
|
if (currentOrgId) {
|
|
setTokenProvider(() => getAccessToken(resource, currentOrgId));
|
|
} else {
|
|
setTokenProvider(() => getAccessToken(resource));
|
|
}
|
|
} else {
|
|
setTokenProvider(null);
|
|
}
|
|
}, [isAuthenticated, getAccessToken, resource, currentOrgId]);
|
|
|
|
return null;
|
|
}
|
|
|
|
function App() {
|
|
const [config, setConfig] = useState<{
|
|
logtoEndpoint: string;
|
|
logtoClientId: string;
|
|
logtoResource: string;
|
|
} | null>(null);
|
|
|
|
useEffect(() => {
|
|
fetchConfig().then(setConfig);
|
|
}, []);
|
|
|
|
if (!config?.logtoClientId) {
|
|
return (
|
|
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', minHeight: '100vh' }}>
|
|
<Spinner />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<LogtoProvider
|
|
config={{
|
|
endpoint: config.logtoEndpoint,
|
|
appId: config.logtoClientId,
|
|
resources: config.logtoResource ? [config.logtoResource] : [],
|
|
scopes: [
|
|
'openid', 'profile', 'email', 'offline_access',
|
|
UserScope.Organizations,
|
|
UserScope.OrganizationRoles,
|
|
],
|
|
}}
|
|
>
|
|
<TokenSync resource={config.logtoResource} />
|
|
<QueryClientProvider client={queryClient}>
|
|
<BrowserRouter>
|
|
<AppRouter />
|
|
</BrowserRouter>
|
|
</QueryClientProvider>
|
|
</LogtoProvider>
|
|
);
|
|
}
|
|
|
|
ReactDOM.createRoot(document.getElementById('root')!).render(
|
|
<React.StrictMode>
|
|
<ThemeProvider>
|
|
<ToastProvider>
|
|
<BreadcrumbProvider>
|
|
<GlobalFilterProvider>
|
|
<CommandPaletteProvider>
|
|
<App />
|
|
</CommandPaletteProvider>
|
|
</GlobalFilterProvider>
|
|
</BreadcrumbProvider>
|
|
</ToastProvider>
|
|
</ThemeProvider>
|
|
</React.StrictMode>,
|
|
);
|