@axa-fr/react-oidc 7.26.5 → 7.26.7

package/README.md

@@ -120,6 +120,13 @@ trustedDomains.config_with_dpop = {
 
 // Setting allowMultiTabLogin to true will enable storing login-specific parameters (state, nonce, code verifier)
 // separately for each tab. This will prevent errors when logins are initiated from multiple tabs.
+// IMPORTANT: When allowMultiTabLogin is true, you MUST use the OIDC fetch provided by useOidcFetch()
+// or withOidcFetch() for API requests. The service worker embeds a tab-specific token placeholder
+// in the Authorization header, which it then replaces with the real access token.
+// Using a plain fetch or axios without the OIDC fetch wrapper will result in requests being sent
+// without an Authorization header (401 errors), because the service worker cannot determine which
+// tab's token to inject without the placeholder.
+// Example with axios: configure it to use the OIDC fetch as its adapter or use the OIDC fetch directly.
 trustedDomains.config_multi_tab_login = {
   domains: ['https://demo.duendesoftware.com'],
   allowMultiTabLogin: true,

package/dist/index.js

@@ -1,122 +1,122 @@
-import { jsx as i, jsxs as S, Fragment as m } from "react/jsx-runtime";
-import { OidcClient as c, getParseQueryStringFromLocation as Q, getPath as O, OidcLocation as F, getFetchDefault as J } from "@axa-fr/oidc-client";
-import { OidcClient as Ue, OidcLocation as Me, TokenAutomaticRenewMode as Fe, TokenRenewMode as qe } from "@axa-fr/oidc-client";
-import V, { useCallback as X, useState as p, useEffect as v } from "react";
-const x = "default", Z = (t, s, e = !1) => async (...n) => await s().fetchWithTokens(t, e)(...n), Ce = (t = null, s = x, e = !1) => (n) => (o) => {
-  const { fetch: r } = ee(
+import { jsx as i, jsxs as E, Fragment as m } from "react/jsx-runtime";
+import { OidcClient as c, getParseQueryStringFromLocation as Q, getPath as A, OidcLocation as F, getFetchDefault as J } from "@axa-fr/oidc-client";
+import { OidcClient as Me, OidcLocation as Fe, TokenAutomaticRenewMode as qe, TokenRenewMode as De } from "@axa-fr/oidc-client";
+import V, { useCallback as X, useState as f, useEffect as v, useRef as Z } from "react";
+const R = "default", ee = (t, n, e = !1) => async (...s) => await n().fetchWithTokens(t, e)(...s), Ae = (t = null, n = R, e = !1) => (s) => (o) => {
+  const { fetch: r } = te(
     t || o.fetch,
-    s,
+    n,
     e
   );
-  return /* @__PURE__ */ i(n, { ...o, fetch: r });
-}, ee = (t = null, s = x, e = !1) => {
-  const n = t || window.fetch, o = c.get;
+  return /* @__PURE__ */ i(s, { ...o, fetch: r });
+}, te = (t = null, n = R, e = !1) => {
+  const s = t || window.fetch, o = c.get;
   return { fetch: X(
-    (d, l) => Z(
-      n,
-      () => o(s),
+    (d, l) => ee(
+      s,
+      () => o(n),
       e
     )(d, l),
-    [n, s, e]
+    [s, n, e]
   ) };
-}, W = () => /* @__PURE__ */ i("div", { className: "oidc-authenticating", children: /* @__PURE__ */ S("div", { className: "oidc-authenticating__container", children: [
+}, x = () => /* @__PURE__ */ i("div", { className: "oidc-authenticating", children: /* @__PURE__ */ E("div", { className: "oidc-authenticating__container", children: [
   /* @__PURE__ */ i("h1", { className: "oidc-authenticating__title", children: "Error authentication" }),
   /* @__PURE__ */ i("p", { className: "oidc-authenticating__content", children: "An error occurred during authentication." })
-] }) }), te = () => /* @__PURE__ */ i("div", { className: "oidc-authenticating", children: /* @__PURE__ */ S("div", { className: "oidc-authenticating__container", children: [
+] }) }), ne = () => /* @__PURE__ */ i("div", { className: "oidc-authenticating", children: /* @__PURE__ */ E("div", { className: "oidc-authenticating__container", children: [
   /* @__PURE__ */ i("h1", { className: "oidc-authenticating__title", children: "Authentication in progress" }),
   /* @__PURE__ */ i("p", { className: "oidc-authenticating__content", children: "You will be redirected to the login page." })
-] }) }), se = () => Math.random().toString(36).slice(2, 8), ne = (t, s) => (e, n) => {
+] }) }), se = () => Math.random().toString(36).slice(2, 8), oe = (t, n) => (e, s) => {
   if (typeof t.CustomEvent == "function")
-    return new t.CustomEvent(e, n);
-  const o = n || { bubbles: !1, cancelable: !1, detail: void 0 }, r = s.createEvent("CustomEvent");
+    return new t.CustomEvent(e, s);
+  const o = s || { bubbles: !1, cancelable: !1, detail: void 0 }, r = n.createEvent("CustomEvent");
   return r.initCustomEvent(
     e,
     o.bubbles,
     o.cancelable,
     o.detail
   ), r.prototype = t.Event.prototype, r;
-}, oe = (t, s, e) => ({
-  replaceState: (n, o) => {
+}, ce = (t, n, e) => ({
+  replaceState: (s, o) => {
     const r = e(), d = o || t.history.state;
-    t.history.replaceState({ key: r, state: d }, null, n), t.dispatchEvent(s("popstate"));
+    t.history.replaceState({ key: r, state: d }, null, s), t.dispatchEvent(n("popstate"));
   }
-}), ce = () => oe(window, ne(window, document), se), R = () => /* @__PURE__ */ i("div", { className: "oidc-callback", children: /* @__PURE__ */ S("div", { className: "oidc-callback__container", children: [
+}), re = () => ce(window, oe(window, document), se), W = () => /* @__PURE__ */ i("div", { className: "oidc-callback", children: /* @__PURE__ */ E("div", { className: "oidc-callback__container", children: [
   /* @__PURE__ */ i("h1", { className: "oidc-callback__title", children: "Authentication complete" }),
   /* @__PURE__ */ i("p", { className: "oidc-callback__content", children: "You will be redirected to your application." })
-] }) }), re = ({
+] }) }), ie = ({
   callBackError: t,
-  callBackSuccess: s,
+  callBackSuccess: n,
   configurationName: e,
-  withCustomHistory: n
+  withCustomHistory: s
 }) => {
-  const [o, r] = p(!1);
+  const [o, r] = f(!1);
   v(() => {
     let a = !0;
     return (async () => {
-      const _ = c.get;
+      const h = c.get;
       try {
-        const { callbackPath: k } = await _(e).loginCallbackAsync();
-        (n ? n() : ce()).replaceState(k || "/");
-      } catch (k) {
-        a && (console.warn(k), r(!0));
+        const { callbackPath: _ } = await h(e).loginCallbackAsync();
+        (s ? s() : re()).replaceState(_ || "/");
+      } catch (_) {
+        a && (console.warn(_), r(!0));
       }
     })(), () => {
       a = !1;
     };
   }, []);
-  const d = t || W, l = s || R;
+  const d = t || x, l = n || W;
   return o ? /* @__PURE__ */ i(d, { configurationName: e }) : /* @__PURE__ */ i(l, { configurationName: e });
-}, ie = () => /* @__PURE__ */ i("span", { className: "oidc-loading", children: "Loading" }), le = () => /* @__PURE__ */ i("div", { className: "oidc-serviceworker", children: /* @__PURE__ */ S("div", { className: "oidc-serviceworker__container", children: [
+}, le = () => /* @__PURE__ */ i("span", { className: "oidc-loading", children: "Loading" }), ae = () => /* @__PURE__ */ i("div", { className: "oidc-serviceworker", children: /* @__PURE__ */ E("div", { className: "oidc-serviceworker__container", children: [
   /* @__PURE__ */ i("h1", { className: "oidc-serviceworker__title", children: "Unable to authenticate on this browser" }),
   /* @__PURE__ */ i("p", { className: "oidc-serviceworker__content", children: "Your browser is not secure enough to make authentication work. Try updating your browser or use a newer browser." })
-] }) }), ae = () => /* @__PURE__ */ i("div", { className: "oidc-session-lost", children: /* @__PURE__ */ S("div", { className: "oidc-session-lost__container", children: [
+] }) }), de = () => /* @__PURE__ */ i("div", { className: "oidc-session-lost", children: /* @__PURE__ */ E("div", { className: "oidc-session-lost__container", children: [
   /* @__PURE__ */ i("h1", { className: "oidc-session-lost__title", children: "Session timed out" }),
   /* @__PURE__ */ i("p", { className: "oidc-session-lost__content", children: "Your session has expired. Please re-authenticate." })
-] }) }), de = ({ configurationName: t }) => (v(() => {
+] }) }), ue = ({ configurationName: t }) => (v(() => {
   (async () => {
     c.get(t).silentLoginCallbackAsync();
   })().catch((e) => {
     console.error("Error during silent login callback:", e);
   });
-}, [t]), null), ue = ({ configurationName: t }) => {
-  const s = Q(window.location.href), e = c.get, n = e(t);
+}, [t]), null), he = ({ configurationName: t }) => {
+  const n = Q(window.location.href), e = c.get, s = e(t);
   let o = null;
-  for (const [r, d] of Object.entries(s))
+  for (const [r, d] of Object.entries(n))
     r === "state" || r === "scope" || (o === null && (o = {}), o[r] = d);
   return v(() => {
-    n.tokens || n.loginAsync(null, o, !0, s.scope);
+    s.tokens || s.loginAsync(null, o, !0, n.scope);
   }, []), /* @__PURE__ */ i(m, {});
-}, he = ({
+}, ke = ({
   callbackErrorComponent: t,
-  callbackSuccessComponent: s,
+  callbackSuccessComponent: n,
   redirect_uri: e,
-  silent_redirect_uri: n,
+  silent_redirect_uri: s,
   silent_login_uri: o,
   children: r,
   configurationName: d,
   withCustomHistory: l = null
 }) => {
-  const a = window ? O(window.location.href) : "", [u, _] = p(a);
+  const a = window ? A(window.location.href) : "", [u, h] = f(a);
   v(() => {
-    const f = () => _(O(window.location.href));
-    return f(), window.addEventListener("popstate", f, !1), () => window.removeEventListener("popstate", f, !1);
+    const y = () => h(A(window.location.href));
+    return y(), window.addEventListener("popstate", y, !1), () => window.removeEventListener("popstate", y, !1);
   }, []);
-  const k = O(e);
-  return n && u === O(n) ? /* @__PURE__ */ i(de, { configurationName: d }) : o && u === O(o) ? /* @__PURE__ */ i(ue, { configurationName: d }) : u === k ? /* @__PURE__ */ i(
-    re,
+  const _ = A(e);
+  return s && u === A(s) ? /* @__PURE__ */ i(ue, { configurationName: d }) : o && u === A(o) ? /* @__PURE__ */ i(he, { configurationName: d }) : u === _ ? /* @__PURE__ */ i(
+    ie,
     {
       callBackError: t,
-      callBackSuccess: s,
+      callBackSuccess: n,
       configurationName: d,
       withCustomHistory: l
     }
   ) : /* @__PURE__ */ i(m, { children: r });
-}, ke = V.memo(he), q = { name: "", data: null }, _e = ({
+}, _e = V.memo(ke), q = { name: "", data: null }, ve = ({
   loadingComponent: t,
-  children: s,
+  children: n,
   configurationName: e
 }) => {
-  const [n, o] = p(!0), r = c.get, d = r(e);
+  const [s, o] = f(!0), r = c.get, d = r(e);
   return v(() => {
     let a = !0;
     return d && d.tryKeepExistingSessionAsync().then(() => {
@@ -124,83 +124,83 @@ const x = "default", Z = (t, s, e = !1) => async (...n) => await s().fetchWithTo
     }), () => {
       a = !1;
     };
-  }, [e]), /* @__PURE__ */ i(m, { children: n ? /* @__PURE__ */ i(t, { configurationName: e }) : /* @__PURE__ */ i(m, { children: s }) });
-}, E = ({ isLoading: t, loadingComponent: s, children: e, configurationName: n }) => {
-  const o = s;
-  return t ? /* @__PURE__ */ i(o, { configurationName: n, children: e }) : /* @__PURE__ */ i(m, { children: e });
-}, Ae = ({
+  }, [e]), /* @__PURE__ */ i(m, { children: s ? /* @__PURE__ */ i(t, { configurationName: e }) : /* @__PURE__ */ i(m, { children: n }) });
+}, O = ({ isLoading: t, loadingComponent: n, children: e, configurationName: s }) => {
+  const o = n;
+  return t ? /* @__PURE__ */ i(o, { configurationName: s, children: e }) : /* @__PURE__ */ i(m, { children: e });
+}, Oe = ({
   children: t,
-  configuration: s,
+  configuration: n,
   configurationName: e = "default",
-  callbackSuccessComponent: n = R,
-  authenticatingComponent: o = te,
-  loadingComponent: r = ie,
-  serviceWorkerNotSupportedComponent: d = le,
-  authenticatingErrorComponent: l = W,
-  sessionLostComponent: a = ae,
+  callbackSuccessComponent: s = W,
+  authenticatingComponent: o = ne,
+  loadingComponent: r = le,
+  serviceWorkerNotSupportedComponent: d = ae,
+  authenticatingErrorComponent: l = x,
+  sessionLostComponent: a = de,
   onSessionLost: u = null,
-  onLogoutFromAnotherTab: _ = null,
-  onLogoutFromSameTab: k = null,
-  withCustomHistory: f = null,
-  onEvent: w = null,
-  getFetch: y = null,
-  location: P = null
+  onLogoutFromAnotherTab: h = null,
+  onLogoutFromSameTab: _ = null,
+  withCustomHistory: y = null,
+  onEvent: p = null,
+  getFetch: S = null,
+  location: U = null
 }) => {
-  if (s && s.redirect_uri && s.silent_redirect_uri && s.redirect_uri === s.silent_redirect_uri)
+  if (n && n.redirect_uri && n.silent_redirect_uri && n.redirect_uri === n.silent_redirect_uri)
     throw new Error("redirect_uri and silent_redirect_uri must be different");
-  const T = (N = "default") => c.getOrCreate(y ?? J, P ?? new F())(
-    s,
-    N
-  ), [B, C] = p(q), [z, M] = p(e);
+  const w = (L = "default") => c.getOrCreate(S ?? J, U ?? new F())(
+    n,
+    L
+  ), [B, T] = f(q), [z, M] = f(e);
   v(() => {
-    const I = T(e).subscribeEvents((h, g) => {
-      w && w(e, h, g);
+    const N = w(e).subscribeEvents((k, g) => {
+      p && p(e, k, g);
     });
     return () => {
-      T(e).removeEventSubscription(I);
+      w(e).removeEventSubscription(N);
     };
-  }, [e, w]), v(() => {
-    const I = T(e).subscribeEvents((h, g) => {
-      if (h === c.eventNames.refreshTokensAsync_error || h === c.eventNames.syncTokensAsync_error) {
+  }, [e, p]), v(() => {
+    const N = w(e).subscribeEvents((k, g) => {
+      if (k === c.eventNames.refreshTokensAsync_error || k === c.eventNames.syncTokensAsync_error) {
         if (u != null) {
           u();
           return;
         }
-        C({ name: h, data: g });
-      } else if (h === c.eventNames.logout_from_another_tab) {
-        if (_ != null) {
-          _();
+        T({ name: k, data: g });
+      } else if (k === c.eventNames.logout_from_another_tab) {
+        if (h != null) {
+          h();
           return;
         }
-        C({ name: h, data: g });
-      } else h === c.eventNames.logout_from_same_tab ? k?.() : h === c.eventNames.loginAsync_begin || h === c.eventNames.loginCallbackAsync_end || h === c.eventNames.loginAsync_error || h === c.eventNames.loginCallbackAsync_error ? C({ name: h, data: g }) : h === c.eventNames.service_worker_not_supported_by_browser && s.service_worker_only === !0 && C({ name: h, data: g });
+        T({ name: k, data: g });
+      } else k === c.eventNames.logout_from_same_tab ? _?.() : k === c.eventNames.loginAsync_begin || k === c.eventNames.loginCallbackAsync_end || k === c.eventNames.loginAsync_error || k === c.eventNames.loginCallbackAsync_error ? T({ name: k, data: g }) : k === c.eventNames.service_worker_not_supported_by_browser && n.service_worker_only === !0 && T({ name: k, data: g });
     });
     return queueMicrotask(() => {
       M(e);
     }), () => {
-      T(e).removeEventSubscription(I), C(q);
+      w(e).removeEventSubscription(N), T(q);
     };
-  }, [s, e]), v(() => {
+  }, [n, e]), v(() => {
     M(e);
   }, [e]);
-  const K = a, $ = o, b = r, G = d, H = l, A = z !== e, L = T(e);
+  const K = a, $ = o, b = r, G = d, H = l, C = z !== e, P = w(e);
   switch (B.name) {
     case c.eventNames.service_worker_not_supported_by_browser:
       return /* @__PURE__ */ i(
-        E,
+        O,
         {
           loadingComponent: b,
-          isLoading: A,
+          isLoading: C,
           configurationName: e,
           children: /* @__PURE__ */ i(G, { configurationName: e })
         }
       );
     case c.eventNames.loginAsync_begin:
       return /* @__PURE__ */ i(
-        E,
+        O,
         {
           loadingComponent: b,
-          isLoading: A,
+          isLoading: C,
           configurationName: e,
           children: /* @__PURE__ */ i($, { configurationName: e })
         }
@@ -208,10 +208,10 @@ const x = "default", Z = (t, s, e = !1) => async (...n) => await s().fetchWithTo
     case c.eventNames.loginAsync_error:
     case c.eventNames.loginCallbackAsync_error:
       return /* @__PURE__ */ i(
-        E,
+        O,
         {
           loadingComponent: b,
-          isLoading: A,
+          isLoading: C,
           configurationName: e,
           children: /* @__PURE__ */ i(H, { configurationName: e })
         }
@@ -220,72 +220,72 @@ const x = "default", Z = (t, s, e = !1) => async (...n) => await s().fetchWithTo
     case c.eventNames.syncTokensAsync_error:
     case c.eventNames.logout_from_another_tab:
       return /* @__PURE__ */ i(
-        E,
+        O,
         {
           loadingComponent: b,
-          isLoading: A,
+          isLoading: C,
           configurationName: e,
           children: /* @__PURE__ */ i(K, { configurationName: e })
         }
       );
     default:
       return /* @__PURE__ */ i(
-        E,
+        O,
         {
           loadingComponent: b,
-          isLoading: A,
+          isLoading: C,
           configurationName: e,
           children: /* @__PURE__ */ i(
-            ke,
+            _e,
             {
-              redirect_uri: L.configuration.redirect_uri,
-              silent_redirect_uri: L.configuration.silent_redirect_uri,
-              silent_login_uri: L.configuration.silent_login_uri,
-              callbackSuccessComponent: n,
+              redirect_uri: P.configuration.redirect_uri,
+              silent_redirect_uri: P.configuration.silent_redirect_uri,
+              silent_login_uri: P.configuration.silent_login_uri,
+              callbackSuccessComponent: s,
               callbackErrorComponent: l,
               authenticatingComponent: o,
               configurationName: e,
-              withCustomHistory: f,
-              location: P ?? new F(),
-              children: /* @__PURE__ */ i(_e, { loadingComponent: b, configurationName: e, children: t })
+              withCustomHistory: y,
+              location: U ?? new F(),
+              children: /* @__PURE__ */ i(ve, { loadingComponent: b, configurationName: e, children: t })
             }
           )
         }
       );
   }
-}, ve = ({
+}, fe = ({
   children: t,
-  callbackPath: s = null,
+  callbackPath: n = null,
   extras: e = null,
-  configurationName: n = "default"
+  configurationName: s = "default"
 }) => {
-  const o = c.get, r = o(n);
+  const o = c.get, r = o(s);
   return v(() => {
-    r.tokens || r.loginAsync(s, e);
-  }, [n, s, e]), r.tokens ? /* @__PURE__ */ i(m, { children: t }) : null;
-}, Oe = (t, s = null, e = null, n = "default") => (o) => /* @__PURE__ */ i(ve, { callbackPath: s, extras: e, configurationName: n, children: /* @__PURE__ */ i(t, { ...o }) }), U = "default", D = (t, s) => {
+    r.tokens || r.loginAsync(n, e);
+  }, [s, n, e]), r.tokens ? /* @__PURE__ */ i(m, { children: t }) : null;
+}, Ee = (t, n = null, e = null, s = "default") => (o) => /* @__PURE__ */ i(fe, { callbackPath: n, extras: e, configurationName: s, children: /* @__PURE__ */ i(t, { ...o }) }), I = "default", D = (t, n) => {
   let e = !1;
-  return t(s) && (e = t(s).tokens != null), e;
-}, Ee = (t = U) => {
-  const s = c.get, [e, n] = p(
-    () => D(s, t)
+  return t(n) && (e = t(n).tokens != null), e;
+}, Se = (t = I) => {
+  const n = c.get, [e, s] = f(
+    () => D(n, t)
   );
   return v(() => {
     let l = !0;
-    const a = s(t), u = a.subscribeEvents((_, k) => {
-      (_ === c.eventNames.logout_from_another_tab || _ === c.eventNames.logout_from_same_tab || _ === c.eventNames.token_acquired) && l && n(D(s, t));
+    const a = n(t), u = a.subscribeEvents((h, _) => {
+      (h === c.eventNames.logout_from_another_tab || h === c.eventNames.logout_from_same_tab || h === c.eventNames.token_acquired) && l && s(D(n, t));
     });
     return () => {
       l = !1, a.removeEventSubscription(u);
     };
-  }, [t]), { login: (l = void 0, a = void 0, u = !1, _ = void 0) => s(t).loginAsync(
+  }, [t]), { login: (l = void 0, a = void 0, u = !1, h = void 0) => n(t).loginAsync(
     l,
     a,
     !1,
-    _,
+    h,
     u
-  ), logout: (l = void 0, a = void 0) => s(t).logoutAsync(l, a), renewTokens: async (l = void 0) => {
-    const a = await s(t).renewTokensAsync(l);
+  ), logout: (l = void 0, a = void 0) => n(t).logoutAsync(l, a), renewTokens: async (l = void 0) => {
+    const a = await n(t).renewTokensAsync(l);
     return {
       // @ts-ignore
       accessToken: a.accessToken,
@@ -297,33 +297,33 @@ const x = "default", Z = (t, s, e = !1) => async (...n) => await s().fetchWithTo
       idTokenPayload: a.idTokenPayload
     };
   }, isAuthenticated: e };
-}, Y = { accessToken: null, accessTokenPayload: null }, fe = (t) => {
-  const s = c.get, e = s(t);
+}, Y = { accessToken: null, accessTokenPayload: null }, pe = (t) => {
+  const n = c.get, e = n(t);
   if (e.tokens) {
-    const n = e.tokens;
+    const s = e.tokens;
     return {
-      accessToken: n.accessToken,
-      accessTokenPayload: n.accessTokenPayload,
-      generateDemonstrationOfProofOfPossessionAsync: e.configuration.demonstrating_proof_of_possession ? (o, r) => e.generateDemonstrationOfProofOfPossessionAsync(n.accessToken, o, r) : null
+      accessToken: s.accessToken,
+      accessTokenPayload: s.accessTokenPayload,
+      generateDemonstrationOfProofOfPossessionAsync: e.configuration.demonstrating_proof_of_possession ? (o, r) => e.generateDemonstrationOfProofOfPossessionAsync(s.accessToken, o, r) : null
     };
   }
   return Y;
 };
-function pe(t, s) {
-  return t.configuration.demonstrating_proof_of_possession ? (e, n, o = {}) => t.generateDemonstrationOfProofOfPossessionAsync(s.accessToken, e, n, o) : null;
+function ye(t, n) {
+  return t.configuration.demonstrating_proof_of_possession ? (e, s, o = {}) => t.generateDemonstrationOfProofOfPossessionAsync(n.accessToken, e, s, o) : null;
 }
-const Se = (t = U) => {
-  const s = c.get, [e, n] = p(() => fe(t));
+const Pe = (t = I) => {
+  const n = c.get, [e, s] = f(() => pe(t));
   return v(() => {
     let o = !0;
-    const r = s(t), d = r.subscribeEvents((l, a) => {
+    const r = n(t), d = r.subscribeEvents((l, a) => {
       if ((l === c.eventNames.token_renewed || l === c.eventNames.token_acquired || l === c.eventNames.logout_from_another_tab || l === c.eventNames.logout_from_same_tab || l === c.eventNames.refreshTokensAsync_error || l === c.eventNames.syncTokensAsync_error) && o) {
         const u = r.tokens;
-        n(
+        s(
           u != null ? {
             accessToken: u.accessToken,
             accessTokenPayload: u.accessTokenPayload,
-            generateDemonstrationOfProofOfPossessionAsync: pe(r, u)
+            generateDemonstrationOfProofOfPossessionAsync: ye(r, u)
           } : Y
         );
       }
@@ -332,21 +332,21 @@ const Se = (t = U) => {
       o = !1, r.removeEventSubscription(d);
     };
   }, [t]), e;
-}, j = { idToken: null, idTokenPayload: null }, ye = (t) => {
-  const s = c.get, e = s(t);
+}, j = { idToken: null, idTokenPayload: null }, be = (t) => {
+  const n = c.get, e = n(t);
   if (e.tokens) {
-    const n = e.tokens;
-    return { idToken: n.idToken, idTokenPayload: n.idTokenPayload };
+    const s = e.tokens;
+    return { idToken: s.idToken, idTokenPayload: s.idTokenPayload };
   }
   return j;
-}, Pe = (t = U) => {
-  const s = c.get, [e, n] = p(() => ye(t));
+}, Le = (t = I) => {
+  const n = c.get, [e, s] = f(() => be(t));
   return v(() => {
     let o = !0;
-    const r = s(t), d = r.subscribeEvents((l, a) => {
+    const r = n(t), d = r.subscribeEvents((l, a) => {
       if ((l === c.eventNames.token_renewed || l === c.eventNames.token_acquired || l === c.eventNames.logout_from_another_tab || l === c.eventNames.logout_from_same_tab || l === c.eventNames.refreshTokensAsync_error || l === c.eventNames.syncTokensAsync_error) && o) {
         const u = r.tokens;
-        n(
+        s(
           u != null ? { idToken: u.idToken, idTokenPayload: u.idTokenPayload } : j
         );
       }
@@ -356,29 +356,29 @@ const Se = (t = U) => {
     };
   }, [t]), e;
 };
-var be = /* @__PURE__ */ ((t) => (t.Unauthenticated = "Unauthenticated", t.Loading = "Loading user", t.Loaded = "User loaded", t.LoadingError = "Error loading user", t))(be || {});
-const Le = (t = "default", s = !1) => {
-  const n = c.get(t).userInfo(), [o, r] = p({
-    user: n,
-    status: n ? "User loaded" : "Unauthenticated"
+var ge = /* @__PURE__ */ ((t) => (t.Unauthenticated = "Unauthenticated", t.Loading = "Loading user", t.Loaded = "User loaded", t.LoadingError = "Error loading user", t))(ge || {});
+const Ne = (t = "default", n = !1) => {
+  const s = c.get(t).userInfo(), [o, r] = f({
+    user: s,
+    status: s ? "User loaded" : "Unauthenticated"
     /* Unauthenticated */
-  }), [d, l] = p(n ? 1 : 0), [a, u] = p(n ? 1 : 0);
+  }), [d, l] = f(s ? 1 : 0), a = Z(s ? 1 : 0);
   v(() => {
-    const k = c.get(t);
-    let f = !0;
-    if (k && k.tokens) {
-      const y = d === a;
-      if (y && k.userInfo())
+    const h = c.get(t);
+    let _ = !0;
+    if (h && h.tokens) {
+      const p = d === a.current;
+      if (p && h.userInfo())
         return;
-      queueMicrotask(() => {
-        f && (r({
+      a.current = d, queueMicrotask(() => {
+        _ && r({
           ...o,
           status: "Loading user"
           /* Loading */
-        }), u(d));
-      }), k.userInfoAsync(!y, s).then((P) => {
-        f && r({
-          user: P,
+        });
+      }), h.userInfoAsync(!p, n).then((S) => {
+        _ && r({
+          user: S,
           status: "User loaded"
           /* Loaded */
         });
@@ -389,41 +389,41 @@ const Le = (t = "default", s = !1) => {
       }));
     } else
       queueMicrotask(() => {
-        f && r({
+        _ && r({
           user: null,
           status: "Unauthenticated"
           /* Unauthenticated */
         });
       });
-    const w = k.subscribeEvents((y) => {
-      (y === c.eventNames.logout_from_another_tab || y === c.eventNames.logout_from_same_tab) && f && r({
+    const y = h.subscribeEvents((p) => {
+      (p === c.eventNames.logout_from_another_tab || p === c.eventNames.logout_from_same_tab) && _ && r({
         user: null,
         status: "Unauthenticated"
         /* Unauthenticated */
       });
     });
     return () => {
-      f = !1, k.removeEventSubscription(w);
+      _ = !1, h.removeEventSubscription(y);
     };
-  }, [d, t, s, a]);
-  const _ = () => {
+  }, [d, t, n]);
+  const u = () => {
     l(d + 1);
   };
-  return { oidcUser: o.user, oidcUserLoadingState: o.status, reloadOidcUser: _ };
+  return { oidcUser: o.user, oidcUserLoadingState: o.status, reloadOidcUser: u };
 };
 export {
-  Ue as OidcClient,
-  Me as OidcLocation,
-  Ae as OidcProvider,
-  ve as OidcSecure,
-  be as OidcUserStatus,
-  Fe as TokenAutomaticRenewMode,
-  qe as TokenRenewMode,
-  Ee as useOidc,
-  Se as useOidcAccessToken,
-  ee as useOidcFetch,
-  Pe as useOidcIdToken,
-  Le as useOidcUser,
-  Ce as withOidcFetch,
-  Oe as withOidcSecure
+  Me as OidcClient,
+  Fe as OidcLocation,
+  Oe as OidcProvider,
+  fe as OidcSecure,
+  ge as OidcUserStatus,
+  qe as TokenAutomaticRenewMode,
+  De as TokenRenewMode,
+  Se as useOidc,
+  Pe as useOidcAccessToken,
+  te as useOidcFetch,
+  Le as useOidcIdToken,
+  Ne as useOidcUser,
+  Ae as withOidcFetch,
+  Ee as withOidcSecure
 };

package/dist/index.umd.cjs

@@ -1 +1 @@
-(function(f,c){typeof exports=="object"&&typeof module<"u"?c(exports,require("react/jsx-runtime"),require("@axa-fr/oidc-client"),require("react")):typeof define=="function"&&define.amd?define(["exports","react/jsx-runtime","@axa-fr/oidc-client","react"],c):(f=typeof globalThis<"u"?globalThis:f||self,c(f["react-oidc"]={},f.jsxRuntime,f.oidcClient,f.React))})(this,(function(f,c,s,d){"use strict";const F="default",z=(t,n,e=!1)=>async(...o)=>await n().fetchWithTokens(t,e)(...o),K=(t=null,n=F,e=!1)=>o=>r=>{const{fetch:i}=I(t||r.fetch,n,e);return c.jsx(o,{...r,fetch:i})},I=(t=null,n=F,e=!1)=>{const o=t||window.fetch,r=s.OidcClient.get;return{fetch:d.useCallback((u,a)=>z(o,()=>r(n),e)(u,a),[o,n,e])}},U=()=>c.jsx("div",{className:"oidc-authenticating",children:c.jsxs("div",{className:"oidc-authenticating__container",children:[c.jsx("h1",{className:"oidc-authenticating__title",children:"Error authentication"}),c.jsx("p",{className:"oidc-authenticating__content",children:"An error occurred during authentication."})]})}),$=()=>c.jsx("div",{className:"oidc-authenticating",children:c.jsxs("div",{className:"oidc-authenticating__container",children:[c.jsx("h1",{className:"oidc-authenticating__title",children:"Authentication in progress"}),c.jsx("p",{className:"oidc-authenticating__content",children:"You will be redirected to the login page."})]})}),G=()=>Math.random().toString(36).slice(2,8),H=(t,n)=>(e,o)=>{if(typeof t.CustomEvent=="function")return new t.CustomEvent(e,o);const r=o||{bubbles:!1,cancelable:!1,detail:void 0},i=n.createEvent("CustomEvent");return i.initCustomEvent(e,r.bubbles,r.cancelable,r.detail),i.prototype=t.Event.prototype,i},Q=(t,n,e)=>({replaceState:(o,r)=>{const i=e(),u=r||t.history.state;t.history.replaceState({key:i,state:u},null,o),t.dispatchEvent(n("popstate"))}}),J=()=>Q(window,H(window,document),G),m=()=>c.jsx("div",{className:"oidc-callback",children:c.jsxs("div",{className:"oidc-callback__container",children:[c.jsx("h1",{className:"oidc-callback__title",children:"Authentication complete"}),c.jsx("p",{className:"oidc-callback__content",children:"You will be redirected to your application."})]})}),V=({callBackError:t,callBackSuccess:n,configurationName:e,withCustomHistory:o})=>{const[r,i]=d.useState(!1);d.useEffect(()=>{let l=!0;return(async()=>{const O=s.OidcClient.get;try{const{callbackPath:_}=await O(e).loginCallbackAsync();(o?o():J()).replaceState(_||"/")}catch(_){l&&(console.warn(_),i(!0))}})(),()=>{l=!1}},[]);const u=t||U,a=n||m;return r?c.jsx(u,{configurationName:e}):c.jsx(a,{configurationName:e})},X=()=>c.jsx("span",{className:"oidc-loading",children:"Loading"}),Z=()=>c.jsx("div",{className:"oidc-serviceworker",children:c.jsxs("div",{className:"oidc-serviceworker__container",children:[c.jsx("h1",{className:"oidc-serviceworker__title",children:"Unable to authenticate on this browser"}),c.jsx("p",{className:"oidc-serviceworker__content",children:"Your browser is not secure enough to make authentication work. Try updating your browser or use a newer browser."})]})}),x=()=>c.jsx("div",{className:"oidc-session-lost",children:c.jsxs("div",{className:"oidc-session-lost__container",children:[c.jsx("h1",{className:"oidc-session-lost__title",children:"Session timed out"}),c.jsx("p",{className:"oidc-session-lost__content",children:"Your session has expired. Please re-authenticate."})]})}),R=({configurationName:t})=>(d.useEffect(()=>{(async()=>{s.OidcClient.get(t).silentLoginCallbackAsync()})().catch(e=>{console.error("Error during silent login callback:",e)})},[t]),null),ee=({configurationName:t})=>{const n=s.getParseQueryStringFromLocation(window.location.href),e=s.OidcClient.get,o=e(t);let r=null;for(const[i,u]of Object.entries(n))i==="state"||i==="scope"||(r===null&&(r={}),r[i]=u);return d.useEffect(()=>{o.tokens||o.loginAsync(null,r,!0,n.scope)},[]),c.jsx(c.Fragment,{})},te=({callbackErrorComponent:t,callbackSuccessComponent:n,redirect_uri:e,silent_redirect_uri:o,silent_login_uri:r,children:i,configurationName:u,withCustomHistory:a=null})=>{const l=window?s.getPath(window.location.href):"",[h,O]=d.useState(l);d.useEffect(()=>{const v=()=>O(s.getPath(window.location.href));return v(),window.addEventListener("popstate",v,!1),()=>window.removeEventListener("popstate",v,!1)},[]);const _=s.getPath(e);return o&&h===s.getPath(o)?c.jsx(R,{configurationName:u}):r&&h===s.getPath(r)?c.jsx(ee,{configurationName:u}):h===_?c.jsx(V,{callBackError:t,callBackSuccess:n,configurationName:u,withCustomHistory:a}):c.jsx(c.Fragment,{children:i})},se=d.memo(te),M={name:"",data:null},ne=({loadingComponent:t,children:n,configurationName:e})=>{const[o,r]=d.useState(!0),i=s.OidcClient.get,u=i(e);d.useEffect(()=>{let l=!0;return u&&u.tryKeepExistingSessionAsync().then(()=>{l&&r(!1)}),()=>{l=!1}},[e]);const a=t;return c.jsx(c.Fragment,{children:o?c.jsx(a,{configurationName:e}):c.jsx(c.Fragment,{children:n})})},p=({isLoading:t,loadingComponent:n,children:e,configurationName:o})=>{const r=n;return t?c.jsx(r,{configurationName:o,children:e}):c.jsx(c.Fragment,{children:e})},ce=({children:t,configuration:n,configurationName:e="default",callbackSuccessComponent:o=m,authenticatingComponent:r=$,loadingComponent:i=X,serviceWorkerNotSupportedComponent:u=Z,authenticatingErrorComponent:a=U,sessionLostComponent:l=x,onSessionLost:h=null,onLogoutFromAnotherTab:O=null,onLogoutFromSameTab:_=null,withCustomHistory:v=null,onEvent:w=null,getFetch:y=null,location:E=null})=>{if(n&&n.redirect_uri&&n.silent_redirect_uri&&n.redirect_uri===n.silent_redirect_uri)throw new Error("redirect_uri and silent_redirect_uri must be different");const T=(L="default")=>s.OidcClient.getOrCreate(y??s.getFetchDefault,E??new s.OidcLocation)(n,L),[fe,S]=d.useState(M),[ke,B]=d.useState(e);d.useEffect(()=>{const N=T(e).subscribeEvents((k,g)=>{w&&w(e,k,g)});return()=>{T(e).removeEventSubscription(N)}},[e,w]),d.useEffect(()=>{const N=T(e).subscribeEvents((k,g)=>{if(k===s.OidcClient.eventNames.refreshTokensAsync_error||k===s.OidcClient.eventNames.syncTokensAsync_error){if(h!=null){h();return}S({name:k,data:g})}else if(k===s.OidcClient.eventNames.logout_from_another_tab){if(O!=null){O();return}S({name:k,data:g})}else k===s.OidcClient.eventNames.logout_from_same_tab?_?.():k===s.OidcClient.eventNames.loginAsync_begin||k===s.OidcClient.eventNames.loginCallbackAsync_end||k===s.OidcClient.eventNames.loginAsync_error||k===s.OidcClient.eventNames.loginCallbackAsync_error?S({name:k,data:g}):k===s.OidcClient.eventNames.service_worker_not_supported_by_browser&&n.service_worker_only===!0&&S({name:k,data:g})});return queueMicrotask(()=>{B(e)}),()=>{T(e).removeEventSubscription(N),S(M)}},[n,e]),d.useEffect(()=>{B(e)},[e]);const _e=l,Oe=r,b=i,ve=u,ye=a,A=ke!==e,C=T(e);switch(fe.name){case s.OidcClient.eventNames.service_worker_not_supported_by_browser:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(ve,{configurationName:e})});case s.OidcClient.eventNames.loginAsync_begin:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(Oe,{configurationName:e})});case s.OidcClient.eventNames.loginAsync_error:case s.OidcClient.eventNames.loginCallbackAsync_error:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(ye,{configurationName:e})});case s.OidcClient.eventNames.refreshTokensAsync_error:case s.OidcClient.eventNames.syncTokensAsync_error:case s.OidcClient.eventNames.logout_from_another_tab:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(_e,{configurationName:e})});default:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(se,{redirect_uri:C.configuration.redirect_uri,silent_redirect_uri:C.configuration.silent_redirect_uri,silent_login_uri:C.configuration.silent_login_uri,callbackSuccessComponent:o,callbackErrorComponent:a,authenticatingComponent:r,configurationName:e,withCustomHistory:v,location:E??new s.OidcLocation,children:c.jsx(ne,{loadingComponent:b,configurationName:e,children:t})})})}},q=({children:t,callbackPath:n=null,extras:e=null,configurationName:o="default"})=>{const r=s.OidcClient.get,i=r(o);return d.useEffect(()=>{i.tokens||i.loginAsync(n,e)},[o,n,e]),i.tokens?c.jsx(c.Fragment,{children:t}):null},oe=(t,n=null,e=null,o="default")=>r=>c.jsx(q,{callbackPath:n,extras:e,configurationName:o,children:c.jsx(t,{...r})}),P="default",D=(t,n)=>{let e=!1;return t(n)&&(e=t(n).tokens!=null),e},re=(t=P)=>{const n=s.OidcClient.get,[e,o]=d.useState(()=>D(n,t));return d.useEffect(()=>{let a=!0;const l=n(t),h=l.subscribeEvents((O,_)=>{(O===s.OidcClient.eventNames.logout_from_another_tab||O===s.OidcClient.eventNames.logout_from_same_tab||O===s.OidcClient.eventNames.token_acquired)&&a&&o(D(n,t))});return()=>{a=!1,l.removeEventSubscription(h)}},[t]),{login:(a=void 0,l=void 0,h=!1,O=void 0)=>n(t).loginAsync(a,l,!1,O,h),logout:(a=void 0,l=void 0)=>n(t).logoutAsync(a,l),renewTokens:async(a=void 0)=>{const l=await n(t).renewTokensAsync(a);return{accessToken:l.accessToken,accessTokenPayload:l.accessTokenPayload,idToken:l.idToken,idTokenPayload:l.idTokenPayload}},isAuthenticated:e}},W={accessToken:null,accessTokenPayload:null},ie=t=>{const n=s.OidcClient.get,e=n(t);if(e.tokens){const o=e.tokens;return{accessToken:o.accessToken,accessTokenPayload:o.accessTokenPayload,generateDemonstrationOfProofOfPossessionAsync:e.configuration.demonstrating_proof_of_possession?(r,i)=>e.generateDemonstrationOfProofOfPossessionAsync(o.accessToken,r,i):null}}return W};function ae(t,n){return t.configuration.demonstrating_proof_of_possession?(e,o,r={})=>t.generateDemonstrationOfProofOfPossessionAsync(n.accessToken,e,o,r):null}const le=(t=P)=>{const n=s.OidcClient.get,[e,o]=d.useState(()=>ie(t));return d.useEffect(()=>{let r=!0;const i=n(t),u=i.subscribeEvents((a,l)=>{if((a===s.OidcClient.eventNames.token_renewed||a===s.OidcClient.eventNames.token_acquired||a===s.OidcClient.eventNames.logout_from_another_tab||a===s.OidcClient.eventNames.logout_from_same_tab||a===s.OidcClient.eventNames.refreshTokensAsync_error||a===s.OidcClient.eventNames.syncTokensAsync_error)&&r){const h=i.tokens;o(h!=null?{accessToken:h.accessToken,accessTokenPayload:h.accessTokenPayload,generateDemonstrationOfProofOfPossessionAsync:ae(i,h)}:W)}});return()=>{r=!1,i.removeEventSubscription(u)}},[t]),e},j={idToken:null,idTokenPayload:null},de=t=>{const n=s.OidcClient.get,e=n(t);if(e.tokens){const o=e.tokens;return{idToken:o.idToken,idTokenPayload:o.idTokenPayload}}return j},ue=(t=P)=>{const n=s.OidcClient.get,[e,o]=d.useState(()=>de(t));return d.useEffect(()=>{let r=!0;const i=n(t),u=i.subscribeEvents((a,l)=>{if((a===s.OidcClient.eventNames.token_renewed||a===s.OidcClient.eventNames.token_acquired||a===s.OidcClient.eventNames.logout_from_another_tab||a===s.OidcClient.eventNames.logout_from_same_tab||a===s.OidcClient.eventNames.refreshTokensAsync_error||a===s.OidcClient.eventNames.syncTokensAsync_error)&&r){const h=i.tokens;o(h!=null?{idToken:h.idToken,idTokenPayload:h.idTokenPayload}:j)}});return()=>{r=!1,i.removeEventSubscription(u)}},[t]),e};var Y=(t=>(t.Unauthenticated="Unauthenticated",t.Loading="Loading user",t.Loaded="User loaded",t.LoadingError="Error loading user",t))(Y||{});const he=(t="default",n=!1)=>{const o=s.OidcClient.get(t).userInfo(),[r,i]=d.useState({user:o,status:o?"User loaded":"Unauthenticated"}),[u,a]=d.useState(o?1:0),[l,h]=d.useState(o?1:0);d.useEffect(()=>{const _=s.OidcClient.get(t);let v=!0;if(_&&_.tokens){const y=u===l;if(y&&_.userInfo())return;queueMicrotask(()=>{v&&(i({...r,status:"Loading user"}),h(u))}),_.userInfoAsync(!y,n).then(E=>{v&&i({user:E,status:"User loaded"})}).catch(()=>i({...r,status:"Error loading user"}))}else queueMicrotask(()=>{v&&i({user:null,status:"Unauthenticated"})});const w=_.subscribeEvents(y=>{(y===s.OidcClient.eventNames.logout_from_another_tab||y===s.OidcClient.eventNames.logout_from_same_tab)&&v&&i({user:null,status:"Unauthenticated"})});return()=>{v=!1,_.removeEventSubscription(w)}},[u,t,n,l]);const O=()=>{a(u+1)};return{oidcUser:r.user,oidcUserLoadingState:r.status,reloadOidcUser:O}};Object.defineProperty(f,"OidcClient",{enumerable:!0,get:()=>s.OidcClient}),Object.defineProperty(f,"OidcLocation",{enumerable:!0,get:()=>s.OidcLocation}),Object.defineProperty(f,"TokenAutomaticRenewMode",{enumerable:!0,get:()=>s.TokenAutomaticRenewMode}),Object.defineProperty(f,"TokenRenewMode",{enumerable:!0,get:()=>s.TokenRenewMode}),f.OidcProvider=ce,f.OidcSecure=q,f.OidcUserStatus=Y,f.useOidc=re,f.useOidcAccessToken=le,f.useOidcFetch=I,f.useOidcIdToken=ue,f.useOidcUser=he,f.withOidcFetch=K,f.withOidcSecure=oe,Object.defineProperty(f,Symbol.toStringTag,{value:"Module"})}));
+(function(f,c){typeof exports=="object"&&typeof module<"u"?c(exports,require("react/jsx-runtime"),require("@axa-fr/oidc-client"),require("react")):typeof define=="function"&&define.amd?define(["exports","react/jsx-runtime","@axa-fr/oidc-client","react"],c):(f=typeof globalThis<"u"?globalThis:f||self,c(f["react-oidc"]={},f.jsxRuntime,f.oidcClient,f.React))})(this,(function(f,c,s,d){"use strict";const N="default",z=(t,n,e=!1)=>async(...o)=>await n().fetchWithTokens(t,e)(...o),K=(t=null,n=N,e=!1)=>o=>r=>{const{fetch:i}=F(t||r.fetch,n,e);return c.jsx(o,{...r,fetch:i})},F=(t=null,n=N,e=!1)=>{const o=t||window.fetch,r=s.OidcClient.get;return{fetch:d.useCallback((u,a)=>z(o,()=>r(n),e)(u,a),[o,n,e])}},I=()=>c.jsx("div",{className:"oidc-authenticating",children:c.jsxs("div",{className:"oidc-authenticating__container",children:[c.jsx("h1",{className:"oidc-authenticating__title",children:"Error authentication"}),c.jsx("p",{className:"oidc-authenticating__content",children:"An error occurred during authentication."})]})}),$=()=>c.jsx("div",{className:"oidc-authenticating",children:c.jsxs("div",{className:"oidc-authenticating__container",children:[c.jsx("h1",{className:"oidc-authenticating__title",children:"Authentication in progress"}),c.jsx("p",{className:"oidc-authenticating__content",children:"You will be redirected to the login page."})]})}),G=()=>Math.random().toString(36).slice(2,8),H=(t,n)=>(e,o)=>{if(typeof t.CustomEvent=="function")return new t.CustomEvent(e,o);const r=o||{bubbles:!1,cancelable:!1,detail:void 0},i=n.createEvent("CustomEvent");return i.initCustomEvent(e,r.bubbles,r.cancelable,r.detail),i.prototype=t.Event.prototype,i},Q=(t,n,e)=>({replaceState:(o,r)=>{const i=e(),u=r||t.history.state;t.history.replaceState({key:i,state:u},null,o),t.dispatchEvent(n("popstate"))}}),J=()=>Q(window,H(window,document),G),m=()=>c.jsx("div",{className:"oidc-callback",children:c.jsxs("div",{className:"oidc-callback__container",children:[c.jsx("h1",{className:"oidc-callback__title",children:"Authentication complete"}),c.jsx("p",{className:"oidc-callback__content",children:"You will be redirected to your application."})]})}),V=({callBackError:t,callBackSuccess:n,configurationName:e,withCustomHistory:o})=>{const[r,i]=d.useState(!1);d.useEffect(()=>{let l=!0;return(async()=>{const k=s.OidcClient.get;try{const{callbackPath:O}=await k(e).loginCallbackAsync();(o?o():J()).replaceState(O||"/")}catch(O){l&&(console.warn(O),i(!0))}})(),()=>{l=!1}},[]);const u=t||I,a=n||m;return r?c.jsx(u,{configurationName:e}):c.jsx(a,{configurationName:e})},X=()=>c.jsx("span",{className:"oidc-loading",children:"Loading"}),Z=()=>c.jsx("div",{className:"oidc-serviceworker",children:c.jsxs("div",{className:"oidc-serviceworker__container",children:[c.jsx("h1",{className:"oidc-serviceworker__title",children:"Unable to authenticate on this browser"}),c.jsx("p",{className:"oidc-serviceworker__content",children:"Your browser is not secure enough to make authentication work. Try updating your browser or use a newer browser."})]})}),x=()=>c.jsx("div",{className:"oidc-session-lost",children:c.jsxs("div",{className:"oidc-session-lost__container",children:[c.jsx("h1",{className:"oidc-session-lost__title",children:"Session timed out"}),c.jsx("p",{className:"oidc-session-lost__content",children:"Your session has expired. Please re-authenticate."})]})}),R=({configurationName:t})=>(d.useEffect(()=>{(async()=>{s.OidcClient.get(t).silentLoginCallbackAsync()})().catch(e=>{console.error("Error during silent login callback:",e)})},[t]),null),ee=({configurationName:t})=>{const n=s.getParseQueryStringFromLocation(window.location.href),e=s.OidcClient.get,o=e(t);let r=null;for(const[i,u]of Object.entries(n))i==="state"||i==="scope"||(r===null&&(r={}),r[i]=u);return d.useEffect(()=>{o.tokens||o.loginAsync(null,r,!0,n.scope)},[]),c.jsx(c.Fragment,{})},te=({callbackErrorComponent:t,callbackSuccessComponent:n,redirect_uri:e,silent_redirect_uri:o,silent_login_uri:r,children:i,configurationName:u,withCustomHistory:a=null})=>{const l=window?s.getPath(window.location.href):"",[h,k]=d.useState(l);d.useEffect(()=>{const y=()=>k(s.getPath(window.location.href));return y(),window.addEventListener("popstate",y,!1),()=>window.removeEventListener("popstate",y,!1)},[]);const O=s.getPath(e);return o&&h===s.getPath(o)?c.jsx(R,{configurationName:u}):r&&h===s.getPath(r)?c.jsx(ee,{configurationName:u}):h===O?c.jsx(V,{callBackError:t,callBackSuccess:n,configurationName:u,withCustomHistory:a}):c.jsx(c.Fragment,{children:i})},se=d.memo(te),M={name:"",data:null},ne=({loadingComponent:t,children:n,configurationName:e})=>{const[o,r]=d.useState(!0),i=s.OidcClient.get,u=i(e);d.useEffect(()=>{let l=!0;return u&&u.tryKeepExistingSessionAsync().then(()=>{l&&r(!1)}),()=>{l=!1}},[e]);const a=t;return c.jsx(c.Fragment,{children:o?c.jsx(a,{configurationName:e}):c.jsx(c.Fragment,{children:n})})},p=({isLoading:t,loadingComponent:n,children:e,configurationName:o})=>{const r=n;return t?c.jsx(r,{configurationName:o,children:e}):c.jsx(c.Fragment,{children:e})},ce=({children:t,configuration:n,configurationName:e="default",callbackSuccessComponent:o=m,authenticatingComponent:r=$,loadingComponent:i=X,serviceWorkerNotSupportedComponent:u=Z,authenticatingErrorComponent:a=I,sessionLostComponent:l=x,onSessionLost:h=null,onLogoutFromAnotherTab:k=null,onLogoutFromSameTab:O=null,withCustomHistory:y=null,onEvent:v=null,getFetch:S=null,location:Y=null})=>{if(n&&n.redirect_uri&&n.silent_redirect_uri&&n.redirect_uri===n.silent_redirect_uri)throw new Error("redirect_uri and silent_redirect_uri must be different");const w=(C="default")=>s.OidcClient.getOrCreate(S??s.getFetchDefault,Y??new s.OidcLocation)(n,C),[fe,T]=d.useState(M),[ke,B]=d.useState(e);d.useEffect(()=>{const L=w(e).subscribeEvents((_,g)=>{v&&v(e,_,g)});return()=>{w(e).removeEventSubscription(L)}},[e,v]),d.useEffect(()=>{const L=w(e).subscribeEvents((_,g)=>{if(_===s.OidcClient.eventNames.refreshTokensAsync_error||_===s.OidcClient.eventNames.syncTokensAsync_error){if(h!=null){h();return}T({name:_,data:g})}else if(_===s.OidcClient.eventNames.logout_from_another_tab){if(k!=null){k();return}T({name:_,data:g})}else _===s.OidcClient.eventNames.logout_from_same_tab?O?.():_===s.OidcClient.eventNames.loginAsync_begin||_===s.OidcClient.eventNames.loginCallbackAsync_end||_===s.OidcClient.eventNames.loginAsync_error||_===s.OidcClient.eventNames.loginCallbackAsync_error?T({name:_,data:g}):_===s.OidcClient.eventNames.service_worker_not_supported_by_browser&&n.service_worker_only===!0&&T({name:_,data:g})});return queueMicrotask(()=>{B(e)}),()=>{w(e).removeEventSubscription(L),T(M)}},[n,e]),d.useEffect(()=>{B(e)},[e]);const _e=l,Oe=r,b=i,ve=u,ye=a,A=ke!==e,P=w(e);switch(fe.name){case s.OidcClient.eventNames.service_worker_not_supported_by_browser:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(ve,{configurationName:e})});case s.OidcClient.eventNames.loginAsync_begin:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(Oe,{configurationName:e})});case s.OidcClient.eventNames.loginAsync_error:case s.OidcClient.eventNames.loginCallbackAsync_error:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(ye,{configurationName:e})});case s.OidcClient.eventNames.refreshTokensAsync_error:case s.OidcClient.eventNames.syncTokensAsync_error:case s.OidcClient.eventNames.logout_from_another_tab:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(_e,{configurationName:e})});default:return c.jsx(p,{loadingComponent:b,isLoading:A,configurationName:e,children:c.jsx(se,{redirect_uri:P.configuration.redirect_uri,silent_redirect_uri:P.configuration.silent_redirect_uri,silent_login_uri:P.configuration.silent_login_uri,callbackSuccessComponent:o,callbackErrorComponent:a,authenticatingComponent:r,configurationName:e,withCustomHistory:y,location:Y??new s.OidcLocation,children:c.jsx(ne,{loadingComponent:b,configurationName:e,children:t})})})}},U=({children:t,callbackPath:n=null,extras:e=null,configurationName:o="default"})=>{const r=s.OidcClient.get,i=r(o);return d.useEffect(()=>{i.tokens||i.loginAsync(n,e)},[o,n,e]),i.tokens?c.jsx(c.Fragment,{children:t}):null},oe=(t,n=null,e=null,o="default")=>r=>c.jsx(U,{callbackPath:n,extras:e,configurationName:o,children:c.jsx(t,{...r})}),E="default",q=(t,n)=>{let e=!1;return t(n)&&(e=t(n).tokens!=null),e},re=(t=E)=>{const n=s.OidcClient.get,[e,o]=d.useState(()=>q(n,t));return d.useEffect(()=>{let a=!0;const l=n(t),h=l.subscribeEvents((k,O)=>{(k===s.OidcClient.eventNames.logout_from_another_tab||k===s.OidcClient.eventNames.logout_from_same_tab||k===s.OidcClient.eventNames.token_acquired)&&a&&o(q(n,t))});return()=>{a=!1,l.removeEventSubscription(h)}},[t]),{login:(a=void 0,l=void 0,h=!1,k=void 0)=>n(t).loginAsync(a,l,!1,k,h),logout:(a=void 0,l=void 0)=>n(t).logoutAsync(a,l),renewTokens:async(a=void 0)=>{const l=await n(t).renewTokensAsync(a);return{accessToken:l.accessToken,accessTokenPayload:l.accessTokenPayload,idToken:l.idToken,idTokenPayload:l.idTokenPayload}},isAuthenticated:e}},D={accessToken:null,accessTokenPayload:null},ie=t=>{const n=s.OidcClient.get,e=n(t);if(e.tokens){const o=e.tokens;return{accessToken:o.accessToken,accessTokenPayload:o.accessTokenPayload,generateDemonstrationOfProofOfPossessionAsync:e.configuration.demonstrating_proof_of_possession?(r,i)=>e.generateDemonstrationOfProofOfPossessionAsync(o.accessToken,r,i):null}}return D};function ae(t,n){return t.configuration.demonstrating_proof_of_possession?(e,o,r={})=>t.generateDemonstrationOfProofOfPossessionAsync(n.accessToken,e,o,r):null}const le=(t=E)=>{const n=s.OidcClient.get,[e,o]=d.useState(()=>ie(t));return d.useEffect(()=>{let r=!0;const i=n(t),u=i.subscribeEvents((a,l)=>{if((a===s.OidcClient.eventNames.token_renewed||a===s.OidcClient.eventNames.token_acquired||a===s.OidcClient.eventNames.logout_from_another_tab||a===s.OidcClient.eventNames.logout_from_same_tab||a===s.OidcClient.eventNames.refreshTokensAsync_error||a===s.OidcClient.eventNames.syncTokensAsync_error)&&r){const h=i.tokens;o(h!=null?{accessToken:h.accessToken,accessTokenPayload:h.accessTokenPayload,generateDemonstrationOfProofOfPossessionAsync:ae(i,h)}:D)}});return()=>{r=!1,i.removeEventSubscription(u)}},[t]),e},W={idToken:null,idTokenPayload:null},de=t=>{const n=s.OidcClient.get,e=n(t);if(e.tokens){const o=e.tokens;return{idToken:o.idToken,idTokenPayload:o.idTokenPayload}}return W},ue=(t=E)=>{const n=s.OidcClient.get,[e,o]=d.useState(()=>de(t));return d.useEffect(()=>{let r=!0;const i=n(t),u=i.subscribeEvents((a,l)=>{if((a===s.OidcClient.eventNames.token_renewed||a===s.OidcClient.eventNames.token_acquired||a===s.OidcClient.eventNames.logout_from_another_tab||a===s.OidcClient.eventNames.logout_from_same_tab||a===s.OidcClient.eventNames.refreshTokensAsync_error||a===s.OidcClient.eventNames.syncTokensAsync_error)&&r){const h=i.tokens;o(h!=null?{idToken:h.idToken,idTokenPayload:h.idTokenPayload}:W)}});return()=>{r=!1,i.removeEventSubscription(u)}},[t]),e};var j=(t=>(t.Unauthenticated="Unauthenticated",t.Loading="Loading user",t.Loaded="User loaded",t.LoadingError="Error loading user",t))(j||{});const he=(t="default",n=!1)=>{const o=s.OidcClient.get(t).userInfo(),[r,i]=d.useState({user:o,status:o?"User loaded":"Unauthenticated"}),[u,a]=d.useState(o?1:0),l=d.useRef(o?1:0);d.useEffect(()=>{const k=s.OidcClient.get(t);let O=!0;if(k&&k.tokens){const v=u===l.current;if(v&&k.userInfo())return;l.current=u,queueMicrotask(()=>{O&&i({...r,status:"Loading user"})}),k.userInfoAsync(!v,n).then(S=>{O&&i({user:S,status:"User loaded"})}).catch(()=>i({...r,status:"Error loading user"}))}else queueMicrotask(()=>{O&&i({user:null,status:"Unauthenticated"})});const y=k.subscribeEvents(v=>{(v===s.OidcClient.eventNames.logout_from_another_tab||v===s.OidcClient.eventNames.logout_from_same_tab)&&O&&i({user:null,status:"Unauthenticated"})});return()=>{O=!1,k.removeEventSubscription(y)}},[u,t,n]);const h=()=>{a(u+1)};return{oidcUser:r.user,oidcUserLoadingState:r.status,reloadOidcUser:h}};Object.defineProperty(f,"OidcClient",{enumerable:!0,get:()=>s.OidcClient}),Object.defineProperty(f,"OidcLocation",{enumerable:!0,get:()=>s.OidcLocation}),Object.defineProperty(f,"TokenAutomaticRenewMode",{enumerable:!0,get:()=>s.TokenAutomaticRenewMode}),Object.defineProperty(f,"TokenRenewMode",{enumerable:!0,get:()=>s.TokenRenewMode}),f.OidcProvider=ce,f.OidcSecure=U,f.OidcUserStatus=j,f.useOidc=re,f.useOidcAccessToken=le,f.useOidcFetch=F,f.useOidcIdToken=ue,f.useOidcUser=he,f.withOidcFetch=K,f.withOidcSecure=oe,Object.defineProperty(f,Symbol.toStringTag,{value:"Module"})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axa-fr/react-oidc",
-  "version": "7.26.5",
+  "version": "7.26.7",
   "private": false,
   "type": "module",
   "main": "./dist/index.umd.cjs",
@@ -40,8 +40,8 @@
     "lint": "eslint src"
   },
   "dependencies": {
-    "@axa-fr/oidc-client-service-worker": "7.26.5",
-    "@axa-fr/oidc-client": "7.26.5"
+    "@axa-fr/oidc-client-service-worker": "7.26.7",
+    "@axa-fr/oidc-client": "7.26.7"
   },
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0 || ^19.0.0"

package/src/User.spec.tsx

@@ -0,0 +1,90 @@
+import { act, renderHook, waitFor } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { OidcUserStatus, useOidcUser } from './User';
+
+const mockSubscribeEvents = vi.fn().mockReturnValue('subscription-id');
+const mockRemoveEventSubscription = vi.fn();
+const mockUserInfo = vi.fn();
+const mockUserInfoAsync = vi.fn();
+
+vi.mock('@axa-fr/oidc-client', () => ({
+  OidcClient: {
+    get: vi.fn(() => ({
+      tokens: { access_token: 'test-token' },
+      userInfo: mockUserInfo,
+      userInfoAsync: mockUserInfoAsync,
+      subscribeEvents: mockSubscribeEvents,
+      removeEventSubscription: mockRemoveEventSubscription,
+    })),
+    eventNames: {
+      logout_from_another_tab: 'logout_from_another_tab',
+      logout_from_same_tab: 'logout_from_same_tab',
+    },
+  },
+}));
+
+describe('useOidcUser', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockSubscribeEvents.mockReturnValue('subscription-id');
+    mockRemoveEventSubscription.mockReset();
+  });
+
+  it('should load user information and update status correctly on reload', async () => {
+    const userInfo = { sub: 'user1', name: 'Test User' };
+    // Initial state: no cached user
+    mockUserInfo.mockReturnValue(null);
+    // userInfoAsync resolves with user info
+    mockUserInfoAsync.mockResolvedValue(userInfo);
+
+    const { result } = renderHook(() => useOidcUser());
+
+    // Initially unauthenticated since userInfo returns null
+    await waitFor(() => {
+      expect(result.current.oidcUserLoadingState).toBe(OidcUserStatus.Unauthenticated);
+    });
+
+    // Simulate the user being authenticated (tokens present)
+    mockUserInfo.mockReturnValue(userInfo);
+
+    // Trigger reload
+    act(() => {
+      result.current.reloadOidcUser();
+    });
+
+    // After reload, should eventually show loaded state (not stay stuck at loading)
+    await waitFor(() => {
+      expect(result.current.oidcUserLoadingState).toBe(OidcUserStatus.Loaded);
+    });
+
+    expect(result.current.oidcUser).toEqual(userInfo);
+  });
+
+  it('should not get stuck at Loading state after reloadOidcUser is called', async () => {
+    const initialUser = { sub: 'user1', name: 'Initial User' };
+    const reloadedUser = { sub: 'user1', name: 'Reloaded User' };
+
+    // User is already authenticated
+    mockUserInfo.mockReturnValue(initialUser);
+    // userInfoAsync resolves with new data
+    mockUserInfoAsync.mockResolvedValue(reloadedUser);
+
+    const { result } = renderHook(() => useOidcUser());
+
+    // Initial state: user loaded from cache
+    expect(result.current.oidcUserLoadingState).toBe(OidcUserStatus.Loaded);
+
+    // Trigger reload
+    act(() => {
+      result.current.reloadOidcUser();
+    });
+
+    // Should complete the reload and show the reloaded user (not stuck at Loading)
+    await waitFor(() => {
+      expect(result.current.oidcUser).toEqual(reloadedUser);
+    });
+
+    expect(result.current.oidcUserLoadingState).toBe(OidcUserStatus.Loaded);
+  });
+});

package/src/User.ts

@@ -1,5 +1,5 @@
 import { OidcClient, type OidcUserInfo } from '@axa-fr/oidc-client';
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 export enum OidcUserStatus {
   Unauthenticated = 'Unauthenticated',
@@ -24,21 +24,21 @@ export const useOidcUser = <T extends OidcUserInfo = OidcUserInfo>(
     status: user ? OidcUserStatus.Loaded : OidcUserStatus.Unauthenticated,
   });
   const [oidcUserId, setOidcUserId] = useState<number>(user ? 1 : 0);
-  const [oidcPreviousUserId, setPreviousOidcUserId] = useState<number>(user ? 1 : 0);
+  const oidcPreviousUserIdRef = useRef<number>(user ? 1 : 0);
 
   useEffect(() => {
     const oidc = OidcClient.get(configurationName);
     let isMounted = true;
     if (oidc && oidc.tokens) {
-      const isCache = oidcUserId === oidcPreviousUserId;
+      const isCache = oidcUserId === oidcPreviousUserIdRef.current;
       if (isCache && oidc.userInfo<T>()) {
         return;
       }
+      oidcPreviousUserIdRef.current = oidcUserId;
       // Use queueMicrotask to defer setState to avoid synchronous call in effect
       queueMicrotask(() => {
         if (isMounted) {
           setOidcUser({ ...oidcUser, status: OidcUserStatus.Loading });
-          setPreviousOidcUserId(oidcUserId);
         }
       });
       oidc
@@ -71,7 +71,7 @@ export const useOidcUser = <T extends OidcUserInfo = OidcUserInfo>(
       isMounted = false;
       oidc.removeEventSubscription(newSubscriptionId);
     };
-  }, [oidcUserId, configurationName, demonstrating_proof_of_possession, oidcPreviousUserId]);
+  }, [oidcUserId, configurationName, demonstrating_proof_of_possession]);
 
   const reloadOidcUser = () => {
     setOidcUserId(oidcUserId + 1);