fix: remove 401 hard redirect, let React Query retry
All checks were successful
CI / build (push) Successful in 40s
CI / docker (push) Successful in 41s

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>
This commit is contained in:
hsiegeln
2026-04-05 03:02:32 +02:00
parent 00ee8876c1
commit 1abf0f827b
3 changed files with 7 additions and 19 deletions

View File

@@ -6,11 +6,6 @@ export function setTokenProvider(provider: (() => Promise<string | undefined>) |
tokenProvider = provider;
}
let logoutHandler: (() => void) | null = null;
export function setLogoutHandler(handler: (() => void) | null) {
logoutHandler = handler;
}
async function apiFetch<T>(path: string, options: RequestInit = {}): Promise<T> {
const token = tokenProvider ? await tokenProvider() : null;
@@ -27,8 +22,8 @@ async function apiFetch<T>(path: string, options: RequestInit = {}): Promise<T>
const response = await fetch(`${API_BASE}${path}`, { ...options, headers });
if (response.status === 401) {
if (logoutHandler) logoutHandler();
window.location.href = '/login';
// Don't hard-redirect — let React Query retry (token may not be ready yet).
// The ProtectedRoute handles unauthenticated state.
throw new Error('Unauthorized');
}

View File

@@ -190,6 +190,8 @@ export function useMe() {
queryKey: ['me'],
queryFn: () => api.get<MeResponse>('/me'),
staleTime: 60_000,
retry: 3,
retryDelay: 1000,
});
}

View File

@@ -1,4 +1,4 @@
import React, { useState, useEffect, useCallback } from 'react';
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';
@@ -7,7 +7,7 @@ import { ThemeProvider, ToastProvider, BreadcrumbProvider, GlobalFilterProvider,
import '@cameleer/design-system/style.css';
import { AppRouter } from './router';
import { fetchConfig } from './config';
import { setTokenProvider, setLogoutHandler } from './api/client';
import { setTokenProvider } from './api/client';
import { useOrgStore } from './auth/useOrganization';
const queryClient = new QueryClient({
@@ -20,7 +20,7 @@ const queryClient = new QueryClient({
});
function TokenSync({ resource }: { resource: string }) {
const { getAccessToken, isAuthenticated, signOut, fetchUserInfo } = useLogto();
const { getAccessToken, isAuthenticated, fetchUserInfo } = useLogto();
const { currentOrgId, setCurrentOrg, setOrganizations } = useOrgStore();
// After auth, resolve user's organizations from Logto
@@ -59,15 +59,6 @@ function TokenSync({ resource }: { resource: string }) {
}
}, [isAuthenticated, getAccessToken, resource, currentOrgId]);
const handleLogout = useCallback(() => {
signOut(window.location.origin + '/login');
}, [signOut]);
useEffect(() => {
setLogoutHandler(handleLogout);
return () => setLogoutHandler(null);
}, [handleLogout]);
return null;
}