fix: login jwt token logic

boostcamp-2020 · Dec 22, 2020 · fd1c3a6 · fd1c3a6
1 parent 5c1ee53
commit fd1c3a6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/client/src/hoc/Auth.tsx b/client/src/hoc/Auth.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react'
-import { toast } from 'react-toastify'
 import { useHistory } from 'react-router-dom'
 import { useDispatch } from 'react-redux'
 import A from '@atom'
-import userAPI from '@api/user'
+import axios from 'axios'
+import { ResponseType, serverURL } from '@util/myAxios'
 import { insertUserInfo } from '@store/reducer/user.reducer'
 import { joinWorkspace } from '@store/reducer/workspace.reducer'
 
@@ -30,7 +30,13 @@ const Auth = (Component: any, option: boolean) => () => {
 
     try {
       if (token) {
-        const { success, data } = await userAPI.getUserInfo()
+        const {
+          data: { success, data },
+        } = await axios.get<ResponseType>(`${serverURL}/api/user/status`, {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        })
 
         if (success && option) {
           dispatch(insertUserInfo(data))
@@ -54,7 +60,17 @@ const Auth = (Component: any, option: boolean) => () => {
 
       setLoading(false)
     } catch (error) {
-      window.location.href = '/'
+      switch (error.response.status) {
+        case 401:
+          localStorage.removeItem('token')
+          window.location.href = '/'
+          break
+        case 403:
+          window.location.href = '/'
+          break
+        default:
+          break
+      }
     }
   }
 

diff --git a/client/src/util/myAxios.ts b/client/src/util/myAxios.ts
@@ -1,11 +1,11 @@
 import axios from 'axios'
 
-const serverURL =
+export const serverURL =
   process.env.NODE_ENV === 'development'
     ? process.env.SERVER_DOMAIN_DEVELOP
     : process.env.SERVER_DOMAIN_PRODUCTION
 
-const headerConfig = {
+export const headerConfig = {
   headers: {
     Authorization: `Bearer ${localStorage.getItem('token')}`,
   },

diff --git a/server/src/middleware/user.middleware.ts b/server/src/middleware/user.middleware.ts
@@ -27,8 +27,9 @@ const verifyUser = (req: Request, res: Response, next: NextFunction) => {
       req.user = { id, email, name, profileImageUrl }
       return next()
     }
-  } catch (error) {
     return res.status(403).json({ success: false })
+  } catch (error) {
+    return res.status(401).json({ success: false })
   }
 }