[Fix]: 서버 로그인 로직 변경에 따른 AccessToken, RefeshToken 쿠키 세팅 제거 및 landingStatus 제거

src/App.tsx

@@ -12,9 +12,8 @@ import styled from '@emotion/styled';
 import { css } from '@emotion/react';
 import GlobalSize from '@/constants/globalSize';
 import { useNavigate } from 'react-router-dom';
-import { getAuthRedirectPath } from '@/utils/auth';
 import 'react-toastify/dist/ReactToastify.css';
-import useLandingStatus from '@/hooks/zustand/useLandingStatus';
+import RoutePath from './routes/routePath';
 
 const IMG_SRC = [
   '/onboarding/1.png',
@@ -29,7 +28,6 @@ const IMG_SRC = [
 
 function App() {
   const navigate = useNavigate();
-  const { landingStatus } = useLandingStatus();
 
   return (
     <Wrapper direction="column">
@@ -162,12 +160,8 @@ function App() {
         <JoinText />
         <OnboardingLogo2 />
         <Space height={25} />
-        <ApplyButton
-          disabled={landingStatus === 'ONBOARDING_CLOSED'}
-          onClick={() => navigate(getAuthRedirectPath(landingStatus))}>
-          {landingStatus === 'ONBOARDING_CLOSED'
-            ? '지금은 지원 기간이 아니에요'
-            : '가입하기'}
+        <ApplyButton onClick={() => navigate(RoutePath.Dashboard)}>
+          가입하기
         </ApplyButton>
         <Space height={40} />
       </BlueSection>

src/apis/index.ts

@@ -1,5 +1,4 @@
 import { BASE_URL, DEV_AUTH_TOKEN } from '@/constants/environment';
-import useAuthToken from '@/hooks/auth/useAuthToken';
 import axios from 'axios';
 
 const apiClient = axios.create({
@@ -8,8 +7,12 @@ const apiClient = axios.create({
   withCredentials: true
 });
 
-apiClient.defaults.headers.common['Authorization'] = DEV_AUTH_TOKEN
-  ? `${DEV_AUTH_TOKEN}`
-  : `Bearer ${useAuthToken().accessToken}`;
+export function setAuthHeader() {
+  if (DEV_AUTH_TOKEN) {
+    apiClient.defaults.headers.common['Authorization'] = DEV_AUTH_TOKEN;
+  }
+}
+
+setAuthHeader();
 
 export default apiClient;

src/components/ApiErrorBoundary.tsx

@@ -31,7 +31,8 @@ export default function ApiErrorBoundary({ children }: PropsWithChildren) {
       case 401:
       case 403:
         toast.error(message);
-        redirect(RoutePath.Index);
+        sessionStorage.setItem('isLogin', 'false');
+        redirect(RoutePath.Home);
         break;
       default:
         toast.error(message);

src/components/auth/guard/AuthAccessGuard.tsx

@@ -1,13 +1,25 @@
-import useLandingStatus from '@/hooks/zustand/useLandingStatus';
-import { useEffect } from 'react';
-import { Outlet } from 'react-router-dom';
+import RoutePath from '@/routes/routePath';
+import { isAuthenticated } from '@/utils/auth';
+import { toast } from 'react-toastify';
+import { useNavigate, Outlet } from 'react-router-dom';
+import { useEffect, useState } from 'react';
 
 export default function AuthAccessGuard() {
-  const { clearLandingStatus } = useLandingStatus();
+  const navigate = useNavigate();
+  const [redirect, setRedirect] = useState(false);
 
   useEffect(() => {
-    clearLandingStatus();
+    if (!isAuthenticated()) {
+      toast.error('로그인이 필요한 서비스예요.');
+      setRedirect(true);
+    }
   }, []);
 
-  return <Outlet />;
+  useEffect(() => {
+    if (redirect) {
+      navigate(RoutePath.Home);
+    }
+  }, [redirect, navigate]);
+
+  return isAuthenticated() ? <Outlet /> : null;
 }

src/components/layout/Header.tsx

@@ -3,21 +3,22 @@ import { Logo } from '@/assets/LogoIcon';
 import { Flex } from '@/components/common/Wrapper';
 import { JoinButton } from '@/components/layout/JoinButton';
 import GlobalSize from '@/constants/globalSize';
-import useLandingStatus from '@/hooks/zustand/useLandingStatus';
 import RoutePath from '@/routes/routePath';
 import { color } from 'wowds-tokens';
 import { media } from '@/styles';
-import { getAuthRedirectPath } from '@/utils/auth';
 import styled from '@emotion/styled';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
+import { isAuthenticated } from '@/utils/auth';
 
+//TODO: 백엔드 로그인 로직 수정 이후 반영 필요
 export default function Header() {
   const navigation = useNavigate();
-  const { pathname } = useLocation();
-  const { landingStatus } = useLandingStatus();
 
   const handleClick = () => {
-    navigation(getAuthRedirectPath(landingStatus));
+    if (isAuthenticated()) navigation(RoutePath.Dashboard);
+    else {
+      navigation(RoutePath.GithubSignin);
+    }
   };
 
   return (
@@ -29,11 +30,9 @@ export default function Header() {
             <HeaderLogo />
           </Flex>
         </LogoContainer>
-
-        {landingStatus === 'TO_DASHBOARD' && (
+        {isAuthenticated() ? (
           <JoinButton onClick={handleClick}>내 정보</JoinButton>
-        )}
-        {pathname === '/' && landingStatus !== 'TO_DASHBOARD' && (
+        ) : (
           <JoinButton onClick={handleClick}>로그인/가입하기</JoinButton>
         )}
       </HeaderContainter>

src/components/myPage/ApproveBox.tsx

@@ -48,7 +48,7 @@ export const ApproveBox = ({
   };
   return (
     <>
-      {currentRecruitment.period.open ? (
+      {currentRecruitment ? (
         <BoxWrapper
           onClick={() => {
             if (role === 'ASSOCIATE') handleBottomSheet();
@@ -66,8 +66,8 @@ export const ApproveBox = ({
       ) : (
         <Box
           variant="warn"
-          text="학회원 모집이 마감되었어요"
-          subText="2학기 모집 소식을 받고 싶으시다면 @gdsc.hongik 을 팔로우 해주세요."
+          text="지금은 모집 기간이 아니에요."
+          subText="모집 기간에 다시 확인해주세요!"
           status="error"
         />
       )}

src/components/myPage/AssociateRequirementCheck.tsx

@@ -63,8 +63,7 @@ const AssociateRequirementCheck = ({
             : '기본 회원 정보를 모두 입력했어요.'
         }
         onClick={() => {
-          if (infoStatus === 'PENDING')
-            navigate(RoutePath.AuthenticationProcess3_Signup);
+          if (infoStatus === 'PENDING') navigate(RoutePath.Signup);
         }}
         status={infoStatus === 'PENDING' ? 'error' : 'success'}
         variant={infoStatus === 'PENDING' ? 'arrow' : 'text'}
@@ -90,7 +89,7 @@ const AssociateRequirementCheck = ({
       />
       <Box
         onClick={() => {
-          navigate(RoutePath.AuthenticationProcess2_StudentVerification);
+          navigate(RoutePath.StudentVerification);
         }}
         text={univStatusContent(univStatus)}
         status={univStatus === 'SATISFIED' ? 'success' : 'error'}

src/components/myPage/BasicUserInfo.tsx

@@ -1,20 +1,17 @@
 import { Flex, Text } from '@/components/common/Wrapper';
 import { User } from '@/types/user';
-import useLandingStatus from '@/hooks/zustand/useLandingStatus';
 import { logout } from '@/utils/auth';
 import { typography, color } from 'wowds-tokens';
 
 import { useNavigate } from 'react-router-dom';
 
 const BasicUserInfo = ({ member }: { member: User }) => {
   const navigate = useNavigate();
-  const { clearLandingStatus } = useLandingStatus();
 
   const handleLogoutClick = () => {
-    clearLandingStatus();
     logout();
-
     navigate('/');
+    location.reload();
   };
 
   return (

src/hooks/mutation/useCreateUserBasicInfo.ts

@@ -5,12 +5,10 @@ import { useNavigate } from 'react-router-dom';
 
 export default function useCreateUserBasicInfo() {
   const navigation = useNavigate();
-  //   const { updateLandingStatue } = useLandingStatus();
 
   const { mutate: createBasicInfo, ...rest } = useMutation({
     mutationFn: createBasicInfoApi.BASIC_INFO,
     onSuccess: () => {
-      //   updateLandingStatue(LandingStatus.Dashboard);
       navigation(RoutePath.Dashboard, { replace: true });
     }
   });

src/pages/Auth.tsx

@@ -1,32 +1,19 @@
 import { GitHubButton } from '@/components/auth/GitHubButton';
 import { Text } from '@/components/common/Wrapper';
-import useLandingStatus from '@/hooks/zustand/useLandingStatus';
 import RoutePath from '@/routes/routePath';
 import { color, space } from 'wowds-tokens';
 import { media } from '@/styles';
-import { setCookie } from '@/utils/auth';
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 import GlobalSize from '@/constants/globalSize';
-import { useEffect } from 'react';
 import { Link } from 'react-router-dom';
 
 /** 깃허브 로그인 및 가입하기 */
 export const Auth = () => {
-  const { clearLandingStatus } = useLandingStatus();
-
-  useEffect(() => {
-    clearLandingStatus();
-    // 로그인을 위한 oauth-base-uri 쿠키 값 세팅
-
-    setCookie({
-      key: 'oauth-base-uri',
-      value: window.location.origin,
-      encoding: false
-    });
-  }, []);
-
   const handleClick = () => {
+    //TODO: QA용으로 임시로 설정
+    sessionStorage.setItem('isLogin', 'true');
+
     // GitHub 로그인 페이지로 직접 리다이렉트
     setTimeout(function () {
       document.location.href = RoutePath.AuthGithubLoginRedirect;