diff --git a/src/Constants/Constants.js b/src/Constants/Constants.js index 9d4b34a..697df27 100644 --- a/src/Constants/Constants.js +++ b/src/Constants/Constants.js @@ -56,7 +56,7 @@ export function removeTrailingZeros(value) { const remainingMinutes = minutes % 60; const remainingSeconds = seconds % 60; - return `${remainingDays === 0 ? "": remainingDays+"d"} ${remainingHours === 0 ? "": remainingHours+"h"} ${remainingMinutes}m `; + return `${remainingDays === 0 ? "": remainingDays+"d"} ${remainingHours === 0 ? "": remainingHours+"h"} ${remainingMinutes}m ${remainingSeconds}s `; } diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx index e98f349..af46fd1 100644 --- a/src/Layout/DefaultLayout.jsx +++ b/src/Layout/DefaultLayout.jsx @@ -656,7 +656,7 @@ const DashboardLayout = ({ isOnline }) => { )} - {getCountdownTimer(localStorage.getItem('accessTokenExp'))} + {/* {getCountdownTimer(localStorage.getItem('accessTokenExp'))} */} )} diff --git a/src/Services/token.serivce.js b/src/Services/token.serivce.js index f9bcb09..1dedc92 100644 --- a/src/Services/token.serivce.js +++ b/src/Services/token.serivce.js @@ -27,50 +27,55 @@ export const baseQuery = async (args, api, extraOptions) => { if (result.error && result.error.status === 401) { // Handle token refresh - const refreshToken = localStorage.getItem("refreshToken"); - if (refreshToken) { - try { - const refreshResult = await fetchBaseQuery({ - baseUrl: import.meta.env.VITE_BAS_URL, - })( - { - url: "/auth/user/regenerate-token", - method: "POST", - body: { refreshToken }, - }, - api, - extraOptions - ); + // const refreshToken = localStorage.getItem("refreshToken"); + // if (refreshToken) { + // try { + // const refreshResult = await fetchBaseQuery({ + // baseUrl: import.meta.env.VITE_BAS_URL, + // })( + // { + // url: "/auth/user/regenerate-token", + // method: "POST", + // body: { refreshToken }, + // }, + // api, + // extraOptions + // ); - if (refreshResult.data) { - // Save new tokens - localStorage.setItem("accessToken", refreshResult.data.access.token); - localStorage.setItem( - "refreshToken", - refreshResult.data.refresh.token - ); - localStorage.setItem( - "refreshTokenExp", - refreshResult.data.refresh.expires - ); + // if (refreshResult.data) { + // // Save new tokens + // localStorage.setItem("accessToken", refreshResult.data.access.token); + // localStorage.setItem( + // "refreshToken", + // refreshResult.data.refresh.token + // ); + // localStorage.setItem( + // "refreshTokenExp", + // refreshResult.data.refresh.expires + // ); - // Retry the original request with the new token - result = await fetchBaseQuery({ - baseUrl: import.meta.env.VITE_BAS_URL, - prepareHeaders: (headers) => { - const token = localStorage.getItem("accessToken"); - if (token) { - headers.set("x-auth-token", token); - } - return headers; - }, - })(args, api, extraOptions); - } - } catch (err) { - console.error("Failed to refresh token:", err); - // Handle refresh failure (e.g., redirect to login) - } - } + // // Retry the original request with the new token + // result = await fetchBaseQuery({ + // baseUrl: import.meta.env.VITE_BAS_URL, + // prepareHeaders: (headers) => { + // const token = localStorage.getItem("accessToken"); + // if (token) { + // headers.set("x-auth-token", token); + // } + // return headers; + // }, + // })(args, api, extraOptions); + // } + // } catch (err) { + // console.error("Failed to refresh token:", err); + // // Handle refresh failure (e.g., redirect to login) + // } + // } + + + localStorage.removeItem("accessToken"); + localStorage.removeItem("refreshToken"); + Cookies.remove("isAuthenticated", { path: '/login' }); } return result;