diff --git a/src/utils/axiosClient.jsx b/src/utils/axiosClient.jsx index 99eaee6f..527ec140 100644 --- a/src/utils/axiosClient.jsx +++ b/src/utils/axiosClient.jsx @@ -48,7 +48,7 @@ axiosClient.interceptors.response.use( "Connection refused. Please ensure the server is running." ); - if (error.config.url.indexOf("refresh-token") == -1) { + if (error.config.url.indexOf("refresh-token") != -1) { //showToast("Server is unreachable. Try again later!", "error"); console.log("1 - error fetching refresh token :", error); } else { @@ -59,7 +59,7 @@ axiosClient.interceptors.response.use( } } else if (error.code === "ERR_NETWORK") { console.error("Network error: Unable to reach the server."); - if (error.config.url.indexOf("refresh-token") == -1) { + if (error.config.url.indexOf("refresh-token") != -1) { //showToast("Server is unreachable. Try again later!", "error"); console.log("2 - error fetching refresh token :", error); } @@ -67,7 +67,7 @@ axiosClient.interceptors.response.use( } else if (error.code === "ECONNABORTED") { console.error("Request timed out."); - if (error.config.url.indexOf("refresh-token") == -1) { + if (error.config.url.indexOf("refresh-token") != -1) { //showToast("Server is unreachable. Try again later!", "error"); console.log("3 - error fetching refresh token :", error); } else { @@ -77,7 +77,7 @@ axiosClient.interceptors.response.use( ); } } else if (error.response) { - if (error.config.url.indexOf("refresh-token") == -1) { + if (error.config.url.indexOf("refresh-token") != -1) { //showToast("Server is unreachable. Try again later!", "error"); console.log("4 - error fetching refresh token :", error); } else { @@ -97,10 +97,14 @@ axiosClient.interceptors.response.use( return Promise.reject(error); } // Make a request to refresh the access token - const response = await axiosClient.post("/api/Auth/refresh-token", { - token: localStorage.getItem("jwtToken"), - refreshToken, - }); + const response = await axiosClient + .post("/api/Auth/refresh-token", { + token: localStorage.getItem("jwtToken"), + refreshToken, + }) + .catch((error) => { + console.log("7 - error fetching refresh token :", error); + }); const { token, refreshToken: newRefreshToken } = response.data.data; localStorage.setItem("jwtToken", token); @@ -121,7 +125,7 @@ axiosClient.interceptors.response.use( return Promise.reject(err); } } else { - if (error.config.url.indexOf("refresh-token") == -1) { + if (error.config.url.indexOf("refresh-token") != -1) { //showToast("Server is unreachable. Try again later!", "error"); console.log("6 - error fetching refresh token :", error); }