Merge pull request #91 from innovationacademy-kr/fe/dev/fix_isLogin/#90

[FE] FIX: isLogin 기능 삭제 #90
innovationacademy-kr · Jan 8, 2024 · 9aa38bb · 9aa38bb
2 parents dd21e42 + d0d46b5
commit 9aa38bb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/src/api/baseAPI.ts b/src/api/baseAPI.ts
@@ -30,7 +30,6 @@ instance.interceptors.response.use(
       error.response?.status === STATUS_401_UNAUTHORIZED ||
       error.response?.status === undefined
     ) {
-      localStorage.removeItem("isLogin");
       removeCookie();
       clearStorage();
       window.location.href = "/";

diff --git a/src/api/cookie/cookies.ts b/src/api/cookie/cookies.ts
@@ -4,12 +4,14 @@ export const getCookie = () => {
   return document.cookie
     .split(";")
     .map((cookie) => cookie.trim())
-    .filter((cookie) => tokenName === cookie.split("=")[0])
-    .join("")
-    .split("=")[1];
+    .find((cookie) => cookie.startsWith(`${tokenName}=`))
+    ?.split("=")[1];
 };
 
 export const removeCookie = (): void => {
-  const domain = ".24hoursarenotenough.42seoul.kr";
+  const hostname = window.location.hostname;
+  const domain =
+    hostname === "localhost" ? "" : ".24hoursarenotenough.42seoul.kr";
+
   document.cookie = `${tokenName}=; path=/; domain=${domain}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
 };
diff --git a/src/router/index.ts b/src/router/index.ts
@@ -7,7 +7,8 @@ import MoreView from "@/views/MoreView.vue";
 import NotificationView from "@/views/NotificationView.vue";
 import NotFoundViewVue from "@/views/NotFoundView.vue";
 import ApplyCardViewVue from "@/views/ApplyCardView.vue";
-import { getCookie } from "@/api/cookie/cookies";
+import { getCookie, removeCookie } from "@/api/cookie/cookies";
+import { clearStorage } from "@/utils/localStorage";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -61,21 +62,25 @@ const router = createRouter({
 
 router.beforeEach((to, from, next) => {
   const token = getCookie();
-  const isLogin = localStorage.getItem("isLogin");
-  if (to.name === "login" && isLogin === "true" && !!token) {
-    next({ name: "home" });
+
+  // 이미 로그인된 상태에서 로그인 페이지로 이동 시 홈으로 리다이렉트
+  const isNavigatingToLogin = to.name === "login";
+  if (isNavigatingToLogin && token) {
+    return next({ name: "home" });
   }
 
-  if (
-    to.name !== "login" &&
-    to.name !== "auth" &&
-    (isLogin !== "true" || !token)
-  ) {
+  // 로그인 및 인증 페이지가 아니고, 토큰이 없는 경우 로그인 페이지로 이동
+  const isProtectedRoute = to.name !== "login" && to.name !== "auth";
+  if (isProtectedRoute && !token) {
+    removeCookie();
+    clearStorage();
     next({ name: "login" });
     alert("로그인 정보가 유효하지 않습니다.\n다시 로그인해주세요.");
-  } else {
-    next();
+    return;
   }
+
+  // 다른 경우는 정상적으로 라우트 진행
+  next();
 });
 
 export default router;
diff --git a/src/views/AuthView.vue b/src/views/AuthView.vue
@@ -11,7 +11,6 @@ onMounted(() => {
   setTimeout(async () => {
     const isLogin = await getIsLogin();
     if (isLogin?.status === STATUS_204_NO_CONTENT) {
-      localStorage.setItem("isLogin", "true");
       router.push("/home");
     } else {
       router.push("/");