From ba2ada64c2ba785f54a315f911225d2c0d6c5586 Mon Sep 17 00:00:00 2001 From: yoonyesol Date: Sun, 8 Dec 2024 23:05:04 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Formatting:=20#291=20=EC=86=8C=EC=85=9C?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B3=B5=EA=B8=89=EC=97=85?= =?UTF-8?q?=EC=B2=B4=20=EB=B3=80=EC=88=98=EB=AA=85=20=EC=86=8C=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=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 --- src/mocks/services/authServiceHandler.ts | 8 ++++---- src/routes/MainRouter.tsx | 4 ++-- src/types/UserType.tsx | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mocks/services/authServiceHandler.ts b/src/mocks/services/authServiceHandler.ts index 4096e34f..6644a7c7 100644 --- a/src/mocks/services/authServiceHandler.ts +++ b/src/mocks/services/authServiceHandler.ts @@ -88,14 +88,14 @@ const authServiceHandler = [ const { provider } = params as { provider: SocialLoginProvider }; const { code } = (await request.json()) as { code: string }; - const validProviders = ['KAKAO', 'GOOGLE']; + const validProviders = ['kakao', 'google']; if (!validProviders.includes(provider)) { return HttpResponse.json({ message: '지원하지 않는 Provider입니다.' }, { status: 400 }); } // 공급업체별 설정 정보 const providerConfigs = { - KAKAO: { + kakao: { tokenUrl: `https://kauth.kakao.com/oauth/token`, userInfoUrl: 'https://kapi.kakao.com/v2/user/me', accessTokenParams: { @@ -107,7 +107,7 @@ const authServiceHandler = [ accessTokenKey: 'access_token', headers: { 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8' }, }, - GOOGLE: { + google: { tokenUrl: `https://oauth2.googleapis.com/token`, userInfoUrl: 'https://www.googleapis.com/userinfo/v2/me', accessTokenParams: { @@ -165,7 +165,7 @@ const authServiceHandler = [ } // 이메일 기반으로 사용자 검색 또는 회원가입 - const email = provider === 'KAKAO' ? userInfo.kakao_account.email : userInfo.email; + const email = provider === 'kakao' ? userInfo.kakao_account.email : userInfo.email; if (!email) return HttpResponse.json({ message: '이메일 정보를 가져올 수 없습니다.' }, { status: 400 }); const foundUser = USER_DUMMY.find((user) => user.email === email); diff --git a/src/routes/MainRouter.tsx b/src/routes/MainRouter.tsx index 8d14f754..17fb71e7 100644 --- a/src/routes/MainRouter.tsx +++ b/src/routes/MainRouter.tsx @@ -46,8 +46,8 @@ export default function MainRouter() { children: [ { path: 'signup', element: }, { path: 'signin', element: }, - { path: 'auth/kakao/callback', element: }, - { path: 'auth/google/callback', element: }, + { path: 'auth/kakao/callback', element: }, + { path: 'auth/google/callback', element: }, { path: 'search/id', element: }, { path: 'search/password', element: }, ], diff --git a/src/types/UserType.tsx b/src/types/UserType.tsx index 15f875c5..eee72db0 100644 --- a/src/types/UserType.tsx +++ b/src/types/UserType.tsx @@ -1,6 +1,6 @@ import type { Role } from '@/types/RoleType'; -export type SocialLoginProvider = 'KAKAO' | 'GOOGLE'; +export type SocialLoginProvider = 'kakao' | 'google'; export type User = { userId: number; From cbe4bc4daec0dba6a6c6ef2cc085eac8effb7aad Mon Sep 17 00:00:00 2001 From: yoonyesol Date: Sun, 8 Dec 2024 23:33:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Chore:=20#291=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20=EC=97=90=EB=9F=AC=20=EC=9B=90=EC=9D=B8=20=ED=8C=8C=EC=95=85?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EC=BD=98=EC=86=94=EB=AC=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/user/auth-form/SocialButton.tsx | 2 +- src/pages/user/SignInPage.tsx | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/user/auth-form/SocialButton.tsx b/src/components/user/auth-form/SocialButton.tsx index 14545510..86045696 100644 --- a/src/components/user/auth-form/SocialButton.tsx +++ b/src/components/user/auth-form/SocialButton.tsx @@ -14,7 +14,7 @@ export default function SocialButton({ provider, isSubmitting }: SocialButtonPro const googleUrl = import.meta.env.VITE_GOOGLE_URL; const kakaoUrl = import.meta.env.VITE_KAKAO_URL; - const isGoogle = provider === 'GOOGLE'; + const isGoogle = provider === 'google'; const [isLoading, setIsLoading] = useState(false); const { toastError } = useToast(); diff --git a/src/pages/user/SignInPage.tsx b/src/pages/user/SignInPage.tsx index abd5ffc4..ba81b4ee 100644 --- a/src/pages/user/SignInPage.tsx +++ b/src/pages/user/SignInPage.tsx @@ -34,7 +34,9 @@ export default function SignInPage() { try { const response = await getUserInfo(); setUserInfo(response.data); + console.log(response.data); } catch (error) { + console.error('유저정보 오류', error); throw new Error('유저 정보를 가져오는 데 실패했습니다.'); } }; @@ -43,9 +45,11 @@ export default function SignInPage() { try { const response = await login(formData); if (!response.headers) throw new Error(); + console.log('response', response); const accessToken = response.headers.authorization; if (!accessToken) throw new Error(); + console.log('accessToken', accessToken); onLogin(accessToken.split(' ')[1]); } catch (error) { @@ -53,6 +57,7 @@ export default function SignInPage() { if (axiosError.response?.status === 401) { throw new Error('아이디와 비밀번호를 한번 더 확인해 주세요.'); } + console.error('로그인 도중 오류', axiosError); throw new Error('로그인 도중 오류가 발생했습니다.'); } }; @@ -60,10 +65,13 @@ export default function SignInPage() { const onSubmit = async (formData: UserSignInForm) => { try { await handleLogin(formData); + console.log('로그인 완료'); await fetchUserInfo(); + console.log('유저정보 가져옴'); navigate('/', { replace: true }); } catch (error) { const axiosError = error as Error; + console.error('로그인 + 유저정보 오류', axiosError); toastError(axiosError.message); } }; @@ -94,8 +102,8 @@ export default function SignInPage() {
- - + +
); From 27def1b4ba782671f5eb1866aabc9281a8411bef Mon Sep 17 00:00:00 2001 From: Yoonyesol <51500821+Yoonyesol@users.noreply.github.com> Date: Tue, 10 Dec 2024 09:10:45 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Formatting:=20#291=20=EC=86=8C=EC=85=9C?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20mockData=20=EA=B3=B5=EA=B8=89?= =?UTF-8?q?=EC=97=85=EC=B2=B4=20=EB=B3=80=EC=88=98=EB=AA=85=20=EC=86=8C?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=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 --- src/mocks/mockData.ts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mocks/mockData.ts b/src/mocks/mockData.ts index 01bc8f64..1843aa8c 100644 --- a/src/mocks/mockData.ts +++ b/src/mocks/mockData.ts @@ -26,7 +26,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'panda_dev@gmail.com', password: 'password@1', email: 'one@naver.com', - provider: 'GOOGLE', + provider: 'google', nickname: '판다', bio: '풀스택 개발자를 목표중', links: [], @@ -37,7 +37,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'two@kakao.com', password: 'password@2', email: 'two@naver.com', - provider: 'KAKAO', + provider: 'kakao', nickname: 'kakao_oauth_2', bio: '디자이너 + 프론트엔드 육각형 인재', links: [], @@ -48,7 +48,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'three@naver.com', password: 'password@3', email: 'three@naver.com', - provider: 'GOOGLE', + provider: 'google', nickname: '랫서판다', bio: '급성장중인 프론트엔드 취준생', links: [], @@ -59,7 +59,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'four@kakao.com', password: 'password@4', email: 'four@naver.com', - provider: 'KAKAO', + provider: 'kakao', nickname: '북금곰', bio: '힘을 숨긴 프론트엔드 취준생', links: [], @@ -70,7 +70,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'five@kakao.com', password: 'password@5', email: 'five@naver.com', - provider: 'KAKAO', + provider: 'kakao', nickname: '호랑이', bio: '백엔드 5년차', links: [], @@ -81,7 +81,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'six@gmail.com', password: 'password@6', email: 'six@naver.com', - provider: 'GOOGLE', + provider: 'google', nickname: '나무늘보', bio: '식스센스 초감각형 풀스택 개발자', links: [], @@ -92,7 +92,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'seven@kakao.com', password: 'password@7', email: 'seven@naver.com', - provider: 'KAKAO', + provider: 'kakao', nickname: 'kakao_oauth_7', bio: '초럭키비키 백엔드 개발자', links: [], @@ -103,7 +103,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'eight@gmail.com', password: 'password@8', email: 'eight@naver.com', - provider: 'GOOGLE', + provider: 'google', nickname: '벨루가', bio: '팔방미인 디자이너', links: [], @@ -114,7 +114,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'nine@kakao.com', password: 'password@9', email: 'nine@naver.com', - provider: 'KAKAO', + provider: 'kakao', nickname: '펭귄', bio: 'MySQL, Postgre SQL DBA', links: [], @@ -125,7 +125,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'ten@gmail.com', password: 'password@10', email: 'ten@naver.com', - provider: 'GOOGLE', + provider: 'google', nickname: 'google_oauth_10', bio: 'DevOps 3년차', links: [], @@ -213,7 +213,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'cony@kakao.com', password: 'test1234!', email: 'cony@example.com', - provider: 'KAKAO', + provider: 'kakao', nickname: '코니', profileImageName: 'Image2.png', bio: '커피와 책을 사랑하는 디자이너', @@ -224,7 +224,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'leonard@gmail.com', password: 'test1234!', email: 'leonard@example.com', - provider: 'GOOGLE', + provider: 'google', nickname: '레너드', profileImageName: 'Image3.jpeg', bio: '자연을 사랑하는 사진작가', @@ -246,7 +246,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'james@kakao.com', password: 'test1234!', email: 'james@example.com', - provider: 'KAKAO', + provider: 'kakao', nickname: '제임스', profileImageName: 'Image2.png', bio: '커피를 코드로 바꾸는 마법사', @@ -257,7 +257,7 @@ export const USER_DUMMY: UserInfo[] = [ username: 'edward@gmail.com', password: 'test1234!', email: 'edward@example.com', - provider: 'GOOGLE', + provider: 'google', nickname: '에드워드', profileImageName: 'Image3.jpeg', bio: '버그를 춤추게 하는 디버깅의 달인',