Siddhesh.More/tanami-admin-panel
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

update

Browse Source
This commit is contained in:
Siddhesh More
2024-09-23 15:21:42 +05:30
parent 9dca99b1c1
commit 28978622f3
3 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Constants/Constants.js
View File

@@ -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 `;
}

2
src/Layout/DefaultLayout.jsx
View File

@@ -656,7 +656,7 @@ const DashboardLayout = ({ isOnline }) => {
<ArrowRightIcon className="web-text-small " />
)}
</Button>
<Text textAlign={'center'} fontWeight={500} fontSize={'xs'} color={"gray.600"}>{getCountdownTimer(localStorage.getItem('accessTokenExp'))}</Text>
{/* <Text textAlign={'center'} fontWeight={500} fontSize={'xs'} color={"gray.600"}>{getCountdownTimer(localStorage.getItem('accessTokenExp'))}</Text> */}
</aside>
)}

89
src/Services/token.serivce.js
View File

@@ -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;