мейк реквест в обёртке

src/api/auth.ts

@@ -1,4 +1,4 @@
-import { makeRequest } from "@frontend/kitui";
+import makeRequest from "@api/makeRequest";
 
 import { parseAxiosError } from "@root/utils/parse-error";
 

src/api/cart.ts

@@ -1,5 +1,5 @@
-import { UserAccount, makeRequest } from "@frontend/kitui"
-import  { AxiosError } from "axios"
+import { UserAccount } from "@frontend/kitui"
+import makeRequest from "@api/makeRequest"
 
 import { parseAxiosError } from "@root/utils/parse-error"
 

src/api/history.ts

@@ -1,5 +1,6 @@
-import { Tariff, makeRequest } from "@frontend/kitui"
+import { Tariff } from "@frontend/kitui"
 import { parseAxiosError } from "@root/utils/parse-error"
+import makeRequest from "@api/makeRequest"
 
 export interface GetHistoryResponse {
 	totalPages: number;

src/api/makeRequest.ts

@@ -0,0 +1,32 @@
+import * as KIT from "@frontend/kitui";
+import { Method, ResponseType, AxiosError } from "axios";
+import { clearAuthToken } from "@frontend/kitui";
+import { clearUserData } from "@root/stores/user";
+import { clearCustomTariffs } from "@root/stores/customTariffs";
+import { clearTickets } from "@root/stores/tickets";
+import { redirect } from "react-router-dom";
+import {setNotEnoughMoneyAmount} from "@stores/cart"
+
+interface MakeRequest { method?: Method | undefined; url: string; body?: unknown; useToken?: boolean | undefined; contentType?: boolean | undefined; responseType?: ResponseType | undefined; signal?: AbortSignal | undefined; withCredentials?: boolean | undefined; }
+
+async function makeRequest<TRequest = unknown, TResponse = unknown>(data: MakeRequest): Promise<TResponse> {
+    try {
+        const response = await KIT.makeRequest<unknown>(data)
+
+        return response as TResponse
+    } catch (e) {
+        const error = e as AxiosError;
+        //@ts-ignore
+        if (error.response?.status === 400 && error.response?.data?.message === "refreshToken is empty") {
+
+            clearAuthToken();
+            clearUserData();
+            clearCustomTariffs();
+            clearTickets();
+            setNotEnoughMoneyAmount(0)
+            redirect("/");
+        }
+        throw e
+    };
+};
+export default makeRequest;

src/api/price.ts

@@ -1,4 +1,4 @@
-import { makeRequest } from "@frontend/kitui";
+import makeRequest from "@api/makeRequest"
 import type { GetDiscountsResponse } from "@root/model/discount";
 import { useUserStore } from "@root/stores/user";
 import { parseAxiosError } from "@root/utils/parse-error";

src/api/promocode.ts

@@ -1,4 +1,4 @@
-import { makeRequest } from "@frontend/kitui";
+import makeRequest from "@api/makeRequest"
 
 import { parseAxiosError } from "@utils/parse-error";
 

src/api/recentlyPurchasedTariffs.ts

@@ -1,4 +1,4 @@
-import { makeRequest } from "@frontend/kitui"
+import makeRequest from "@api/makeRequest"
 import { parseAxiosError } from "@root/utils/parse-error"
 
 export async function getRecentlyPurchasedTariffs(): Promise<[any | null, string?]> {

src/api/tariff.ts

@@ -1,4 +1,5 @@
-import { Tariff, makeRequest } from "@frontend/kitui";
+import makeRequest from "@api/makeRequest"
+import { Tariff } from "@frontend/kitui";
 import { parseAxiosError } from "@root/utils/parse-error";
 
 import type { PrivilegeWithoutPrice, ServiceKeyToPrivilegesMap } from "@root/model/privilege";

src/api/ticket.ts

@@ -1,4 +1,4 @@
-import { makeRequest } from "@frontend/kitui";
+import makeRequest from "@api/makeRequest"
 import { parseAxiosError } from "@root/utils/parse-error";
 
 import { SendTicketMessageRequest } from "@frontend/kitui";

src/api/user.ts

@@ -1,4 +1,5 @@
-import { User, makeRequest } from "@frontend/kitui"
+import { User } from "@frontend/kitui"
+import makeRequest from "@api/makeRequest"
 import { PatchUserRequest } from "@root/model/user"
 import { parseAxiosError } from "@root/utils/parse-error"
 

src/api/verification.ts

@@ -1,4 +1,4 @@
-import { makeRequest } from "@frontend/kitui"
+import makeRequest from "@api/makeRequest"
 
 import { jsonToFormdata } from "@root/utils/jsonToFormdata"
 import { parseAxiosError } from "@root/utils/parse-error"

src/api/wallet.ts

@@ -1,4 +1,4 @@
-import { makeRequest } from "@frontend/kitui";
+import makeRequest from "@api/makeRequest"
 import { SendPaymentRequest, SendPaymentResponse } from "@root/model/wallet";
 import { parseAxiosError } from "@root/utils/parse-error";
 

src/components/FloatingSupportChat/Chat.tsx

@@ -10,9 +10,9 @@ import {
   useMediaQuery,
   useTheme,
 } from "@mui/material";
+import makeRequest from "@api/makeRequest"
 import {
   TicketMessage,
-  makeRequest,
   useTicketsFetcher,
   useTicketMessages,
   getMessageFromFetchError,

src/pages/History/AccordionWrapper.tsx

@@ -4,8 +4,6 @@ import File from "@components/icons/File"
 import { getDeclension } from "@utils/declension"
 import { enqueueSnackbar } from "notistack"
 import { addTariffToCart } from "@root/stores/user"
-import {getMessageFromFetchError, makeRequest} from "@frontend/kitui"
-import EmailIcon from "@mui/icons-material/Email"
 
 export type History = {
   title: string;

src/pages/Support/SupportChat.tsx

@@ -14,7 +14,8 @@ import ArrowDownwardIcon from "@mui/icons-material/ArrowDownward";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useParams } from "react-router-dom";
 import SendIcon from "@components/icons/SendIcon";
-import { makeRequest, throttle, useToken } from "@frontend/kitui";
+import makeRequest from "@api/makeRequest"
+import { throttle, useToken } from "@frontend/kitui";
 import { enqueueSnackbar } from "notistack";
 import { useTicketStore } from "@root/stores/tickets";
 import {

src/pages/auth/RecoverPassword.tsx

@@ -14,15 +14,13 @@ import { useFormik } from "formik";
 import InputTextfield from "@components/InputTextfield";
 import PenaLogo from "@components/PenaLogo";
 import { enqueueSnackbar } from "notistack";
-import { Link as RouterLink } from "react-router-dom";
 import { object, string } from "yup";
 import { useEffect, useState } from "react";
 import { useUserStore } from "@root/stores/user";
 import { cardShadow } from "@root/utils/theme";
 
-import { recover } from "@root/api/auth";
-import axios, {AxiosResponse} from "axios"
-import {getAuthToken, makeRequest, setAuthToken} from "@frontend/kitui"
+import makeRequest from "@api/makeRequest"
+import { setAuthToken } from "@frontend/kitui"
 interface Values {
 	password: string;
 }

src/utils/handleComponentError.ts

@@ -1,4 +1,3 @@
-import { makeRequest } from "@frontend/kitui"
 import { ErrorInfo } from "react"
 
 

tsconfig.extend.json

@@ -5,7 +5,8 @@
       "@root/*": ["./*"],
       "@utils/*": ["./utils/*"],
       "@components/*": ["./components/*"],
-      "@stores/*": ["./stores/*"]
+      "@stores/*": ["./stores/*"],
+      "@api/*": ["./api/*"]
     }
   }
 }