🐛 [fix] 비로그인 유저 루트 디렉토리로 이동 시 모달 표시 제거

Author: seorang42

src/constants/common.ts

@@ -40,32 +40,32 @@ export const COLOR_LIST = [
 ]
 
 export const PERMITTED_URL = {
-  UNKNOWN: ['login', 'pw-change-email'],
-  ROLE_USER: ['my-request', 'task-request', 'edit-information', 'pw-change'],
+  UNKNOWN: ['/login', '/pw-change-email'],
+  ROLE_USER: ['/my-request', '/task-request', '/edit-information', '/pw-change'],
   ROLE_MANAGER: [
-    'my-task',
-    'task-board',
-    'team-board',
-    'statistics',
-    'my-request',
-    'task-request',
-    'requested',
-    'request-approve',
-    'request-history',
-    'edit-information',
-    'pw-change'
+    '/my-task',
+    '/task-board',
+    '/team-board',
+    '/statistics',
+    '/my-request',
+    '/task-request',
+    '/requested',
+    '/request-approve',
+    '/request-history',
+    '/edit-information',
+    '/pw-change'
   ],
   ROLE_ADMIN: [
-    'member-management',
-    'user-registration',
-    'user-update',
-    'task-management',
-    'category-first',
-    'category-second',
-    'login-logs',
-    'api-logs',
-    'edit-information',
-    'pw-change'
+    '/member-management',
+    '/user-registration',
+    '/user-update',
+    '/task-management',
+    '/category-first',
+    '/category-second',
+    '/login-logs',
+    '/api-logs',
+    '/edit-information',
+    '/pw-change'
   ]
 }
 

src/router/index.ts

@@ -137,25 +137,26 @@ router.beforeEach(async (to, from, next) => {
   await memberStore.updateMemberInfoWithToken()
   const { info } = memberStore
 
-  const originUrl = to.path.split('/')[1]
-
   const redirectMap = {
     ROLE_USER: '/my-request',
     ROLE_MANAGER: '/my-task',
     ROLE_ADMIN: '/member-management'
   }
 
-  if ((info.role && to.path === '/login') || (info.role && to.path === '/')) {
+  if ((info.role && PERMITTED_URL.UNKNOWN.includes(to.path)) || (info.role && to.path === '/')) {
     return next(redirectMap[info.role])
   }
 
   if (!info.role) {
-    if (PERMITTED_URL.UNKNOWN.includes(originUrl)) {
+    if (PERMITTED_URL.UNKNOWN.includes(to.path)) {
       return next()
     }
     if (to.path === '/login') {
       return next()
     }
+    if (to.path === '/') {
+      return next('/login')
+    }
     setError('로그인이 필요합니다')
     return next('/login')
   }
@@ -166,11 +167,11 @@ router.beforeEach(async (to, from, next) => {
     ROLE_ADMIN: PERMITTED_URL.ROLE_ADMIN
   }
 
-  if (from.path === redirectMap[info.role] && !permittedUrlMap[info.role].includes(originUrl)) {
+  if (from.path === redirectMap[info.role] && !permittedUrlMap[info.role].includes(to.path)) {
     return false
   }
 
-  if (!permittedUrlMap[info.role].includes(originUrl)) {
+  if (!permittedUrlMap[info.role].includes(to.path)) {
     if (to.path === redirectMap[info.role]) {
       return next()
     }