@axa-fr/oidc-client 7.22.27 → 7.22.28

package/dist/index.js

@@ -88,9 +88,9 @@ const m = {
     n[`oidc.session_state.${e}`] = h;
   }, r = async () => n[`oidc.session_state.${e}`], a = (h) => {
     n[`oidc.nonce.${e}`] = h.nonce;
-  }, l = (h) => {
+  }, u = (h) => {
     n[`oidc.jwk.${e}`] = JSON.stringify(h);
-  }, f = () => JSON.parse(n[`oidc.jwk.${e}`]), u = async () => ({ nonce: n[`oidc.nonce.${e}`] }), c = async (h) => {
+  }, f = () => JSON.parse(n[`oidc.jwk.${e}`]), l = async () => ({ nonce: n[`oidc.nonce.${e}`] }), c = async (h) => {
     n[`oidc.dpop_nonce.${e}`] = h;
   }, _ = () => n[`oidc.dpop_nonce.${e}`], d = () => n[`oidc.${e}`] ? JSON.stringify({ tokens: JSON.parse(n[`oidc.${e}`]).tokens }) : null, y = {};
   return {
@@ -101,7 +101,7 @@ const m = {
     setSessionStateAsync: i,
     getSessionStateAsync: r,
     setNonceAsync: a,
-    getNonceAsync: u,
+    getNonceAsync: l,
     setLoginParams: (h) => {
       y[e] = h, n[`oidc.login.${e}`] = JSON.stringify(h);
     },
@@ -121,7 +121,7 @@ const m = {
     },
     setDemonstratingProofOfPossessionNonce: c,
     getDemonstratingProofOfPossessionNonce: _,
-    setDemonstratingProofOfPossessionJwkAsync: l,
+    setDemonstratingProofOfPossessionJwkAsync: u,
     getDemonstratingProofOfPossessionJwkAsync: f
   };
 };
@@ -155,11 +155,11 @@ const te = (e, n = null, s) => {
   e.accessTokenPayload !== void 0 ? t = e.accessTokenPayload : t = ce(e.accessToken);
   let i;
   n != null && "idToken" in n && !("idToken" in e) ? i = n.idToken : i = e.idToken;
-  const r = e.idTokenPayload ? e.idTokenPayload : ce(i), a = r && r.exp ? r.exp : Number.MAX_VALUE, l = t && t.exp ? t.exp : e.issuedAt + o;
+  const r = e.idTokenPayload ? e.idTokenPayload : ce(i), a = r && r.exp ? r.exp : Number.MAX_VALUE, u = t && t.exp ? t.exp : e.issuedAt + o;
   e.issuedAt = xe(e, t, r);
   let f;
-  e.expiresAt ? f = e.expiresAt : s === Q.access_token_invalid ? f = l : s === Q.id_token_invalid ? f = a : f = a < l ? a : l;
-  const u = {
+  e.expiresAt ? f = e.expiresAt : s === Q.access_token_invalid ? f = u : s === Q.id_token_invalid ? f = a : f = a < u ? a : u;
+  const l = {
     ...e,
     idTokenPayload: r,
     accessTokenPayload: t,
@@ -168,9 +168,9 @@ const te = (e, n = null, s) => {
   };
   if (n != null && "refreshToken" in n && !("refreshToken" in e)) {
     const c = n.refreshToken;
-    return { ...u, refreshToken: c };
+    return { ...l, refreshToken: c };
   }
-  return u;
+  return l;
 }, oe = (e, n, s) => {
   if (!e)
     return null;
@@ -187,18 +187,18 @@ const te = (e, n = null, s) => {
     issuedAt: e.issued_at
   };
   return "refresh_token" in e && (t.refreshToken = e.refresh_token), e.accessTokenPayload !== void 0 && (t.accessTokenPayload = e.accessTokenPayload), e.idTokenPayload !== void 0 && (t.idTokenPayload = e.idTokenPayload), te(t, n, s);
-}, F = (e, n) => {
+}, V = (e, n) => {
   const s = (/* @__PURE__ */ new Date()).getTime() / 1e3, t = n - s;
   return Math.round(t - e);
-}, le = (e, n = 0) => e ? F(n, e.expiresAt) > 0 : !1, ke = async (e, n = 200, s = 50) => {
+}, le = (e, n = 0) => e ? V(n, e.expiresAt) > 0 : !1, ke = async (e, n = 200, s = 50) => {
   let t = s;
-  if (!e.tokens)
+  if (!e.getTokens())
     return null;
   for (; !le(
-    e.tokens,
+    e.getTokens(),
     e.configuration.refresh_time_before_tokens_expiration_in_second
   ) && t > 0; ) {
-    if (e.configuration.token_automatic_renew_mode == J.AutomaticOnlyWhenFetchExecuted) {
+    if (console.log("getValidTokenAsync wait and return value"), console.log(e.getTokens()), e.configuration.token_automatic_renew_mode == J.AutomaticOnlyWhenFetchExecuted) {
       await e.renewTokensAsync({});
       break;
     } else
@@ -206,8 +206,8 @@ const te = (e, n = null, s) => {
     t = t - 1;
   }
   return {
-    isTokensValid: le(e.tokens),
-    tokens: e.tokens,
+    isTokensValid: le(e.getTokens()),
+    tokens: e.getTokens(),
     numberWaited: t - s
   };
 }, me = (e, n, s) => {
@@ -245,7 +245,7 @@ const te = (e, n = null, s) => {
     setInterval: setInterval.bind(e),
     clearInterval: clearInterval.bind(e)
   };
-}(), ue = "7.22.27";
+}(), ue = "7.22.28";
 let _e = null, j;
 const X = ({ milliseconds: e }) => new Promise((n) => K.setTimeout(n, e)), pe = (e = "/") => {
   try {
@@ -319,7 +319,7 @@ const X = ({ milliseconds: e }) => new Promise((n) => K.setTimeout(n, e)), pe =
     type: "setSessionState",
     data: { sessionState: g },
     configurationName: n
-  }), l = async () => (await O(t)({
+  }), u = async () => (await O(t)({
     type: "getSessionState",
     data: null,
     configurationName: n
@@ -327,7 +327,7 @@ const X = ({ milliseconds: e }) => new Promise((n) => K.setTimeout(n, e)), pe =
     type: "setNonce",
     data: { nonce: g },
     configurationName: n
-  })), u = async () => {
+  })), l = async () => {
     let A = (await O(t)({
       type: "getNonce",
       data: null,
@@ -341,9 +341,9 @@ const X = ({ milliseconds: e }) => new Promise((n) => K.setTimeout(n, e)), pe =
     startKeepAliveServiceWorker: () => r(e.service_worker_keep_alive_path),
     isServiceWorkerProxyActiveAsync: () => Le(e.service_worker_keep_alive_path),
     setSessionStateAsync: a,
-    getSessionStateAsync: l,
+    getSessionStateAsync: u,
     setNonceAsync: f,
-    getNonceAsync: u,
+    getNonceAsync: l,
     setLoginParams: (g) => {
       c[n] = g, localStorage[`oidc.login.${n}`] = JSON.stringify(g);
     },
@@ -437,7 +437,7 @@ const ie = (e) => {
 function fe(e) {
   return Ae(Ue(e));
 }
-const Fe = {
+const Ve = {
   importKeyAlgorithm: {
     name: "ECDSA",
     namedCurve: "P-256",
@@ -450,7 +450,7 @@ const Fe = {
   },
   digestAlgorithm: { name: "SHA-256" },
   jwtHeaderAlgorithm: "ES256"
-}, Ve = (e) => async (n, s, t, o, i = "dpop+jwt") => {
+}, Fe = (e) => async (n, s, t, o, i = "dpop+jwt") => {
   switch (n = Object.assign({}, n), s.typ = i, s.alg = o.jwtHeaderAlgorithm, s.alg) {
     case "ES256":
       s.jwk = { kty: n.kty, crv: n.crv, x: n.x, y: n.y };
@@ -468,9 +468,9 @@ const Fe = {
     // @ts-ignore
     // JWT "claims" are really a JSON-defined JWS "payload"
     payload: fe(JSON.stringify(t))
-  }, a = o.importKeyAlgorithm, l = !0, f = ["sign"], u = await e.crypto.subtle.importKey("jwk", n, a, l, f), c = we(`${r.protected}.${r.payload}`), _ = o.signAlgorithm, d = await e.crypto.subtle.sign(_, u, c);
+  }, a = o.importKeyAlgorithm, u = !0, f = ["sign"], l = await e.crypto.subtle.importKey("jwk", n, a, u, f), c = we(`${r.protected}.${r.payload}`), _ = o.signAlgorithm, d = await e.crypto.subtle.sign(_, l, c);
   return r.signature = ie(new Uint8Array(d)), `${r.protected}.${r.payload}.${r.signature}`;
-}, Je = { sign: Ve }, Me = (e) => async (n) => {
+}, Je = { sign: Fe }, Me = (e) => async (n) => {
   const s = n, t = !0, o = ["sign", "verify"], i = await e.crypto.subtle.generateKey(s, t, o);
   return await e.crypto.subtle.exportKey("jwk", i.privateKey);
 }, Be = (e) => {
@@ -517,7 +517,7 @@ const Fe = {
   for (let o = 0; o < 36; o++)
     e[o] !== "-" && e[o] !== "4" && (s = Math.random() * 16 | 0), e[o] === "x" ? t += n[s] : e[o] === "y" ? (s &= 3, s |= 8, t += n[s]) : t += e[o];
   return t;
-}, ve = () => {
+}, Te = () => {
   const e = typeof window < "u" && !!window.crypto, n = e && !!window.crypto.subtle;
   return { hasCrypto: e, hasSubtleCrypto: n };
 }, Z = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", Xe = (e) => {
@@ -528,7 +528,7 @@ const Fe = {
   }
   return n.join("");
 }, ee = (e) => {
-  const n = new Uint8Array(e), { hasCrypto: s } = ve();
+  const n = new Uint8Array(e), { hasCrypto: s } = Te();
   if (s)
     window.crypto.getRandomValues(n);
   else
@@ -542,7 +542,7 @@ function ze(e) {
     s[t] = e.charCodeAt(t);
   return s;
 }
-function Te(e) {
+function ve(e) {
   return new Promise((n, s) => {
     crypto.subtle.digest("SHA-256", ze(e)).then(
       (t) => n(ie(new Uint8Array(t))),
@@ -553,16 +553,16 @@ function Te(e) {
 const Qe = (e) => {
   if (e.length < 43 || e.length > 128)
     return Promise.reject(new Error("Invalid code length."));
-  const { hasSubtleCrypto: n } = ve();
-  return n ? Te(e) : Promise.reject(new Error("window.crypto.subtle is unavailable."));
+  const { hasSubtleCrypto: n } = Te();
+  return n ? ve(e) : Promise.reject(new Error("window.crypto.subtle is unavailable."));
 }, Ze = 60 * 60, en = (e) => async (n, s = Ze, t = window.sessionStorage, o = 1e4) => {
   const i = `${n}/.well-known/openid-configuration`, r = `oidc.server:${n}`, a = $e(r, t, s);
   if (a)
     return new se(a);
-  const l = await B(e)(i, {}, o);
-  if (l.status !== 200)
+  const u = await B(e)(i, {}, o);
+  if (u.status !== 200)
     return null;
-  const f = await l.json();
+  const f = await u.json();
   return Ke(r, f, t), new se(f);
 }, B = (e) => async (n, s = {}, t = 1e4, o = 0) => {
   let i;
@@ -589,12 +589,12 @@ const Qe = (e) => {
   };
   for (const [c, _] of Object.entries(i))
     a[c] === void 0 && (a[c] = _);
-  const l = [];
+  const u = [];
   for (const c in a) {
     const _ = encodeURIComponent(c), d = encodeURIComponent(a[c]);
-    l.push(`${_}=${d}`);
+    u.push(`${_}=${d}`);
   }
-  const f = l.join("&");
+  const f = u.join("&");
   return (await B(e)(
     n,
     {
@@ -611,12 +611,12 @@ const Qe = (e) => {
 }, nn = (e) => async (n, s, t, o, i = {}, r, a = 1e4) => {
   for (const [d, y] of Object.entries(t))
     s[d] === void 0 && (s[d] = y);
-  const l = [];
+  const u = [];
   for (const d in s) {
     const y = encodeURIComponent(d), p = encodeURIComponent(s[d]);
-    l.push(`${y}=${p}`);
+    u.push(`${y}=${p}`);
   }
-  const f = l.join("&"), u = await B(e)(
+  const f = u.join("&"), l = await B(e)(
     n,
     {
       method: "POST",
@@ -628,19 +628,19 @@ const Qe = (e) => {
     },
     a
   );
-  if (u.status !== 200)
+  if (l.status !== 200)
     return {
       success: !1,
-      status: u.status,
+      status: l.status,
       demonstratingProofOfPossessionNonce: null
     };
-  const c = await u.json();
+  const c = await l.json();
   let _ = null;
-  return u.headers.has(G) && (_ = u.headers.get(
+  return l.headers.has(G) && (_ = l.headers.get(
     G
   )), {
     success: !0,
-    status: u.status,
+    status: l.status,
     data: oe(c, o, r),
     demonstratingProofOfPossessionNonce: _
   };
@@ -650,8 +650,8 @@ const Qe = (e) => {
   await e.setCodeVerifierAsync(o), await e.setStateAsync(t.state), t.code_challenge = i, t.code_challenge_method = "S256";
   let r = "";
   if (t)
-    for (const [a, l] of Object.entries(t))
-      r === "" ? r += "?" : r += "&", r += `${a}=${encodeURIComponent(l)}`;
+    for (const [a, u] of Object.entries(t))
+      r === "" ? r += "?" : r += "&", r += `${a}=${encodeURIComponent(u)}`;
   n.open(`${s}${r}`);
 }, G = "DPoP-Nonce", tn = (e) => async (n, s, t, o, i = 1e4) => {
   s = s ? { ...s } : {}, s.code_verifier = await e.getCodeVerifierAsync();
@@ -660,7 +660,7 @@ const Qe = (e) => {
     const _ = encodeURIComponent(c), d = encodeURIComponent(s[c]);
     r.push(`${_}=${d}`);
   }
-  const a = r.join("&"), l = await B(fetch)(
+  const a = r.join("&"), u = await B(fetch)(
     n,
     {
       method: "POST",
@@ -672,18 +672,18 @@ const Qe = (e) => {
     },
     i
   );
-  if (await Promise.all([e.setCodeVerifierAsync(null), e.setStateAsync(null)]), l.status !== 200)
-    return { success: !1, status: l.status };
+  if (await Promise.all([e.setCodeVerifierAsync(null), e.setStateAsync(null)]), u.status !== 200)
+    return { success: !1, status: u.status };
   let f = null;
-  l.headers.has(G) && (f = l.headers.get(
+  u.headers.has(G) && (f = u.headers.get(
     G
   ));
-  const u = await l.json();
+  const l = await u.json();
   return {
     success: !0,
     data: {
       state: s.state,
-      tokens: oe(u, null, o),
+      tokens: oe(l, null, o),
       demonstratingProofOfPossessionNonce: f
     }
   };
@@ -711,7 +711,7 @@ async function be(e, n = !1, s = null) {
       a = await navigator.locks.request(
         o,
         { ifAvailable: !0 },
-        async (l) => l ? await he(e, n, s) : (e.publishEvent(C.eventNames.syncTokensAsync_lock_not_available, {
+        async (u) => u ? await he(e, n, s) : (e.publishEvent(C.eventNames.syncTokensAsync_lock_not_available, {
           lock: "lock not available"
         }), "retry")
       );
@@ -722,7 +722,7 @@ async function be(e, n = !1, s = null) {
 const M = (e, n, s = null) => {
   const t = e.configuration.refresh_time_before_tokens_expiration_in_second;
   return e.timeoutId && K.clearTimeout(e.timeoutId), K.setTimeout(async () => {
-    const i = { timeLeft: F(t, n) };
+    const i = { timeLeft: V(t, n) };
     e.publishEvent(C.eventNames.token_timer, i), await be(e, !1, s);
   }, 1e3);
 }, N = {
@@ -741,9 +741,9 @@ const M = (e, n, s = null) => {
   const a = await e.initAsync(
     n.authority,
     n.authority_configuration
-  ), l = await I(n, s);
-  if (l) {
-    const { status: c, tokens: _ } = await l.initAsync(
+  ), u = await I(n, s);
+  if (u) {
+    const { status: c, tokens: _ } = await u.initAsync(
       a,
       "syncTokensAsync",
       n
@@ -755,13 +755,13 @@ const M = (e, n, s = null) => {
     if (!c || !_)
       return { tokens: null, status: "REQUIRE_SYNC_TOKENS", nonce: i };
     if (_.issuedAt !== t.issuedAt) {
-      const y = F(
+      const y = V(
         n.refresh_time_before_tokens_expiration_in_second,
         _.expiresAt
-      ) > 0 ? "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_VALID" : "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_INVALID", p = await l.getNonceAsync();
+      ) > 0 ? "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_VALID" : "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_INVALID", p = await u.getNonceAsync();
       return { tokens: _, status: y, nonce: p };
     }
-    r = await l.getNonceAsync();
+    r = await u.getNonceAsync();
   } else {
     const c = P(s, n.storage ?? sessionStorage), _ = await c.initAsync();
     let { tokens: d } = _;
@@ -770,7 +770,7 @@ const M = (e, n, s = null) => {
       if (y === "SESSIONS_LOST")
         return { tokens: null, status: "SESSIONS_LOST", nonce: i };
       if (d.issuedAt !== t.issuedAt) {
-        const k = F(
+        const k = V(
           n.refresh_time_before_tokens_expiration_in_second,
           d.expiresAt
         ) > 0 ? "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_VALID" : "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_INVALID", b = await c.getNonceAsync();
@@ -779,11 +779,11 @@ const M = (e, n, s = null) => {
     } else return { tokens: null, status: "LOGOUT_FROM_ANOTHER_TAB", nonce: i };
     r = await c.getNonceAsync();
   }
-  const u = F(
+  const l = V(
     n.refresh_time_before_tokens_expiration_in_second,
     t.expiresAt
   ) > 0 ? "TOKENS_VALID" : "TOKENS_INVALID";
-  return o ? { tokens: t, status: "FORCE_REFRESH", nonce: r } : { tokens: t, status: u, nonce: r };
+  return o ? { tokens: t, status: "FORCE_REFRESH", nonce: r } : { tokens: t, status: l, nonce: r };
 }, H = (e) => async (n, s = 0, t = !1, o = null) => {
   if (!navigator.onLine && document.hidden)
     return { tokens: e.tokens, status: "GIVE_UP" };
@@ -794,17 +794,17 @@ const M = (e, n, s = null) => {
     });
   const r = s + 1;
   o || (o = {});
-  const a = e.configuration, l = (u, c = null, _ = null) => re(
+  const a = e.configuration, u = (l, c = null, _ = null) => re(
     e.configurationName,
     e.configuration,
     e.publishEvent.bind(e)
-  )(u, c, _), f = async () => {
+  )(l, c, _), f = async () => {
     try {
-      let u;
+      let l;
       const c = await I(a, e.configurationName);
-      c ? u = c.getLoginParams() : u = P(e.configurationName, a.storage).getLoginParams();
-      const _ = await l({
-        ...u.extras,
+      c ? l = c.getLoginParams() : l = P(e.configurationName, a.storage).getLoginParams();
+      const _ = await u({
+        ...l.extras,
         ...o,
         prompt: "none"
       });
@@ -813,21 +813,21 @@ const M = (e, n, s = null) => {
       }), { tokens: null, status: "SESSION_LOST" }) : (n(_.tokens), e.publishEvent(C.eventNames.token_renewed, {}), { tokens: _.tokens, status: "LOGGED" }) : (n(null), e.publishEvent(m.refreshTokensAsync_error, {
         message: "refresh token silent not active"
       }), { tokens: null, status: "SESSION_LOST" });
-    } catch (u) {
-      return console.error(u), e.publishEvent(m.refreshTokensAsync_silent_error, {
+    } catch (l) {
+      return console.error(l), e.publishEvent(m.refreshTokensAsync_silent_error, {
         message: "exceptionSilent",
-        exception: u.message
+        exception: l.message
       }), await H(e)(n, r, t, o);
     }
   };
   try {
-    const { status: u, tokens: c, nonce: _ } = await on(e)(
+    const { status: l, tokens: c, nonce: _ } = await on(e)(
       a,
       e.configurationName,
       e.tokens,
       t
     );
-    switch (u) {
+    switch (l) {
       case N.SESSION_LOST:
         return n(null), e.publishEvent(m.refreshTokensAsync_error, {
           message: "refresh token session lost"
@@ -845,29 +845,29 @@ const M = (e, n, s = null) => {
           status: "session syncTokensAsync"
         }), { tokens: null, status: "LOGGED_OUT" };
       case N.REQUIRE_SYNC_TOKENS:
-        return a.token_automatic_renew_mode == J.AutomaticOnlyWhenFetchExecuted && N.FORCE_REFRESH !== u ? (e.publishEvent(m.tokensInvalidAndWaitingActionsToRefresh, {}), { tokens: e.tokens, status: "GIVE_UP" }) : (e.publishEvent(m.refreshTokensAsync_begin, { tryNumber: s }), await f());
+        return a.token_automatic_renew_mode == J.AutomaticOnlyWhenFetchExecuted && N.FORCE_REFRESH !== l ? (e.publishEvent(m.tokensInvalidAndWaitingActionsToRefresh, {}), { tokens: e.tokens, status: "GIVE_UP" }) : (e.publishEvent(m.refreshTokensAsync_begin, { tryNumber: s }), await f());
       default: {
-        if (a.token_automatic_renew_mode == J.AutomaticOnlyWhenFetchExecuted && N.FORCE_REFRESH !== u)
+        if (a.token_automatic_renew_mode == J.AutomaticOnlyWhenFetchExecuted && N.FORCE_REFRESH !== l)
           return e.publishEvent(m.tokensInvalidAndWaitingActionsToRefresh, {}), { tokens: e.tokens, status: "GIVE_UP" };
         if (e.publishEvent(m.refreshTokensAsync_begin, {
           refreshToken: c.refreshToken,
-          status: u,
+          status: l,
           tryNumber: s
         }), !c.refreshToken)
           return await f();
         const d = a.client_id, y = a.redirect_uri, p = a.authority, b = { ...a.token_request_extras ? a.token_request_extras : {} };
-        for (const [w, v] of Object.entries(o))
-          w.endsWith(":token_request") && (b[w.replace(":token_request", "")] = v);
+        for (const [w, T] of Object.entries(o))
+          w.endsWith(":token_request") && (b[w.replace(":token_request", "")] = T);
         return await (async () => {
           const w = {
             client_id: d,
             redirect_uri: y,
             grant_type: "refresh_token",
             refresh_token: c.refreshToken
-          }, v = await e.initAsync(
+          }, T = await e.initAsync(
             p,
             a.authority_configuration
-          ), h = document.hidden ? 1e4 : 3e4 * 10, g = v.tokenEndpoint, A = {};
+          ), h = document.hidden ? 1e4 : 3e4 * 10, g = T.tokenEndpoint, A = {};
           a.demonstrating_proof_of_possession && (A.DPoP = await e.generateDemonstrationOfProofOfPossessionAsync(
             c.accessToken,
             g,
@@ -886,15 +886,15 @@ const M = (e, n, s = null) => {
             const { isValid: W, reason: L } = me(
               S.data,
               _.nonce,
-              v
+              T
             );
             if (!W)
               return n(null), e.publishEvent(m.refreshTokensAsync_error, {
                 message: `refresh token return not valid tokens, reason: ${L}`
               }), { tokens: null, status: "SESSION_LOST" };
             if (n(S.data), S.demonstratingProofOfPossessionNonce) {
-              const T = await I(a, e.configurationName);
-              T ? await T.setDemonstratingProofOfPossessionNonce(
+              const v = await I(a, e.configurationName);
+              v ? await v.setDemonstratingProofOfPossessionNonce(
                 S.demonstratingProofOfPossessionNonce
               ) : await P(e.configurationName, a.storage).setDemonstratingProofOfPossessionNonce(
                 S.demonstratingProofOfPossessionNonce
@@ -918,10 +918,10 @@ const M = (e, n, s = null) => {
         })();
       }
     }
-  } catch (u) {
-    return console.error(u), e.publishEvent(m.refreshTokensAsync_silent_error, {
+  } catch (l) {
+    return console.error(l), e.publishEvent(m.refreshTokensAsync_silent_error, {
       message: "exception",
-      exception: u.message
+      exception: l.message
     }), new Promise((c, _) => {
       setTimeout(() => {
         H(e)(n, r, t, o).then(c).catch(_);
@@ -937,22 +937,22 @@ const M = (e, n, s = null) => {
     if (o && (t == null && (t = {}), t.state = o), i && (t == null && (t = {}), t.scope = i), t != null)
       for (const [c, _] of Object.entries(t))
         r === "" ? r = `?${encodeURIComponent(c)}=${encodeURIComponent(_)}` : r += `&${encodeURIComponent(c)}=${encodeURIComponent(_)}`;
-    const a = n.silent_login_uri + r, l = a.indexOf("/", a.indexOf("//") + 2), f = a.substring(0, l), u = document.createElement("iframe");
-    return u.width = "0px", u.height = "0px", u.id = `${e}_oidc_iframe`, u.setAttribute("src", a), document.body.appendChild(u), new Promise((c, _) => {
+    const a = n.silent_login_uri + r, u = a.indexOf("/", a.indexOf("//") + 2), f = a.substring(0, u), l = document.createElement("iframe");
+    return l.width = "0px", l.height = "0px", l.id = `${e}_oidc_iframe`, l.setAttribute("src", a), document.body.appendChild(l), new Promise((c, _) => {
       let d = !1;
       const y = () => {
-        window.removeEventListener("message", p), u.remove(), d = !0;
+        window.removeEventListener("message", p), l.remove(), d = !0;
       }, p = (k) => {
-        if (k.origin === f && k.source === u.contentWindow) {
-          const b = `${e}_oidc_tokens:`, E = `${e}_oidc_error:`, w = `${e}_oidc_exception:`, v = k.data;
-          if (v && typeof v == "string" && !d) {
-            if (v.startsWith(b)) {
+        if (k.origin === f && k.source === l.contentWindow) {
+          const b = `${e}_oidc_tokens:`, E = `${e}_oidc_error:`, w = `${e}_oidc_exception:`, T = k.data;
+          if (T && typeof T == "string" && !d) {
+            if (T.startsWith(b)) {
               const h = JSON.parse(k.data.replace(b, ""));
               s(m.silentLoginAsync_end, {}), c(h), y();
-            } else if (v.startsWith(E)) {
+            } else if (T.startsWith(E)) {
               const h = JSON.parse(k.data.replace(E, ""));
               s(m.silentLoginAsync_error, h), c({ error: "oidc_" + h.error, tokens: null, sessionState: null }), y();
-            } else if (v.startsWith(w)) {
+            } else if (T.startsWith(w)) {
               const h = JSON.parse(k.data.replace(w, ""));
               s(m.silentLoginAsync_error, h), _(new Error(h.error)), y();
             }
@@ -974,9 +974,9 @@ const M = (e, n, s = null) => {
   }
 }, rn = (e, n, s, t, o) => (i = null, r = void 0) => {
   i = { ...i };
-  const a = (f, u, c) => re(n, s, t.bind(o))(
+  const a = (f, l, c) => re(n, s, t.bind(o))(
     f,
-    u,
+    l,
     c
   );
   return (async () => {
@@ -984,9 +984,9 @@ const M = (e, n, s = null) => {
     let f;
     i && "state" in i && (f = i.state, delete i.state);
     try {
-      const u = s.extras ? { ...s.extras, ...i } : i, c = await a(
+      const l = s.extras ? { ...s.extras, ...i } : i, c = await a(
         {
-          ...u,
+          ...l,
           prompt: "none"
         },
         f,
@@ -994,19 +994,19 @@ const M = (e, n, s = null) => {
       );
       if (c)
         return o.tokens = c.tokens, t(m.token_acquired, {}), o.timeoutId = M(o, o.tokens.expiresAt, i), {};
-    } catch (u) {
-      return u;
+    } catch (l) {
+      return l;
     }
   })();
 }, an = (e, n, s) => (t, o, i, r = !1) => {
-  const a = (l, f = void 0, u = void 0) => re(e.configurationName, s, e.publishEvent.bind(e))(
-    l,
+  const a = (u, f = void 0, l = void 0) => re(e.configurationName, s, e.publishEvent.bind(e))(
+    u,
     f,
-    u
+    l
   );
-  return new Promise((l, f) => {
+  return new Promise((u, f) => {
     if (s.silent_login_uri && s.silent_redirect_uri && s.monitor_session && t && i && !r) {
-      const u = () => {
+      const l = () => {
         e.checkSessionIFrame.stop();
         const c = e.tokens;
         if (c === null)
@@ -1044,16 +1044,16 @@ const M = (e, n, s = null) => {
         });
       };
       e.checkSessionIFrame = new Pe(
-        u,
+        l,
         o,
         t
       ), e.checkSessionIFrame.load().then(() => {
-        e.checkSessionIFrame.start(i), l(e.checkSessionIFrame);
+        e.checkSessionIFrame.start(i), u(e.checkSessionIFrame);
       }).catch((c) => {
         f(c);
       });
     } else
-      l(null);
+      u(null);
   });
 }, cn = (e) => !!(e.os === "iOS" && e.osVersion.startsWith("12") || e.os === "Mac OS X" && e.osVersion.startsWith("10_15_6")), ln = (e) => {
   const n = e.appVersion, s = e.userAgent, t = "-";
@@ -1091,9 +1091,9 @@ const M = (e, n, s = null) => {
     }
   ];
   for (const a in i) {
-    const l = i[a];
-    if (l.r.test(s)) {
-      o = l.s;
+    const u = i[a];
+    if (u.r.test(s)) {
+      o = u.s;
       break;
     }
   }
@@ -1225,7 +1225,7 @@ const _n = () => {
     search: s,
     hash: t
   };
-}, Tn = (e) => {
+}, vn = (e) => {
   const n = Ee(e);
   let { path: s } = n;
   s.endsWith("/") && (s = s.slice(0, -1));
@@ -1241,7 +1241,7 @@ const _n = () => {
   for (t = 0, o = i.length; t < o; t++)
     s = i[t].split("="), n[decodeURIComponent(s[0])] = decodeURIComponent(s[1]);
   return n;
-}, hn = (e, n, s, t, o) => (i = void 0, r = null, a = !1, l = void 0) => {
+}, hn = (e, n, s, t, o) => (i = void 0, r = null, a = !1, u = void 0) => {
   const f = r;
   return r = { ...r }, (async () => {
     const c = i || o.getPath();
@@ -1250,7 +1250,7 @@ const _n = () => {
         _.endsWith(":token_request") && delete r[_];
     try {
       const _ = a ? n.silent_redirect_uri : n.redirect_uri;
-      l || (l = n.scope);
+      u || (u = n.scope);
       const d = n.extras ? { ...n.extras, ...r } : r;
       d.nonce || (d.nonce = ee(12));
       const y = { nonce: d.nonce }, p = await I(n, e), k = await t(
@@ -1267,7 +1267,7 @@ const _n = () => {
       const E = {
         client_id: n.client_id,
         redirect_uri: _,
-        scope: l,
+        scope: u,
         response_type: "code",
         ...d
       };
@@ -1285,18 +1285,18 @@ const _n = () => {
     const s = e.configuration, t = s.client_id, o = n ? s.silent_redirect_uri : s.redirect_uri, i = s.authority, r = s.token_request_timeout, a = await e.initAsync(
       i,
       s.authority_configuration
-    ), l = e.location.getCurrentHref(), u = Y(l).session_state, c = await I(s, e.configurationName);
+    ), u = e.location.getCurrentHref(), l = Y(u).session_state, c = await I(s, e.configurationName);
     let _, d, y, p;
     if (c)
-      await c.initAsync(a, "loginCallbackAsync", s), await c.setSessionStateAsync(u), d = await c.getNonceAsync(), y = c.getLoginParams(), p = await c.getStateAsync(), c.startKeepAliveServiceWorker(), _ = c;
+      await c.initAsync(a, "loginCallbackAsync", s), await c.setSessionStateAsync(l), d = await c.getNonceAsync(), y = c.getLoginParams(), p = await c.getStateAsync(), c.startKeepAliveServiceWorker(), _ = c;
     else {
-      const T = P(
+      const v = P(
         e.configurationName,
         s.storage ?? sessionStorage
       );
-      await T.setSessionStateAsync(u), d = await T.getNonceAsync(), y = T.getLoginParams(), p = await T.getStateAsync(), _ = T;
+      await v.setSessionStateAsync(l), d = await v.getNonceAsync(), y = v.getLoginParams(), p = await v.getStateAsync(), _ = v;
     }
-    const k = Y(l);
+    const k = Y(u);
     if (k.error || k.error_description)
       throw new Error(`Error from OIDC server: ${k.error} - ${k.error_description}`);
     if (k.iss && k.iss !== a.issuer)
@@ -1312,27 +1312,27 @@ const _n = () => {
       redirect_uri: o
     }, E = {};
     if (s.token_request_extras)
-      for (const [T, U] of Object.entries(s.token_request_extras))
-        E[T] = U;
+      for (const [v, U] of Object.entries(s.token_request_extras))
+        E[v] = U;
     if (y != null && y.extras)
-      for (const [T, U] of Object.entries(y.extras))
-        T.endsWith(":token_request") && (E[T.replace(":token_request", "")] = U);
-    const w = a.tokenEndpoint, v = {};
+      for (const [v, U] of Object.entries(y.extras))
+        v.endsWith(":token_request") && (E[v.replace(":token_request", "")] = U);
+    const w = a.tokenEndpoint, T = {};
     if (s.demonstrating_proof_of_possession)
       if (c)
-        v.DPoP = `DPOP_SECURED_BY_OIDC_SERVICE_WORKER_${e.configurationName}`;
+        T.DPoP = `DPOP_SECURED_BY_OIDC_SERVICE_WORKER_${e.configurationName}`;
       else {
-        const T = await Ge(window)(
+        const v = await Ge(window)(
           s.demonstrating_proof_of_possession_configuration.generateKeyAlgorithm
         );
-        await P(e.configurationName, s.storage).setDemonstratingProofOfPossessionJwkAsync(T), v.DPoP = await Se(window)(
+        await P(e.configurationName, s.storage).setDemonstratingProofOfPossessionJwkAsync(v), T.DPoP = await Se(window)(
           s.demonstrating_proof_of_possession_configuration
-        )(T, "POST", w);
+        )(v, "POST", w);
       }
     const h = await tn(_)(
       w,
       { ...b, ...E },
-      v,
+      T,
       e.configuration.token_renew_mode,
       r
     );
@@ -1362,13 +1362,13 @@ const _n = () => {
         S
       );
     else {
-      const T = P(e.configurationName, s.storage);
-      g = T.getLoginParams(), S && await T.setDemonstratingProofOfPossessionNonce(S);
+      const v = P(e.configurationName, s.storage);
+      g = v.getLoginParams(), S && await v.setDemonstratingProofOfPossessionNonce(S);
     }
     return await e.startCheckSessionAsync(
       a.checkSessionIframe,
       t,
-      u,
+      l,
       n
     ), e.publishEvent(m.loginCallbackAsync_end, {}), {
       tokens: A,
@@ -1406,19 +1406,19 @@ const _n = () => {
   s ? await s.clearAsync(n) : await P(e.configurationName, e.configuration.storage).clearAsync(n), e.tokens = null, e.userInfo = null;
 }, mn = (e, n, s, t, o) => async (i = void 0, r = null) => {
   var b, E;
-  const a = e.configuration, l = await e.initAsync(
+  const a = e.configuration, u = await e.initAsync(
     a.authority,
     a.authority_configuration
   );
   i && typeof i != "string" && (i = void 0, t.warn("callbackPathOrUrl path is not a string"));
   const f = i ?? o.getPath();
-  let u = !1;
-  i && (u = i.includes("https://") || i.includes("http://"));
-  const c = u ? i : o.getOrigin() + f, _ = e.tokens ? e.tokens.idToken : "";
+  let l = !1;
+  i && (l = i.includes("https://") || i.includes("http://"));
+  const c = l ? i : o.getOrigin() + f, _ = e.tokens ? e.tokens.idToken : "";
   try {
-    const w = l.revocationEndpoint;
+    const w = u.revocationEndpoint;
     if (w) {
-      const v = [], h = e.tokens ? e.tokens.accessToken : null;
+      const T = [], h = e.tokens ? e.tokens.accessToken : null;
       if (h && a.logout_tokens_to_invalidate.includes(ye.access_token)) {
         const A = z(r, ":revoke_access_token"), S = de(s)(
           w,
@@ -1427,7 +1427,7 @@ const _n = () => {
           a.client_id,
           A
         );
-        v.push(S);
+        T.push(S);
       }
       const g = e.tokens ? e.tokens.refreshToken : null;
       if (g && a.logout_tokens_to_invalidate.includes(ye.refresh_token)) {
@@ -1438,9 +1438,9 @@ const _n = () => {
           a.client_id,
           A
         );
-        v.push(S);
+        T.push(S);
       }
-      v.length > 0 && await Promise.all(v);
+      T.length > 0 && await Promise.all(T);
     }
   } catch (w) {
     t.warn(
@@ -1455,40 +1455,42 @@ const _n = () => {
   if (y && y.no_reload === "true")
     return;
   const k = gn(r);
-  if (l.endSessionEndpoint) {
+  if (u.endSessionEndpoint) {
     "id_token_hint" in k || (k.id_token_hint = _), !("post_logout_redirect_uri" in k) && i !== null && (k.post_logout_redirect_uri = c);
     let w = "";
-    for (const [v, h] of Object.entries(k))
-      h != null && (w === "" ? w += "?" : w += "&", w += `${v}=${encodeURIComponent(h)}`);
-    o.open(`${l.endSessionEndpoint}${w}`);
+    for (const [T, h] of Object.entries(k))
+      h != null && (w === "" ? w += "?" : w += "&", w += `${T}=${encodeURIComponent(h)}`);
+    o.open(`${u.endSessionEndpoint}${w}`);
   } else
     o.reload();
 }, Oe = (e, n, s = !1) => async (...t) => {
   var d;
   const [o, i, ...r] = t, a = i ? { ...i } : { method: "GET" };
-  let l = new Headers();
-  a.headers && (l = a.headers instanceof Headers ? a.headers : new Headers(a.headers));
+  let u = new Headers();
+  a.headers && (u = a.headers instanceof Headers ? a.headers : new Headers(a.headers));
   const f = {
-    tokens: n.tokens,
+    getTokens: () => n.tokens,
     configuration: {
       token_automatic_renew_mode: n.configuration.token_automatic_renew_mode,
       refresh_time_before_tokens_expiration_in_second: n.configuration.refresh_time_before_tokens_expiration_in_second
     },
     renewTokensAsync: n.renewTokensAsync.bind(n)
-  }, u = await ke(f), c = (d = u == null ? void 0 : u.tokens) == null ? void 0 : d.accessToken;
-  if (l.has("Accept") || l.set("Accept", "application/json"), c) {
+  }, l = await ke(f);
+  console.log("getValidTokenAsync"), console.log(l);
+  const c = (d = l == null ? void 0 : l.tokens) == null ? void 0 : d.accessToken;
+  if (u.has("Accept") || u.set("Accept", "application/json"), c) {
     if (n.configuration.demonstrating_proof_of_possession && s) {
       const y = await n.generateDemonstrationOfProofOfPossessionAsync(
         c,
         o.toString(),
         a.method
       );
-      l.set("Authorization", `PoP ${c}`), l.set("DPoP", y);
+      u.set("Authorization", `PoP ${c}`), u.set("DPoP", y);
     } else
-      l.set("Authorization", `Bearer ${c}`);
+      u.set("Authorization", `Bearer ${c}`);
     a.credentials || (a.credentials = "same-origin");
   }
-  const _ = { ...a, headers: l };
+  const _ = { ...a, headers: u };
   return await e(o, _, ...r);
 }, pn = (e) => async (n = !1, s = !1) => {
   if (e.userInfo != null && !n)
@@ -1510,7 +1512,7 @@ class se {
 const x = {}, An = (e, n = new q()) => (s, t = "default") => (x[t] || (x[t] = new C(s, t, e, n)), x[t]), Sn = async (e) => {
   const { parsedTokens: n, callbackPath: s } = await e.loginCallbackAsync();
   return e.timeoutId = M(e, n.expiresAt), { callbackPath: s };
-}, vn = (e) => Math.floor(Math.random() * e), V = class V {
+}, Tn = (e) => Math.floor(Math.random() * e), F = class F {
   constructor(n, s = "default", t, o = new q()) {
     this.initPromise = null, this.tryKeepExistingSessionPromise = null, this.loginPromise = null, this.loginCallbackPromise = null, this.loginCallbackWithAutoTokensRenewPromise = null, this.userInfoPromise = null, this.renewTokensPromise = null, this.logoutPromise = null;
     let i = n.silent_login_uri;
@@ -1534,12 +1536,12 @@ const x = {}, An = (e, n = new q()) => (s, t = "default") => (x[t] || (x[t] = ne
       ],
       service_worker_update_require_callback: a,
       service_worker_activate: n.service_worker_activate ?? _n,
-      demonstrating_proof_of_possession_configuration: n.demonstrating_proof_of_possession_configuration ?? Fe,
+      demonstrating_proof_of_possession_configuration: n.demonstrating_proof_of_possession_configuration ?? Ve,
       preload_user_info: n.preload_user_info ?? !1
     }, this.getFetch = t ?? wn, this.configurationName = s, this.tokens = null, this.userInfo = null, this.events = [], this.timeoutId = null, this.loginCallbackWithAutoTokensRenewAsync.bind(this), this.initAsync.bind(this), this.loginCallbackAsync.bind(this), this.subscribeEvents.bind(this), this.removeEventSubscription.bind(this), this.publishEvent.bind(this), this.destroyAsync.bind(this), this.logoutAsync.bind(this), this.renewTokensAsync.bind(this), this.initAsync(this.configuration.authority, this.configuration.authority_configuration);
   }
   subscribeEvents(n) {
-    const s = vn(9999999999999).toString();
+    const s = Tn(9999999999999).toString();
     return this.events.push({ id: s, func: n }), s;
   }
   removeEventSubscription(n) {
@@ -1647,7 +1649,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
       return this.loginCallbackPromise;
     const s = async () => {
       const t = await yn(this)(n), o = t.tokens;
-      return this.tokens = o, await I(this.configuration, this.configurationName) || P(this.configurationName, this.configuration.storage).setTokens(o), this.publishEvent(V.eventNames.token_acquired, o), this.configuration.preload_user_info && await this.userInfoAsync(), { parsedTokens: o, state: t.state, callbackPath: t.callbackPath };
+      return this.tokens = o, await I(this.configuration, this.configurationName) || P(this.configurationName, this.configuration.storage).setTokens(o), this.publishEvent(F.eventNames.token_acquired, o), this.configuration.preload_user_info && await this.userInfoAsync(), { parsedTokens: o, state: t.state, callbackPath: t.callbackPath };
     };
     return this.loginCallbackPromise = s(), this.loginCallbackPromise.finally(() => {
       this.loginCallbackPromise = null;
@@ -1655,13 +1657,13 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
   }
   async generateDemonstrationOfProofOfPossessionAsync(n, s, t, o = {}) {
     const i = this.configuration, r = {
-      ath: await Te(n),
+      ath: await ve(n),
       ...o
     };
     if (await I(i, this.configurationName))
       return `DPOP_SECURED_BY_OIDC_SERVICE_WORKER_${this.configurationName}`;
-    const l = P(this.configurationName, i.storage), f = await l.getDemonstratingProofOfPossessionJwkAsync(), u = l.getDemonstratingProofOfPossessionNonce();
-    return u && (r.nonce = u), await Se(window)(
+    const u = P(this.configurationName, i.storage), f = await u.getDemonstratingProofOfPossessionJwkAsync(), l = u.getDemonstratingProofOfPossessionNonce();
+    return l && (r.nonce = l), await Se(window)(
       i.demonstrating_proof_of_possession_configuration
     )(f, t, s, r);
   }
@@ -1704,8 +1706,8 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
     }));
   }
 };
-V.getOrCreate = (n, s) => (t, o = "default") => An(n, s)(t, o), V.eventNames = m;
-let C = V;
+F.getOrCreate = (n, s) => (t, o = "default") => An(n, s)(t, o), F.eventNames = m;
+let C = F;
 const $ = class $ {
   constructor(n) {
     this._oidc = n;
@@ -1755,7 +1757,15 @@ const $ = class $ {
     );
   }
   async getValidTokenAsync(n = 200, s = 50) {
-    return ke(this._oidc, n, s);
+    const t = this._oidc, o = {
+      getTokens: () => t.tokens,
+      configuration: {
+        token_automatic_renew_mode: t.configuration.token_automatic_renew_mode,
+        refresh_time_before_tokens_expiration_in_second: t.configuration.refresh_time_before_tokens_expiration_in_second
+      },
+      renewTokensAsync: t.renewTokensAsync.bind(t)
+    };
+    return ke(o, n, s);
   }
   fetchWithTokens(n, s = !1) {
     return Oe(n, this._oidc, s);
@@ -1776,5 +1786,5 @@ export {
   Q as TokenRenewMode,
   wn as getFetchDefault,
   Y as getParseQueryStringFromLocation,
-  Tn as getPath
+  vn as getPath
 };