Merge pull request #65 from wafflestudio/fix/social-login

fix: update Google account linking to use fetch and improve callback …

Author: alinwinskingsleigh-svg

src/api/client.ts

@@ -1346,7 +1346,7 @@ export const linkGoogleAccount = async (
 ): Promise<{ success: boolean; data?: GoogleLinkResponse; error?: string }> => {
     try {
         const accessToken = getAccessToken();
-        const response = await authFetch('/api/auth/google/link', {
+        const response = await fetch('/api/auth/google/link', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',

src/pages/GoogleCallbackPage.tsx

@@ -15,6 +15,7 @@ export function GoogleCallbackPage() {
     const isProcessed = useRef(false);
 
     useEffect(() => {
+        if (isProcessed.current) return;
         const handleCallback = async () => {
             const code = searchParams.get('code');
             const state = searchParams.get('state');
@@ -46,10 +47,9 @@ export function GoogleCallbackPage() {
                 return;
             }
 
-            isProcessed.current = true;
-
             const redirectUri = `${window.location.origin}/auth/google/callback`;
 
+             isProcessed.current = true;
             try {
                 if (pkceData.mode === 'link') {
                     const result = await linkGoogleAccount(code, pkceData.codeVerifier, redirectUri);