@civic/auth 0.0.1-beta.12 → 0.0.1-beta.14

package/dist/react.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkEM4APQVYjs = require('./chunk-EM4APQVY.js');
 
+var _chunkF55XKBNMjs = require('./chunk-F55XKBNM.js');
 
 
 
@@ -15,7 +15,9 @@ var _chunkEM4APQVYjs = require('./chunk-EM4APQVY.js');
 
 
 
-var _chunk2SAT3UFJjs = require('./chunk-2SAT3UFJ.js');
+
+
+var _chunkF2CKPLXXjs = require('./chunk-F2CKPLXX.js');
 
 
 
@@ -26,7 +28,7 @@ var _chunkCRTRMMJ7js = require('./chunk-CRTRMMJ7.js');
 // src/react/hooks/useUser.tsx
 var _react = require('react');
 
-// src/react/providers/UserProvider.tsx
+// src/shared/UserProvider.tsx
 
 var _reactquery = require('@tanstack/react-query');
 
@@ -96,20 +98,6 @@ var useSession = () => {
 // src/react/providers/TokenProvider.tsx
 var _jwt = require('oslo/jwt');
 
-// src/lib/jwt.ts
-var convertForwardedTokenFormat = (inputTokens) => Object.fromEntries(
-  Object.entries(inputTokens).map(([source, tokens]) => [
-    source,
-    {
-      idToken: tokens == null ? void 0 : tokens.id_token,
-      accessToken: tokens == null ? void 0 : tokens.access_token,
-      refreshToken: tokens == null ? void 0 : tokens.refresh_token
-    }
-  ])
-);
-
-// src/react/providers/TokenProvider.tsx
-
 var TokenContext = _react.createContext.call(void 0, void 0);
 var TokenProvider = ({ children }) => {
   const { isLoading, error: authError } = useAuth();
@@ -128,7 +116,7 @@ var TokenProvider = ({ children }) => {
     const parsedJWT = _jwt.parseJWT.call(void 0, session.idToken);
     if (!parsedJWT) return null;
     const { forwardedTokens } = parsedJWT.payload;
-    return forwardedTokens ? convertForwardedTokenFormat(forwardedTokens) : null;
+    return forwardedTokens ? _chunkF2CKPLXXjs.convertForwardedTokenFormat.call(void 0, forwardedTokens) : null;
   }, [session == null ? void 0 : session.idToken]);
   const value = _react.useMemo.call(void 0, 
     () => ({
@@ -161,13 +149,16 @@ var useToken = () => {
   return context;
 };
 
-// src/react/providers/UserProvider.tsx
+// src/shared/UserProvider.tsx
 
 var UserContext = _react.createContext.call(void 0, null);
 var UserProvider = ({
   children,
-  storage
+  storage,
+  user: inputUser,
+  signOut: inputSignOut
 }) => {
+  var _a;
   const { isLoading: authLoading, error: authError } = useAuth();
   const session = useSession();
   const { accessToken } = useToken();
@@ -176,7 +167,7 @@ var UserProvider = ({
     if (!accessToken) {
       return null;
     }
-    const userSession = new (0, _chunk2SAT3UFJjs.GenericUserSession)(storage);
+    const userSession = new (0, _chunkF2CKPLXXjs.GenericUserSession)(storage);
     return userSession.get();
   });
   const {
@@ -195,11 +186,11 @@ var UserProvider = ({
     UserContext.Provider,
     {
       value: {
-        user: user != null ? user : null,
+        user: (_a = inputUser || user) != null ? _a : null,
         isLoading,
         error,
         signIn,
-        signOut
+        signOut: inputSignOut || signOut
       },
       children
     }
@@ -281,7 +272,7 @@ var CivicAuthIframe = _react.forwardRef.call(void 0,
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       "iframe",
       {
-        id: _chunk2SAT3UFJjs.IFRAME_ID,
+        id: _chunkF2CKPLXXjs.IFRAME_ID,
         ref,
         className: "cac-h-96 cac-w-80 cac-border-none",
         onLoad
@@ -336,16 +327,19 @@ var CivicAuthIframeContainer = ({
   const [isLoading, setIsLoading] = _react.useState.call(void 0, true);
   const { isLoading: isAuthLoading } = useAuth();
   const config = useConfig();
-  const { serverTokenExchange } = config;
   const { setAuthResponseUrl, iframeRef } = useSession();
   const processIframeUrl = _react.useCallback.call(void 0, () => {
     if (iframeRef && iframeRef.current && iframeRef.current.contentWindow) {
       try {
         const iframeUrl = iframeRef.current.contentWindow.location.href;
         if (iframeUrl.startsWith(config.redirectUrl)) {
-          if (serverTokenExchange) {
+          setIsLoading(true);
+          const iframeBody = iframeRef.current.contentWindow.document.body.innerHTML;
+          if (iframeBody.includes("sameDomainCodeExchangeRequired")) {
+            console.log(
+              "sameDomainCodeExchangeRequired, calling callback URL again..."
+            );
             const params = new URL(iframeUrl).searchParams;
-            params.set("tokenExchange", "true");
             fetch(`${config.redirectUrl}?${params.toString()}`);
           } else {
             setAuthResponseUrl(iframeUrl);
@@ -363,7 +357,6 @@ var CivicAuthIframeContainer = ({
     config.redirectUrl,
     iframeRef,
     onClose,
-    serverTokenExchange,
     setAuthResponseUrl
   ]);
   const intervalId = _react.useRef.call(void 0, );
@@ -388,6 +381,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;
+  console.log("CivicAuthIframeContainer showLoadingIcon", showLoadingIcon);
   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, {}) }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, CivicAuthIframe, { ref: iframeRef, onLoad: handleIframeLoad })
@@ -465,11 +459,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 _chunk2SAT3UFJjs.ConfidentialClientPKCEConsumer;
+  const serverTokenExchange = pkceConsumer instanceof _chunkF2CKPLXXjs.ConfidentialClientPKCEConsumer;
   _react.useEffect.call(void 0, () => {
     if (typeof globalThis.window !== "undefined") {
       setCurrentUrl(globalThis.window.location.href);
-      const isInIframeVal = _chunk2SAT3UFJjs.isWindowInIframe.call(void 0, globalThis.window);
+      const isInIframeVal = _chunkF2CKPLXXjs.isWindowInIframe.call(void 0, globalThis.window);
       setIsInIframe(isInIframeVal);
     }
   }, []);
@@ -480,11 +474,11 @@ var AuthProvider = ({
   const [authService, setAuthService] = _react.useState.call(void 0, );
   _react.useEffect.call(void 0, () => {
     if (!currentUrl) return;
-    _chunk2SAT3UFJjs.BrowserAuthenticationService.build({
+    _chunkF2CKPLXXjs.BrowserAuthenticationService.build({
       clientId,
       redirectUrl,
       oauthServer: config.oauthServer,
-      scopes: _chunk2SAT3UFJjs.DEFAULT_SCOPES,
+      scopes: _chunkF2CKPLXXjs.DEFAULT_SCOPES,
       displayMode
     }).then(setAuthService);
   }, [currentUrl, clientId, redirectUrl, config, displayMode]);
@@ -518,12 +512,12 @@ var AuthProvider = ({
             state
           });
           yield authService.tokenExchange(code, state);
-          const clientStorage = new (0, _chunk2SAT3UFJjs.LocalStorageAdapter)();
-          const user = yield _chunk2SAT3UFJjs.getUser.call(void 0, clientStorage);
+          const clientStorage = new (0, _chunkF2CKPLXXjs.LocalStorageAdapter)();
+          const user = yield _chunkF2CKPLXXjs.getUser.call(void 0, clientStorage);
           if (!user) {
             throw new Error("Failed to get user info");
           }
-          const userSession = new (0, _chunk2SAT3UFJjs.GenericUserSession)(clientStorage);
+          const userSession = new (0, _chunkF2CKPLXXjs.GenericUserSession)(clientStorage);
           userSession.set(user);
           onSignIn == null ? void 0 : onSignIn();
           return authService.getSessionData();
@@ -571,13 +565,13 @@ var AuthProvider = ({
       if (!pkceConsumer) {
         return null;
       }
-      return browserAuthenticationInitiator || new (0, _chunk2SAT3UFJjs.BrowserAuthenticationInitiator)({
+      return browserAuthenticationInitiator || new (0, _chunkF2CKPLXXjs.BrowserAuthenticationInitiator)({
         pkceConsumer,
         // generate and retrieve the challenge client-side
         clientId,
         redirectUrl,
-        state: _chunk2SAT3UFJjs.generateState.call(void 0, useDisplayMode),
-        scopes: _chunk2SAT3UFJjs.DEFAULT_SCOPES,
+        state: _chunkF2CKPLXXjs.generateState.call(void 0, useDisplayMode),
+        scopes: _chunkF2CKPLXXjs.DEFAULT_SCOPES,
         displayMode: useDisplayMode,
         oauthServer: config.oauthServer,
         // the endpoints to use for the login (if not obtained from the auth server
@@ -653,7 +647,7 @@ var AuthProvider = ({
           session,
           setAuthResponseUrl,
           iframeRef,
-          children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, TokenProvider, { children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, UserProvider, { storage: new (0, _chunk2SAT3UFJjs.LocalStorageAdapter)(), children: [
+          children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, TokenProvider, { children: [
             modalIframe && !isInIframe && !(session == null ? void 0 : session.authenticated) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
               "div",
               {
@@ -672,7 +666,7 @@ var AuthProvider = ({
               (tokenExchangeError || error).message
             ] }) }),
             children
-          ] }) })
+          ] })
         }
       )
     }
@@ -689,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, _chunk2SAT3UFJjs.BrowserPublicClientPKCEProducer)(),
-      children
+      pkceConsumer: new (0, _chunkF2CKPLXXjs.BrowserPublicClientPKCEProducer)(),
+      children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, UserProvider, { storage: new (0, _chunkF2CKPLXXjs.LocalStorageAdapter)(), children })
     })
   ) });
 };
@@ -698,6 +692,57 @@ var CivicAuthProvider = (_a) => {
 // src/react/providers/NextAuthProvider.tsx
 
 
+
+
+var queryClient2 = new (0, _reactquery.QueryClient)();
+var CivicNextAuthProvider = (_a) => {
+  var _b = _a, {
+    children
+  } = _b, props = _chunkCRTRMMJ7js.__objRest.call(void 0, _b, [
+    "children"
+  ]);
+  const [redirectUrl, setRedirectUrl] = _react.useState.call(void 0, "");
+  const { clientId, oauthServer, callbackUrl, challengeUrl, logoutUrl } = _chunkF55XKBNMjs.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));
+    }
+  }, [callbackUrl]);
+  const user = useUserCookie();
+  const signOut = () => _chunkCRTRMMJ7js.__async.call(void 0, void 0, null, function* () {
+    yield fetch(logoutUrl);
+    return;
+  });
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _reactquery.QueryClientProvider, { client: queryClient2, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+    AuthProvider,
+    _chunkCRTRMMJ7js.__spreadProps.call(void 0, _chunkCRTRMMJ7js.__spreadValues.call(void 0, {}, props), {
+      redirectUrl,
+      config: { oauthServer },
+      clientId,
+      pkceConsumer: new (0, _chunkF2CKPLXXjs.ConfidentialClientPKCEConsumer)(challengeUrl),
+      children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        UserProvider,
+        {
+          storage: new (0, _chunkF55XKBNMjs.NextjsClientStorage)(),
+          user,
+          signOut,
+          children
+        }
+      )
+    })
+  ) });
+};
+
+// src/react/hooks/useUser.tsx
+var useUser = () => {
+  const context = _react.useContext.call(void 0, UserContext);
+  if (!context) {
+    throw new Error("useUser must be used within a UserProvider");
+  }
+  return context;
+};
+
 // src/react/hooks/useUserCookie.ts
 
 var _navigationjs = require('next/navigation.js');
@@ -751,50 +796,6 @@ var useUserCookie = () => {
   return user;
 };
 
-// src/react/providers/NextAuthProvider.tsx
-
-
-
-var queryClient2 = new (0, _reactquery.QueryClient)();
-var defaultUserContext = { user: null };
-var UserContext2 = _react.createContext.call(void 0, defaultUserContext);
-var CivicNextAuthProvider = (_a) => {
-  var _b = _a, {
-    children
-  } = _b, props = _chunkCRTRMMJ7js.__objRest.call(void 0, _b, [
-    "children"
-  ]);
-  const user = useUserCookie();
-  const [redirectUrl, setRedirectUrl] = _react.useState.call(void 0, "");
-  const { clientId, oauthServer, callbackUrl, challengeUrl } = _chunkEM4APQVYjs.resolveAuthConfig.call(void 0, );
-  _react.useEffect.call(void 0, () => {
-    if (typeof globalThis.window !== "undefined") {
-      const currentUrl = globalThis.window.location.href;
-      setRedirectUrl(_chunkEM4APQVYjs.resolveCallbackUrl.call(void 0, _chunkEM4APQVYjs.resolveAuthConfig.call(void 0, ), currentUrl));
-    }
-  }, [callbackUrl]);
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _reactquery.QueryClientProvider, { client: queryClient2, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    AuthProvider,
-    _chunkCRTRMMJ7js.__spreadProps.call(void 0, _chunkCRTRMMJ7js.__spreadValues.call(void 0, {}, props), {
-      redirectUrl,
-      config: { oauthServer },
-      clientId,
-      pkceConsumer: new (0, _chunk2SAT3UFJjs.ConfidentialClientPKCEConsumer)(challengeUrl),
-      children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, UserContext2.Provider, { value: user, children })
-    })
-  ) });
-};
-var useNextUser = () => _react.useContext.call(void 0, UserContext2);
-
-// src/react/hooks/useUser.tsx
-var useUser = () => {
-  const context = _react.useContext.call(void 0, UserContext);
-  if (!context) {
-    throw new Error("useUser must be used within a UserProvider");
-  }
-  return context;
-};
-
 // src/react/hooks/useConfig.tsx
 
 var useConfig = () => {
@@ -845,8 +846,7 @@ var UserButton = ({
   className
 }) => {
   const [isOpen, setIsOpen] = _react.useState.call(void 0, false);
-  const { signIn, isAuthenticated, signOut } = useAuth();
-  const { user } = useUser();
+  const { user, signIn, signOut } = useUser();
   const handleClickOutside = _react.useCallback.call(void 0, (event) => {
     const target = event.target;
     if (!target.closest("#civic-dropdown-container")) {
@@ -854,7 +854,7 @@ var UserButton = ({
     }
   }, []);
   const handleSignOut = _react.useCallback.call(void 0, () => _chunkCRTRMMJ7js.__async.call(void 0, void 0, null, function* () {
-    yield signOut();
+    signOut();
     setIsOpen(false);
   }), [signOut]);
   const handleSignIn = _react.useCallback.call(void 0, () => _chunkCRTRMMJ7js.__async.call(void 0, void 0, null, function* () {
@@ -876,12 +876,12 @@ var UserButton = ({
       window.removeEventListener("keydown", handleEscape);
     };
   }, [handleClickOutside, handleEscape, isOpen]);
-  if (isAuthenticated) {
+  if (user) {
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "cac-relative", id: "civic-dropdown-container", children: [
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
         "button",
         {
-          className: _chunk2SAT3UFJjs.cn.call(void 0, 
+          className: _chunkF2CKPLXXjs.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
           ),
@@ -920,7 +920,7 @@ var UserButton = ({
     "button",
     {
       "data-testid": "sign-in-button",
-      className: _chunk2SAT3UFJjs.cn.call(void 0, 
+      className: _chunkF2CKPLXXjs.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
       ),
@@ -936,12 +936,12 @@ var SignInButton = ({
   displayMode,
   className
 }) => {
-  const { signIn } = useAuth();
+  const { signIn } = useUser();
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     "button",
     {
       "data-testid": "sign-in-button",
-      className: _chunk2SAT3UFJjs.cn.call(void 0, 
+      className: _chunkF2CKPLXXjs.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
       ),
@@ -954,11 +954,11 @@ var SignInButton = ({
 // src/react/components/SignOutButton.tsx
 
 var SignOutButton = ({ className }) => {
-  const { signOut } = useAuth();
+  const { signOut } = useUser();
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     "button",
     {
-      className: _chunk2SAT3UFJjs.cn.call(void 0, 
+      className: _chunkF2CKPLXXjs.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
       ),
@@ -971,7 +971,7 @@ var SignOutButton = ({ className }) => {
 // src/react/components/NextLogOut.tsx
 
 var NextLogOut = ({ children }) => {
-  const config = _chunkEM4APQVYjs.resolveAuthConfig.call(void 0, );
+  const config = _chunkF55XKBNMjs.resolveAuthConfig.call(void 0, );
   const logoutUrl = `${config.logoutUrl}`;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "a", { href: logoutUrl, children });
 };
@@ -989,6 +989,5 @@ 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.useNextUser = useNextUser; 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.useSession = useSession; exports.useToken = useToken; exports.useUser = useUser; exports.useUserCookie = useUserCookie;
 //# sourceMappingURL=react.js.map