From 760c8b9a0de35ce62904d53e48001a7193b4bbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=84=EB=AF=BC=EC=B0=AC?= <132974029+wjzlskxk@users.noreply.github.com> Date: Fri, 15 Nov 2024 19:42:49 +0900 Subject: [PATCH] chore :: pre-commit --- .husky/pre-commit | 6 +++-- src/libs/Axios/errorResponseHandler.ts | 31 +++++++++----------------- src/libs/Axios/requestHandler.ts | 20 +++++------------ 3 files changed, 21 insertions(+), 36 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 629b54b..799d328 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -4,8 +4,10 @@ # 모든 TypeScript 파일을 검사하고, 사용하지 않는 임포트를 제거 if npx eslint --fix --ignore-pattern 'node_modules/' --ext .ts .; then echo "검사 통과" + exit 0 else echo "에러 발생!" - # 오류 발생 시, 실패한 파일과 코드 라인만 출력 - npx eslint --quiet --format=compact --ext .ts . | grep -E 'error|warn' + # 오류 발생 시, 실패한 파일과 코드 라인만 출력 (error만 필터링) + npx eslint --quiet --format=compact --ext .ts . | grep 'error' + exit 1 fi diff --git a/src/libs/Axios/errorResponseHandler.ts b/src/libs/Axios/errorResponseHandler.ts index 77eb4cf..c9f0142 100644 --- a/src/libs/Axios/errorResponseHandler.ts +++ b/src/libs/Axios/errorResponseHandler.ts @@ -1,12 +1,8 @@ -import { AxiosError } from "axios"; -import Token from "../Token/Token"; -import { - ACCESS_TOKEN_KEY, - REFRESH_TOKEN_KEY, - REQUEST_TOKEN_KEY, -} from "constants/Token/Token.constant"; -import { dodamAxios } from "./customAxios"; -import AuthRepositoryImpl from "repositories/Auth/AuthRepositoryImpl"; +import { AxiosError } from 'axios'; +import Token from '../Token/Token'; +import { ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY, REQUEST_TOKEN_KEY } from 'constants/Token/Token.constant'; +import { dodamAxios } from './customAxios'; +import AuthRepositoryImpl from 'repositories/Auth/AuthRepositoryImpl'; export const errorResponseHandler = async (error: AxiosError) => { if (error.response) { @@ -17,21 +13,16 @@ export const errorResponseHandler = async (error: AxiosError) => { const usingAccessToken = Token.getToken(ACCESS_TOKEN_KEY); const usingRefreshToken = Token.getToken(REFRESH_TOKEN_KEY); - if ( - usingAccessToken !== undefined && - usingRefreshToken !== undefined && - status === 401 - ) { + if (usingAccessToken !== undefined && usingRefreshToken !== undefined && status === 401) { try { - const { data: newAccessToken } = - await AuthRepositoryImpl.refreshAccessToken(usingRefreshToken); + const { data: newAccessToken } = await AuthRepositoryImpl.refreshAccessToken(usingRefreshToken); Token.setToken(ACCESS_TOKEN_KEY, newAccessToken); - dodamAxios.defaults.headers.common[ - REQUEST_TOKEN_KEY - ] = `Bearer ${newAccessToken}`; - } catch (error) {} + dodamAxios.defaults.headers.common[REQUEST_TOKEN_KEY] = `Bearer ${newAccessToken}`; + } catch (error) { + console.log(error); + } } } return Promise.reject(error); diff --git a/src/libs/Axios/requestHandler.ts b/src/libs/Axios/requestHandler.ts index 2585047..e35f0da 100644 --- a/src/libs/Axios/requestHandler.ts +++ b/src/libs/Axios/requestHandler.ts @@ -1,20 +1,12 @@ -import { InternalAxiosRequestConfig } from "axios"; -import Token from "../Token/Token"; -import { - ACCESS_TOKEN_KEY, - REFRESH_TOKEN_KEY, - REQUEST_TOKEN_KEY, -} from "constants/Token/Token.constant"; +import { InternalAxiosRequestConfig } from 'axios'; +import Token from '../Token/Token'; +import { ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY, REQUEST_TOKEN_KEY } from 'constants/Token/Token.constant'; export const requestHandler = async (config: InternalAxiosRequestConfig) => { - if ( - Token.getToken(ACCESS_TOKEN_KEY) !== undefined && - Token.getToken(REFRESH_TOKEN_KEY) !== undefined - ) { - config.headers[REQUEST_TOKEN_KEY] = `Bearer ${Token.getToken( - ACCESS_TOKEN_KEY - )}`; + if (Token.getToken(ACCESS_TOKEN_KEY) !== undefined && Token.getToken(REFRESH_TOKEN_KEY) !== undefined) { + config.headers[REQUEST_TOKEN_KEY] = `Bearer ${Token.getToken(ACCESS_TOKEN_KEY)}`; } else { + console.log('Token is not exist'); } return config;