Merge pull request #39 from GihoKo/dev

Dev
GihoKo · Aug 14, 2024 · 1221cc6 · 1221cc6
2 parents 4a2ca93 + 855282d
commit 1221cc6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -17,19 +17,22 @@ import { useEffect } from 'react';
 import { renewTokens } from './apis/services/auth';
 
 // token
-import AccessTokenManager from './authentication/AccessTokenManager';
+import accessTokenManager from './authentication/accessTokenManager';
 
 export default function App() {
   // 모달
   const { isOpen, component: ModalComponent } = useModalStore();
 
   // 새로고침 시 엑세스 토큰 재발급
   useEffect(() => {
-    if (!AccessTokenManager.hasAccessToken()) {
+    const isincludeMain = window.location.href.includes('main');
+    const isHasAccessToken = accessTokenManager.hasAccessToken();
+
+    if (!isHasAccessToken && isincludeMain) {
       renewTokens()
         .then((newAccessToken) => {
           if (newAccessToken) {
-            AccessTokenManager.setAccessToken(newAccessToken);
+            accessTokenManager.setAccessToken(newAccessToken);
           }
         })
         .catch((error) => {

diff --git a/src/apis/instances/index.ts b/src/apis/instances/index.ts
@@ -2,7 +2,7 @@ import axios, { AxiosError } from 'axios';
 import { handleAxiosError } from '../../utils/handleAxiosError';
 import { handleUnexpectedError } from '../../utils/handleUnexpectedError';
 import { renewTokens } from '../services/auth';
-import AccessTokenManager from '@/authentication/accessTokenManager';
+import accessTokenManager from '@/authentication/accessTokenManager';
 
 const baseURL = process.env.API_URL;
 
@@ -28,10 +28,10 @@ export const axiosInstanceWithToken = axios.create({
 // request interceptor의 경우 token을 넣을 때 자주 사용한다.
 axiosInstanceWithToken.interceptors.request.use(
   (AxiosRequestConfig) => {
-    const accessToken = AccessTokenManager.getAccessToken();
+    const accessToken = accessTokenManager.getAccessToken();
 
     // 만약 토큰이 존재하는 경우 헤더에 넣어준다.
-    if (AccessTokenManager.hasAccessToken()) {
+    if (accessTokenManager.hasAccessToken()) {
       AxiosRequestConfig.headers['authorization'] = `Bearer ${accessToken}`;
     }
     return AxiosRequestConfig;
@@ -59,9 +59,9 @@ axiosInstanceWithToken.interceptors.response.use(
         // accessToken 갱신
         const newAccessToken = await renewTokens();
 
-        AccessTokenManager.setAccessToken(newAccessToken);
+        accessTokenManager.setAccessToken(newAccessToken);
 
-        const accessToken = AccessTokenManager.getAccessToken();
+        const accessToken = accessTokenManager.getAccessToken();
 
         if (originalRequest) {
           // 새로운 accessToken으로 요청 재시도

diff --git a/src/authentication/accessTokenManager.ts b/src/authentication/accessTokenManager.ts
@@ -1,4 +1,4 @@
-const AccessTokenManager = (function () {
+const accessTokenManager = (function () {
   let accessToken: string | null = null;
 
   return {
@@ -20,4 +20,4 @@ const AccessTokenManager = (function () {
   };
 })();
 
-export default AccessTokenManager;
+export default accessTokenManager;
diff --git a/src/pages/Signin/_components/GoogleLoginButton.hook.tsx b/src/pages/Signin/_components/GoogleLoginButton.hook.tsx
@@ -8,7 +8,7 @@ import { useGoogleOAuthTokenStore } from '../../../store/useAuthStore';
 import { useUserStore } from '../../../store/useUserStore';
 
 // token
-import AccessTokenManager from '@/authentication/AccessTokenManager';
+import accessTokenManager from '@/authentication/accessTokenManager';
 
 export default function useGoogleLoginButton() {
   const navigate = useNavigate();
@@ -20,11 +20,11 @@ export default function useGoogleLoginButton() {
       try {
         await axiosInstanceWithToken.post('/auth/google/callback', { code }).then((response) => {
           setGoogleOAuthToken(response.data.googleAccessToken);
-          AccessTokenManager.setAccessToken(response.data.applicationAccessToken);
+          accessTokenManager.setAccessToken(response.data.applicationAccessToken);
           setUser(response.data.user);
         });
 
-        if (AccessTokenManager.hasAccessToken()) {
+        if (accessTokenManager.hasAccessToken()) {
           navigate('/main');
         }
       } catch (error) {