Merge pull request #26 from TeamRecorDream/develop

Develop => main 머지
TeamRecorDream · May 26, 2024 · c3e0233 · c3e0233
2 parents 5fdd809 + ab2f6fc
commit c3e0233
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/hooks/queries/usePostKakao.tsx b/src/hooks/queries/usePostKakao.tsx
@@ -25,9 +25,11 @@ const usePostKakao = () => {
         nickname: data.data.nickname,
       });
       console.log('응답이 왔나요?', kakaoResponse);
-      localStorage.setItem('accessToken', data.data.accessToken);
+      localStorage.setItem('ACCESS_TOKEN', data.data.accessToken);
+      localStorage.setItem('REFRESH_TOKEN', data.data.refreshToken);
     } catch (err) {
       setKakaoError(err as AxiosError);
+      console.log('에러 발생', err);
     } finally {
       setKakaoLoading(false);
     }

diff --git a/src/layouts/DeleteLayout.tsx b/src/layouts/DeleteLayout.tsx
@@ -12,7 +12,7 @@ interface DeleteLayoutInterface {
 
 const DeleteLayout = ({ iconOn, btnColor, btnMessage }: DeleteLayoutInterface) => {
   const { deleteUser } = useDeleteUser();
-  const accessToken = localStorage.getItem('accessToken');
+  const accessToken = localStorage.getItem('ACCESS_TOKEN');
 
   console.log('ACCESSTOKEn', accessToken);
   if (!accessToken) {

diff --git a/src/pages/KakaoLoginPage.tsx b/src/pages/KakaoLoginPage.tsx
@@ -16,7 +16,12 @@ const KakaoLoginPage = () => {
     try {
       await postKakao(code);
       if (!kakaoError && !kakaoLoading && kakaoResponse) {
-        navigate('/delete');
+        console.log('이동 전 콘솔 찍히는지 확인', kakaoResponse);
+        if (kakaoResponse.isAlreadyUser) {
+          navigate('/delete');
+        } else {
+          navigate('/unregistered');
+        }
       }
     } catch (error) {
       navigate('/unregistered');
@@ -29,7 +34,7 @@ const KakaoLoginPage = () => {
       .then((res) => {
         if (res) {
           const token = res.data.access_token;
-          localStorage.setItem('token', JSON.stringify(token));
+          // localStorage.setItem('ACCESS_TOKEN', JSON.stringify(token));
           handlePostKakao(token);
         }
       })