[#66] 토큰 관리 함수 작성

UOSTime · Aug 1, 2021 · 522a19a · 522a19a
1 parent 5fe347b
commit 522a19a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/src/utils/api.js b/src/utils/api.js
@@ -63,7 +63,7 @@ const axiosInstance = axios.create({
 
 axiosInstance.interceptors.request.use(
   config => {
-    const token = localStorage.getItem('token');
+    const token = getToken();
     if (token) {
       config.headers.Authorization = token;
     }
@@ -96,3 +96,15 @@ export async function requestAPI(config) {
     return null;
   }
 }
+
+export function setToken(token) {
+  localStorage.setItem('token', token);
+}
+
+export function getToken() {
+  return localStorage.getItem('token');
+}
+
+export function removeToken() {
+  localStorage.removeItem('token');
+}
diff --git a/src/utils/socket.js b/src/utils/socket.js
@@ -1,4 +1,5 @@
 import io from 'socket.io-client';
+import { getToken } from './api';
 
 let socket;
 
@@ -8,7 +9,7 @@ export function getSocket() {
             path: '/websocket/entryPoint',
             transports: ['websocket'],
             query: {
-              token: window.localStorage.getItem('token')
+              token: getToken()
             },
             reconnectionAttempts: 10
           });

diff --git a/src/views/login/SignUp.jsx b/src/views/login/SignUp.jsx
@@ -5,7 +5,7 @@ import UosInput from '@components/UosInput';
 import useButtonStyles from '@utils/styles/Button';
 import useFontStyles from '@utils/styles/Font';
 import UosDialog from '@components/UosDialog';
-import { requestAPI, API_SIGN_UP } from '@utils/api';
+import { requestAPI, API_SIGN_UP, removeToken } from '@utils/api';
 import { uosRed } from '@utils/styles/Colors';
 import Loading from '@components/Loading';
 
@@ -88,6 +88,8 @@ export default function SignUpDialog({onClose, open}) {
 
         setIsLoading(true);
 
+        removeToken();
+
         const response = await requestAPI(API_SIGN_UP(), newUser);
 
         if(response.status === StatusCodes.CREATED) {

diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
@@ -8,7 +8,7 @@ import Loading from '@components/Loading';
 import UosInput from '@components/UosInput';
 import FindIdDialog from '@views/login/FindId';
 import FindPWDialog from '@views/login/FindPw';
-import { API_LOGIN, API_GET_SEMESTER, requestAPI } from '@utils/api';
+import { API_LOGIN, API_GET_SEMESTER, requestAPI, removeToken, setToken } from '@utils/api';
 import { foregroundColor } from '@utils/styles/Colors';
 import useLogoLayoutStyles from '@utils/styles/login/LogoLayout';
 import useLoginLabelStyles from '@utils/styles/login/LoginLabel';
@@ -57,11 +57,13 @@ export default function Login() {
     const callLogin = async () => {
       setLoading(true);
       setError(null);
-
-      const response = await requestAPI(API_LOGIN(), loginInfo);
+
+      removeToken();
+
+      const response = await requestAPI(API_LOGIN(loginInfo));
 
       if(response.status === StatusCodes.OK) {
-        window.localStorage.setItem('token', response.data.token);
+        setToken(response.data.token);
         window.localStorage.setItem('userID', response.data.userId);
         setUserID(response.data.userId);
         setSemester({year: '2021', term: 'A10'})
@@ -87,7 +89,7 @@ export default function Login() {
         return;
       }
 
-      window.localStorage.setItem('token', response.data.token);
+      setToken(response.data.token);
       window.localStorage.setItem('userID', response.data.userId);
       setUserID(response.data.userId);