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

package/dist/node/client/index.cjs

@@ -267,7 +267,6 @@ function useAccessToken() {
 function useHydratedData(props, fetcher) {
   const { getAccessToken, auth } = useImmutableAuth();
   const {
-    session,
     ssr,
     data: serverData,
     fetchError
@@ -301,12 +300,7 @@ function useHydratedData(props, fetcher) {
     setIsLoading(true);
     setError(null);
     try {
-      let token;
-      if (ssr && session?.accessToken) {
-        token = session.accessToken;
-      } else {
-        token = await getAccessToken();
-      }
+      const token = await getAccessToken();
       const result = await fetcher(token);
       setData(result);
     } catch (err) {
@@ -314,7 +308,7 @@ function useHydratedData(props, fetcher) {
     } finally {
       setIsLoading(false);
     }
-  }, [session, ssr, fetcher, getAccessToken]);
+  }, [fetcher, getAccessToken]);
   (0, import_react.useEffect)(() => {
     if (hasFetchedRef.current) return;
     if (!needsClientFetch) return;
@@ -336,6 +330,12 @@ var import_navigation = require("next/navigation");
 var import_react4 = require("next-auth/react");
 var import_auth3 = require("@imtbl/auth");
 var import_jsx_runtime2 = require("react/jsx-runtime");
+function getSearchParams() {
+  if (typeof window === "undefined") {
+    return new URLSearchParams();
+  }
+  return new URLSearchParams(window.location.search);
+}
 function CallbackPage({
   config,
   redirectTo = "/",
@@ -345,15 +345,16 @@ function CallbackPage({
   onError
 }) {
   const router = (0, import_navigation.useRouter)();
-  const searchParams = (0, import_navigation.useSearchParams)();
   const [error, setError] = (0, import_react3.useState)(null);
   const callbackProcessedRef = (0, import_react3.useRef)(false);
   (0, import_react3.useEffect)(() => {
+    const searchParams = getSearchParams();
     const handleCallback = async () => {
       try {
         const auth = new import_auth3.Auth({
           clientId: config.clientId,
           redirectUri: config.redirectUri,
+          popupRedirectUri: config.popupRedirectUri,
           logoutRedirectUri: config.logoutRedirectUri,
           audience: config.audience || DEFAULT_AUDIENCE,
           scope: config.scope || DEFAULT_SCOPE,
@@ -448,7 +449,7 @@ function CallbackPage({
       onError(errorMessage);
     }
     setError(errorMessage);
-  }, [searchParams, router, config, redirectTo, onSuccess, onError]);
+  }, [router, config, redirectTo, onSuccess, onError]);
   if (error) {
     if (errorComponent) {
       return errorComponent(error);

package/dist/node/client/index.js

@@ -253,7 +253,6 @@ function useAccessToken() {
 function useHydratedData(props, fetcher) {
   const { getAccessToken, auth } = useImmutableAuth();
   const {
-    session,
     ssr,
     data: serverData,
     fetchError
@@ -287,12 +286,7 @@ function useHydratedData(props, fetcher) {
     setIsLoading(true);
     setError(null);
     try {
-      let token;
-      if (ssr && session?.accessToken) {
-        token = session.accessToken;
-      } else {
-        token = await getAccessToken();
-      }
+      const token = await getAccessToken();
       const result = await fetcher(token);
       setData(result);
     } catch (err) {
@@ -300,7 +294,7 @@ function useHydratedData(props, fetcher) {
     } finally {
       setIsLoading(false);
     }
-  }, [session, ssr, fetcher, getAccessToken]);
+  }, [fetcher, getAccessToken]);
   useEffect(() => {
     if (hasFetchedRef.current) return;
     if (!needsClientFetch) return;
@@ -318,10 +312,16 @@ function useHydratedData(props, fetcher) {
 
 // src/client/callback.tsx
 import { useEffect as useEffect2, useState as useState2, useRef as useRef2 } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import { signIn as signIn2 } from "next-auth/react";
 import { Auth as Auth2 } from "@imtbl/auth";
 import { jsx as jsx2, jsxs } from "react/jsx-runtime";
+function getSearchParams() {
+  if (typeof window === "undefined") {
+    return new URLSearchParams();
+  }
+  return new URLSearchParams(window.location.search);
+}
 function CallbackPage({
   config,
   redirectTo = "/",
@@ -331,15 +331,16 @@ function CallbackPage({
   onError
 }) {
   const router = useRouter();
-  const searchParams = useSearchParams();
   const [error, setError] = useState2(null);
   const callbackProcessedRef = useRef2(false);
   useEffect2(() => {
+    const searchParams = getSearchParams();
     const handleCallback = async () => {
       try {
         const auth = new Auth2({
           clientId: config.clientId,
           redirectUri: config.redirectUri,
+          popupRedirectUri: config.popupRedirectUri,
           logoutRedirectUri: config.logoutRedirectUri,
           audience: config.audience || DEFAULT_AUDIENCE,
           scope: config.scope || DEFAULT_SCOPE,
@@ -434,7 +435,7 @@ function CallbackPage({
       onError(errorMessage);
     }
     setError(errorMessage);
-  }, [searchParams, router, config, redirectTo, onSuccess, onError]);
+  }, [router, config, redirectTo, onSuccess, onError]);
   if (error) {
     if (errorComponent) {
       return errorComponent(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imtbl/auth-nextjs",
-  "version": "2.12.5-alpha.2",
+  "version": "2.12.5-alpha.3",
   "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.2"
+    "@imtbl/auth": "2.12.5-alpha.3"
   },
   "peerDependencies": {
     "next": "14.2.25",