From 7c3abfae1f5ea78f172235ea93f270216e2243fb Mon Sep 17 00:00:00 2001 From: SeungGwa123 Date: Tue, 26 Nov 2024 08:10:14 +0900 Subject: [PATCH] fix: test --- packages/client/src/components/Header.tsx | 6 +++++- packages/client/src/constants/authAddress.ts | 4 ++-- packages/server/src/auth/strategies/google.strategy.ts | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/Header.tsx b/packages/client/src/components/Header.tsx index b5c8e43e..82a7ad0b 100644 --- a/packages/client/src/components/Header.tsx +++ b/packages/client/src/components/Header.tsx @@ -7,6 +7,7 @@ import logoImage from '@asset/logo/corineeLogo.png'; import kakaLogo from '@asset/logo/kakao.png'; import googleLogo from '@asset/logo/google.png'; import { GOOGLE_AUTH_URL, KAKAO_AUTH_URL } from '@/constants/authAddress'; +import { instance } from '@/api/instance'; function Header() { const { guestLogin, logout } = useAuth(); @@ -14,7 +15,10 @@ function Header() { const toast = useToast(); const handleLogin = (param: 'kakao' | 'google') => { - if (param === 'google') window.location.href = GOOGLE_AUTH_URL; + if (param === 'google') { + const response = instance.get(GOOGLE_AUTH_URL); + //window.location.href = GOOGLE_AUTH_URL; + } else if (param === 'kakao') window.location.href = KAKAO_AUTH_URL; }; diff --git a/packages/client/src/constants/authAddress.ts b/packages/client/src/constants/authAddress.ts index efe958e4..445cf36d 100644 --- a/packages/client/src/constants/authAddress.ts +++ b/packages/client/src/constants/authAddress.ts @@ -1,4 +1,4 @@ -const KAKAO_AUTH_URL = 'https://corinee.site/api/auth/kakao'; -const GOOGLE_AUTH_URL = 'https://corinee.site/api/auth/google'; +const KAKAO_AUTH_URL = '/auth/kakao'; +const GOOGLE_AUTH_URL = '/auth/google'; export { KAKAO_AUTH_URL, GOOGLE_AUTH_URL }; diff --git a/packages/server/src/auth/strategies/google.strategy.ts b/packages/server/src/auth/strategies/google.strategy.ts index 9251719e..2c472d02 100644 --- a/packages/server/src/auth/strategies/google.strategy.ts +++ b/packages/server/src/auth/strategies/google.strategy.ts @@ -8,7 +8,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') { super({ clientID: process.env.GOOGLE_CLIENT_ID, clientSecret: process.env.GOOGLE_CLIENT_SECRET, - callbackURL: `${process.env.CALLBACK_URL}/api/auth/google/callback`, + callbackURL: `/api/auth/google/callback`, scope: ['email', 'profile'], }); }