Refactor instance ID handling in authorization flow and update related utility functions

kavindadimuthu · kavindadimuthu · commit 2b1f8decba88 · 2026-02-16T14:09:21.000+05:30
diff --git a/packages/javascript/src/__legacy__/client.ts b/packages/javascript/src/__legacy__/client.ts
@@ -255,11 +255,11 @@ export class AsgardeoAuthClient<T> {
           clientId: configData.clientId,
           codeChallenge,
           codeChallengeMethod: PKCEConstants.DEFAULT_CODE_CHALLENGE_METHOD,
+          instanceId: this.getInstanceId().toString(),
           prompt: configData.prompt,
           redirectUri: configData.afterSignInUrl,
           responseMode: configData.responseMode,
           scopes: processOpenIDScopes(configData.scopes),
-          instanceId: this.getInstanceId().toString(),
         },
         {key: pkceKey},
         authRequestConfig,
diff --git a/packages/javascript/src/utils/getAuthorizeRequestUrlParams.ts b/packages/javascript/src/utils/getAuthorizeRequestUrlParams.ts
@@ -55,11 +55,11 @@ const getAuthorizeRequestUrlParams = (
     clientId: string;
     codeChallenge?: string;
     codeChallengeMethod?: string;
+    instanceId?: string;
     prompt?: string;
     redirectUri: string;
     responseMode?: string;
     scopes?: string;
-    instanceId?: string;
   } & ExtendedAuthorizeRequestUrlParams,
   pkceOptions: {key: string},
   customParams: Record<string, string | number | boolean>,
@@ -106,17 +106,14 @@ const getAuthorizeRequestUrlParams = (
     });
   }
 
-  if (options.instanceId) {
-    const AUTH_INSTANCE_PREFIX = "instance_";
-    customParams[OIDCRequestConstants.Params.STATE] = AUTH_INSTANCE_PREFIX + options.instanceId;
-  }
+  const AUTH_INSTANCE_PREFIX: string = 'instance_';
+  const customStateValue: string = options.instanceId
+    ? AUTH_INSTANCE_PREFIX + options.instanceId
+    : customParams ? customParams[OIDCRequestConstants.Params.STATE]?.toString() : '';
 
   authorizeRequestParams.set(
     OIDCRequestConstants.Params.STATE,
-    generateStateParamForRequestCorrelation(
-      pkceKey,
-      customParams ? customParams[OIDCRequestConstants.Params.STATE]?.toString() : '',
-    ),
+    generateStateParamForRequestCorrelation(pkceKey, customStateValue),
   );
 
   return authorizeRequestParams;
diff --git a/packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx b/packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx
@@ -266,7 +266,8 @@ const AsgardeoProvider: FC<PropsWithChildren<AsgardeoProviderProps>> = ({
       }
 
       const currentUrl: URL = new URL(window.location.href);
-      const hasAuthParamsResult: boolean = hasAuthParams(currentUrl, afterSignInUrl) && hasCalledForThisInstance(currentUrl, instanceId ?? 0);
+      const hasAuthParamsResult: boolean =
+        hasAuthParams(currentUrl, afterSignInUrl) && hasCalledForThisInstance(currentUrl, instanceId ?? 0);
 
       const isV2Platform: boolean = config.platform === Platform.AsgardeoV2;
 
diff --git a/packages/react/src/hooks/useBrowserUrl.ts b/packages/react/src/hooks/useBrowserUrl.ts
@@ -62,8 +62,8 @@ const useBrowserUrl = (): UseBrowserUrl => {
     // authParams?.authorizationCode || // FIXME: These are sent externally. Need to see what we can do about this.
     url.searchParams.get('error') !== null;
 
-  const hasCalledForThisInstance = (url: URL, instanceId: number): boolean => 
-    (hasCalledForThisInstanceInUrl(instanceId, url.search));
+  const hasCalledForThisInstance = (url: URL, instanceId: number): boolean =>
+    hasCalledForThisInstanceInUrl(instanceId, url.search);
 
   return {hasAuthParams, hasCalledForThisInstance};
 };

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,8 @@ const AsgardeoProvider: FC<PropsWithChildren<AsgardeoProviderProps>> = ({`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`const currentUrl: URL = new URL(window.location.href);`
`269`		`- const hasAuthParamsResult: boolean = hasAuthParams(currentUrl, afterSignInUrl) && hasCalledForThisInstance(currentUrl, instanceId ?? 0);`
	`269`	`+ const hasAuthParamsResult: boolean =`
	`270`	`+ hasAuthParams(currentUrl, afterSignInUrl) && hasCalledForThisInstance(currentUrl, instanceId ?? 0);`
`270`	`271`
`271`	`272`	`const isV2Platform: boolean = config.platform === Platform.AsgardeoV2;`
`272`	`273`