From 0f79b1d753074ee16785ce309737b2047323fa48 Mon Sep 17 00:00:00 2001
From: Mike Fortman <michael.fortman@datastax.com>
Date: Wed, 1 Oct 2025 14:34:47 -0500
Subject: [PATCH] Fix the double callback call resulting in the Auth code
 already used screen

---
 frontend/src/app/auth/callback/page.tsx | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/auth/callback/page.tsx b/frontend/src/app/auth/callback/page.tsx
index 9c6bdbb0..23c1972a 100644
--- a/frontend/src/app/auth/callback/page.tsx
+++ b/frontend/src/app/auth/callback/page.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { useEffect, useState, useRef, Suspense } from "react"
+import { useEffect, useState, Suspense } from "react"
 import { useRouter, useSearchParams } from "next/navigation"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
 import { Button } from "@/components/ui/button"
@@ -14,17 +14,21 @@ function AuthCallbackContent() {
   const [status, setStatus] = useState<"processing" | "success" | "error">("processing")
   const [error, setError] = useState<string | null>(null)
   const [purpose, setPurpose] = useState<string>("app_auth")
-  const hasProcessed = useRef(false)
 
   useEffect(() => {
-    // Prevent double execution in React Strict Mode
-    if (hasProcessed.current) return
-    hasProcessed.current = true
+    const code = searchParams.get('code')
+    const callbackKey = `callback_processed_${code}`
+
+    // Prevent double execution across component remounts
+    if (sessionStorage.getItem(callbackKey)) {
+      console.log('Callback already processed, skipping')
+      return
+    }
+    sessionStorage.setItem(callbackKey, 'true')
 
     const handleCallback = async () => {
       try {
         // Get parameters from URL
-        const code = searchParams.get('code')
         const state = searchParams.get('state')
         const errorParam = searchParams.get('error')
         
@@ -37,14 +41,6 @@ function AuthCallbackContent() {
         const detectedPurpose = authPurpose || (storedConnectorType?.includes('drive') ? 'data_source' : 'app_auth')
         setPurpose(detectedPurpose)
         
-        // Debug logging
-        console.log('OAuth Callback Debug:', {
-          urlParams: { code: !!code, state: !!state, error: errorParam },
-          localStorage: { connectorId, storedConnectorType, authPurpose },
-          detectedPurpose,
-          fullUrl: window.location.href
-        })
-        
         // Use state parameter as connection_id if localStorage is missing
         const finalConnectorId = connectorId || state