@versini/auth-provider 4.4.0 → 5.0.1

package/dist/index.d.ts

@@ -13,7 +13,10 @@ type AuthState = {
 	isLoading: boolean;
 	isAuthenticated: boolean;
 	logoutReason?: string;
-	userId?: string;
+	user?: {
+		userId?: string;
+		username?: string;
+	};
 };
 
 type LoginType = (

package/dist/index.js

@@ -1,27 +1,27 @@
 import { jsx as We } from "react/jsx-runtime";
-import * as D from "react";
+import * as U from "react";
 import { createContext as Je, useState as xe, useCallback as je, useEffect as Me, useContext as Ve } from "react";
 /*!
-  @versini/auth-provider v4.4.0
+  @versini/auth-provider v5.0.1
   © 2024 gizmette.com
 */
 try {
   window.__VERSINI_AUTH_CLIENT__ || (window.__VERSINI_AUTH_CLIENT__ = {
-    version: "4.4.0",
-    buildTime: "06/29/2024 12:23 PM EDT",
+    version: "5.0.1",
+    buildTime: "07/03/2024 06:46 PM EDT",
     homepage: "https://github.com/aversini/auth-client",
     license: "MIT"
   });
 } catch {
 }
 /*!
-  @versini/auth-common v2.10.0
+  @versini/auth-common v2.10.1
   © 2024 gizmette.com
 */
 try {
   window.__VERSINI_AUTH_COMMON__ || (window.__VERSINI_AUTH_COMMON__ = {
-    version: "2.10.0",
-    buildTime: "06/29/2024 12:23 PM EDT",
+    version: "2.10.1",
+    buildTime: "07/03/2024 06:46 PM EDT",
     homepage: "https://github.com/aversini/auth-client",
     license: "MIT"
   });
@@ -35,11 +35,12 @@ const B = {
   REFRESH_TOKEN: "refresh_token"
 }, Ye = {
   CLIENT_ID: "X-Auth-ClientId"
-}, y = {
+}, f = {
   ALG: "RS256",
   USER_ID_KEY: "sub",
   TOKEN_ID_KEY: "__raw",
   NONCE_KEY: "_nonce",
+  USERNAME_KEY: "username",
   ISSUER: "gizmette.com"
 }, Be = `-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsF6i3Jd9fY/3COqCw/m7
@@ -53,7 +54,7 @@ awIDAQAB
   AUTHENTICATE: "authenticate",
   CODE: "code",
   LOGOUT: "logout"
-}, G = crypto, Ae = (e) => e instanceof CryptoKey, K = new TextEncoder(), q = new TextDecoder();
+}, G = crypto, Ae = (e) => e instanceof CryptoKey, N = new TextEncoder(), q = new TextDecoder();
 function Fe(...e) {
   const t = e.reduce((n, { length: s }) => n + s, 0), r = new Uint8Array(t);
   let a = 0;
@@ -84,7 +85,7 @@ class C extends Error {
     super(t), this.code = "ERR_JOSE_GENERIC", this.name = this.constructor.name, (r = Error.captureStackTrace) == null || r.call(Error, this, this.constructor);
   }
 }
-class g extends C {
+class A extends C {
   static get code() {
     return "ERR_JWT_CLAIM_VALIDATION_FAILED";
   }
@@ -108,7 +109,7 @@ class qe extends C {
     return "ERR_JOSE_ALG_NOT_ALLOWED";
   }
 }
-let T = class extends C {
+let k = class extends C {
   constructor() {
     super(...arguments), this.code = "ERR_JOSE_NOT_SUPPORTED";
   }
@@ -300,7 +301,7 @@ function at(e) {
           }, r = e.d ? ["decrypt", "unwrapKey"] : ["encrypt", "wrapKey"];
           break;
         default:
-          throw new T('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+          throw new k('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
       }
       break;
     }
@@ -322,7 +323,7 @@ function at(e) {
           t = { name: "ECDH", namedCurve: e.crv }, r = e.d ? ["deriveBits"] : [];
           break;
         default:
-          throw new T('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+          throw new k('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
       }
       break;
     }
@@ -338,12 +339,12 @@ function at(e) {
           t = { name: e.crv }, r = e.d ? ["deriveBits"] : [];
           break;
         default:
-          throw new T('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+          throw new k('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
       }
       break;
     }
     default:
-      throw new T('Invalid or unsupported JWK "kty" (Key Type) Parameter value');
+      throw new k('Invalid or unsupported JWK "kty" (Key Type) Parameter value');
   }
   return { algorithm: t, keyUsages: r };
 }
@@ -358,49 +359,49 @@ const nt = async (e) => {
   return delete n.alg, delete n.use, G.subtle.importKey("jwk", n, ...a);
 }, ke = (e) => M(e);
 let Q, Z;
-const Ie = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", Re = async (e, t, r, a) => {
+const Re = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", Ie = async (e, t, r, a) => {
   let n = e.get(t);
   if (n != null && n[a])
     return n[a];
   const s = await nt({ ...r, alg: a });
   return n ? n[a] = s : e.set(t, { [a]: s }), s;
 }, ot = (e, t) => {
-  if (Ie(e)) {
+  if (Re(e)) {
     let r = e.export({ format: "jwk" });
-    return delete r.d, delete r.dp, delete r.dq, delete r.p, delete r.q, delete r.qi, r.k ? ke(r.k) : (Z || (Z = /* @__PURE__ */ new WeakMap()), Re(Z, e, r, t));
+    return delete r.d, delete r.dp, delete r.dq, delete r.p, delete r.q, delete r.qi, r.k ? ke(r.k) : (Z || (Z = /* @__PURE__ */ new WeakMap()), Ie(Z, e, r, t));
   }
   return e;
 }, st = (e, t) => {
-  if (Ie(e)) {
+  if (Re(e)) {
     let r = e.export({ format: "jwk" });
-    return r.k ? ke(r.k) : (Q || (Q = /* @__PURE__ */ new WeakMap()), Re(Q, e, r, t));
+    return r.k ? ke(r.k) : (Q || (Q = /* @__PURE__ */ new WeakMap()), Ie(Q, e, r, t));
   }
   return e;
-}, ct = { normalizePublicKey: ot, normalizePrivateKey: st }, v = (e, t, r = 0) => {
+}, ct = { normalizePublicKey: ot, normalizePrivateKey: st }, T = (e, t, r = 0) => {
   r === 0 && (t.unshift(t.length), t.unshift(6));
   const a = e.indexOf(t[0], r);
   if (a === -1)
     return !1;
   const n = e.subarray(a, a + t.length);
-  return n.length !== t.length ? !1 : n.every((s, o) => s === t[o]) || v(e, t, a + 1);
+  return n.length !== t.length ? !1 : n.every((s, o) => s === t[o]) || T(e, t, a + 1);
 }, ue = (e) => {
   switch (!0) {
-    case v(e, [42, 134, 72, 206, 61, 3, 1, 7]):
+    case T(e, [42, 134, 72, 206, 61, 3, 1, 7]):
       return "P-256";
-    case v(e, [43, 129, 4, 0, 34]):
+    case T(e, [43, 129, 4, 0, 34]):
       return "P-384";
-    case v(e, [43, 129, 4, 0, 35]):
+    case T(e, [43, 129, 4, 0, 35]):
       return "P-521";
-    case v(e, [43, 101, 110]):
+    case T(e, [43, 101, 110]):
       return "X25519";
-    case v(e, [43, 101, 111]):
+    case T(e, [43, 101, 111]):
       return "X448";
-    case v(e, [43, 101, 112]):
+    case T(e, [43, 101, 112]):
       return "Ed25519";
-    case v(e, [43, 101, 113]):
+    case T(e, [43, 101, 113]):
       return "Ed448";
     default:
-      throw new T("Invalid or unsupported EC Key Curve or OKP Key Sub Type");
+      throw new k("Invalid or unsupported EC Key Curve or OKP Key Sub Type");
   }
 }, it = async (e, t, r, a, n) => {
   let s, o;
@@ -446,7 +447,7 @@ const Ie = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject",
       s = { name: ue(i) }, o = ["verify"];
       break;
     default:
-      throw new T('Invalid or unsupported "alg" (Algorithm) value');
+      throw new k('Invalid or unsupported "alg" (Algorithm) value');
   }
   return G.subtle.importKey(t, i, s, !1, o);
 }, ut = (e, t, r) => it(/(?:-----(?:BEGIN|END) PUBLIC KEY-----|\s)/g, "spki", e, t);
@@ -485,7 +486,7 @@ function yt(e, t, r, a, n) {
   r !== void 0 ? s = new Map([...Object.entries(r), ...t.entries()]) : s = t;
   for (const o of a.crit) {
     if (!s.has(o))
-      throw new T(`Extension Header Parameter "${o}" is not recognized`);
+      throw new k(`Extension Header Parameter "${o}" is not recognized`);
     if (n[o] === void 0)
       throw new e(`Extension Header Parameter "${o}" is missing`);
     if (s.get(o) && a[o] === void 0)
@@ -521,7 +522,7 @@ function mt(e, t) {
     case "EdDSA":
       return { name: t.name };
     default:
-      throw new T(`alg ${e} is not supported either by JOSE or your javascript runtime`);
+      throw new k(`alg ${e} is not supported either by JOSE or your javascript runtime`);
   }
 }
 async function wt(e, t, r) {
@@ -534,7 +535,7 @@ async function wt(e, t, r) {
   }
   throw new TypeError(ie(t, ...Y, "Uint8Array"));
 }
-const St = async (e, t, r, a) => {
+const Et = async (e, t, r, a) => {
   const n = await wt(e, t, "verify");
   rt(e, n);
   const s = mt(e, n.algorithm);
@@ -544,7 +545,7 @@ const St = async (e, t, r, a) => {
     return !1;
   }
 };
-async function Et(e, t, r) {
+async function St(e, t, r) {
   if (!ne(e))
     throw new h("Flattened JWS must be an object");
   if (e.protected === void 0 && e.header === void 0)
@@ -560,8 +561,8 @@ async function Et(e, t, r) {
   let a = {};
   if (e.protected)
     try {
-      const m = M(e.protected);
-      a = JSON.parse(q.decode(m));
+      const E = M(e.protected);
+      a = JSON.parse(q.decode(E));
     } catch {
       throw new h("JWS Protected Header is invalid");
     }
@@ -587,14 +588,14 @@ async function Et(e, t, r) {
     throw new h("JWS Payload must be a string or an Uint8Array instance");
   let u = !1;
   typeof t == "function" && (t = await t(a, e), u = !0), pt(i, t, "verify");
-  const f = Fe(K.encode(e.protected ?? ""), K.encode("."), typeof e.payload == "string" ? K.encode(e.payload) : e.payload);
-  let p;
+  const w = Fe(N.encode(e.protected ?? ""), N.encode("."), typeof e.payload == "string" ? N.encode(e.payload) : e.payload);
+  let y;
   try {
-    p = M(e.signature);
+    y = M(e.signature);
   } catch {
     throw new h("Failed to base64url decode the signature");
   }
-  if (!await St(i, t, p, f))
+  if (!await Et(i, t, y, w))
     throw new ze();
   let _;
   if (o)
@@ -604,7 +605,7 @@ async function Et(e, t, r) {
       throw new h("Failed to base64url decode the payload");
     }
   else
-    typeof e.payload == "string" ? _ = K.encode(e.payload) : _ = e.payload;
+    typeof e.payload == "string" ? _ = N.encode(e.payload) : _ = e.payload;
   const S = { payload: _ };
   return e.protected !== void 0 && (S.protectedHeader = a), e.header !== void 0 && (S.unprotectedHeader = e.header), u ? { ...S, key: t } : S;
 }
@@ -614,7 +615,7 @@ async function gt(e, t, r) {
   const { 0: a, 1: n, 2: s, length: o } = e.split(".");
   if (o !== 3)
     throw new h("Invalid Compact JWS");
-  const i = await Et({ payload: n, protected: a, signature: s }, t, r), c = { payload: i.payload, protectedHeader: i.protectedHeader };
+  const i = await St({ payload: n, protected: a, signature: s }, t, r), c = { payload: i.payload, protectedHeader: i.protectedHeader };
   return typeof t == "function" ? { ...c, key: i.key } : c;
 }
 const At = (e) => Math.floor(e.getTime() / 1e3), Ce = 60, Pe = Ce * 60, oe = Pe * 24, bt = oe * 7, _t = oe * 365.25, vt = /^(\+|\-)? ?(\d+|\d+\.\d+) ?(seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)(?: (ago|from now))?$/i, de = (e) => {
@@ -670,57 +671,57 @@ const At = (e) => Math.floor(e.getTime() / 1e3), Ce = 60, Pe = Ce * 60, oe = Pe
     throw new be("JWT Claims Set must be a top-level JSON object");
   const { typ: n } = r;
   if (n && (typeof e.typ != "string" || le(e.typ) !== le(n)))
-    throw new g('unexpected "typ" JWT header value', a, "typ", "check_failed");
-  const { requiredClaims: s = [], issuer: o, subject: i, audience: c, maxTokenAge: u } = r, f = [...s];
-  u !== void 0 && f.push("iat"), c !== void 0 && f.push("aud"), i !== void 0 && f.push("sub"), o !== void 0 && f.push("iss");
-  for (const m of new Set(f.reverse()))
-    if (!(m in a))
-      throw new g(`missing required "${m}" claim`, a, m, "missing");
+    throw new A('unexpected "typ" JWT header value', a, "typ", "check_failed");
+  const { requiredClaims: s = [], issuer: o, subject: i, audience: c, maxTokenAge: u } = r, w = [...s];
+  u !== void 0 && w.push("iat"), c !== void 0 && w.push("aud"), i !== void 0 && w.push("sub"), o !== void 0 && w.push("iss");
+  for (const E of new Set(w.reverse()))
+    if (!(E in a))
+      throw new A(`missing required "${E}" claim`, a, E, "missing");
   if (o && !(Array.isArray(o) ? o : [o]).includes(a.iss))
-    throw new g('unexpected "iss" claim value', a, "iss", "check_failed");
+    throw new A('unexpected "iss" claim value', a, "iss", "check_failed");
   if (i && a.sub !== i)
-    throw new g('unexpected "sub" claim value', a, "sub", "check_failed");
+    throw new A('unexpected "sub" claim value', a, "sub", "check_failed");
   if (c && !Tt(a.aud, typeof c == "string" ? [c] : c))
-    throw new g('unexpected "aud" claim value', a, "aud", "check_failed");
-  let p;
+    throw new A('unexpected "aud" claim value', a, "aud", "check_failed");
+  let y;
   switch (typeof r.clockTolerance) {
     case "string":
-      p = de(r.clockTolerance);
+      y = de(r.clockTolerance);
       break;
     case "number":
-      p = r.clockTolerance;
+      y = r.clockTolerance;
       break;
     case "undefined":
-      p = 0;
+      y = 0;
       break;
     default:
       throw new TypeError("Invalid clockTolerance option type");
   }
   const { currentDate: _ } = r, S = At(_ || /* @__PURE__ */ new Date());
   if ((a.iat !== void 0 || u) && typeof a.iat != "number")
-    throw new g('"iat" claim must be a number', a, "iat", "invalid");
+    throw new A('"iat" claim must be a number', a, "iat", "invalid");
   if (a.nbf !== void 0) {
     if (typeof a.nbf != "number")
-      throw new g('"nbf" claim must be a number', a, "nbf", "invalid");
-    if (a.nbf > S + p)
-      throw new g('"nbf" claim timestamp check failed', a, "nbf", "check_failed");
+      throw new A('"nbf" claim must be a number', a, "nbf", "invalid");
+    if (a.nbf > S + y)
+      throw new A('"nbf" claim timestamp check failed', a, "nbf", "check_failed");
   }
   if (a.exp !== void 0) {
     if (typeof a.exp != "number")
-      throw new g('"exp" claim must be a number', a, "exp", "invalid");
-    if (a.exp <= S - p)
+      throw new A('"exp" claim must be a number', a, "exp", "invalid");
+    if (a.exp <= S - y)
       throw new ce('"exp" claim timestamp check failed', a, "exp", "check_failed");
   }
   if (u) {
-    const m = S - a.iat, k = typeof u == "number" ? u : de(u);
-    if (m - p > k)
+    const E = S - a.iat, R = typeof u == "number" ? u : de(u);
+    if (E - y > R)
       throw new ce('"iat" claim timestamp check failed (too far in the past)', a, "iat", "check_failed");
-    if (m < 0 - p)
-      throw new g('"iat" claim timestamp check failed (it should be in the past)', a, "iat", "check_failed");
+    if (E < 0 - y)
+      throw new A('"iat" claim timestamp check failed (it should be in the past)', a, "iat", "check_failed");
   }
   return a;
 };
-async function It(e, t, r) {
+async function Rt(e, t, r) {
   var a;
   const n = await gt(e, t, r);
   if ((a = n.protectedHeader.crit) != null && a.includes("b64") && n.protectedHeader.b64 === !1)
@@ -730,9 +731,9 @@ async function It(e, t, r) {
 }
 const H = async (e) => {
   try {
-    const t = y.ALG, r = await dt(Be, t);
-    return await It(e, r, {
-      issuer: y.ISSUER
+    const t = f.ALG, r = await dt(Be, t);
+    return await Rt(e, r, {
+      issuer: f.ISSUER
     });
   } catch {
     return;
@@ -741,7 +742,7 @@ const H = async (e) => {
 var d = [];
 for (var ee = 0; ee < 256; ++ee)
   d.push((ee + 256).toString(16).slice(1));
-function Rt(e, t = 0) {
+function It(e, t = 0) {
   return (d[e[t + 0]] + d[e[t + 1]] + d[e[t + 2]] + d[e[t + 3]] + "-" + d[e[t + 4]] + d[e[t + 5]] + "-" + d[e[t + 6]] + d[e[t + 7]] + "-" + d[e[t + 8]] + d[e[t + 9]] + "-" + d[e[t + 10]] + d[e[t + 11]] + d[e[t + 12]] + d[e[t + 13]] + d[e[t + 14]] + d[e[t + 15]]).toLowerCase();
 }
 var L, Ct = new Uint8Array(16);
@@ -759,7 +760,7 @@ function pe(e, t, r) {
     return he.randomUUID();
   e = e || {};
   var a = e.random || (e.rng || Pt)();
-  return a[6] = a[6] & 15 | 64, a[8] = a[8] & 63 | 128, Rt(a);
+  return a[6] = a[6] & 15 | 64, a[8] = a[8] & 63 | 128, It(a);
 }
 const ye = globalThis.crypto, Dt = (e) => `${pe()}${pe()}`.slice(0, e), Ut = (e) => btoa(
   [...new Uint8Array(e)].map((t) => String.fromCharCode(t)).join("")
@@ -772,7 +773,7 @@ async function Ht(e) {
   const t = new TextEncoder().encode(e), r = await ye.subtle.digest("SHA-256", t);
   return Ut(r).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
-async function Nt(e) {
+async function Kt(e) {
   const r = Dt(43), a = await Ht(r);
   return {
     code_verifier: r,
@@ -787,32 +788,32 @@ const fe = (e, t) => {
     typeof t == "function" ? t() : t
   );
   window.localStorage.setItem(e, r), Oe(e, r);
-}, Kt = (e) => {
+}, Nt = (e) => {
   window.localStorage.removeItem(e), Oe(e, null);
 }, me = (e) => window.localStorage.getItem(e), $t = (e) => (window.addEventListener("storage", e), () => window.removeEventListener("storage", e));
 function W({
   key: e,
   initialValue: t
 }) {
-  const r = () => me(e), a = D.useSyncExternalStore(
+  const r = () => me(e), a = U.useSyncExternalStore(
     $t,
     r
-  ), n = D.useCallback(
+  ), n = U.useCallback(
     (i) => {
       try {
         const c = typeof i == "function" ? i(JSON.parse(a)) : i;
-        c == null ? Kt(e) : fe(e, c);
+        c == null ? Nt(e) : fe(e, c);
       } catch (c) {
         console.warn(c);
       }
     },
     [e, a]
-  ), s = D.useCallback(() => {
+  ), s = U.useCallback(() => {
     n(t);
-  }, [t, n]), o = D.useCallback(() => {
+  }, [t, n]), o = U.useCallback(() => {
     n(null);
   }, [n]);
-  return D.useEffect(() => {
+  return U.useEffect(() => {
     try {
       me(e) === null && typeof t < "u" && fe(e, t);
     } catch (i) {
@@ -843,7 +844,7 @@ function jt(e, t, r) {
   var a = e.random || (e.rng || Jt)();
   return a[6] = a[6] & 15 | 64, a[8] = a[8] & 63 | 128, Lt(a);
 }
-const re = "Oops! It looks like your session has expired. For your security, please log in again to continue.", Mt = "Your session has been successfully terminated.", Se = "Login failed. Please try again.", U = "Error getting access token, please re-authenticate.", Vt = "You forgot to wrap your component in <AuthProvider>.", Ee = {
+const re = "Oops! It looks like your session has expired. For your security, please log in again to continue.", Mt = "Your session has been successfully terminated.", Ee = "Login failed. Please try again.", v = "Error getting access token, please re-authenticate.", Vt = "You forgot to wrap your component in <AuthProvider>.", Se = {
   dev: "https://auth.gizmette.local.com:3003",
   prod: "https://mylogin.gizmette.com"
 }, x = "@@auth@@", Yt = process.env.NODE_ENV === "production", Bt = !Yt, z = async ({
@@ -853,7 +854,7 @@ const re = "Oops! It looks like your session has expired. For your security, ple
 }) => {
   try {
     const a = await fetch(
-      Bt ? `${Ee.dev}/${e}` : `${Ee.prod}/${e}`,
+      Bt ? `${Se.dev}/${e}` : `${Se.prod}/${e}`,
       {
         credentials: "include",
         method: "POST",
@@ -922,11 +923,11 @@ const re = "Oops! It looks like your session has expired. For your security, ple
         code_verifier: i
       }
     }), u = await H(c.data.idToken);
-    return u && u.payload[y.USER_ID_KEY] !== "" && u.payload[y.NONCE_KEY] === a ? {
+    return u && u.payload[f.USER_ID_KEY] !== "" && u.payload[f.NONCE_KEY] === a ? {
       idToken: c.data.idToken,
       accessToken: c.data.accessToken,
       refreshToken: c.data.refreshToken,
-      userId: u.payload[y.USER_ID_KEY],
+      userId: u.payload[f.USER_ID_KEY],
       status: !0
     } : {
       status: !1
@@ -981,10 +982,10 @@ const re = "Oops! It looks like your session has expired. For your security, ple
         accessToken: n
       }
     }), o = await H(s.data.accessToken);
-    return o && o.payload[y.USER_ID_KEY] !== "" && o.payload[y.NONCE_KEY] === r ? {
+    return o && o.payload[f.USER_ID_KEY] !== "" && o.payload[f.NONCE_KEY] === r ? {
       accessToken: s.data.accessToken,
       refreshToken: s.data.refreshToken,
-      userId: o.payload[y.USER_ID_KEY],
+      userId: o.payload[f.USER_ID_KEY],
       status: !0
     } : {
       status: !1
@@ -1013,45 +1014,48 @@ const re = "Oops! It looks like your session has expired. For your security, ple
     key: `${x}::${r}::@@user@@`
   }), [o, i, , c] = W({
     key: `${x}::${r}::@@access@@`
-  }), [u, f, , p] = W(
+  }), [u, w, , y] = W(
     {
       key: `${x}::${r}::@@refresh@@`
     }
-  ), [_, S, , m] = W({
+  ), [_, S, , E] = W({
     key: `${x}::${r}::@@nonce@@`
-  }), [k, N] = xe({
+  }), [R, K] = xe({
     isLoading: !0,
     isAuthenticated: !1,
-    userId: "",
+    user: void 0,
     logoutReason: ""
-  }), A = je(
-    (w) => {
-      N({
+  }), g = je(
+    (p) => {
+      K({
         isLoading: !1,
         isAuthenticated: !1,
-        userId: "",
-        logoutReason: w || re
-      }), s(), c(), p(), m();
+        user: void 0,
+        logoutReason: p || re
+      }), s(), c(), y(), E();
     },
-    [s, c, m, p]
+    [s, c, E, y]
   );
   Me(() => {
-    k.isLoading && a !== null && (async () => {
+    R.isLoading && a !== null && (async () => {
       try {
-        const w = await H(a);
-        w && w.payload[y.USER_ID_KEY] !== "" ? N({
+        const p = await H(a);
+        p && p.payload[f.USER_ID_KEY] !== "" ? K({
           isLoading: !1,
           isAuthenticated: !0,
-          userId: w.payload[y.USER_ID_KEY],
+          user: {
+            userId: p.payload[f.USER_ID_KEY],
+            username: p.payload[f.USERNAME_KEY]
+          },
           logoutReason: ""
-        }) : (A(re), await ae({
+        }) : (g(re), await ae({
           idToken: a,
           accessToken: o,
           refreshToken: u,
           clientId: r
         }));
       } catch {
-        A(re), await ae({
+        g(re), await ae({
           idToken: a,
           accessToken: o,
           refreshToken: u,
@@ -1060,94 +1064,101 @@ const re = "Oops! It looks like your session has expired. For your security, ple
       }
     })();
   }, [
-    k.isLoading,
+    R.isLoading,
     o,
     a,
     u,
     r,
-    A
+    g
   ]);
-  const Ue = async (w, P, I) => {
-    const R = jt();
-    if (S(R), I === B.CODE) {
-      const { code_verifier: $e, code_challenge: Le } = await Nt(), se = await Ft({
-        nonce: R,
+  const Ue = async (p, P, I) => {
+    const m = jt();
+    if (S(m), I === B.CODE) {
+      const { code_verifier: $e, code_challenge: Le } = await Kt(), se = await Ft({
+        nonce: m,
         clientId: r,
         code_challenge: Le
       });
       if (se.status) {
-        const O = await ge({
-          username: w,
+        const D = await ge({
+          username: p,
           password: P,
           clientId: r,
           sessionExpiration: t,
-          nonce: R,
+          nonce: m,
           type: I,
           code: se.code,
           code_verifier: $e
         });
-        return O.status ? (n(O.idToken), i(O.accessToken), f(O.refreshToken), N({
+        return D.status ? (n(D.idToken), i(D.accessToken), w(D.refreshToken), K({
           isLoading: !1,
           isAuthenticated: !0,
-          userId: O.userId,
+          user: {
+            userId: D.userId,
+            username: p
+          },
           logoutReason: ""
-        }), !0) : (A(Se), !1);
+        }), !0) : (g(Ee), !1);
       }
       return !1;
     }
-    const E = await ge({
-      username: w,
+    const O = await ge({
+      username: p,
       password: P,
       clientId: r,
       sessionExpiration: t,
-      nonce: R,
+      nonce: m,
       type: I
     });
-    return E.status ? (n(E.idToken), i(E.accessToken), f(E.refreshToken), N({
+    return O.status ? (n(O.idToken), i(O.accessToken), w(O.refreshToken), K({
       isLoading: !1,
       isAuthenticated: !0,
-      userId: E.userId
-    }), !0) : (A(Se), !1);
+      user: {
+        userId: O.userId,
+        username: p
+      }
+    }), !0) : (g(Ee), !1);
   }, He = async () => {
-    A(Mt), await ae({
+    g(Mt), await ae({
       idToken: a,
       accessToken: o,
       refreshToken: u,
       clientId: r
     });
-  }, Ne = async () => {
-    const { isAuthenticated: w, userId: P } = k;
+  }, Ke = async () => {
+    const { isAuthenticated: p, user: P } = R;
     try {
-      if (w && P && o) {
-        const I = await H(o);
-        if (I && I.payload[y.USER_ID_KEY] !== "")
-          return o;
-        const R = await H(u);
-        if (R && R.payload[y.USER_ID_KEY] !== "") {
-          const E = await Gt({
+      if (p && P && P.userId) {
+        if (o) {
+          const m = await H(o);
+          if (m && m.payload[f.USER_ID_KEY] !== "")
+            return o;
+        }
+        const I = await H(u);
+        if (I && I.payload[f.USER_ID_KEY] !== "") {
+          const m = await Gt({
             clientId: r,
-            userId: P,
+            userId: P.userId,
             nonce: _,
             refreshToken: u,
             accessToken: o
           });
-          if (E.status)
-            return i(E.accessToken), f(E.refreshToken), E.accessToken;
-          A(U);
+          return m.status ? (i(m.accessToken), w(m.refreshToken), m.accessToken) : (g(v), console.error(v), "");
         }
-        return A(U), console.error(U), "";
+        return g(v), console.error(v), "";
       }
+      return g(v), console.error(v), "";
     } catch {
-      return A(U), console.error(U), "";
+      return g(v), console.error(v), "";
     }
-  }, Ke = () => {
-    if (k.isAuthenticated && a)
+  }, Ne = () => {
+    if (R.isAuthenticated && a)
       return a;
   };
   return /* @__PURE__ */ We(
     De.Provider,
     {
-      value: { ...k, login: Ue, logout: He, getAccessToken: Ne, getIdToken: Ke },
+      value: { ...R, login: Ue, logout: He, getAccessToken: Ke, getIdToken: Ne },
       children: e
     }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@versini/auth-provider",
-	"version": "4.4.0",
+	"version": "5.0.1",
 	"license": "MIT",
 	"author": "Arno Versini",
 	"publishConfig": {
@@ -44,10 +44,10 @@
 		"react-dom": "18.3.1"
 	},
 	"dependencies": {
-		"@versini/auth-common": "2.10.0",
+		"@versini/auth-common": "2.10.1",
 		"@versini/ui-hooks": "4.0.0",
-		"jose": "5.6.2",
+		"jose": "5.6.3",
 		"uuid": "10.0.0"
 	},
-	"gitHead": "5abd68fc5595a95360b4e80088cc39c067722085"
+	"gitHead": "e58285842ff21caaa538c6c0e41b840a2df569cd"
 }