From 57bab5c76d935fcd3096169596dac5b6586751d7 Mon Sep 17 00:00:00 2001
From: senthalan <senthalank@gmail.com>
Date: Fri, 31 Oct 2025 12:03:38 +0530
Subject: [PATCH] chore: Support already initiated flow in '@asgardeo/react'
 <SignIn/>

---
 .changeset/wild-deer-swim.md                  |  5 +++
 .../SignIn/component-driven/SignIn.tsx        | 33 ++++++++++++++-----
 2 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/wild-deer-swim.md

diff --git a/.changeset/wild-deer-swim.md b/.changeset/wild-deer-swim.md
new file mode 100644
index 00000000..cb5c26f8
--- /dev/null
+++ b/.changeset/wild-deer-swim.md
@@ -0,0 +1,5 @@
+---
+'@asgardeo/react': patch
+---
+
+chore: Support already initiated flow in '@asgardeo/react' <SignIn/>
diff --git a/packages/react/src/components/presentation/SignIn/component-driven/SignIn.tsx b/packages/react/src/components/presentation/SignIn/component-driven/SignIn.tsx
index 3e64fcc9..1c9ccd70 100644
--- a/packages/react/src/components/presentation/SignIn/component-driven/SignIn.tsx
+++ b/packages/react/src/components/presentation/SignIn/component-driven/SignIn.tsx
@@ -165,7 +165,7 @@ export type SignInProps = {
  * ```
  */
 const SignIn: FC<SignInProps> = ({className, size = 'medium', onSuccess, onError, variant, children}) => {
-  const {applicationId, afterSignInUrl, signIn, isInitialized, isLoading, baseUrl} = useAsgardeo();
+  const {applicationId, afterSignInUrl, signIn, isInitialized, isLoading} = useAsgardeo();
   const {t} = useTranslation();
 
   // State management for the flow
@@ -186,13 +186,20 @@ const SignIn: FC<SignInProps> = ({className, size = 'medium', onSuccess, onError
 
   /**
    * Initialize the authentication flow.
+   * Priority: flowId > applicationId (from context) > applicationId (from URL)
    */
   const initializeFlow = async (): Promise<void> => {
-    const applicationIdFromUrl: string = new URL(window.location.href).searchParams.get('applicationId');
+    const urlParams = new URL(window.location.href).searchParams;
+    const flowIdFromUrl: string = urlParams.get('flowId');
+    const applicationIdFromUrl: string = urlParams.get('applicationId');
 
-    if (!applicationIdFromUrl && !applicationId) {
+    // Priority order: flowId from URL > applicationId from context > applicationId from URL
+    const effectiveApplicationId = applicationId || applicationIdFromUrl;
+
+    // Validate that we have either flowId or applicationId
+    if (!flowIdFromUrl && !effectiveApplicationId) {
       const error = new AsgardeoRuntimeError(
-        `Application ID is required for authentication`,
+        'Either flowId or applicationId is required for authentication',
         'SignIn-initializeFlow-RuntimeError-001',
         'react',
         'Something went wrong while trying to sign in. Please try again later.',
@@ -203,10 +210,20 @@ const SignIn: FC<SignInProps> = ({className, size = 'medium', onSuccess, onError
 
     try {
       setFlowError(null);
-      const response: EmbeddedSignInFlowResponseV2 = await signIn({
-        applicationId: applicationId || applicationIdFromUrl,
-        flowType: EmbeddedFlowType.Authentication,
-      }) as EmbeddedSignInFlowResponseV2;
+
+      let response: EmbeddedSignInFlowResponseV2;
+
+      // Use flowId if available (priority), otherwise use applicationId
+      if (flowIdFromUrl) {
+        response = await signIn({
+          flowId: flowIdFromUrl,
+        }) as EmbeddedSignInFlowResponseV2;
+      } else {
+        response = await signIn({
+          applicationId: effectiveApplicationId,
+          flowType: EmbeddedFlowType.Authentication,
+        }) as EmbeddedSignInFlowResponseV2;
+      }
 
       const {flowId, components} = normalizeFlowResponse(response, t);