[Refactor] fetch instance 기능 보강

src/common/apis/instance.ts

@@ -3,22 +3,40 @@ const baseURL = import.meta.env.VITE_BASE_URL;
 type StandardHeaders = 'Content-Type' | 'Authorization' | 'Accept' | 'Cache-Control' | 'User-Agent';
 type RequestMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 
-interface FetchOptions extends RequestInit {
+export class CustomError extends Error {
+  status: number;
+
+  constructor(message: string, status: number) {
+    super(message);
+    this.status = status;
+  }
+}
+
+interface FetchOptions extends Omit<RequestInit, 'body'> {
   method?: RequestMethod;
-  headers?: Record<StandardHeaders, string>;
+  headers?: Partial<Record<StandardHeaders, string>>;
+  body?: Record<string, unknown>;
+  params?: Record<string, any>;
 }
 
 const instance = async (url: string, options: FetchOptions = {}) => {
-  const response = await fetch(`${baseURL}${url}`, {
-    headers: {
-      'Content-Type': 'application/json',
-      ...options.headers,
-    },
-    ...options,
+  const { body, params, headers = {}, ...rest } = options;
+  const urlWithParams = params ? `${url}?${new URLSearchParams(params).toString()}` : url;
+  const isFormData = body instanceof FormData;
+
+  if (!isFormData) {
+    headers['Content-Type'] = 'application/json';
+  }
+
+  const response = await fetch(`${baseURL}${urlWithParams}`, {
+    headers,
+    body: isFormData ? body : JSON.stringify(body),
+    ...rest,
   });
 
   if (!response.ok) {
-    throw new Error('network response가 도착하지 않았어요');
+    const errMsg = await response.json();
+    throw new CustomError(errMsg.userMessage, response.status);
   }
 
   return response.json();

src/common/components/Input/apis.ts

@@ -6,12 +6,12 @@ export const checkUser = async (userInfo: CheckUserRequest) => {
   const { email, name, season, group } = userInfo;
   const res = await instance('/recruiting-auth/check/user', {
     method: 'POST',
-    body: JSON.stringify({
+    body: {
       email,
       name,
       season,
       group,
-    }),
+    },
   });
 
   return res;
@@ -20,12 +20,12 @@ export const checkUser = async (userInfo: CheckUserRequest) => {
 export const sendVerificationCode = async (email: string, season: number, group: string, isSignup: boolean) => {
   const res = await instance('/recruiting-auth/verify/send', {
     method: 'POST',
-    body: JSON.stringify({
+    body: {
       email,
       season,
       group,
       isSignup,
-    }),
+    },
   });
 
   return res;
@@ -34,10 +34,10 @@ export const sendVerificationCode = async (email: string, season: number, group:
 export const checkVerificationCode = async (email: string, code: string) => {
   const res = await instance('/recruiting-auth/verify/email', {
     method: 'POST',
-    body: JSON.stringify({
+    body: {
       email,
       code,
-    }),
+    },
   });
 
   return res;

src/common/components/Input/hooks/useMutateCheckCode.tsx

@@ -6,8 +6,7 @@ import { VALIDATION_CHECK } from '@constants/validationCheck';
 import { checkVerificationCode } from '../apis';
 
 import type { CheckVerificationCodeRequest, EmailResponse } from '../types';
-import type { ErrorResponse } from '@type/errorResponse';
-import type { AxiosError, AxiosResponse } from 'axios';
+import type { CustomError } from '@apis/instance';
 
 interface MutateCheckCodeProps {
   onSuccess: () => void;
@@ -17,14 +16,14 @@ const useMutateCheckCode = ({ onSuccess }: MutateCheckCodeProps) => {
   const { setError } = useFormContext();
 
   const { mutate: checkVerificationCodeMutate, isPending: checkVerificationCodeIsPending } = useMutation<
-    AxiosResponse<EmailResponse, CheckVerificationCodeRequest>,
-    AxiosError<ErrorResponse, CheckVerificationCodeRequest>,
+    EmailResponse,
+    CustomError,
     CheckVerificationCodeRequest
   >({
     mutationFn: ({ email, code }: CheckVerificationCodeRequest) => checkVerificationCode(email, code),
     onSuccess,
     onError(error) {
-      if (error.response?.status === 400) {
+      if (error.status === 400) {
         setError('code', {
           type: 'not-match',
           message: VALIDATION_CHECK.verificationCode.errorText,

src/common/components/Input/hooks/useMutateCheckUser.tsx

@@ -6,8 +6,7 @@ import { VALIDATION_CHECK } from '@constants/validationCheck';
 import { checkUser } from '../apis';
 
 import type { CheckUserRequest, EmailResponse } from '../types';
-import type { ErrorResponse } from '@type/errorResponse';
-import type { AxiosError, AxiosResponse } from 'axios';
+import type { CustomError } from '@apis/instance';
 
 interface MutateCheckUserProps {
   onSendCode: () => void;
@@ -17,8 +16,8 @@ const useMutateCheckUser = ({ onSendCode }: MutateCheckUserProps) => {
   const { clearErrors, setError } = useFormContext();
 
   const { mutate: checkUserMutate, isPending: checkUserIsPending } = useMutation<
-    AxiosResponse<EmailResponse, CheckUserRequest>,
-    AxiosError<ErrorResponse, CheckUserRequest>,
+    EmailResponse,
+    CustomError,
     CheckUserRequest
   >({
     mutationFn: (userInfo: CheckUserRequest) => checkUser(userInfo),
@@ -27,7 +26,7 @@ const useMutateCheckUser = ({ onSendCode }: MutateCheckUserProps) => {
       onSendCode();
     },
     onError: (error) => {
-      if (error.response?.status === 400 || error.response?.status === 403) {
+      if (error.status === 400 || error.status === 403) {
         setError('name', {
           type: 'non-existence',
           message: VALIDATION_CHECK.name.errorTextNonexistence,

src/common/components/Input/hooks/useMutateSendCode.tsx

@@ -6,8 +6,7 @@ import { VALIDATION_CHECK } from '@constants/validationCheck';
 import { sendVerificationCode } from '../apis';
 
 import type { EmailResponse, SendVerificationCodeRequest } from '../types';
-import type { ErrorResponse } from '@type/errorResponse';
-import type { AxiosError, AxiosResponse } from 'axios';
+import type { CustomError } from '@apis/instance';
 
 interface MutateSendCodeProps {
   onChangeVerification: (bool: boolean) => void;
@@ -18,8 +17,8 @@ const useMutateSendCode = ({ onChangeVerification, onSetTimer }: MutateSendCodeP
   const { setError } = useFormContext();
 
   const { mutate: sendVerificationCodeMutate, isPending: sendVerificationCodeIsPending } = useMutation<
-    AxiosResponse<EmailResponse, SendVerificationCodeRequest>,
-    AxiosError<ErrorResponse, SendVerificationCodeRequest>,
+    EmailResponse,
+    CustomError,
     SendVerificationCodeRequest
   >({
     mutationFn: ({ email, season, group, isSignup }: SendVerificationCodeRequest) =>
@@ -29,7 +28,7 @@ const useMutateSendCode = ({ onChangeVerification, onSetTimer }: MutateSendCodeP
       onSetTimer();
     },
     onError: (error) => {
-      if (error.response?.status === 400 || error.response?.status === 403) {
+      if (error.status === 400 || error.status === 403) {
         setError('email', {
           type: 'already-existence',
           message: VALIDATION_CHECK.email.errorTextExistence,

src/common/hooks/useDate.tsx

@@ -35,7 +35,7 @@ const useDate = () => {
     obInterviewStart,
     ybInterviewEnd,
     obInterviewEnd,
-  } = data?.data.season || {};
+  } = data?.season || {};
 
   const applicationStart = group === 'YB' ? ybApplicationStart : obApplicationStart; // 서류 시작
   const applicationEnd = group === 'YB' ? ybApplicationEnd : obApplicationEnd; // 서류 마감
@@ -98,7 +98,7 @@ const useDate = () => {
   ]);
 
   return {
-    ...data?.data.season,
+    ...data?.season,
     NoMoreRecruit,
     NoMoreApply,
     NoMoreScreeningResult,

src/common/hooks/useGetRecruitingInfo.tsx

@@ -2,17 +2,11 @@ import { useQuery } from '@tanstack/react-query';
 
 import { getRecruitingInfo } from '@apis/getRecruitingInfo';
 
-import type { ErrorResponse } from '@type/errorResponse';
 import type { RecruitingResponse } from '@type/recruitingInfo';
-import type { AxiosError, AxiosResponse } from 'axios';
+import type { CustomError } from '@apis/instance';
 
 const useGetRecruitingInfo = () => {
-  const { data, isLoading } = useQuery<
-    AxiosResponse<RecruitingResponse, null>,
-    AxiosError<ErrorResponse, null>,
-    AxiosResponse<RecruitingResponse, null>,
-    string[]
-  >({
+  const { data, isLoading } = useQuery<RecruitingResponse, CustomError, RecruitingResponse, string[]>({
     queryKey: ['get-recruiting-info'],
     queryFn: getRecruitingInfo,
   });

src/views/PasswordPage/apis.ts

@@ -6,13 +6,13 @@ export const sendPasswordChange = async (userInfo: PasswordRequest) => {
   const { email, season, group, password, passwordCheck } = userInfo;
   const res = await instance('/recruiting-auth/change/password', {
     method: 'POST',
-    body: JSON.stringify({
+    body: {
       email,
       season,
       group,
       password,
       passwordCheck,
-    }),
+    },
   });
 
   return res;

src/views/PasswordPage/hooks/useMutateChangePassword.tsx

@@ -1,19 +1,18 @@
 import { useMutation } from '@tanstack/react-query';
-import { AxiosError, AxiosResponse } from 'axios';
 
 import { sendPasswordChange } from '../apis';
 
 import type { PasswordRequest, PasswordResponse } from '../types';
-import type { ErrorResponse } from '@type/errorResponse';
+import type { CustomError } from '@apis/instance';
 
 interface MutateChangePasswordProps {
   onSuccess: () => void;
 }
 
 const useMutateChangePassword = ({ onSuccess }: MutateChangePasswordProps) => {
   const { mutate: changePasswordMutate, isPending: changePasswordIsPending } = useMutation<
-    AxiosResponse<PasswordResponse, PasswordRequest>,
-    AxiosError<ErrorResponse, PasswordRequest>,
+    PasswordResponse,
+    CustomError,
     PasswordRequest
   >({
     mutationFn: (userInfo: PasswordRequest) => sendPasswordChange(userInfo),

src/views/SignInPage/apis.ts

@@ -6,12 +6,12 @@ export const sendSignIn = async (userInfo: SignInRequest) => {
   const { email, season, group, password } = userInfo;
   const res = await instance('/recruiting-auth/login', {
     method: 'POST',
-    body: JSON.stringify({
+    body: {
       email,
       season,
       group,
       password,
-    }),
+    },
   });
 
   return res;

src/views/SignInPage/hooks/useMutateSignIn.tsx

@@ -6,29 +6,24 @@ import { VALIDATION_CHECK } from '@constants/validationCheck';
 import { sendSignIn } from '../apis';
 
 import type { SignInRequest, SignInResponse } from '../types';
-import type { ErrorResponse } from '@type/errorResponse';
-import type { AxiosError, AxiosResponse } from 'axios';
+import type { CustomError } from '@apis/instance';
 
 interface MutateSignInProps {
   finalPassConfirmEnd?: string;
   onSetError: (name: string, type: string, message: string) => void;
 }
 
 const useMutateSignIn = ({ finalPassConfirmEnd, onSetError }: MutateSignInProps) => {
-  const { mutate: signInMutate, isPending: signInIsPending } = useMutation<
-    AxiosResponse<SignInResponse, SignInRequest>,
-    AxiosError<ErrorResponse, SignInRequest>,
-    SignInRequest
-  >({
+  const { mutate: signInMutate, isPending: signInIsPending } = useMutation<SignInResponse, CustomError, SignInRequest>({
     mutationFn: (userInfo: SignInRequest) => sendSignIn(userInfo),
-    onSuccess: ({ data: { email, token } }) => {
+    onSuccess: ({ email, token }) => {
       setUserId(email);
       localStorage.setItem('soptApplyAccessToken', token);
       localStorage.setItem('soptApplyAccessTokenExpiredTime', finalPassConfirmEnd || '');
       window.location.reload();
     },
     onError(error) {
-      if (error.response?.status === 403) {
+      if (error.status === 403) {
         onSetError('email', 'not-match', VALIDATION_CHECK.email.notMatchErrorText);
         onSetError('password', 'not-match', VALIDATION_CHECK.password.notMatchErrorText);
       }

src/views/SignupPage/apis.ts

@@ -6,15 +6,15 @@ export const sendSignUp = async (userInfo: SignUpRequest) => {
   const { email, password, passwordCheck, name, phone, season, group } = userInfo;
   const res = await instance('/recruiting-auth/signup', {
     method: 'POST',
-    body: JSON.stringify({
+    body: {
       email,
       password,
       passwordCheck,
       name,
       phone,
       season,
       group,
-    }),
+    },
   });
 
   return res;

src/views/SignupPage/hooks/useMutateSignUp.tsx

@@ -5,8 +5,7 @@ import { useNavigate } from 'react-router-dom';
 import { sendSignUp } from '../apis';
 
 import type { SignUpRequest, SignUpResponse } from '../types';
-import type { ErrorResponse } from '@type/errorResponse';
-import type { AxiosError, AxiosResponse } from 'axios';
+import type { CustomError } from '@apis/instance';
 
 interface MutateSignUpProps {
   onCheckExistence: () => void;
@@ -15,18 +14,14 @@ interface MutateSignUpProps {
 const useMutateSignUp = ({ onCheckExistence }: MutateSignUpProps) => {
   const navigate = useNavigate();
 
-  const { mutate: signUpMutate, isPending: signUpIsPending } = useMutation<
-    AxiosResponse<SignUpResponse, SignUpRequest>,
-    AxiosError<ErrorResponse, SignUpRequest>,
-    SignUpRequest
-  >({
+  const { mutate: signUpMutate, isPending: signUpIsPending } = useMutation<SignUpResponse, CustomError, SignUpRequest>({
     mutationFn: (userInfo: SignUpRequest) => sendSignUp(userInfo),
     onSuccess: () => {
       track('done-signup-apply');
       navigate('/');
     },
     onError: (error) => {
-      if (error.response?.status === 400) {
+      if (error.status === 400) {
         onCheckExistence();
       }
     },