🔀 services 및 types 폴더 리팩토링, 로그인/회원가입 hook 리팩토링 (#74)

Author: dolmeengii

src/app/router.tsx

@@ -12,14 +12,12 @@ import LogIn from '@/pages/logIn';
 import Game from '@/pages/play/game';
 import LobbyPage, { getLobbyInfo } from '@/pages/play/lobby';
 import Mode from '@/pages/play/mode';
-import Ranking from '@/pages/ranking';
+import Ranking, { getRank } from '@/pages/ranking';
 import Result, { getGameResult } from '@/pages/result';
 import Settings from '@/pages/settings';
 import Tutorial from '@/pages/tutorial';
 
-import { checkToken } from '@/services/auth';
-import { getRank } from '@/services/rank';
-
+import { checkToken } from '@/features/auth';
 import { ROUTE } from '@/shared/constants';
 
 const router = createBrowserRouter([
@@ -111,6 +109,8 @@ const router = createBrowserRouter([
   {
     path: ROUTE.game,
     element: <Game />,
+    loader: checkToken,
+    errorElement: <Navigate to={ROUTE.main} replace />,
   },
 ]);
 

src/components/frame/with-buttons/index.tsx

@@ -38,15 +38,17 @@ const BackButton = ({ pathname }: { pathname: string }) => {
 
 const DISABLED = {
   rightButtons: new Set([ROUTE.error, ROUTE.result]),
-  menuButton: new Set([ROUTE.tutorial]),
+  menuButton: [ROUTE.tutorial, ROUTE.error],
 };
 
 const BasicContentFrame = ({ children }: { children: ReactNode }) => {
   const { pathname } = useLocation();
 
   const rightButtonsDisabled = DISABLED.rightButtons.has(pathname);
 
-  const menuButtonDisabled = DISABLED.menuButton.has(pathname);
+  const menuButtonDisabled = DISABLED.menuButton.some((route) =>
+    pathname.startsWith(route),
+  );
 
   return (
     <div className={styles.frame}>

src/features/auth/api.ts

@@ -8,22 +8,37 @@ const setToken = (token: string, status: number) => {
   return false;
 };
 
+const axiosConfig = {
+  headers: {
+    'X-Bypass-Authorization': true,
+  },
+};
+
 export const loginAsMember = async (account: Account) => {
-  const { data, status } = await client.post<string>(`/user/login`, account, {
-    headers: {
-      'X-Bypass-Authorization': true,
-    },
-  });
+  const { data, status } = await client.post<string>(
+    `/user/login`,
+    account,
+    axiosConfig,
+  );
   return setToken(data, status);
 };
 
 export const loginAsGuest = async () => {
   return client
-    .get<string>('/user/guest', {
-      headers: {
-        'X-Bypass-Authorization': true,
-      },
-    })
+    .get<string>('/user/guest', axiosConfig)
     .then(({ data, status }) => setToken(data, status))
     .catch(() => false);
 };
+
+export const checkToken = async () => {
+  const isTokenValid = await client
+    .get<boolean>('/user/token')
+    .then(({ data }) => data);
+
+  if (!isTokenValid) {
+    localStorage.removeItem('token');
+    throw new Error();
+  }
+
+  return isTokenValid;
+};

src/features/auth/hooks.ts

@@ -1,18 +1,20 @@
+import { useQueryClient } from '@tanstack/react-query';
 import { type AxiosError } from 'axios';
 import { useNavigate } from 'react-router-dom';
 
 import { loginAsGuest, loginAsMember } from './api';
 
-import { removeUserQuery } from '@/models/user';
+import { userQueryKey } from '@/models/user';
 import { ROUTE } from '@/shared/constants';
 import { setFullScreen } from '@/shared/utils';
 
 export const useLogout = () => {
   const navigate = useNavigate();
+  const queryClient = useQueryClient();
 
   const logout = () => {
     window.localStorage.removeItem('token');
-    removeUserQuery();
+    queryClient.removeQueries({ queryKey: userQueryKey });
     navigate('/');
   };
 
@@ -21,9 +23,10 @@ export const useLogout = () => {
 
 export const useLogin = () => {
   const navigate = useNavigate();
+  const queryClient = useQueryClient();
 
-  const login = async (account: Account) => {
-    removeUserQuery();
+  const memberLogin = async (account: Account) => {
+    queryClient.removeQueries({ queryKey: userQueryKey });
 
     return loginAsMember(account)
       .then((isSuccess) => {
@@ -42,14 +45,8 @@ export const useLogin = () => {
       });
   };
 
-  return { login };
-};
-
-export const useGuestLogin = () => {
-  const navigate = useNavigate();
-
-  const login = async () => {
-    removeUserQuery();
+  const guestLogin = async () => {
+    queryClient.removeQueries({ queryKey: userQueryKey });
 
     const isSuccess = await loginAsGuest();
     if (!isSuccess) {
@@ -59,5 +56,5 @@ export const useGuestLogin = () => {
     return navigate(ROUTE.tutorial, { replace: true });
   };
 
-  return { guestLogin: login };
+  return { memberLogin, guestLogin };
 };

src/features/auth/index.ts

@@ -1 +1,2 @@
 export * from './hooks';
+export { checkToken } from './api';

src/features/sign-up/api.ts

@@ -1,6 +1,5 @@
 import type { AxiosError } from 'axios';
 
-import { invalidateUserQuery } from '@/models/user';
 import { client } from '@/shared/api';
 
 const axiosConfig = {
@@ -22,7 +21,6 @@ export const upgradeToMember = async (formData: SignUpForm) => {
     .post<string>('/user/guest', formData)
     .then(({ data }) => {
       console.debug(data);
-      invalidateUserQuery();
       return true;
     })
     .catch(({ response }: AxiosError) => {

src/features/sign-up/hooks.ts

@@ -0,0 +1,21 @@
+import { useQueryClient } from '@tanstack/react-query';
+
+import { registerMember, upgradeToMember } from './api';
+
+import { userQueryKey } from '@/models/user';
+
+export const useSignUp = (isGuest: boolean) => {
+  const queryClient = useQueryClient();
+
+  if (!isGuest) {
+    return registerMember;
+  }
+
+  return async (formData: SignUpForm) => {
+    const isSuccess = await upgradeToMember(formData);
+    if (isSuccess) {
+      await queryClient.invalidateQueries({ queryKey: userQueryKey });
+    }
+    return isSuccess;
+  };
+};

src/features/sign-up/ui.tsx

@@ -1,7 +1,8 @@
 import React, { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { checkIdDuplicate, registerMember, upgradeToMember } from './api';
+import { checkIdDuplicate } from './api';
+import { useSignUp } from './hooks';
 import { validateSignUpForm } from './utils';
 
 import ColoredButton from '@/components/button/ColoredButton';
@@ -17,8 +18,9 @@ interface Props {
   isGuest?: boolean;
 }
 
-const SignUp = ({ closeModal, isGuest }: Props) => {
+const SignUp = ({ closeModal, isGuest = false }: Props) => {
   const navigate = useNavigate();
+  const signUp = useSignUp(isGuest);
   const [errorMessage, setErrorMessage] = useState(ERROR_MESSAGE.welcome);
   const [form, setForm] = useState<SignUpForm>({
     id: '',
@@ -48,7 +50,6 @@ const SignUp = ({ closeModal, isGuest }: Props) => {
       return;
     }
 
-    const signUp = isGuest ? upgradeToMember : registerMember;
     const isSuccess = await signUp(form);
     if (!isSuccess) {
       return;

src/models/user/hooks.ts

@@ -1,12 +1,12 @@
-import { useQuery } from '@tanstack/react-query';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { getDefaultStore, useAtomValue, useSetAtom } from 'jotai';
 
 import { getUser } from './api';
 import { queryKey } from './constants';
 import { updateUserCodeAtom, userCodeAtom, userStaleAtom } from './store';
-import { invalidateUserQuery } from './utils';
 
 export const useUserInfo = () => {
+  const queryClient = useQueryClient();
   const setUserCode = useSetAtom(updateUserCodeAtom);
   const store = getDefaultStore();
   const isStale = store.get(userStaleAtom);
@@ -18,14 +18,15 @@ export const useUserInfo = () => {
       setUserCode(user.userCode);
       return user;
     },
-    throwOnError: true,
     refetchOnWindowFocus: false,
     refetchOnMount: isStale,
   });
 
+  const refetchUser = () => queryClient.invalidateQueries({ queryKey });
+
   return {
     user: data,
-    refetchUser: invalidateUserQuery,
+    refetchUser,
   };
 };
 

src/models/user/index.ts

@@ -1,2 +1,2 @@
 export * from './hooks';
-export * from './utils';
+export { queryKey as userQueryKey } from './constants';