@imtbl/auth-nextjs 2.12.5-alpha.1 → 2.12.5-alpha.2

package/dist/node/client/index.cjs

@@ -265,19 +265,38 @@ function useAccessToken() {
   return getAccessToken;
 }
 function useHydratedData(props, fetcher) {
-  const { getAccessToken } = useImmutableAuth();
+  const { getAccessToken, auth } = useImmutableAuth();
   const {
     session,
     ssr,
     data: serverData,
     fetchError
   } = props;
-  const needsClientFetch = !ssr || Boolean(fetchError) || serverData === null;
+  const needsClientFetch = !ssr || Boolean(fetchError);
   const [data, setData] = (0, import_react.useState)(serverData);
   const [isLoading, setIsLoading] = (0, import_react.useState)(needsClientFetch);
   const [error, setError] = (0, import_react.useState)(
     fetchError ? new Error(fetchError) : null
   );
+  const hasFetchedRef = (0, import_react.useRef)(false);
+  const prevPropsRef = (0, import_react.useRef)({ serverData, ssr, fetchError });
+  (0, import_react.useEffect)(() => {
+    const prevProps = prevPropsRef.current;
+    const propsChanged = prevProps.serverData !== serverData || prevProps.ssr !== ssr || prevProps.fetchError !== fetchError;
+    if (propsChanged) {
+      prevPropsRef.current = { serverData, ssr, fetchError };
+      hasFetchedRef.current = false;
+      if (ssr && !fetchError) {
+        setData(serverData);
+        setIsLoading(false);
+        setError(null);
+      } else {
+        setData(null);
+        setIsLoading(true);
+        setError(fetchError ? new Error(fetchError) : null);
+      }
+    }
+  }, [serverData, ssr, fetchError]);
   const fetchData = (0, import_react.useCallback)(async () => {
     setIsLoading(true);
     setError(null);
@@ -297,10 +316,12 @@ function useHydratedData(props, fetcher) {
     }
   }, [session, ssr, fetcher, getAccessToken]);
   (0, import_react.useEffect)(() => {
-    if (needsClientFetch) {
-      fetchData();
-    }
-  }, []);
+    if (hasFetchedRef.current) return;
+    if (!needsClientFetch) return;
+    if (!ssr && !auth) return;
+    hasFetchedRef.current = true;
+    fetchData();
+  }, [needsClientFetch, ssr, auth, fetchData]);
   return {
     data,
     isLoading,

package/dist/node/client/index.js

@@ -251,19 +251,38 @@ function useAccessToken() {
   return getAccessToken;
 }
 function useHydratedData(props, fetcher) {
-  const { getAccessToken } = useImmutableAuth();
+  const { getAccessToken, auth } = useImmutableAuth();
   const {
     session,
     ssr,
     data: serverData,
     fetchError
   } = props;
-  const needsClientFetch = !ssr || Boolean(fetchError) || serverData === null;
+  const needsClientFetch = !ssr || Boolean(fetchError);
   const [data, setData] = useState(serverData);
   const [isLoading, setIsLoading] = useState(needsClientFetch);
   const [error, setError] = useState(
     fetchError ? new Error(fetchError) : null
   );
+  const hasFetchedRef = useRef(false);
+  const prevPropsRef = useRef({ serverData, ssr, fetchError });
+  useEffect(() => {
+    const prevProps = prevPropsRef.current;
+    const propsChanged = prevProps.serverData !== serverData || prevProps.ssr !== ssr || prevProps.fetchError !== fetchError;
+    if (propsChanged) {
+      prevPropsRef.current = { serverData, ssr, fetchError };
+      hasFetchedRef.current = false;
+      if (ssr && !fetchError) {
+        setData(serverData);
+        setIsLoading(false);
+        setError(null);
+      } else {
+        setData(null);
+        setIsLoading(true);
+        setError(fetchError ? new Error(fetchError) : null);
+      }
+    }
+  }, [serverData, ssr, fetchError]);
   const fetchData = useCallback(async () => {
     setIsLoading(true);
     setError(null);
@@ -283,10 +302,12 @@ function useHydratedData(props, fetcher) {
     }
   }, [session, ssr, fetcher, getAccessToken]);
   useEffect(() => {
-    if (needsClientFetch) {
-      fetchData();
-    }
-  }, []);
+    if (hasFetchedRef.current) return;
+    if (!needsClientFetch) return;
+    if (!ssr && !auth) return;
+    hasFetchedRef.current = true;
+    fetchData();
+  }, [needsClientFetch, ssr, auth, fetchData]);
   return {
     data,
     isLoading,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imtbl/auth-nextjs",
-  "version": "2.12.5-alpha.1",
+  "version": "2.12.5-alpha.2",
   "description": "Next.js App Router authentication integration for Immutable SDK using Auth.js v5",
   "author": "Immutable",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",
@@ -51,7 +51,7 @@
     "dist"
   ],
   "dependencies": {
-    "@imtbl/auth": "2.12.5-alpha.1"
+    "@imtbl/auth": "2.12.5-alpha.2"
   },
   "peerDependencies": {
     "next": "14.2.25",