del logs from jwtexp
This commit is contained in:
@@ -10,15 +10,11 @@ export function cn(...inputs) {
|
|||||||
let refreshPromise = null;
|
let refreshPromise = null;
|
||||||
|
|
||||||
export async function jwtexp(token) {
|
export async function jwtexp(token) {
|
||||||
console.log("jwtexp called from:", new Error().stack);
|
|
||||||
const decoded = decode(token);
|
const decoded = decode(token);
|
||||||
const currentTime = Date.now() / 1000;
|
const currentTime = Date.now() / 1000;
|
||||||
const tokenExp = decoded.exp;
|
const tokenExp = decoded.exp;
|
||||||
console.log("Token exp:", tokenExp, "Current time:", currentTime);
|
|
||||||
|
|
||||||
if (tokenExp < currentTime || tokenExp - currentTime < 120) {
|
if (tokenExp < currentTime || tokenExp - currentTime < 120) {
|
||||||
console.log("Token needs refresh");
|
|
||||||
|
|
||||||
if (refreshPromise) {
|
if (refreshPromise) {
|
||||||
console.log("Refresh already in progress, waiting...");
|
console.log("Refresh already in progress, waiting...");
|
||||||
return await refreshPromise;
|
return await refreshPromise;
|
||||||
@@ -26,9 +22,7 @@ export async function jwtexp(token) {
|
|||||||
|
|
||||||
refreshPromise = (async () => {
|
refreshPromise = (async () => {
|
||||||
try {
|
try {
|
||||||
console.log("Starting token refresh...");
|
|
||||||
await refreshToken();
|
await refreshToken();
|
||||||
console.log("Token refreshed successfully");
|
|
||||||
return true;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Failed to refresh token:", error);
|
console.error("Failed to refresh token:", error);
|
||||||
@@ -41,6 +35,5 @@ export async function jwtexp(token) {
|
|||||||
return await refreshPromise;
|
return await refreshPromise;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Token is valid");
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -12,18 +12,16 @@ export default function RootRedirect() {
|
|||||||
const token = localStorage.getItem('access_token');
|
const token = localStorage.getItem('access_token');
|
||||||
|
|
||||||
if (token) {
|
if (token) {
|
||||||
console.log('Token found, validating...');
|
|
||||||
const isTokenValid = await jwtexp(token);
|
const isTokenValid = await jwtexp(token);
|
||||||
|
|
||||||
if (isTokenValid) {
|
if (isTokenValid) {
|
||||||
console.log('Token is valid, redirecting to dashboard...');
|
|
||||||
navigate('/dashboard', { replace: true });
|
navigate('/dashboard', { replace: true });
|
||||||
} else {
|
} else {
|
||||||
console.log('Token is invalid, redirecting to login...');
|
console.error('Token is invalid, redirecting...');
|
||||||
navigate('/auth/login', { replace: true });
|
navigate('/auth/login', { replace: true });
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log('No token found, redirecting to login...');
|
console.error('No token found, redirecting...');
|
||||||
navigate('/auth/login', { replace: true });
|
navigate('/auth/login', { replace: true });
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user