rm deprecated request

src/Providers/AuthUserProvider.tsx

@@ -10,8 +10,7 @@ import { AuthUserContext } from "@/hooks/useAuthUser";
 import { LocalStorageKeys } from "@/common/constants";
 
 import routes from "@/Utils/request/api";
-import query from "@/Utils/request/query";
-import request from "@/Utils/request/request";
+import query, { callApi } from "@/Utils/request/query";
 import { TokenData } from "@/types/auth/otpToken";
 
 interface Props {
@@ -56,12 +55,12 @@ export default function AuthUserProvider({
 
   const signIn = useCallback(
     async (creds: { username: string; password: string }) => {
-      const query = await request(routes.login, { body: creds });
+      const data = await callApi(routes.login, { body: creds });
 
-      if (query.res?.ok && query.data) {
-        setAccessToken(query.data.access);
-        localStorage.setItem(LocalStorageKeys.accessToken, query.data.access);
-        localStorage.setItem(LocalStorageKeys.refreshToken, query.data.refresh);
+      if (data?.access && data?.refresh) {
+        setAccessToken(data.access);
+        localStorage.setItem(LocalStorageKeys.accessToken, data.access);
+        localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
 
         await queryClient.invalidateQueries({ queryKey: ["currentUser"] });
 
@@ -70,7 +69,7 @@ export default function AuthUserProvider({
         }
       }
 
-      return query;
+      return data;
     },
     [queryClient],
   );
@@ -155,19 +154,22 @@ const updateRefreshToken = async (silent = false) => {
     return;
   }
 
-  const { res, data } = await request(routes.token_refresh, {
-    body: { refresh },
-    silent,
-  });
+  try {
+    const data = await callApi(routes.token_refresh, {
+      body: { refresh },
+      silent,
+    });
+
+    if (!data) {
+      throw new Error("Token refresh failed");
+    }
 
-  if (res?.status !== 200 || !data) {
+    localStorage.setItem(LocalStorageKeys.accessToken, data.access);
+    localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
+  } catch {
     localStorage.removeItem(LocalStorageKeys.accessToken);
     localStorage.removeItem(LocalStorageKeys.refreshToken);
-    return;
   }
-
-  localStorage.setItem(LocalStorageKeys.accessToken, data.access);
-  localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
 };
 
 const getRedirectURL = () => {

src/Utils/request/query.ts

@@ -5,6 +5,8 @@ import { ApiCallOptions, ApiRoute, HTTPError } from "@/Utils/request/types";
 import { makeHeaders, makeUrl } from "@/Utils/request/utils";
 import { sleep } from "@/Utils/utils";
 
+export type ApiResponse<TData> = TData;
+
 export async function callApi<Route extends ApiRoute<unknown, unknown>>(
   { path, method, noAuth }: Route,
   options?: ApiCallOptions<Route>,

src/components/Auth/Login.tsx

@@ -102,8 +102,8 @@ const Login = (props: LoginProps) => {
       FiltersCache.invaldiateAll();
       return await signIn(data);
     },
-    onSuccess: ({ res }) => {
-      setCaptcha(res?.status === 429);
+    onSuccess: (res) => {
+      setCaptcha(!!res?.access);
     },
   });
 

src/components/Facility/FacilityHome.tsx

@@ -34,7 +34,6 @@ import { FACILITY_FEATURE_TYPES } from "@/common/constants";
 import { PLUGIN_Component } from "@/PluginEngine";
 import routes from "@/Utils/request/api";
 import query, { callApi } from "@/Utils/request/query";
-import request from "@/Utils/request/request";
 import uploadFile from "@/Utils/request/uploadFile";
 import { getAuthorizationHeader } from "@/Utils/request/utils";
 import { sleep } from "@/Utils/utils";
@@ -150,16 +149,17 @@ export const FacilityHome = ({ facilityId }: Props) => {
   };
 
   const handleCoverImageDelete = async (onError: () => void) => {
-    const { res } = await request(routes.deleteFacilityCoverImage, {
-      pathParams: { id: facilityId },
-    });
-    if (res?.ok) {
+    try {
+      await callApi(routes.deleteFacilityCoverImage, {
+        pathParams: { id: facilityId },
+      });
+
       toast.success(t("cover_image_deleted"));
       queryClient.invalidateQueries({
         queryKey: ["facility", facilityId],
       });
       setEditCoverImage(false);
-    } else {
+    } catch {
       onError();
     }
   };

src/components/Users/UserSummary.tsx

@@ -28,7 +28,7 @@ import {
   showUserPasswordReset,
 } from "@/Utils/permissions";
 import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
+import { callApi } from "@/Utils/request/query";
 import EditUserSheet from "@/pages/Organization/components/EditUserSheet";
 import { UserBase } from "@/types/user/user";
 
@@ -40,7 +40,7 @@ export default function UserSummaryTab({ userData }: { userData?: UserBase }) {
 
   const { mutate: deleteUser, isPending: isDeleting } = useMutation({
     mutationFn: async () => {
-      return await request(routes.deleteUser, {
+      return await callApi(routes.deleteUser, {
         pathParams: { username: userData?.username || "" },
       });
     },

src/hooks/useAuthUser.ts

@@ -3,11 +3,10 @@ import { createContext, useContext } from "react";
 import { UserModel } from "@/components/Users/models";
 
 import { JwtTokenObtainPair, LoginCredentials } from "@/Utils/request/api";
-import { RequestResult } from "@/Utils/request/types";
+import { ApiResponse } from "@/Utils/request/query";
 import { TokenData } from "@/types/auth/otpToken";
 
-type SignInReturnType = RequestResult<JwtTokenObtainPair>;
-
+type SignInReturnType = ApiResponse<JwtTokenObtainPair>;
 interface AuthContextType {
   user: UserModel | undefined;
   signIn: (creds: LoginCredentials) => Promise<SignInReturnType>;