Update v2 hook

Author: thiva-k

…react-router/src/components/Callback.tsx …-router/src/components/CallbackRoute.tsxpackages/react-router/src/components/Callback.tsx renamed to packages/react-router/src/components/CallbackRoute.tsx packages/react-router/src/components/Callback.tsx renamed to packages/react-router/src/components/CallbackRoute.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -16,14 +16,14 @@
  * under the License.
  */
 
-import {BaseCallback} from '@asgardeo/react';
+import {Callback} from '@asgardeo/react';
 import {FC} from 'react';
 import {useLocation, useNavigate} from 'react-router';
 
 /**
- * Props for the Callback component.
+ * Props for the CallbackRoute component.
  */
-export interface CallbackProps {
+export interface CallbackRouteProps {
   /**
    * Callback function called when an error occurs during OAuth processing.
    * @param error - The error that occurred
@@ -46,10 +46,10 @@ export interface CallbackProps {
  *
  * @example
  * ```tsx
- * <Route path="/callback" element={<Callback />} />
+ * <Route path="/callback" element={<CallbackRoute />} />
  * ```
  */
-const Callback: FC<CallbackProps> = ({onError, onNavigate}: CallbackProps) => {
+const CallbackRoute: FC<CallbackRouteProps> = ({onError, onNavigate}: CallbackRouteProps) => {
   const navigate: ReturnType<typeof useNavigate> = useNavigate();
   const location: ReturnType<typeof useLocation> = useLocation();
 
@@ -71,7 +71,7 @@ const Callback: FC<CallbackProps> = ({onError, onNavigate}: CallbackProps) => {
   };
 
   return (
-    <BaseCallback
+    <Callback
       onNavigate={handleNavigate}
       onError={
         onError ||
@@ -84,4 +84,4 @@ const Callback: FC<CallbackProps> = ({onError, onNavigate}: CallbackProps) => {
   );
 };
 
-export default Callback;
+export default CallbackRoute;

packages/react-router/src/index.ts

@@ -19,5 +19,5 @@
 export {default as ProtectedRoute} from './components/ProtectedRoute';
 export * from './components/ProtectedRoute';
 
-export {default as Callback} from './components/Callback';
-export * from './components/Callback';
+export {default as CallbackRoute} from './components/CallbackRoute';
+export * from './components/CallbackRoute';

…omponents/auth/Callback/BaseCallback.tsx …rc/components/auth/Callback/Callback.tsxpackages/react/src/components/auth/Callback/BaseCallback.tsx renamed to packages/react/src/components/auth/Callback/Callback.tsx packages/react/src/components/auth/Callback/BaseCallback.tsx renamed to packages/react/src/components/auth/Callback/Callback.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -16,30 +16,33 @@
  * under the License.
  */
 
+import {navigate as browserNavigate} from '@asgardeo/browser';
 import {FC, useEffect, useRef} from 'react';
 
 /**
- * Props for BaseCallback component
+ * Props for Callback component
  */
-export interface BaseCallbackProps {
+export interface CallbackProps {
   /**
    * Callback function called when an error occurs
    */
   onError?: (error: Error) => void;
 
   /**
-   * Function to navigate to a different path
+   * Function to navigate to a different path.
+   * If not provided, falls back to the browser navigate utility (SPA navigation via History API for same-origin paths).
+   * Provide this prop to enable framework-specific navigation (e.g., from React Router).
    */
-  onNavigate: (path: string) => void;
+  onNavigate?: (path: string) => void;
 }
 
 /**
  * BaseCallback is a headless component that handles OAuth callback parameter forwarding.
  * This component extracts OAuth parameters (code, state, error) from the URL and forwards them
  * to the original component that initiated the OAuth flow.
  *
- * This component is framework-agnostic and should be wrapped by framework-specific
- * implementations that provide navigation functions.
+ * Works standalone using the browser navigate utility (History API) for navigation by default.
+ * Pass an onNavigate prop to enable framework-specific navigation (e.g., via React Router).
  *
  * Flow: Extract OAuth parameters from URL -> Parse state parameter -> Redirect to original path with parameters
  *
@@ -49,10 +52,19 @@ export interface BaseCallbackProps {
  * - Handling the assertion and auth/callback POST
  * - Managing the authenticated session
  */
-export const BaseCallback: FC<BaseCallbackProps> = ({onNavigate, onError}: BaseCallbackProps) => {
+export const Callback: FC<CallbackProps> = ({onNavigate, onError}: CallbackProps) => {
   // Prevent double execution in React Strict Mode
   const processingRef: any = useRef(false);
 
+  // Resolve navigation: use provided onNavigate (router-aware) or fall back to browser navigate utility
+  const navigate = (path: string): void => {
+    if (onNavigate) {
+      onNavigate(path);
+    } else {
+      browserNavigate(path);
+    }
+  };
+
   useEffect(() => {
     const processOAuthCallback = (): void => {
       // Guard against double execution
@@ -92,7 +104,7 @@ export const BaseCallback: FC<BaseCallbackProps> = ({onNavigate, onError}: BaseC
               params.set('error_description', errorDescription);
             }
 
-            onNavigate(`/?${params.toString()}`);
+            navigate(`/?${params.toString()}`);
             return;
           }
           throw new Error('Invalid OAuth state - possible CSRF attack');
@@ -123,7 +135,7 @@ export const BaseCallback: FC<BaseCallbackProps> = ({onNavigate, onError}: BaseC
             params.set('error_description', errorDescription);
           }
 
-          onNavigate(`${returnPath}?${params.toString()}`);
+          navigate(`${returnPath}?${params.toString()}`);
           return;
         }
 
@@ -140,7 +152,7 @@ export const BaseCallback: FC<BaseCallbackProps> = ({onNavigate, onError}: BaseC
           params.set('nonce', nonce);
         }
 
-        onNavigate(`${returnPath}?${params.toString()}`);
+        navigate(`${returnPath}?${params.toString()}`);
       } catch (err) {
         const errorMessage: string = err instanceof Error ? err.message : 'OAuth callback processing failed';
         // eslint-disable-next-line no-console
@@ -153,7 +165,7 @@ export const BaseCallback: FC<BaseCallbackProps> = ({onNavigate, onError}: BaseC
         params.set('error', 'callback_error');
         params.set('error_description', errorMessage);
 
-        onNavigate(`${returnPath}?${params.toString()}`);
+        navigate(`${returnPath}?${params.toString()}`);
       }
     };
 
@@ -164,4 +176,4 @@ export const BaseCallback: FC<BaseCallbackProps> = ({onNavigate, onError}: BaseC
   return null;
 };
 
-export default BaseCallback;
+export default Callback;

packages/react/src/components/presentation/auth/AcceptInvite/v2/BaseAcceptInvite.tsx

@@ -20,7 +20,7 @@ import {cx} from '@emotion/css';
 import {FC, ReactElement, ReactNode, useCallback, useEffect, useRef, useState} from 'react';
 import useStyles from './BaseAcceptInvite.styles';
 import useTheme from '../../../../../contexts/Theme/useTheme';
-import {useOAuthCallback} from '../../../../../hooks/useOAuthCallback';
+import {useOAuthCallback} from '../../../../../hooks/v2/useOAuthCallback';
 import useTranslation from '../../../../../hooks/useTranslation';
 import {initiateOAuthRedirect} from '../../../../../utils/oauth';
 import {normalizeFlowResponse, extractErrorMessage} from '../../../../../utils/v2/flowTransformer';

packages/react/src/components/presentation/auth/SignIn/v2/SignIn.tsx

@@ -29,7 +29,7 @@ import {FC, ReactElement, useState, useEffect, useRef, ReactNode} from 'react';
 // eslint-disable-next-line import/no-named-as-default
 import BaseSignIn, {BaseSignInProps} from './BaseSignIn';
 import useAsgardeo from '../../../../../contexts/Asgardeo/useAsgardeo';
-import {useOAuthCallback} from '../../../../../hooks/useOAuthCallback';
+import {useOAuthCallback} from '../../../../../hooks/v2/useOAuthCallback';
 import useTranslation from '../../../../../hooks/useTranslation';
 import {initiateOAuthRedirect} from '../../../../../utils/oauth';
 import {normalizeFlowResponse} from '../../../../../utils/v2/flowTransformer';

…ages/react/src/hooks/useOAuthCallback.ts …s/react/src/hooks/v2/useOAuthCallback.tspackages/react/src/hooks/useOAuthCallback.ts renamed to packages/react/src/hooks/v2/useOAuthCallback.ts packages/react/src/hooks/useOAuthCallback.ts renamed to packages/react/src/hooks/v2/useOAuthCallback.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except

packages/react/src/index.ts

@@ -125,7 +125,7 @@ export * from './components/presentation/auth/InviteUser';
 
 export {BaseAcceptInvite, AcceptInvite} from './components/presentation/auth/AcceptInvite';
 
-export * from './components/auth/Callback/BaseCallback';
+export * from './components/auth/Callback/Callback';
 
 // Sign-In Options
 export {default as IdentifierFirst} from './components/presentation/auth/SignIn/v1/options/IdentifierFirst';

packages/react/src/utils/oauth.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -16,6 +16,8 @@
  * under the License.
  */
 
+import {navigate} from '@asgardeo/browser';
+
 /**
  * Initiates OAuth redirect with CSRF protection.
  * Generates random state, stores return path in sessionStorage, and redirects to OAuth provider.
@@ -43,5 +45,5 @@ export function initiateOAuthRedirect(redirectURL: string): void {
   const redirectUrlObj: URL = new URL(redirectURL);
   redirectUrlObj.searchParams.set('state', state);
 
-  window.location.href = redirectUrlObj.toString();
+  navigate(redirectUrlObj.toString());
 }