@civic/auth 0.0.1-beta.15 → 0.0.1-beta.17

package/dist/react.d.ts

@@ -1,5 +1,6 @@
-import { U as UserContextType, A as AuthContextType } from './index-Bq3T3FPG.js';
-import { F as ForwardedTokens, C as Config, S as SessionData, D as DisplayMode } from './types-Bfi0hVMZ.js';
+import { U as UserContextType, A as AuthContextType } from './index-DTimUlkB.js';
+import { F as ForwardedTokens, C as Config, S as SessionData, b as EmptyObject, U as User, D as DisplayMode } from './types-HdCjGldB.js';
+import { O as OAuthTokens } from './types-b4c1koXj.js';
 import { ReactNode, RefObject, Dispatch, SetStateAction } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import 'oslo/jwt';
@@ -28,11 +29,7 @@ type AuthProviderProps = {
     onSignOut?: () => void;
     pkceConsumer?: PKCEConsumer;
     modalIframe?: boolean;
-};
-
-type SessionProviderOutput = SessionData & {
-    iframeRef: RefObject<HTMLIFrameElement> | null;
-    setAuthResponseUrl: Dispatch<SetStateAction<string | null>>;
+    sessionData?: SessionData;
 };
 
 type CivicAuthProviderProps = Omit<AuthProviderProps, "pkceConsumer">;
@@ -43,13 +40,13 @@ declare const CivicNextAuthProvider: ({ children, ...props }: NextCivicAuthProvi
 
 declare const useUser: <T extends Record<string, unknown> = Record<string, never>>() => UserContextType<T>;
 
-declare const useUserCookie: () => any;
+declare const useUserCookie: <T extends EmptyObject>() => User<T> | null;
 
 declare const useToken: () => TokenContextType;
 
 declare const useAuth: () => AuthContextType;
 
-declare const useSession: () => SessionProviderOutput;
+declare const useSession: () => SessionData;
 
 type ConfigProviderOutput = {
     config: Config;
@@ -60,6 +57,15 @@ type ConfigProviderOutput = {
 
 declare const useConfig: () => ConfigProviderOutput;
 
+declare const useTokenCookie: (tokenName: OAuthTokens) => string | null;
+
+type IframeProviderOutput = {
+    iframeRef: RefObject<HTMLIFrameElement> | null;
+    setAuthResponseUrl: Dispatch<SetStateAction<string | null>>;
+};
+
+declare const useIframe: () => IframeProviderOutput;
+
 type CivicAuthIframeContainerProps = {
     onClose?: () => void;
     closeOnRedirect?: boolean;
@@ -84,4 +90,4 @@ declare const NextLogOut: ({ children }: {
     children: ReactNode;
 }) => react_jsx_runtime.JSX.Element;
 
-export { AuthContextType, CivicAuthIframeContainer, CivicAuthProvider, type CivicAuthProviderProps, CivicNextAuthProvider, type NextCivicAuthProviderProps, NextLogOut, SignInButton, SignOutButton, type TokenContextType, UserButton, UserContextType, useAuth, useConfig, useSession, useToken, useUser, useUserCookie };
+export { AuthContextType, CivicAuthIframeContainer, CivicAuthProvider, type CivicAuthProviderProps, CivicNextAuthProvider, type NextCivicAuthProviderProps, NextLogOut, SignInButton, SignOutButton, type TokenContextType, UserButton, UserContextType, useAuth, useConfig, useIframe, useSession, useToken, useTokenCookie, useUser, useUserCookie };

package/dist/react.js

@@ -2,7 +2,7 @@
 
 
 
-var _chunkF55XKBNMjs = require('./chunk-F55XKBNM.js');
+var _chunkSEKF2WZXjs = require('./chunk-SEKF2WZX.js');
 
 
 
@@ -17,7 +17,8 @@ var _chunkF55XKBNMjs = require('./chunk-F55XKBNM.js');
 
 
 
-var _chunkF2CKPLXXjs = require('./chunk-F2CKPLXX.js');
+
+var _chunkRF23Q4V6js = require('./chunk-RF23Q4V6.js');
 
 
 
@@ -60,31 +61,15 @@ var useAuth = () => {
 
 // src/react/providers/SessionProvider.tsx
 
-
-
 var _jsxruntime = require('react/jsx-runtime');
 var defaultSession = {
   authenticated: false,
   idToken: void 0,
   accessToken: void 0,
-  displayMode: "iframe",
-  iframeRef: null,
-  setAuthResponseUrl: () => {
-  }
+  displayMode: "iframe"
 };
 var SessionContext = _react.createContext.call(void 0, defaultSession);
-var SessionProvider = ({
-  children,
-  session,
-  iframeRef,
-  setAuthResponseUrl
-}) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-  SessionContext.Provider,
-  {
-    value: _chunkCRTRMMJ7js.__spreadProps.call(void 0, _chunkCRTRMMJ7js.__spreadValues.call(void 0, {}, session || defaultSession), { iframeRef, setAuthResponseUrl }),
-    children
-  }
-);
+var SessionProvider = ({ children, session }) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, SessionContext.Provider, { value: _chunkCRTRMMJ7js.__spreadValues.call(void 0, _chunkCRTRMMJ7js.__spreadValues.call(void 0, {}, defaultSession), session || {}), children });
 
 // src/react/hooks/useSession.tsx
 var useSession = () => {
@@ -116,7 +101,7 @@ var TokenProvider = ({ children }) => {
     const parsedJWT = _jwt.parseJWT.call(void 0, session.idToken);
     if (!parsedJWT) return null;
     const { forwardedTokens } = parsedJWT.payload;
-    return forwardedTokens ? _chunkF2CKPLXXjs.convertForwardedTokenFormat.call(void 0, forwardedTokens) : null;
+    return forwardedTokens ? _chunkRF23Q4V6js.convertForwardedTokenFormat.call(void 0, forwardedTokens) : null;
   }, [session == null ? void 0 : session.idToken]);
   const value = _react.useMemo.call(void 0, 
     () => ({
@@ -167,7 +152,7 @@ var UserProvider = ({
     if (!accessToken) {
       return null;
     }
-    const userSession = new (0, _chunkF2CKPLXXjs.GenericUserSession)(storage);
+    const userSession = new (0, _chunkRF23Q4V6js.GenericUserSession)(storage);
     return userSession.get();
   });
   const {
@@ -272,9 +257,9 @@ var CivicAuthIframe = _react.forwardRef.call(void 0,
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       "iframe",
       {
-        id: _chunkF2CKPLXXjs.IFRAME_ID,
+        id: _chunkRF23Q4V6js.IFRAME_ID,
         ref,
-        className: "cac-h-96 cac-w-80 cac-border-none",
+        className: "cac-h-[26rem] cac-w-80 cac-border-none",
         onLoad
       }
     );
@@ -287,7 +272,7 @@ CivicAuthIframe.displayName = "CivicAuthIframe";
 function NoChrome({
   children
 }) {
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _jsxruntime.Fragment, { children });
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "cac-relative", children });
 }
 function IframeChrome({
   children,
@@ -327,7 +312,7 @@ var CivicAuthIframeContainer = ({
   const [isLoading, setIsLoading] = _react.useState.call(void 0, true);
   const { isLoading: isAuthLoading } = useAuth();
   const config = useConfig();
-  const { setAuthResponseUrl, iframeRef } = useSession();
+  const { setAuthResponseUrl, iframeRef } = useIframe();
   const processIframeUrl = _react.useCallback.call(void 0, () => {
     if (iframeRef && iframeRef.current && iframeRef.current.contentWindow) {
       try {
@@ -335,9 +320,9 @@ var CivicAuthIframeContainer = ({
         if (iframeUrl.startsWith(config.redirectUrl)) {
           setIsLoading(true);
           const iframeBody = iframeRef.current.contentWindow.document.body.innerHTML;
-          if (iframeBody.includes("sameDomainCodeExchangeRequired")) {
+          if (iframeBody.includes(_chunkRF23Q4V6js.TOKEN_EXCHANGE_TRIGGER_TEXT)) {
             console.log(
-              "sameDomainCodeExchangeRequired, calling callback URL again..."
+              `${_chunkRF23Q4V6js.TOKEN_EXCHANGE_TRIGGER_TEXT}, calling callback URL again...`
             );
             const params = new URL(iframeUrl).searchParams;
             fetch(`${config.redirectUrl}?${params.toString()}`);
@@ -382,7 +367,7 @@ var CivicAuthIframeContainer = ({
   const showLoadingIcon = isLoading || isAuthLoading || !((_a = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a.getAttribute("src"));
   const WrapperComponent = config.modalIframe ? IframeChrome : NoChrome;
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, WrapperComponent, { onClose, children: [
-    showLoadingIcon && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "cac-absolute cac-inset-0 cac-flex cac-items-center cac-justify-center cac-rounded-3xl cac-bg-neutral-100", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, LoadingIcon, {}) }),
+    showLoadingIcon && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "cac-absolute cac-inset-0 cac-flex cac-items-center cac-justify-center cac-rounded-3xl cac-bg-white", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, LoadingIcon, {}) }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, CivicAuthIframe, { ref: iframeRef, onLoad: handleIframeLoad })
   ] });
 };
@@ -422,6 +407,23 @@ var ConfigProvider = ({
   }
 );
 
+// src/react/providers/IframeProvider.tsx
+
+
+
+
+var defaultIframe = {
+  iframeRef: null,
+  setAuthResponseUrl: () => {
+  }
+};
+var IframeContext = _react.createContext.call(void 0, defaultIframe);
+var IframeProvider = ({
+  children,
+  iframeRef,
+  setAuthResponseUrl
+}) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, IframeContext.Provider, { value: { iframeRef, setAuthResponseUrl }, children });
+
 // src/shared/AuthProvider.tsx
 
 var globalThisObject;
@@ -434,7 +436,7 @@ if (typeof window !== "undefined") {
 }
 globalThisObject.globalThis = globalThisObject;
 function BlockDisplay({ children }) {
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "cac-absolute cac-left-0 cac-top-0 cac-z-50 cac-flex cac-h-screen cac-w-screen cac-items-center cac-justify-center cac-bg-white", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "cac-absolute cac-inset-0 cac-flex cac-items-center cac-justify-center cac-bg-white", children }) });
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "cac-relative cac-left-0 cac-top-0 cac-z-50 cac-flex cac-h-screen cac-w-screen cac-items-center cac-justify-center cac-bg-white", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "cac-absolute cac-inset-0 cac-flex cac-items-center cac-justify-center cac-bg-white", children }) });
 }
 var AuthProvider = ({
   children,
@@ -445,7 +447,8 @@ var AuthProvider = ({
   onSignOut,
   pkceConsumer,
   nonce,
-  modalIframe = true
+  modalIframe = true,
+  sessionData: inputSessionData
 }) => {
   const [iframeUrl, setIframeUrl] = _react.useState.call(void 0, null);
   const [currentUrl, setCurrentUrl] = _react.useState.call(void 0, null);
@@ -458,11 +461,11 @@ var AuthProvider = ({
   const [isRedirecting, setIsRedirecting] = _react.useState.call(void 0, false);
   const queryClient3 = _reactquery.useQueryClient.call(void 0, );
   const iframeRef = _react.useRef.call(void 0, null);
-  const serverTokenExchange = pkceConsumer instanceof _chunkF2CKPLXXjs.ConfidentialClientPKCEConsumer;
+  const serverTokenExchange = pkceConsumer instanceof _chunkRF23Q4V6js.ConfidentialClientPKCEConsumer;
   _react.useEffect.call(void 0, () => {
     if (typeof globalThis.window !== "undefined") {
       setCurrentUrl(globalThis.window.location.href);
-      const isInIframeVal = _chunkF2CKPLXXjs.isWindowInIframe.call(void 0, globalThis.window);
+      const isInIframeVal = _chunkRF23Q4V6js.isWindowInIframe.call(void 0, globalThis.window);
       setIsInIframe(isInIframeVal);
     }
   }, []);
@@ -473,11 +476,11 @@ var AuthProvider = ({
   const [authService, setAuthService] = _react.useState.call(void 0, );
   _react.useEffect.call(void 0, () => {
     if (!currentUrl) return;
-    _chunkF2CKPLXXjs.BrowserAuthenticationService.build({
+    _chunkRF23Q4V6js.BrowserAuthenticationService.build({
       clientId,
       redirectUrl,
       oauthServer: config.oauthServer,
-      scopes: _chunkF2CKPLXXjs.DEFAULT_SCOPES,
+      scopes: _chunkRF23Q4V6js.DEFAULT_SCOPES,
       displayMode
     }).then(setAuthService);
   }, [currentUrl, clientId, redirectUrl, config, displayMode]);
@@ -498,9 +501,16 @@ var AuthProvider = ({
       if (!authService) {
         return { authenticated: false };
       }
+      if (inputSessionData) {
+        return inputSessionData;
+      }
       const url = new URL(
         authResponseUrl ? authResponseUrl : globalThis.window.location.href || ""
       );
+      const existingSessionData = yield authService.validateExistingSession();
+      if (existingSessionData.authenticated) {
+        return existingSessionData;
+      }
       const code = url.searchParams.get("code");
       const state = url.searchParams.get("state");
       if (!serverTokenExchange && code && state && !isInIframe) {
@@ -511,12 +521,12 @@ var AuthProvider = ({
             state
           });
           yield authService.tokenExchange(code, state);
-          const clientStorage = new (0, _chunkF2CKPLXXjs.LocalStorageAdapter)();
-          const user = yield _chunkF2CKPLXXjs.getUser.call(void 0, clientStorage);
+          const clientStorage = new (0, _chunkRF23Q4V6js.LocalStorageAdapter)();
+          const user = yield _chunkRF23Q4V6js.getUser.call(void 0, clientStorage);
           if (!user) {
             throw new Error("Failed to get user info");
           }
-          const userSession = new (0, _chunkF2CKPLXXjs.GenericUserSession)(clientStorage);
+          const userSession = new (0, _chunkRF23Q4V6js.GenericUserSession)(clientStorage);
           userSession.set(user);
           onSignIn == null ? void 0 : onSignIn();
           return authService.getSessionData();
@@ -528,10 +538,6 @@ var AuthProvider = ({
           return { authenticated: false };
         }
       }
-      const existingSessionData = yield authService.validateExistingSession();
-      if (existingSessionData.authenticated) {
-        return existingSessionData;
-      }
       return existingSessionData;
     })
   });
@@ -564,13 +570,13 @@ var AuthProvider = ({
       if (!pkceConsumer) {
         return null;
       }
-      return browserAuthenticationInitiator || new (0, _chunkF2CKPLXXjs.BrowserAuthenticationInitiator)({
+      return browserAuthenticationInitiator || new (0, _chunkRF23Q4V6js.BrowserAuthenticationInitiator)({
         pkceConsumer,
         // generate and retrieve the challenge client-side
         clientId,
         redirectUrl,
-        state: _chunkF2CKPLXXjs.generateState.call(void 0, useDisplayMode),
-        scopes: _chunkF2CKPLXXjs.DEFAULT_SCOPES,
+        state: _chunkRF23Q4V6js.generateState.call(void 0, useDisplayMode),
+        scopes: _chunkRF23Q4V6js.DEFAULT_SCOPES,
         displayMode: useDisplayMode,
         oauthServer: config.oauthServer,
         // the endpoints to use for the login (if not obtained from the auth server
@@ -607,11 +613,7 @@ var AuthProvider = ({
     () => session ? session.authenticated : false,
     [session]
   );
-  const {
-    data: autoSignIn,
-    isLoading: autoSignInLoading,
-    error: autoSignInError
-  } = _reactquery.useQuery.call(void 0, {
+  _reactquery.useQuery.call(void 0, {
     queryKey: ["autoSignIn", modalIframe, redirectUrl, isAuthenticated],
     queryFn: () => _chunkCRTRMMJ7js.__async.call(void 0, void 0, null, function* () {
       if (!modalIframe && redirectUrl && !isAuthenticated && iframeRef.current) {
@@ -641,12 +643,11 @@ var AuthProvider = ({
       modalIframe,
       serverTokenExchange,
       children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        SessionProvider,
+        IframeProvider,
         {
-          session,
           setAuthResponseUrl,
           iframeRef,
-          children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, TokenProvider, { children: [
+          children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, SessionProvider, { session, children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, TokenProvider, { children: [
             modalIframe && !isInIframe && !(session == null ? void 0 : session.authenticated) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
               "div",
               {
@@ -659,13 +660,13 @@ var AuthProvider = ({
                 )
               }
             ),
-            modalIframe && (isInIframe || isRedirecting || isLoading) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, BlockDisplay, { children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, LoadingIcon, {}) }),
+            modalIframe && (isInIframe || isRedirecting || isLoading && !serverTokenExchange) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, BlockDisplay, { children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, LoadingIcon, {}) }),
             (tokenExchangeError || error) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, BlockDisplay, { children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { children: [
               "Error: ",
               (tokenExchangeError || error).message
             ] }) }),
             children
-          ] })
+          ] }) })
         }
       )
     }
@@ -682,8 +683,8 @@ var CivicAuthProvider = (_a) => {
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _reactquery.QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     AuthProvider,
     _chunkCRTRMMJ7js.__spreadProps.call(void 0, _chunkCRTRMMJ7js.__spreadValues.call(void 0, {}, props), {
-      pkceConsumer: new (0, _chunkF2CKPLXXjs.BrowserPublicClientPKCEProducer)(),
-      children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, UserProvider, { storage: new (0, _chunkF2CKPLXXjs.LocalStorageAdapter)(), children })
+      pkceConsumer: new (0, _chunkRF23Q4V6js.BrowserPublicClientPKCEProducer)(),
+      children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, UserProvider, { storage: new (0, _chunkRF23Q4V6js.LocalStorageAdapter)(), children })
     })
   ) });
 };
@@ -693,6 +694,68 @@ var CivicAuthProvider = (_a) => {
 
 
 
+// src/react/hooks/useTokenCookie.ts
+
+var _navigationjs = require('next/navigation.js');
+
+
+// src/lib/cookies.ts
+var getWindowCookieValue = ({
+  key,
+  window: window2,
+  parseJson = false
+}) => {
+  const cookie = window2.document.cookie;
+  if (!cookie) return null;
+  const cookies = cookie.split(";");
+  for (const c of cookies) {
+    const [name, value] = c.trim().split("=");
+    if (value && name === key) {
+      try {
+        const decodeURIComponentValue = decodeURIComponent(value);
+        return parseJson === true ? JSON.parse(decodeURIComponentValue) : decodeURIComponentValue;
+      } catch (e) {
+        return value;
+      }
+    }
+  }
+  return null;
+};
+
+// src/react/hooks/useTokenCookie.ts
+var getTokenFromCookie = (tokenName) => {
+  return getWindowCookieValue({
+    key: tokenName,
+    window: globalThis.window,
+    parseJson: false
+  });
+};
+var useTokenCookie = (tokenName) => {
+  const hasRunRef = _react.useRef.call(void 0, false);
+  const router = _navigationjs.useRouter.call(void 0, );
+  const { data: token } = _reactquery.useQuery.call(void 0, {
+    queryKey: ["token", tokenName],
+    queryFn: () => getTokenFromCookie(tokenName) || null,
+    refetchInterval: 2e3,
+    refetchIntervalInBackground: true,
+    enabled: !hasRunRef.current,
+    refetchOnWindowFocus: true
+  });
+  _react.useEffect.call(void 0, () => {
+    if (token) {
+      if (!hasRunRef.current) {
+        hasRunRef.current = true;
+        router.refresh();
+      }
+    } else {
+      hasRunRef.current = false;
+    }
+  }, [token, router]);
+  return token != null ? token : null;
+};
+
+// src/react/providers/NextAuthProvider.tsx
+
 var queryClient2 = new (0, _reactquery.QueryClient)();
 var CivicNextAuthProvider = (_a) => {
   var _b = _a, {
@@ -701,18 +764,23 @@ var CivicNextAuthProvider = (_a) => {
     "children"
   ]);
   const [redirectUrl, setRedirectUrl] = _react.useState.call(void 0, "");
-  const { clientId, oauthServer, callbackUrl, challengeUrl, logoutUrl } = _chunkF55XKBNMjs.resolveAuthConfig.call(void 0, );
+  const { clientId, oauthServer, callbackUrl, challengeUrl, logoutUrl } = _chunkSEKF2WZXjs.resolveAuthConfig.call(void 0, );
   _react.useEffect.call(void 0, () => {
     if (typeof globalThis.window !== "undefined") {
       const currentUrl = globalThis.window.location.href;
-      setRedirectUrl(_chunkF55XKBNMjs.resolveCallbackUrl.call(void 0, _chunkF55XKBNMjs.resolveAuthConfig.call(void 0, ), currentUrl));
+      setRedirectUrl(_chunkSEKF2WZXjs.resolveCallbackUrl.call(void 0, _chunkSEKF2WZXjs.resolveAuthConfig.call(void 0, ), currentUrl));
     }
   }, [callbackUrl]);
   const user = useUserCookie();
+  const idToken = useTokenCookie("id_token" /* ID_TOKEN */);
+  const combinedUser = user ? _chunkCRTRMMJ7js.__spreadProps.call(void 0, _chunkCRTRMMJ7js.__spreadValues.call(void 0, {}, user || {}), { idToken }) : null;
+  const sessionData = _chunkCRTRMMJ7js.__spreadValues.call(void 0, {
+    authenticated: !!user
+  }, idToken ? { idToken } : {});
   const signOut = () => _chunkCRTRMMJ7js.__async.call(void 0, void 0, null, function* () {
     var _a2;
-    yield fetch(logoutUrl);
     (_a2 = props.onSignOut) == null ? void 0 : _a2.call(props);
+    window.location.href = logoutUrl;
     return;
   });
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _reactquery.QueryClientProvider, { client: queryClient2, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -721,12 +789,13 @@ var CivicNextAuthProvider = (_a) => {
       redirectUrl,
       config: { oauthServer },
       clientId,
-      pkceConsumer: new (0, _chunkF2CKPLXXjs.ConfidentialClientPKCEConsumer)(challengeUrl),
+      pkceConsumer: new (0, _chunkRF23Q4V6js.ConfidentialClientPKCEConsumer)(challengeUrl),
+      sessionData,
       children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         UserProvider,
         {
-          storage: new (0, _chunkF55XKBNMjs.NextjsClientStorage)(),
-          user,
+          storage: new (0, _chunkSEKF2WZXjs.NextjsClientStorage)(),
+          user: combinedUser,
           signOut,
           children
         }
@@ -746,31 +815,14 @@ var useUser = () => {
 
 // src/react/hooks/useUserCookie.ts
 
-var _navigationjs = require('next/navigation.js');
 
 
-// src/lib/cookies.ts
-var getCookieValue = (key, window2) => {
-  const cookie = window2.document.cookie;
-  if (!cookie) return null;
-  const cookies = cookie.split(";");
-  for (const c of cookies) {
-    const [name, value] = c.trim().split("=");
-    if (value && name === key) {
-      try {
-        return JSON.parse(decodeURIComponent(value));
-      } catch (e) {
-        console.log("Error parsing cookie value", e);
-        return value;
-      }
-    }
-  }
-  return null;
-};
-
-// src/react/hooks/useUserCookie.ts
 var getUserFromCookie = () => {
-  const userCookie = getCookieValue("user", globalThis.window);
+  const userCookie = getWindowCookieValue({
+    key: "user" /* USER */,
+    window: globalThis.window,
+    parseJson: true
+  });
   return userCookie;
 };
 var useUserCookie = () => {
@@ -794,7 +846,7 @@ var useUserCookie = () => {
       hasRunRef.current = false;
     }
   }, [user, router]);
-  return user;
+  return user != null ? user : null;
 };
 
 // src/react/hooks/useConfig.tsx
@@ -807,6 +859,16 @@ var useConfig = () => {
   return context;
 };
 
+// src/react/hooks/useIframe.tsx
+
+var useIframe = () => {
+  const context = _react.useContext.call(void 0, IframeContext);
+  if (!context) {
+    throw new Error("useIframe must be used within an IframeProvider");
+  }
+  return context;
+};
+
 // src/react/components/UserButton.tsx
 
 
@@ -882,7 +944,7 @@ var UserButton = ({
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
         "button",
         {
-          className: _chunkF2CKPLXXjs.cn.call(void 0, 
+          className: _chunkRF23Q4V6js.cn.call(void 0, 
             "cac-flex cac-w-full cac-items-center cac-justify-between cac-gap-2 cac-rounded-full cac-border cac-border-neutral-500 cac-px-3 cac-py-2 cac-text-neutral-500 cac-transition-colors hover:cac-bg-neutral-200 hover:cac-bg-opacity-50",
             className
           ),
@@ -921,7 +983,7 @@ var UserButton = ({
     "button",
     {
       "data-testid": "sign-in-button",
-      className: _chunkF2CKPLXXjs.cn.call(void 0, 
+      className: _chunkRF23Q4V6js.cn.call(void 0, 
         "cac-rounded-full cac-border cac-border-neutral-500 cac-px-3 cac-py-2 cac-transition-colors hover:cac-bg-neutral-200 hover:cac-bg-opacity-50",
         className
       ),
@@ -942,7 +1004,7 @@ var SignInButton = ({
     "button",
     {
       "data-testid": "sign-in-button",
-      className: _chunkF2CKPLXXjs.cn.call(void 0, 
+      className: _chunkRF23Q4V6js.cn.call(void 0, 
         "cac-rounded-full cac-border cac-border-neutral-500 cac-px-3 cac-py-2 cac-transition-colors hover:cac-bg-neutral-200 hover:cac-bg-opacity-50",
         className
       ),
@@ -959,7 +1021,7 @@ var SignOutButton = ({ className }) => {
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     "button",
     {
-      className: _chunkF2CKPLXXjs.cn.call(void 0, 
+      className: _chunkRF23Q4V6js.cn.call(void 0, 
         "cac-rounded-full cac-border cac-border-neutral-500 cac-px-3 cac-py-2 cac-transition-colors hover:cac-bg-neutral-200 hover:cac-bg-opacity-50",
         className
       ),
@@ -972,7 +1034,7 @@ var SignOutButton = ({ className }) => {
 // src/react/components/NextLogOut.tsx
 
 var NextLogOut = ({ children }) => {
-  const config = _chunkF55XKBNMjs.resolveAuthConfig.call(void 0, );
+  const config = _chunkSEKF2WZXjs.resolveAuthConfig.call(void 0, );
   const logoutUrl = `${config.logoutUrl}`;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "a", { href: logoutUrl, children });
 };
@@ -990,5 +1052,7 @@ var NextLogOut = ({ children }) => {
 
 
 
-exports.CivicAuthIframeContainer = CivicAuthIframeContainer; exports.CivicAuthProvider = CivicAuthProvider; exports.CivicNextAuthProvider = CivicNextAuthProvider; exports.NextLogOut = NextLogOut; exports.SignInButton = SignInButton; exports.SignOutButton = SignOutButton; exports.UserButton = UserButton; exports.useAuth = useAuth; exports.useConfig = useConfig; exports.useSession = useSession; exports.useToken = useToken; exports.useUser = useUser; exports.useUserCookie = useUserCookie;
+
+
+exports.CivicAuthIframeContainer = CivicAuthIframeContainer; exports.CivicAuthProvider = CivicAuthProvider; exports.CivicNextAuthProvider = CivicNextAuthProvider; exports.NextLogOut = NextLogOut; exports.SignInButton = SignInButton; exports.SignOutButton = SignOutButton; exports.UserButton = UserButton; exports.useAuth = useAuth; exports.useConfig = useConfig; exports.useIframe = useIframe; exports.useSession = useSession; exports.useToken = useToken; exports.useTokenCookie = useTokenCookie; exports.useUser = useUser; exports.useUserCookie = useUserCookie;
 //# sourceMappingURL=react.js.map