Merge pull request #60 from team-crews/main

Main
team-crews · Nov 9, 2024 · d8882bf · d8882bf
2 parents 1f80af6 + a0114d9
commit d8882bf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/src/apis/instance.ts b/src/apis/instance.ts
@@ -26,10 +26,8 @@ const useAuthInstance = () => {
   useEffect(() => {
     const requestIntercept = authInstance.interceptors.request.use(
       (config) => {
-        console.log();
         if (!config.headers?.Authorization)
           config.headers.Authorization = accessToken;
-
         return config;
       },
       (e) => {
@@ -44,14 +42,14 @@ const useAuthInstance = () => {
       async (error) => {
         const prevRequest = error?.config;
 
-        if (error?.response?.status === 403 && !prevRequest?.sent) {
+        if (error?.response?.status === 401 && !prevRequest?.sent) {
           prevRequest.sent = true; // Prevent Infinite Loop
 
           prevRequest.headers['Authorization'] = await refresh();
           return authInstance(prevRequest);
         }
 
-        if (error?.response?.status === 403) clearSession();
+        if (error?.response?.status === 401) clearSession();
         return Promise.reject(error);
       },
     );

diff --git a/src/app/recruit/_components/recruit-complete/footer-section.tsx b/src/app/recruit/_components/recruit-complete/footer-section.tsx
@@ -1,4 +1,3 @@
-import { Button } from '../../../../components/shadcn/button.tsx';
 import CrewsDialog from '../../../../components/molecule/crews-dialog.tsx';
 import { useQueryClient } from '@tanstack/react-query';
 import { useToast } from '../../../../hooks/use-toast.ts';
@@ -15,6 +14,7 @@ import {
   TooltipTrigger,
 } from '../../../../components/shadcn/tooltip.tsx';
 import useAtomicMutation from '../../../../hooks/use-atomic-mutation.ts';
+import { Button } from '../../../../components/shadcn/button.tsx';
 
 const url = import.meta.env.VITE_KAKAO_OPEN_CHAT;
 
@@ -91,10 +91,12 @@ const FooterSection = ({
       ) : null}
       <CrewsFooter>
         <Tooltip>
-          <TooltipTrigger>
-            <Button size="lg" disabled>
-              CSV 추출
-            </Button>
+          <TooltipTrigger asChild>
+            <div>
+              <Button size="lg" disabled>
+                CSV 추출
+              </Button>
+            </div>
           </TooltipTrigger>
 
           <TooltipContent>

diff --git a/src/app/sign-up/_components/admin-sign-up.tsx b/src/app/sign-up/_components/admin-sign-up.tsx
@@ -9,7 +9,7 @@ const AdminSignUp = () => {
   return (
     <>
       <a
-        href={import.meta.env.VITE_KAKAO_ADMIN_CHAT}
+        href={import.meta.env.VITE_NEW_RECRUITER}
         target="_blank"
         className="flex w-full items-center justify-center gap-2 rounded bg-[#2F3234] py-2 text-sm font-bold tracking-widest text-crews-w01 hover:bg-crews-bk02"
       >

diff --git a/src/components/wrapper/try-login-wrapper.tsx b/src/components/wrapper/try-login-wrapper.tsx
@@ -3,6 +3,7 @@ import Loading from '../atom/loading.tsx';
 import useRefreshToken from '../../hooks/use-refresh-token.ts';
 import { printCustomError } from '../../lib/utils/error.ts';
 import { Outlet } from 'react-router-dom';
+import useSession from '../../hooks/use-session.ts';
 
 /*
   ToDo
@@ -12,12 +13,14 @@ import { Outlet } from 'react-router-dom';
 const TryLoginWrapper = () => {
   const [loading, setLoading] = useState(true);
   const { refresh } = useRefreshToken();
+  const { clearSession } = useSession();
 
   useEffect(() => {
     const redirectByAuth = async () => {
       try {
         await refresh();
       } catch (e) {
+        clearSession();
         printCustomError(e, 'redirectByAuth');
       } finally {
         setLoading(false);

diff --git a/src/lib/utils/error.ts b/src/lib/utils/error.ts
@@ -66,7 +66,6 @@ export function throwCustomError(e: unknown, errorFunctionName: string): never {
 // FixMe
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getErrorMessage(error: any): string {
-  console.log(error);
   if (isRouteErrorResponse(error)) {
     if (error.status === 404) return '페이지를 찾을 수 없습니다';
   }