@versini/auth-provider 4.4.0 → 5.0.0

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

@@ -2,26 +2,26 @@ import { jsx as We } from "react/jsx-runtime";
 import * as D 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.0
   © 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.0",
+    buildTime: "06/29/2024 02:02 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: "06/29/2024 02:02 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;
@@ -92,7 +93,7 @@ class g extends C {
     super(t), this.code = "ERR_JWT_CLAIM_VALIDATION_FAILED", this.claim = a, this.reason = n, this.payload = r;
   }
 }
-class ce extends C {
+class ie extends C {
   static get code() {
     return "ERR_JWT_EXPIRED";
   }
@@ -232,7 +233,7 @@ function _e(e, t, ...r) {
     r.length === 2 ? e += `one of type ${r[0]} or ${r[1]}.` : e += `of type ${r[0]}.`;
   return t == null ? e += ` Received ${t}` : typeof t == "function" && t.name ? e += ` Received function ${t.name}` : typeof t == "object" && t != null && (a = t.constructor) != null && a.name && (e += ` Received an instance of ${t.constructor.name}`), e;
 }
-const ie = (e, ...t) => _e("Key must be ", e, ...t);
+const ce = (e, ...t) => _e("Key must be ", e, ...t);
 function ve(e, t, ...r) {
   return _e(`Key for the ${e} algorithm must be `, t, ...r);
 }
@@ -358,25 +359,25 @@ 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) => {
+}, it = { normalizePublicKey: ot, normalizePrivateKey: st }, v = (e, t, r = 0) => {
   r === 0 && (t.unshift(t.length), t.unshift(6));
   const a = e.indexOf(t[0], r);
   if (a === -1)
@@ -402,9 +403,9 @@ const Ie = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject",
     default:
       throw new T("Invalid or unsupported EC Key Curve or OKP Key Sub Type");
   }
-}, it = async (e, t, r, a, n) => {
+}, ct = async (e, t, r, a, n) => {
   let s, o;
-  const i = new Uint8Array(atob(r.replace(e, "")).split("").map((c) => c.charCodeAt(0)));
+  const c = new Uint8Array(atob(r.replace(e, "")).split("").map((i) => i.charCodeAt(0)));
   switch (a) {
     case "PS256":
     case "PS384":
@@ -438,18 +439,18 @@ const Ie = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject",
     case "ECDH-ES+A128KW":
     case "ECDH-ES+A192KW":
     case "ECDH-ES+A256KW": {
-      const c = ue(i);
-      s = c.startsWith("P-") ? { name: "ECDH", namedCurve: c } : { name: c }, o = [];
+      const i = ue(c);
+      s = i.startsWith("P-") ? { name: "ECDH", namedCurve: i } : { name: i }, o = [];
       break;
     }
     case "EdDSA":
-      s = { name: ue(i) }, o = ["verify"];
+      s = { name: ue(c) }, o = ["verify"];
       break;
     default:
       throw new T('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);
+  return G.subtle.importKey(t, c, s, !1, o);
+}, ut = (e, t, r) => ct(/(?:-----(?:BEGIN|END) PUBLIC KEY-----|\s)/g, "spki", e, t);
 async function dt(e, t, r) {
   if (e.indexOf("-----BEGIN PUBLIC KEY-----") !== 0)
     throw new TypeError('"spki" must be SPKI formatted string');
@@ -525,16 +526,16 @@ function mt(e, t) {
   }
 }
 async function wt(e, t, r) {
-  if (t = await ct.normalizePublicKey(t, e), Ae(t))
+  if (t = await it.normalizePublicKey(t, e), Ae(t))
     return Ze(t, e, r), t;
   if (t instanceof Uint8Array) {
     if (!e.startsWith("HS"))
-      throw new TypeError(ie(t, ...Y));
+      throw new TypeError(ce(t, ...Y));
     return G.subtle.importKey("raw", t, { hash: `SHA-${e.slice(-3)}`, name: "HMAC" }, !1, [r]);
   }
-  throw new TypeError(ie(t, ...Y, "Uint8Array"));
+  throw new TypeError(ce(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 w = M(e.protected);
+      a = JSON.parse(q.decode(w));
     } catch {
       throw new h("JWS Protected Header is invalid");
     }
@@ -574,11 +575,11 @@ async function Et(e, t, r) {
   let o = !0;
   if (s.has("b64") && (o = a.b64, typeof o != "boolean"))
     throw new h('The "b64" (base64url-encode payload) Header Parameter must be a boolean');
-  const { alg: i } = n;
-  if (typeof i != "string" || !i)
+  const { alg: c } = n;
+  if (typeof c != "string" || !c)
     throw new h('JWS "alg" (Algorithm) Header Parameter missing or invalid');
-  const c = r && ft("algorithms", r.algorithms);
-  if (c && !c.has(i))
+  const i = r && ft("algorithms", r.algorithms);
+  if (i && !i.has(c))
     throw new qe('"alg" (Algorithm) Header Parameter value not allowed');
   if (o) {
     if (typeof e.payload != "string")
@@ -586,15 +587,15 @@ async function Et(e, t, r) {
   } else if (typeof e.payload != "string" && !(e.payload instanceof Uint8Array))
     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;
+  typeof t == "function" && (t = await t(a, e), u = !0), pt(c, t, "verify");
+  const m = 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(c, t, y, m))
     throw new ze();
   let _;
   if (o)
@@ -604,9 +605,9 @@ 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;
-  const S = { payload: _ };
-  return e.protected !== void 0 && (S.protectedHeader = a), e.header !== void 0 && (S.unprotectedHeader = e.header), u ? { ...S, key: t } : S;
+    typeof e.payload == "string" ? _ = N.encode(e.payload) : _ = e.payload;
+  const E = { payload: _ };
+  return e.protected !== void 0 && (E.protectedHeader = a), e.header !== void 0 && (E.unprotectedHeader = e.header), u ? { ...E, key: t } : E;
 }
 async function gt(e, t, r) {
   if (e instanceof Uint8Array && (e = q.decode(e)), typeof e != "string")
@@ -614,8 +615,8 @@ 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 };
-  return typeof t == "function" ? { ...c, key: i.key } : c;
+  const c = await St({ payload: n, protected: a, signature: s }, t, r), i = { payload: c.payload, protectedHeader: c.protectedHeader };
+  return typeof t == "function" ? { ...i, key: c.key } : i;
 }
 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) => {
   const t = vt.exec(e);
@@ -671,56 +672,56 @@ const At = (e) => Math.floor(e.getTime() / 1e3), Ce = 60, Pe = Ce * 60, oe = Pe
   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");
+  const { requiredClaims: s = [], issuer: o, subject: c, audience: i, maxTokenAge: u } = r, m = [...s];
+  u !== void 0 && m.push("iat"), i !== void 0 && m.push("aud"), c !== void 0 && m.push("sub"), o !== void 0 && m.push("iss");
+  for (const w of new Set(m.reverse()))
+    if (!(w in a))
+      throw new g(`missing required "${w}" claim`, a, w, "missing");
   if (o && !(Array.isArray(o) ? o : [o]).includes(a.iss))
     throw new g('unexpected "iss" claim value', a, "iss", "check_failed");
-  if (i && a.sub !== i)
+  if (c && a.sub !== c)
     throw new g('unexpected "sub" claim value', a, "sub", "check_failed");
-  if (c && !Tt(a.aud, typeof c == "string" ? [c] : c))
+  if (i && !Tt(a.aud, typeof i == "string" ? [i] : i))
     throw new g('unexpected "aud" claim value', a, "aud", "check_failed");
-  let p;
+  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());
+  const { currentDate: _ } = r, E = 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");
   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)
+    if (a.nbf > E + y)
       throw new g('"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 ce('"exp" claim timestamp check failed', a, "exp", "check_failed");
+    if (a.exp <= E - y)
+      throw new ie('"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)
-      throw new ce('"iat" claim timestamp check failed (too far in the past)', a, "iat", "check_failed");
-    if (m < 0 - p)
+    const w = E - a.iat, k = typeof u == "number" ? u : de(u);
+    if (w - y > k)
+      throw new ie('"iat" claim timestamp check failed (too far in the past)', a, "iat", "check_failed");
+    if (w < 0 - y)
       throw new g('"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,7 +788,7 @@ 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({
@@ -798,12 +799,12 @@ function W({
     $t,
     r
   ), n = D.useCallback(
-    (i) => {
+    (c) => {
       try {
-        const c = typeof i == "function" ? i(JSON.parse(a)) : i;
-        c == null ? Kt(e) : fe(e, c);
-      } catch (c) {
-        console.warn(c);
+        const i = typeof c == "function" ? c(JSON.parse(a)) : c;
+        i == null ? Nt(e) : fe(e, i);
+      } catch (i) {
+        console.warn(i);
       }
     },
     [e, a]
@@ -815,8 +816,8 @@ function W({
   return D.useEffect(() => {
     try {
       me(e) === null && typeof t < "u" && fe(e, t);
-    } catch (i) {
-      console.warn(i);
+    } catch (c) {
+      console.warn(c);
     }
   }, [e, t]), [a ? JSON.parse(a) : null, n, s, o];
 }
@@ -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.", U = "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",
@@ -906,10 +907,10 @@ const re = "Oops! It looks like your session has expired. For your security, ple
   type: n,
   sessionExpiration: s,
   code: o,
-  code_verifier: i
+  code_verifier: c
 }) => {
   try {
-    const c = await z({
+    const i = await z({
       type: F.AUTHENTICATE,
       clientId: r,
       params: {
@@ -919,14 +920,14 @@ const re = "Oops! It looks like your session has expired. For your security, ple
         sessionExpiration: s,
         nonce: a,
         code: o,
-        code_verifier: i
+        code_verifier: c
       }
-    }), u = await H(c.data.idToken);
-    return u && u.payload[y.USER_ID_KEY] !== "" && u.payload[y.NONCE_KEY] === a ? {
-      idToken: c.data.idToken,
-      accessToken: c.data.accessToken,
-      refreshToken: c.data.refreshToken,
-      userId: u.payload[y.USER_ID_KEY],
+    }), u = await H(i.data.idToken);
+    return u && u.payload[f.USER_ID_KEY] !== "" && u.payload[f.NONCE_KEY] === a ? {
+      idToken: i.data.idToken,
+      accessToken: i.data.accessToken,
+      refreshToken: i.data.refreshToken,
+      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
@@ -1011,38 +1012,41 @@ const re = "Oops! It looks like your session has expired. For your security, ple
 }) => {
   const [a, n, , s] = W({
     key: `${x}::${r}::@@user@@`
-  }), [o, i, , c] = W({
+  }), [o, c, , i] = W({
     key: `${x}::${r}::@@access@@`
-  }), [u, f, , p] = W(
+  }), [u, m, , y] = W(
     {
       key: `${x}::${r}::@@refresh@@`
     }
-  ), [_, S, , m] = W({
+  ), [_, E, , w] = W({
     key: `${x}::${r}::@@nonce@@`
-  }), [k, N] = xe({
+  }), [k, K] = xe({
     isLoading: !0,
     isAuthenticated: !1,
-    userId: "",
+    user: void 0,
     logoutReason: ""
   }), A = je(
-    (w) => {
-      N({
+    (p) => {
+      K({
         isLoading: !1,
         isAuthenticated: !1,
-        userId: "",
-        logoutReason: w || re
-      }), s(), c(), p(), m();
+        user: void 0,
+        logoutReason: p || re
+      }), s(), i(), y(), w();
     },
-    [s, c, m, p]
+    [s, i, w, y]
   );
   Me(() => {
     k.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({
           idToken: a,
@@ -1067,47 +1071,53 @@ const re = "Oops! It looks like your session has expired. For your security, ple
     r,
     A
   ]);
-  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, R) => {
+    const I = jt();
+    if (E(I), R === B.CODE) {
+      const { code_verifier: $e, code_challenge: Le } = await Kt(), se = await Ft({
+        nonce: I,
         clientId: r,
         code_challenge: Le
       });
       if (se.status) {
         const O = await ge({
-          username: w,
+          username: p,
           password: P,
           clientId: r,
           sessionExpiration: t,
-          nonce: R,
-          type: I,
+          nonce: I,
+          type: R,
           code: se.code,
           code_verifier: $e
         });
-        return O.status ? (n(O.idToken), i(O.accessToken), f(O.refreshToken), N({
+        return O.status ? (n(O.idToken), c(O.accessToken), m(O.refreshToken), K({
           isLoading: !1,
           isAuthenticated: !0,
-          userId: O.userId,
+          user: {
+            userId: O.userId,
+            username: p
+          },
           logoutReason: ""
-        }), !0) : (A(Se), !1);
+        }), !0) : (A(Ee), !1);
       }
       return !1;
     }
-    const E = await ge({
-      username: w,
+    const S = await ge({
+      username: p,
       password: P,
       clientId: r,
       sessionExpiration: t,
-      nonce: R,
-      type: I
+      nonce: I,
+      type: R
     });
-    return E.status ? (n(E.idToken), i(E.accessToken), f(E.refreshToken), N({
+    return S.status ? (n(S.idToken), c(S.accessToken), m(S.refreshToken), K({
       isLoading: !1,
       isAuthenticated: !0,
-      userId: E.userId
-    }), !0) : (A(Se), !1);
+      user: {
+        userId: S.userId,
+        username: p
+      }
+    }), !0) : (A(Ee), !1);
   }, He = async () => {
     A(Mt), await ae({
       idToken: a,
@@ -1115,24 +1125,24 @@ const re = "Oops! It looks like your session has expired. For your security, ple
       refreshToken: u,
       clientId: r
     });
-  }, Ne = async () => {
-    const { isAuthenticated: w, userId: P } = k;
+  }, Ke = async () => {
+    const { isAuthenticated: p, user: P } = k;
     try {
-      if (w && P && o) {
-        const I = await H(o);
-        if (I && I.payload[y.USER_ID_KEY] !== "")
+      if (p && P && P.userId && o) {
+        const R = await H(o);
+        if (R && R.payload[f.USER_ID_KEY] !== "")
           return o;
-        const R = await H(u);
-        if (R && R.payload[y.USER_ID_KEY] !== "") {
-          const E = await Gt({
+        const I = await H(u);
+        if (I && I.payload[f.USER_ID_KEY] !== "") {
+          const S = 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;
+          if (S.status)
+            return c(S.accessToken), m(S.refreshToken), S.accessToken;
           A(U);
         }
         return A(U), console.error(U), "";
@@ -1140,14 +1150,14 @@ const re = "Oops! It looks like your session has expired. For your security, ple
     } catch {
       return A(U), console.error(U), "";
     }
-  }, Ke = () => {
+  }, Ne = () => {
     if (k.isAuthenticated && a)
       return a;
   };
   return /* @__PURE__ */ We(
     De.Provider,
     {
-      value: { ...k, login: Ue, logout: He, getAccessToken: Ne, getIdToken: Ke },
+      value: { ...k, 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.0",
 	"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",
 		"uuid": "10.0.0"
 	},
-	"gitHead": "5abd68fc5595a95360b4e80088cc39c067722085"
+	"gitHead": "5a4130a33944cf31fe9bd4dd32207119bc27678d"
 }