refactor: token check 로직 전체 라우트 적용 및 불필요 코드 제거

catchweak · Oct 10, 2024 · 7745df1 · 7745df1
1 parent 426559b
commit 7745df1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/src/App.js b/src/App.js
@@ -10,22 +10,17 @@ import CheckLocalStorage from "./routes/CheckLocalStorage";
 const App = () => {
   return (
     <Router>
-      <Routes>
-        <Route
-          path="/"
-          element={
-            <CheckLocalStorage>
-              <Home />
-            </CheckLocalStorage>
-          }
-        >
-          <Route index element={<News />} />
-          <Route path="category/:code" element={<News />} />
-          <Route path="news/:id" element={<NewsDetail />} />
-          <Route path="login" element={<Login />} />
-          <Route path="signup" element={<Signup />} />
-        </Route>
-      </Routes>
+      <CheckLocalStorage>
+        <Routes>
+          <Route path="/" element={<Home />}>
+            <Route index element={<News />} />
+            <Route path="category/:code" element={<News />} />
+            <Route path="news/:id" element={<NewsDetail />} />
+            <Route path="login" element={<Login />} />
+            <Route path="signup" element={<Signup />} />
+          </Route>
+        </Routes>
+      </CheckLocalStorage>
     </Router>
   );
 };

diff --git a/src/pages/Login.js b/src/pages/Login.js
@@ -31,7 +31,7 @@ function Login(props) {
       }
 
       const { accessToken } = response.data.data;
-      setTokenWithExpiry("accessToken", accessToken, 24 * 60 * 60 * 1000);
+      setTokenWithExpiry("accessToken", accessToken, 5 * 60 * 60 * 1000);
       Cookies.set("userId", response.data.data.userId, { expires: 1 });
       alert("로그인 성공");
       window.location.href = "/";

diff --git a/src/routes/CheckLocalStorage.js b/src/routes/CheckLocalStorage.js
@@ -1,12 +1,13 @@
-import { Navigate } from "react-router-dom";
+// import { Navigate } from "react-router-dom";
 import { getTokenWithExpiry } from "../utils/auth";
 
 const CheckLocalStorage = ({ children }) => {
   const token = getTokenWithExpiry("accessToken");
 
-  // if (!token) {
-  //   return <Navigate to="/login" />;
-  // }
+  if (!token) {
+    console.log("expired");
+    // return <Navigate to="/login" />;
+  }
 
   return children;
 };