Refresh token error fix
This commit is contained in:
+41
-1
@@ -30,6 +30,7 @@ i18next.init({
|
||||
declare global {
|
||||
interface Window {
|
||||
isRefreshingToken?: boolean;
|
||||
isRefreshTokenExpired?: boolean;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,6 +38,23 @@ const queryClient = new QueryClient({
|
||||
queryCache: new QueryCache({
|
||||
onError: async (error: IApiErrorRepsonse) => {
|
||||
if (error?.response?.status === 401) {
|
||||
// اگر refresh token منقضی شده باشد، دیگر تلاش نکن
|
||||
if (window.isRefreshTokenExpired) {
|
||||
return;
|
||||
}
|
||||
|
||||
// بررسی کن که آیا خطا از refresh endpoint است
|
||||
const isRefreshEndpoint = error?.config?.url?.includes('/admin/auth/refresh');
|
||||
|
||||
// اگر خطا از refresh endpoint است، refresh token منقضی شده
|
||||
if (isRefreshEndpoint) {
|
||||
window.isRefreshTokenExpired = true;
|
||||
await removeToken();
|
||||
await removeRefreshToken();
|
||||
window.location.href = Pages.auth.login;
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// Use a flag to track if refresh is in progress
|
||||
if (window.isRefreshingToken) {
|
||||
@@ -57,6 +75,15 @@ const queryClient = new QueryClient({
|
||||
|
||||
try {
|
||||
const refreshTokenValue = await getRefreshToken();
|
||||
|
||||
if (!refreshTokenValue) {
|
||||
window.isRefreshTokenExpired = true;
|
||||
await removeToken();
|
||||
await removeRefreshToken();
|
||||
window.location.href = Pages.auth.login;
|
||||
return;
|
||||
}
|
||||
|
||||
const { data } = await refreshToken({ refreshToken: refreshTokenValue || '' });
|
||||
|
||||
if (data?.accessToken?.token) {
|
||||
@@ -68,6 +95,9 @@ const queryClient = new QueryClient({
|
||||
await setRefreshToken(data.refreshToken?.token);
|
||||
}
|
||||
|
||||
// Reset expired flag if refresh was successful
|
||||
window.isRefreshTokenExpired = false;
|
||||
|
||||
// Retry the failed request
|
||||
queryClient.invalidateQueries();
|
||||
return;
|
||||
@@ -79,10 +109,20 @@ const queryClient = new QueryClient({
|
||||
}
|
||||
} catch (refreshError: unknown) {
|
||||
console.error('Token refresh failed:', refreshError);
|
||||
|
||||
// بررسی کن که آیا خطا از refresh endpoint است
|
||||
const errorWithConfig = refreshError as IApiErrorRepsonse;
|
||||
const isRefreshError = errorWithConfig?.config?.url?.includes('/admin/auth/refresh');
|
||||
|
||||
// اگر refresh token خودش 401 خورده، آن را منقضی شده علامت بزن
|
||||
if (isRefreshError || errorWithConfig?.response?.status === 401) {
|
||||
window.isRefreshTokenExpired = true;
|
||||
}
|
||||
|
||||
// Clear tokens and redirect to login
|
||||
await removeToken();
|
||||
await removeRefreshToken();
|
||||
// window.location.href = '/auth/login';
|
||||
window.location.href = Pages.auth.login;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user