From e94335584c850f600aa5cc2478fa94667329712a Mon Sep 17 00:00:00 2001 From: esthel Date: Sat, 9 Dec 2023 17:52:23 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=BF=A0=ED=82=A4=EA=B0=92=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=EB=8A=94=20loggedin,=20=EC=97=86=EB=8B=A4=EB=A9=B4=20?= =?UTF-8?q?/=EC=9C=BC=EB=A1=9C=20=EB=9D=BC=EC=9A=B0=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/hooks/useLogout.tsx | 2 -- front/src/pages/Intro/Intro.tsx | 2 +- front/src/pages/Main/Main.tsx | 7 +++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/front/src/hooks/useLogout.tsx b/front/src/hooks/useLogout.tsx index 5ac3b65..3220551 100644 --- a/front/src/hooks/useLogout.tsx +++ b/front/src/hooks/useLogout.tsx @@ -2,8 +2,6 @@ import cookie from 'react-cookies'; const useLogout = () => { window.open(`/api/auth/logout`, '_self'); - cookie.remove('access_token'); - cookie.remove('refresh_token'); cookie.remove('loggedin'); window.location.replace('/'); }; diff --git a/front/src/pages/Intro/Intro.tsx b/front/src/pages/Intro/Intro.tsx index 5f62f3f..7263e8b 100644 --- a/front/src/pages/Intro/Intro.tsx +++ b/front/src/pages/Intro/Intro.tsx @@ -26,7 +26,7 @@ const Intro = () => { useEffect(() => { setMessageList(mockData.snowball_data.message_list as Array); - cookie.load('access_token') ? navigate('/main') : null; + cookie.load('loggedin') ? navigate('/main') : null; }, [setMessageList, navigate]); return ( diff --git a/front/src/pages/Main/Main.tsx b/front/src/pages/Main/Main.tsx index c03688e..b8fa54d 100644 --- a/front/src/pages/Main/Main.tsx +++ b/front/src/pages/Main/Main.tsx @@ -1,6 +1,7 @@ import { useEffect, useRef, useContext, useState } from 'react'; import { useNavigate } from 'react-router-dom'; import axios from 'axios'; +import cookie from 'react-cookies'; import styled from 'styled-components'; import { Loading } from '@utils'; import { useLogout } from '@hooks'; @@ -104,6 +105,12 @@ const Main = () => { useEffect(() => { // saveCookie(); + + if (!cookie.load('loggedin')) { + navigate('/'); + return; + } + axios .get('/api/user', { withCredentials: true // axios 쿠키 값 전달