Compare commits

..

No commits in common. "09eeaacfa62e98a8f9d69038e43efeab6f5b87db" and "6ae50f9cf7d9927d88d8449cb1d80e5e820d2da0" have entirely different histories.

View File

@ -1,7 +1,6 @@
import axios, { type AxiosError, type AxiosResponse } from "axios"; import axios, { type AxiosError, type AxiosResponse } from "axios";
import { store } from "@/main.ts"; import { store } from "@/main.ts";
import { addNewMessage, color } from "@/services/popupDisplayer.ts"; import { addNewMessage, color } from "@/services/popupDisplayer.ts";
import router from "@/router/router";
const axiosInstance = axios.create({ const axiosInstance = axios.create({
baseURL: import.meta.env.VITE_BACKEND_URL, baseURL: import.meta.env.VITE_BACKEND_URL,
@ -32,7 +31,7 @@ axiosInstance.interceptors.response.use(
console.error("Token refresh failed:", refreshError); console.error("Token refresh failed:", refreshError);
localStorage.removeItem("accessToken"); localStorage.removeItem("accessToken");
localStorage.removeItem("refreshToken"); localStorage.removeItem("refreshToken");
router.push("/login"); window.location.href = "/login";
return Promise.reject(refreshError); return Promise.reject(refreshError);
} }
} }
@ -42,10 +41,7 @@ axiosInstance.interceptors.response.use(
// TODO: spawn a error modal // TODO: spawn a error modal
function defaultApiErrorHandler(err: AxiosError) { function defaultApiErrorHandler(err: AxiosError) {
const errorMessage = addNewMessage(err.message, color.Red);
(err.response?.data as { message?: string })?.message ??
err.message;
addNewMessage(errorMessage, color.Red);
} }
function defaultApiSuccessHandler(response: AxiosResponse) { function defaultApiSuccessHandler(response: AxiosResponse) {
@ -92,6 +88,4 @@ function deleteApi(
.catch(onErrorHandler ?? defaultApiErrorHandler); .catch(onErrorHandler ?? defaultApiErrorHandler);
} }
//export { axiosInstance, callApi, postApi, deleteApi }; export { axiosInstance, callApi, postApi, deleteApi };
export{ axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler, callApi, postApi, deleteApi }