@logto/react 0.1.14 → 0.1.15

package/lib/hooks/index.d.ts

@@ -9,7 +9,7 @@ declare type Logto = {
     signIn: (redirectUri: string) => Promise<void>;
     signOut: (postLogoutRedirectUri: string) => Promise<void>;
 };
-declare const useHandleSignInCallback: (returnToPageUrl?: string) => {
+declare const useHandleSignInCallback: (callback?: (() => void) | undefined) => {
     isLoading: boolean;
     isAuthenticated: boolean;
     error: Error | undefined;

package/lib/hooks/index.js

@@ -29,10 +29,15 @@ const useErrorHandler = () => {
     }, [setError]);
     return { handleError };
 };
-const useHandleSignInCallback = (returnToPageUrl = window.location.origin) => {
-    const { logtoClient, isAuthenticated, error } = (0, react_1.useContext)(context_1.LogtoContext);
+const useHandleSignInCallback = (callback) => {
+    const { logtoClient, isAuthenticated, error, setIsAuthenticated } = (0, react_1.useContext)(context_1.LogtoContext);
     const { isLoading, setLoadingState } = useLoadingState();
     const { handleError } = useErrorHandler();
+    const callbackRef = (0, react_1.useRef)();
+    (0, react_1.useEffect)(() => {
+        // eslint-disable-next-line @silverhand/fp/no-mutation
+        callbackRef.current = callback; // Update ref to the latest callback.
+    }, [callback]);
     const handleSignInCallback = (0, react_1.useCallback)(async (callbackUri) => {
         if (!logtoClient) {
             return (0, context_1.throwContextError)();
@@ -40,10 +45,8 @@ const useHandleSignInCallback = (returnToPageUrl = window.location.origin) => {
         try {
             setLoadingState(true);
             await logtoClient.handleSignInCallback(callbackUri);
-            // We deliberately do NOT set isAuthenticated to true here, because the app state may change immediately
-            // even before navigating to the return page URL, which might cause rendering problems.
-            // Moreover, since the location will be redirected, the isAuthenticated state will not matter any more.
-            window.location.assign(returnToPageUrl);
+            setIsAuthenticated(true);
+            callbackRef.current?.();
         }
         catch (error) {
             handleError(error, 'Unexpected error occurred while handling sign in callback.');
@@ -51,10 +54,11 @@ const useHandleSignInCallback = (returnToPageUrl = window.location.origin) => {
         finally {
             setLoadingState(false);
         }
-    }, [logtoClient, returnToPageUrl, setLoadingState, handleError]);
+    }, [logtoClient, setLoadingState, setIsAuthenticated, handleError]);
     (0, react_1.useEffect)(() => {
-        if (!isAuthenticated && logtoClient?.isSignInRedirected(window.location.href)) {
-            void handleSignInCallback(window.location.href);
+        const currentPageUrl = window.location.href;
+        if (!isAuthenticated && logtoClient?.isSignInRedirected(currentPageUrl)) {
+            void handleSignInCallback(currentPageUrl);
         }
     }, [handleSignInCallback, isAuthenticated, logtoClient]);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/react",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "main": "./lib/index.js",
   "exports": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -56,5 +56,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5d05c6bd23dc35d7217031edccc01db2bae33b7b"
+  "gitHead": "51665f47934ef390136ee8ff53393f20f9fb8221"
 }