Skip to content

[#85] Feat/로그인 로딩페이지 UI #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CJewon merged 2 commits into from
Feb 15, 2025
Merged

[#85] Feat/로그인 로딩페이지 UI #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cda4b5d
:truck: truck : 카카오, 구글 로그인 성공 시 route 위치 변경
CJewon Feb 15, 2025
8305158
:lipstick: lipstick : 카카오, 구글 로그인 성공 시 로딩스피너를 활용하여 로딩페이지 UI 구현
CJewon Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/app/oauth/google/_components/GoogleCallback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { useEffect } from 'react';
import { useRouter, useSearchParams } from 'next/navigation';
import { useAuth } from '@/contexts/AuthProvider';
import LoadingSpinner from '@/components/LoadingSpinner';

export default function GoogleCallback() {
const searchParams = useSearchParams();
Expand All @@ -15,24 +16,21 @@ export default function GoogleCallback() {

const fetchGoogleToken = async () => {
try {
// 1️⃣ code → ID 토큰 교환
const idToken = await exchangeCodeForIdToken(code);
if (!idToken) throw new Error('Google ID 토큰 발급 실패');

// 2️⃣ 서버로 ID 토큰 전송
const googleLogin = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL}/auth/signIn/GOOGLE`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
token: idToken, // 🔑 Google은 ID 토큰을 전달해야 함
token: idToken,
redirectUri: process.env.NEXT_PUBLIC_GOOGLE_REDIRECT_URI,
}),
});

const response = await googleLogin.json();
if (response.accessToken && response.refreshToken) {
login(response.accessToken, response.refreshToken);
router.push('/');
router.push('/wines');
} else {
console.error('🚨 구글 로그인 실패:', response);
router.push('/signin');
Expand All @@ -43,7 +41,6 @@ export default function GoogleCallback() {
}
};

// ID 토큰 발급 함수
const exchangeCodeForIdToken = async (code: string) => {
const tokenResponse = await fetch('https://oauth2.googleapis.com/token', {
method: 'POST',
Expand All @@ -63,5 +60,9 @@ export default function GoogleCallback() {
fetchGoogleToken();
}, [searchParams, router, login]);

return <p>🔄 구글 로그인 처리 중...</p>;
return (
<section className='flex h-screen items-center justify-center bg-gray-100'>
<LoadingSpinner></LoadingSpinner>
</section>
);
}
9 changes: 7 additions & 2 deletions src/app/oauth/kakao/_components/KakaoCallback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { useEffect } from 'react';
import { useRouter, useSearchParams } from 'next/navigation';
import { useAuth } from '@/contexts/AuthProvider';
import LoadingSpinner from '@/components/LoadingSpinner';

export default function KakaoCallback() {
const searchParams = useSearchParams();
Expand All @@ -24,7 +25,7 @@ export default function KakaoCallback() {
const response = await kakaoLogin.json();
login(response.accessToken, response.refreshToken);

router.push('/');
router.push('/wines');
} catch (error) {
console.error('카카오 로그인 실패:', error);
router.push('/signin');
Expand All @@ -34,5 +35,9 @@ export default function KakaoCallback() {
fetchKakaoToken();
}, [searchParams, router, login]);

return <p>카카오 로그인 처리 중...</p>;
return (
<section className='flex h-screen items-center justify-center bg-gray-100'>
<LoadingSpinner></LoadingSpinner>
</section>
);
}