From 0ec183e05820d75a43292820fe506cc34ff0514e Mon Sep 17 00:00:00 2001
From: Jeong-Ag <kjungu1105@gmail.com>
Date: Fri, 1 Mar 2024 03:50:41 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20Auth=20=ED=94=84=EB=A1=9C=ED=86=A0?=
 =?UTF-8?q?=EC=BD=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/auth/app/api/auth.ts                     | 57 ++++++++++++-------
 apps/auth/app/constants/api.ts                |  2 +
 .../app/hooks/queries/useLoginMutation.ts     | 11 ++--
 .../queries/useTwoFactorLoginMutation.ts      | 11 +++-
 4 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/apps/auth/app/api/auth.ts b/apps/auth/app/api/auth.ts
index e81d10b6..28811a93 100644
--- a/apps/auth/app/api/auth.ts
+++ b/apps/auth/app/api/auth.ts
@@ -1,6 +1,4 @@
-import { ServerResponse } from '@type/server';
-import { END_POINTS } from '../constants/api';
-import { server } from './server';
+import { API_BASE_URL, END_POINTS } from '../constants/api';
 
 interface PostLoginBody {
   [key: string]: string;
@@ -8,17 +6,6 @@ interface PostLoginBody {
   password: string;
 }
 
-interface PostLoginResponse extends ServerResponse {
-  data: string | null;
-}
-
-interface PostTwoFactorLoginResponse extends ServerResponse {
-  data: {
-    accessToken: string;
-    refreshToken: string;
-  };
-}
-
 interface PostTwoFactorLoginBody {
   [key: string]: string;
   memberId: string;
@@ -26,20 +13,48 @@ interface PostTwoFactorLoginBody {
 }
 
 export const postLogin = async (body: PostLoginBody) => {
-  const response = await server.post<PostLoginBody, PostLoginResponse>({
-    url: END_POINTS.LOGIN,
-    body,
+  const url = API_BASE_URL + END_POINTS.LOGIN;
+  const response = await fetch(url, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(body),
   });
 
+  if (!response.ok) {
+    throw new Error('Network response was not ok');
+  }
+
+  const authHeader = response.headers.get('X-Clab-Auth');
+  const responseBody = await response.json();
+
   return {
-    ...response,
+    success: responseBody.success,
+    authHeader: authHeader,
     id: body.id,
   };
 };
 
 export const postTwoFactorLogin = async (body: PostTwoFactorLoginBody) => {
-  return await server.post<PostTwoFactorLoginBody, PostTwoFactorLoginResponse>({
-    url: END_POINTS.TWO_FACTOR_LOGIN,
-    body,
+  const url = API_BASE_URL + END_POINTS.TWO_FACTOR_LOGIN;
+  const response = await fetch(url, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(body),
   });
+
+  if (!response.ok) {
+    throw new Error('Network response was not ok');
+  }
+
+  const authHeader = response.headers.get('X-Clab-Auth');
+  const responseBody = await response.json();
+
+  return {
+    success: responseBody.success,
+    authHeader: authHeader,
+  };
 };
diff --git a/apps/auth/app/constants/api.ts b/apps/auth/app/constants/api.ts
index d45f7695..62c8ea9b 100644
--- a/apps/auth/app/constants/api.ts
+++ b/apps/auth/app/constants/api.ts
@@ -1,3 +1,5 @@
+export const API_BASE_URL = 'https://api.clab.page';
+
 export const END_POINTS = {
   LOGIN: '/login',
   TWO_FACTOR_LOGIN: '/login/authenticator',
diff --git a/apps/auth/app/hooks/queries/useLoginMutation.ts b/apps/auth/app/hooks/queries/useLoginMutation.ts
index 8e7c244b..315738d9 100644
--- a/apps/auth/app/hooks/queries/useLoginMutation.ts
+++ b/apps/auth/app/hooks/queries/useLoginMutation.ts
@@ -12,20 +12,23 @@ export const useLoginMutation = () => {
 
   const logInMutation = useMutation({
     mutationFn: postLogin,
-    onSuccess: ({ success, data, id }) => {
-      if (success && data === null) {
+    onSuccess: ({ success, authHeader, id }) => {
+      if (!authHeader) return;
+
+      const parsedAuthHeader = JSON.parse(authHeader);
+      if (success && parsedAuthHeader.secretKey === null) {
         // 최초 로그인이 아닐 경우, Two Factor 인증으로 넘어감
         setAuth({
           step: AUTH_ATOM_STATE.TWO_FACTOR,
           id,
           secretKey: '',
         });
-      } else if (success && data) {
+      } else if (success && parsedAuthHeader.secretKey !== null) {
         // 최초 로그인, secretKey를 저장합니다
         setAuth({
           step: AUTH_ATOM_STATE.FIRST_LOGIN,
           id,
-          secretKey: data,
+          secretKey: parsedAuthHeader.secretKey,
         });
       }
     },
diff --git a/apps/auth/app/hooks/queries/useTwoFactorLoginMutation.ts b/apps/auth/app/hooks/queries/useTwoFactorLoginMutation.ts
index 8ff45df7..57ff9db5 100644
--- a/apps/auth/app/hooks/queries/useTwoFactorLoginMutation.ts
+++ b/apps/auth/app/hooks/queries/useTwoFactorLoginMutation.ts
@@ -10,8 +10,11 @@ export const useTwoFactorLoginMutation = () => {
 
   const twoFactorLoginMutation = useMutation({
     mutationFn: postTwoFactorLogin,
-    onSuccess: ({ success, data }) => {
-      const { accessToken, refreshToken } = data;
+    onSuccess: ({ success, authHeader }) => {
+      if (!authHeader) return;
+
+      const parsedAuthHeader = JSON.parse(authHeader);
+      const { accessToken, refreshToken } = parsedAuthHeader;
 
       if (!code || !success) {
         alert(ERROR_MESSAGE.AUTH);
@@ -21,7 +24,9 @@ export const useTwoFactorLoginMutation = () => {
       if (accessToken && refreshToken) {
         // 로그인 성공, 서비스로 리다이렉트 합니다
         alert(SUCCESS_MESSAGE.AUTH);
-        window.location.href = `${REDIRECT(code)}/?a=${accessToken}&r=${refreshToken}`;
+        window.location.href = `${REDIRECT(
+          code,
+        )}/?a=${accessToken}&r=${refreshToken}`;
       } else {
         alert(ERROR_MESSAGE.AUTH);
       }