From 09f18b76e746267ed89dee19a25891b39c3d5422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=91=ED=98=84?= Date: Fri, 8 Sep 2023 10:42:46 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Fix]=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EB=AC=B8=EC=9E=90=EC=97=B4=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EC=95=8C=EB=A6=BC=20=EC=95=84=EC=9D=B4=EC=BD=98,?= =?UTF-8?q?=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=95=84=EC=9D=B4=EC=BD=98,?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=98=A4=EB=A5=B8=EC=AA=BD=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20Issues=20#15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/components/Headers/LoginHeader.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/components/Headers/LoginHeader.tsx b/client/src/components/Headers/LoginHeader.tsx index de6cadd6..2229a786 100644 --- a/client/src/components/Headers/LoginHeader.tsx +++ b/client/src/components/Headers/LoginHeader.tsx @@ -30,12 +30,12 @@ const LoginHeader: React.FC = ({ onLogoutClick }) => { - Notification // 알림 이미지 + Notification - // 프로필 이미지 + - {logoutText} // 로그아웃 버튼 + {logoutText} ); From fb932168d2b9dd32cbd6c32890da439a4a9f1def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=91=ED=98=84?= Date: Fri, 8 Sep 2023 10:46:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Feat]=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=ED=81=B0=20=EC=A0=80=EC=9E=A5=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=84=A4=EC=A0=95=20=EB=AA=A8?= =?UTF-8?q?=EB=8B=AC=EC=97=90=EC=84=9C=20=EB=B0=B1=EC=97=94=EB=93=9C=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=EB=A5=BC=20200=EC=9D=B4=20=EC=95=84?= =?UTF-8?q?=EB=8B=8C=20201=EB=A1=9C=20=EB=B0=9B=EC=9D=8C=20=EA=B5=AC?= =?UTF-8?q?=EA=B8=80/=EC=B9=B4=EC=B9=B4=EC=98=A4/=EC=9D=B4=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=84=B1=EA=B3=B5=20?= =?UTF-8?q?=EC=8B=9C=20=EC=97=91=EC=84=B8=EC=8A=A4=20=ED=86=A0=ED=81=B0?= =?UTF-8?q?=EA=B3=BC=20=EB=A6=AC=ED=94=84=EB=A0=88=EC=8B=9C=20=ED=86=A0?= =?UTF-8?q?=ED=81=B0=EC=9D=84=20=EB=B3=80=EC=88=98=EC=99=80=20=EB=A1=9C?= =?UTF-8?q?=EC=BB=AC=20=EC=8A=A4=ED=86=A0=EB=A6=AC=EC=A7=80=EC=97=90=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=20Issues=20#15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/components/Logins/EmailLogin.tsx | 13 +++++++++---- client/src/components/Logins/OAuthLogin.tsx | 16 ++++++++++++++++ client/src/components/Signups/Password.tsx | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/client/src/components/Logins/EmailLogin.tsx b/client/src/components/Logins/EmailLogin.tsx index b1b10a31..a284a1a1 100644 --- a/client/src/components/Logins/EmailLogin.tsx +++ b/client/src/components/Logins/EmailLogin.tsx @@ -31,14 +31,19 @@ const EmailLoginModal: React.FC = ({ onClose, onLogin }) = const handleLoginClick = async () => { try { // 백엔드에 로그인 요청 - const response = await axios.post("http://ec2-13-125-246-160.ap-northeast-2.compute.amazonaws.com:8080/login", { + const response = await axios.post("http://ec2-13-125-246-160.ap-northeast-2.compute.amazonaws.com:8080/members/login", { email, password, }); if (response.status === 200) { - // 성공적으로 로그인된 경우, 토큰을 로컬 스토리지에 저장 - const authToken = response.data.authorization; - localStorage.setItem('authToken', authToken); + const authToken = response.headers['authorization']; + const accessToken = response.headers['accessToken']; + const refreshToken = response.headers['refreshToken']; + + // 토큰들을 로컬 스토리지에 저장 + if(authToken) localStorage.setItem('authToken', authToken); + if(accessToken) localStorage.setItem('accessToken', accessToken); + if(refreshToken) localStorage.setItem('refreshToken', refreshToken); onLogin(); onClose(); } else { diff --git a/client/src/components/Logins/OAuthLogin.tsx b/client/src/components/Logins/OAuthLogin.tsx index 6ccd6ea9..9ad7da78 100644 --- a/client/src/components/Logins/OAuthLogin.tsx +++ b/client/src/components/Logins/OAuthLogin.tsx @@ -19,6 +19,14 @@ const OAuthLoginModal: React.FC = ({ onClose, onEmailLoginClick try { const response = await axios.post('/oauth2/authorization/google'); if (response.status === 200) { + const authToken = response.headers['authorization']; + const accessToken = response.headers['accessToken']; + const refreshToken = response.headers['refreshToken']; + + // 토큰들을 로컬 스토리지에 저장 + if(authToken) localStorage.setItem('authToken', authToken); + if(accessToken) localStorage.setItem('accessToken', accessToken); + if(refreshToken) localStorage.setItem('refreshToken', refreshToken); console.log("Successfully logged in with Google!"); onClose(); } else { @@ -34,6 +42,14 @@ const OAuthLoginModal: React.FC = ({ onClose, onEmailLoginClick try { const response = await axios.post('/oauth2/authorization/kakao'); if (response.status === 200) { + const authToken = response.headers['authorization']; + const accessToken = response.headers['accessToken']; + const refreshToken = response.headers['refreshToken']; + + // 토큰들을 로컬 스토리지에 저장 + if(authToken) localStorage.setItem('authToken', authToken); + if(accessToken) localStorage.setItem('accessToken', accessToken); + if(refreshToken) localStorage.setItem('refreshToken', refreshToken); console.log("Successfully logged in with Kakao!"); onClose(); } else { diff --git a/client/src/components/Signups/Password.tsx b/client/src/components/Signups/Password.tsx index 14a6b07f..af485a29 100644 --- a/client/src/components/Signups/Password.tsx +++ b/client/src/components/Signups/Password.tsx @@ -60,7 +60,7 @@ const PasswordSettingModal: React.FC = ({ onClose, on confirmPassword, }); - if (response.status === 200) { + if (response.status === 201) { console.log('Data sent successfully'); onClose(); onNext();