Update

Author: thiva-k

packages/react/src/components/presentation/SignIn/component-driven/SignIn.tsx

@@ -317,6 +317,9 @@ const SignIn: FC<SignInProps> = ({className, size = 'medium', onSuccess, onError
     return false;
   };
 
+  /**
+   * Initialize the flow and handle cleanup of stale flow state.
+   */
   useEffect(() => {
     const storedFlowId = sessionStorage.getItem('asgardeo_flow_id');
     const urlParams = getUrlParams();
@@ -329,32 +332,16 @@ const SignIn: FC<SignInProps> = ({className, size = 'medium', onSuccess, onError
 
     handleSessionDataKey(urlParams.sessionDataKey);
 
+    // Skip OAuth code processing
     if (urlParams.code) {
-      const flowIdFromState = resolveFlowId(
-        currentFlowId,
-        urlParams.state,
-        urlParams.flowId,
-        storedFlowId,
-      );
-
-      // Only process code if we have a valid flowId to use
-      if (flowIdFromState) {
-        setFlowId(flowIdFromState);
-        setIsFlowInitialized(true);
-        initializationAttemptedRef.current = true;
-        // Clean up flowId from URL after setting it in state
-        cleanupFlowUrlParams();
-      } else {
-        console.warn('[SignIn] OAuth code in URL but no valid flowId found. Cleaning up stale OAuth parameters.');
-        cleanupOAuthUrlParams(true);
-      }
       return;
     }
 
-    // If flowId is in URL or sessionStorage but no code and no active flow state
-    if ((urlParams.flowId || storedFlowId) && !urlParams.code && !currentFlowId) {
+    // If flowId is in URL or sessionStorage but no active flow state, clean it up
+    // This handles stale flowIds from previous sessions or incomplete flows
+    if ((urlParams.flowId || storedFlowId) && !currentFlowId) {
       console.warn(
-        '[SignIn] FlowId in URL/sessionStorage but no active flow state detected. '
+        '[SignIn] FlowId in URL/sessionStorage but no active flow state detected. Cleaning up stale flowId.'
       );
       setFlowId(null);
       sessionStorage.removeItem('asgardeo_flow_id');