Fix : fix instance interceptor

potenday-project · Dec 17, 2023 · 555365a · 555365a
1 parent ce09f17
commit 555365a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/src/components/login/KakaoOauth.tsx b/src/components/login/KakaoOauth.tsx
@@ -1,12 +1,13 @@
 import { useLocation, useNavigate } from 'react-router';
 import instance from 'shared/axios';
-import { setItem } from 'utils/localStorage';
+import { getItem, setItem } from 'utils/localStorage';
 import { ILoginResponse } from './NaverOauth';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 export default function KakaoOauth() {
   const location = useLocation();
   const navigate = useNavigate();
+
   const urlParams = new URLSearchParams(location.search);
   const codeValue = urlParams.get('code');
 
@@ -15,12 +16,10 @@ export default function KakaoOauth() {
       `/api/user/kakao?code=${codeValue}`
     );
 
-    if (response.data) {
-      setItem('token', response.data.Authorization);
-      setItem('id', response.data.id);
-      setItem('nickname', response.data.nickname);
-      navigate('/');
-    }
+    setItem('token', response.Authorization);
+    setItem('id', response.id);
+    setItem('nickname', response.nickname);
+    navigate('/');
   };
 
   Login();

diff --git a/src/components/login/NaverOauth.tsx b/src/components/login/NaverOauth.tsx
@@ -8,7 +8,9 @@ interface TokenSet {
   nickname: string;
 }
 export interface ILoginResponse {
-  data: TokenSet;
+  Authorization: string;
+  id: string;
+  nickname: string;
 }
 
 export default function NaverOauth() {
@@ -22,12 +24,10 @@ export default function NaverOauth() {
       `/api/user/naver?code=${codeValue}`
     );
 
-    if (response.data) {
-      setItem('token', response.data.Authorization);
-      setItem('id', response.data.id);
-      setItem('nickname', response.data.nickname);
-      navigate('/');
-    }
+    setItem('token', response.Authorization);
+    setItem('id', response.id);
+    setItem('nickname', response.nickname);
+    navigate('/');
   };
 
   Login();

diff --git a/src/shared/axios.ts b/src/shared/axios.ts
@@ -1,6 +1,5 @@
 import axios, { InternalAxiosRequestConfig } from 'axios';
-
-const token = localStorage.getItem('token');
+import { getItem } from 'utils/localStorage';
 
 const baseURL = process.env.REACT_APP_BASE_URL;
 
@@ -9,13 +8,12 @@ const instance = axios.create({ baseURL });
 const setToken = (
   config: InternalAxiosRequestConfig
 ): InternalAxiosRequestConfig => {
+  const token = getItem('token');
   config.headers['Authorization'] = `${token}`;
   return config;
 };
 
-if (token) {
-  instance.interceptors.request.use(setToken);
-}
+instance.interceptors.request.use(setToken);
 
 instance.interceptors.response.use(
   (response) => {