From 13b63868782656133a82c1c92f733dd7eceb9393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=89=E1=85=A9=E1=86=AB=E1=84=8C=E1=85=B5=E1=86=AB?= =?UTF-8?q?=E1=84=8B=E1=85=A7=E1=86=BC?= Date: Thu, 1 Aug 2024 13:33:31 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor(KakaoCallbackPage):=20http=20metho?= =?UTF-8?q?d=EB=A5=BC=20get=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/pages/login/KakaoCallbackPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/pages/login/KakaoCallbackPage.tsx b/frontend/src/components/pages/login/KakaoCallbackPage.tsx index 61958b64..7efa0007 100644 --- a/frontend/src/components/pages/login/KakaoCallbackPage.tsx +++ b/frontend/src/components/pages/login/KakaoCallbackPage.tsx @@ -17,7 +17,7 @@ const KakaoCallbackPage = () => { if (code) { client - .post(`${ROUTE_PATHS.loginOauth}?code=${code}`) + .get(`${ROUTE_PATHS.loginOauth}?code=${code}`) .then((res) => { saveUser(res.data); navigate(ROUTE_PATHS.root); From 590437fab315412925012e7bfc48a2eddaaf9fbe Mon Sep 17 00:00:00 2001 From: simhorim Date: Fri, 2 Aug 2024 20:24:49 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor(KakaoCallbackPage):=20encoding?= =?UTF-8?q?=EB=90=9C=20redirect-uri=20params=EC=97=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/pages/login/KakaoCallbackPage.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/pages/login/KakaoCallbackPage.tsx b/frontend/src/components/pages/login/KakaoCallbackPage.tsx index 7efa0007..946c6fa0 100644 --- a/frontend/src/components/pages/login/KakaoCallbackPage.tsx +++ b/frontend/src/components/pages/login/KakaoCallbackPage.tsx @@ -14,10 +14,17 @@ const KakaoCallbackPage = () => { useEffect(() => { const searchParams = new URLSearchParams(window.location.search); const code = searchParams.get("code"); + const redirectUri = `${window.location.origin}/oauth`; + const encodedRedirectUri = encodeURIComponent(redirectUri); if (code) { client - .get(`${ROUTE_PATHS.loginOauth}?code=${code}`) + .get(`${ROUTE_PATHS.loginOauth}`, { + params: { + code: code, + "redirect-uri": encodedRedirectUri, + }, + }) .then((res) => { saveUser(res.data); navigate(ROUTE_PATHS.root); From 4cb5c3029e8d373525d34b749b3f5f49c55796d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=89=E1=85=A9=E1=86=AB=E1=84=8C=E1=85=B5=E1=86=AB?= =?UTF-8?q?=E1=84=8B=E1=85=A7=E1=86=BC?= Date: Tue, 6 Aug 2024 12:01:30 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EB=AA=85=EC=84=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. http method post로 변경 2. params에 추가하는 것이 아닌 url내 code 및 redirectUri 추가 --- frontend/src/components/pages/login/KakaoCallbackPage.tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/frontend/src/components/pages/login/KakaoCallbackPage.tsx b/frontend/src/components/pages/login/KakaoCallbackPage.tsx index 946c6fa0..64979fa4 100644 --- a/frontend/src/components/pages/login/KakaoCallbackPage.tsx +++ b/frontend/src/components/pages/login/KakaoCallbackPage.tsx @@ -19,12 +19,7 @@ const KakaoCallbackPage = () => { if (code) { client - .get(`${ROUTE_PATHS.loginOauth}`, { - params: { - code: code, - "redirect-uri": encodedRedirectUri, - }, - }) + .post(`${ROUTE_PATHS.loginOauth}?code=${code}&redirectUri=${encodedRedirectUri}`) .then((res) => { saveUser(res.data); navigate(ROUTE_PATHS.root); From 4fec945c984b14d77a942dcd7055cb390344f364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=89=E1=85=A9=E1=86=AB=E1=84=8C=E1=85=B5=E1=86=AB?= =?UTF-8?q?=E1=84=8B=E1=85=A7=E1=86=BC?= Date: Tue, 6 Aug 2024 12:12:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20ci=20=EC=8B=A4=ED=8C=A8=20=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EC=9B=90=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. api endpoint map 내 loginOauth 수정 2. KakaoCallbackPage 내 반영 --- frontend/src/components/pages/login/KakaoCallbackPage.tsx | 2 +- frontend/src/constants/endpoint.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/pages/login/KakaoCallbackPage.tsx b/frontend/src/components/pages/login/KakaoCallbackPage.tsx index b9e3d698..31f40c80 100644 --- a/frontend/src/components/pages/login/KakaoCallbackPage.tsx +++ b/frontend/src/components/pages/login/KakaoCallbackPage.tsx @@ -21,7 +21,7 @@ const KakaoCallbackPage = () => { if (code) { client - .post(`${ROUTE_PATHS.loginOauth}?code=${code}&redirectUri=${encodedRedirectUri}`) + .post(API_ENDPOINT_MAP.loginOauth(code, encodedRedirectUri)) .then((res) => { saveUser(res.data); navigate(ROUTE_PATHS_MAP.root); diff --git a/frontend/src/constants/endpoint.ts b/frontend/src/constants/endpoint.ts index 4cf1433a..8f03dece 100644 --- a/frontend/src/constants/endpoint.ts +++ b/frontend/src/constants/endpoint.ts @@ -1,5 +1,6 @@ export const API_ENDPOINT_MAP = { - loginOauth: (code: string) => `/login/oauth/kakao?code=${code}`, + loginOauth: (code: string, redirectUri: string) => + `/login/oauth/kakao?code=${code}&redirectUri=${redirectUri}`, travelogueDetail: (id: number) => `/travelogues/${id}`, travelPlanDetail: (id: number) => `travel-plans/${id}`, travelogues: "/travelogues",