@versini/auth-provider 2.3.0 → 3.1.0

package/dist/index.d.ts

@@ -9,15 +9,17 @@ type AuthProviderProps = {
 };
 
 type AuthState = {
+	isLoading: boolean;
 	isAuthenticated: boolean;
 	logoutReason?: string;
 	userId?: string;
+	idTokenClaims?: any;
 };
 
 type AuthContextProps = {
 	login: (username: string, password: string) => Promise<boolean>;
 	logout: () => void;
-	getIdTokenClaims: () => Promise<any>;
+	getAccessToken: () => string;
 } & AuthState;
 
 declare const AuthProvider: ({ children, sessionExpiration, clientId, }: AuthProviderProps) => react_jsx_runtime.JSX.Element;

package/dist/index.js

@@ -1,55 +1,55 @@
-import { jsx as ne } from "react/jsx-runtime";
+import { jsx as ue } from "react/jsx-runtime";
 import * as I from "react";
-import { useRef as ae, useEffect as Y, createContext as se, useState as ie, useContext as ce } from "react";
+import { useRef as de, useEffect as X, createContext as le, useState as he, useCallback as pe, useContext as fe } from "react";
 /*!
-  @versini/auth-provider v2.3.0
+  @versini/auth-provider v3.1.0
   © 2024 gizmette.com
 */
 try {
   window.__VERSINI_AUTH_CLIENT__ || (window.__VERSINI_AUTH_CLIENT__ = {
-    version: "2.3.0",
-    buildTime: "06/24/2024 06:34 PM EDT",
+    version: "3.1.0",
+    buildTime: "06/25/2024 05:52 PM EDT",
     homepage: "https://github.com/aversini/auth-client",
     license: "MIT"
   });
 } catch {
 }
 /*!
-  @versini/auth-common v2.3.0
+  @versini/auth-common v2.5.0
   © 2024 gizmette.com
 */
 try {
   window.__VERSINI_AUTH_COMMON__ || (window.__VERSINI_AUTH_COMMON__ = {
-    version: "2.3.0",
-    buildTime: "06/24/2024 06:34 PM EDT",
+    version: "2.5.0",
+    buildTime: "06/25/2024 05:52 PM EDT",
     homepage: "https://github.com/aversini/auth-client",
     license: "MIT"
   });
 } catch {
 }
-const U = crypto, G = (e) => e instanceof CryptoKey, _ = new TextEncoder(), T = new TextDecoder();
-function ue(...e) {
+const $ = crypto, Q = (e) => e instanceof CryptoKey, T = new TextEncoder(), C = new TextDecoder();
+function ye(...e) {
   const t = e.reduce((n, { length: a }) => n + a, 0), o = new Uint8Array(t);
   let r = 0;
   for (const n of e)
     o.set(n, r), r += n.length;
   return o;
 }
-const de = (e) => {
+const me = (e) => {
   const t = atob(e), o = new Uint8Array(t.length);
   for (let r = 0; r < t.length; r++)
     o[r] = t.charCodeAt(r);
   return o;
-}, C = (e) => {
+}, D = (e) => {
   let t = e;
-  t instanceof Uint8Array && (t = T.decode(t)), t = t.replace(/-/g, "+").replace(/_/g, "/").replace(/\s/g, "");
+  t instanceof Uint8Array && (t = C.decode(t)), t = t.replace(/-/g, "+").replace(/_/g, "/").replace(/\s/g, "");
   try {
-    return de(t);
+    return me(t);
   } catch {
     throw new TypeError("The input to be decoded is not correctly encoded.");
   }
 };
-class b extends Error {
+let _ = class extends Error {
   static get code() {
     return "ERR_JOSE_GENERIC";
   }
@@ -57,8 +57,8 @@ class b extends Error {
     var o;
     super(t), this.code = "ERR_JOSE_GENERIC", this.name = this.constructor.name, (o = Error.captureStackTrace) == null || o.call(Error, this, this.constructor);
   }
-}
-class m extends b {
+};
+class S extends _ {
   static get code() {
     return "ERR_JWT_CLAIM_VALIDATION_FAILED";
   }
@@ -66,7 +66,7 @@ class m extends b {
     super(t), this.code = "ERR_JWT_CLAIM_VALIDATION_FAILED", this.claim = r, this.reason = n, this.payload = o;
   }
 }
-class $ extends b {
+class W extends _ {
   static get code() {
     return "ERR_JWT_EXPIRED";
   }
@@ -74,7 +74,7 @@ class $ extends b {
     super(t), this.code = "ERR_JWT_EXPIRED", this.claim = r, this.reason = n, this.payload = o;
   }
 }
-class le extends b {
+class we extends _ {
   constructor() {
     super(...arguments), this.code = "ERR_JOSE_ALG_NOT_ALLOWED";
   }
@@ -82,7 +82,7 @@ class le extends b {
     return "ERR_JOSE_ALG_NOT_ALLOWED";
   }
 }
-class k extends b {
+class P extends _ {
   constructor() {
     super(...arguments), this.code = "ERR_JOSE_NOT_SUPPORTED";
   }
@@ -90,7 +90,7 @@ class k extends b {
     return "ERR_JOSE_NOT_SUPPORTED";
   }
 }
-let l = class extends b {
+let d = class extends _ {
   constructor() {
     super(...arguments), this.code = "ERR_JWS_INVALID";
   }
@@ -98,7 +98,7 @@ let l = class extends b {
     return "ERR_JWS_INVALID";
   }
 };
-class q extends b {
+class Z extends _ {
   constructor() {
     super(...arguments), this.code = "ERR_JWT_INVALID";
   }
@@ -106,7 +106,7 @@ class q extends b {
     return "ERR_JWT_INVALID";
   }
 }
-class he extends b {
+class Se extends _ {
   constructor() {
     super(...arguments), this.code = "ERR_JWS_SIGNATURE_VERIFICATION_FAILED", this.message = "signature verification failed";
   }
@@ -114,16 +114,16 @@ class he extends b {
     return "ERR_JWS_SIGNATURE_VERIFICATION_FAILED";
   }
 }
-function S(e, t = "algorithm.name") {
+function E(e, t = "algorithm.name") {
   return new TypeError(`CryptoKey does not support this operation, its ${t} must be ${e}`);
 }
-function v(e, t) {
+function R(e, t) {
   return e.name === t;
 }
-function P(e) {
+function N(e) {
   return parseInt(e.name.slice(4), 10);
 }
-function pe(e) {
+function Ee(e) {
   switch (e) {
     case "ES256":
       return "P-256";
@@ -135,7 +135,7 @@ function pe(e) {
       throw new Error("unreachable");
   }
 }
-function fe(e, t) {
+function ge(e, t) {
   if (t.length && !t.some((o) => e.usages.includes(o))) {
     let o = "CryptoKey does not support this operation, its usages must include ";
     if (t.length > 2) {
@@ -146,59 +146,59 @@ function fe(e, t) {
     throw new TypeError(o);
   }
 }
-function ye(e, t, ...o) {
+function Ae(e, t, ...o) {
   switch (t) {
     case "HS256":
     case "HS384":
     case "HS512": {
-      if (!v(e.algorithm, "HMAC"))
-        throw S("HMAC");
+      if (!R(e.algorithm, "HMAC"))
+        throw E("HMAC");
       const r = parseInt(t.slice(2), 10);
-      if (P(e.algorithm.hash) !== r)
-        throw S(`SHA-${r}`, "algorithm.hash");
+      if (N(e.algorithm.hash) !== r)
+        throw E(`SHA-${r}`, "algorithm.hash");
       break;
     }
     case "RS256":
     case "RS384":
     case "RS512": {
-      if (!v(e.algorithm, "RSASSA-PKCS1-v1_5"))
-        throw S("RSASSA-PKCS1-v1_5");
+      if (!R(e.algorithm, "RSASSA-PKCS1-v1_5"))
+        throw E("RSASSA-PKCS1-v1_5");
       const r = parseInt(t.slice(2), 10);
-      if (P(e.algorithm.hash) !== r)
-        throw S(`SHA-${r}`, "algorithm.hash");
+      if (N(e.algorithm.hash) !== r)
+        throw E(`SHA-${r}`, "algorithm.hash");
       break;
     }
     case "PS256":
     case "PS384":
     case "PS512": {
-      if (!v(e.algorithm, "RSA-PSS"))
-        throw S("RSA-PSS");
+      if (!R(e.algorithm, "RSA-PSS"))
+        throw E("RSA-PSS");
       const r = parseInt(t.slice(2), 10);
-      if (P(e.algorithm.hash) !== r)
-        throw S(`SHA-${r}`, "algorithm.hash");
+      if (N(e.algorithm.hash) !== r)
+        throw E(`SHA-${r}`, "algorithm.hash");
       break;
     }
     case "EdDSA": {
       if (e.algorithm.name !== "Ed25519" && e.algorithm.name !== "Ed448")
-        throw S("Ed25519 or Ed448");
+        throw E("Ed25519 or Ed448");
       break;
     }
     case "ES256":
     case "ES384":
     case "ES512": {
-      if (!v(e.algorithm, "ECDSA"))
-        throw S("ECDSA");
-      const r = pe(t);
+      if (!R(e.algorithm, "ECDSA"))
+        throw E("ECDSA");
+      const r = Ee(t);
       if (e.algorithm.namedCurve !== r)
-        throw S(r, "algorithm.namedCurve");
+        throw E(r, "algorithm.namedCurve");
       break;
     }
     default:
       throw new TypeError("CryptoKey does not support this operation");
   }
-  fe(e, o);
+  ge(e, o);
 }
-function z(e, t, ...o) {
+function ee(e, t, ...o) {
   var r;
   if (o.length > 2) {
     const n = o.pop();
@@ -207,11 +207,11 @@ function z(e, t, ...o) {
     o.length === 2 ? e += `one of type ${o[0]} or ${o[1]}.` : e += `of type ${o[0]}.`;
   return t == null ? e += ` Received ${t}` : typeof t == "function" && t.name ? e += ` Received function ${t.name}` : typeof t == "object" && t != null && (r = t.constructor) != null && r.name && (e += ` Received an instance of ${t.constructor.name}`), e;
 }
-const L = (e, ...t) => z("Key must be ", e, ...t);
-function X(e, t, ...o) {
-  return z(`Key for the ${e} algorithm must be `, t, ...o);
+const x = (e, ...t) => ee("Key must be ", e, ...t);
+function te(e, t, ...o) {
+  return ee(`Key for the ${e} algorithm must be `, t, ...o);
 }
-const Q = (e) => G(e), g = ["CryptoKey"], me = (...e) => {
+const re = (e) => Q(e), A = ["CryptoKey"], be = (...e) => {
   const t = e.filter(Boolean);
   if (t.length === 0 || t.length === 1)
     return !0;
@@ -230,11 +230,11 @@ const Q = (e) => G(e), g = ["CryptoKey"], me = (...e) => {
   }
   return !0;
 };
-function we(e) {
+function _e(e) {
   return typeof e == "object" && e !== null;
 }
-function H(e) {
-  if (!we(e) || Object.prototype.toString.call(e) !== "[object Object]")
+function J(e) {
+  if (!_e(e) || Object.prototype.toString.call(e) !== "[object Object]")
     return !1;
   if (Object.getPrototypeOf(e) === null)
     return !0;
@@ -243,39 +243,39 @@ function H(e) {
     t = Object.getPrototypeOf(t);
   return Object.getPrototypeOf(e) === t;
 }
-const Se = (e, t) => {
+const Ie = (e, t) => {
   if (e.startsWith("RS") || e.startsWith("PS")) {
     const { modulusLength: o } = t.algorithm;
     if (typeof o != "number" || o < 2048)
       throw new TypeError(`${e} requires key modulusLength to be 2048 bits or larger`);
   }
-}, E = (e, t, o = 0) => {
+}, g = (e, t, o = 0) => {
   o === 0 && (t.unshift(t.length), t.unshift(6));
   const r = e.indexOf(t[0], o);
   if (r === -1)
     return !1;
   const n = e.subarray(r, r + t.length);
-  return n.length !== t.length ? !1 : n.every((a, s) => a === t[s]) || E(e, t, r + 1);
-}, K = (e) => {
+  return n.length !== t.length ? !1 : n.every((a, s) => a === t[s]) || g(e, t, r + 1);
+}, j = (e) => {
   switch (!0) {
-    case E(e, [42, 134, 72, 206, 61, 3, 1, 7]):
+    case g(e, [42, 134, 72, 206, 61, 3, 1, 7]):
       return "P-256";
-    case E(e, [43, 129, 4, 0, 34]):
+    case g(e, [43, 129, 4, 0, 34]):
       return "P-384";
-    case E(e, [43, 129, 4, 0, 35]):
+    case g(e, [43, 129, 4, 0, 35]):
       return "P-521";
-    case E(e, [43, 101, 110]):
+    case g(e, [43, 101, 110]):
       return "X25519";
-    case E(e, [43, 101, 111]):
+    case g(e, [43, 101, 111]):
       return "X448";
-    case E(e, [43, 101, 112]):
+    case g(e, [43, 101, 112]):
       return "Ed25519";
-    case E(e, [43, 101, 113]):
+    case g(e, [43, 101, 113]):
       return "Ed448";
     default:
-      throw new k("Invalid or unsupported EC Key Curve or OKP Key Sub Type");
+      throw new P("Invalid or unsupported EC Key Curve or OKP Key Sub Type");
   }
-}, Ee = async (e, t, o, r, n) => {
+}, ve = async (e, t, o, r, n) => {
   let a, s;
   const i = new Uint8Array(atob(o.replace(e, "")).split("").map((c) => c.charCodeAt(0)));
   switch (r) {
@@ -311,43 +311,43 @@ const Se = (e, t) => {
     case "ECDH-ES+A128KW":
     case "ECDH-ES+A192KW":
     case "ECDH-ES+A256KW": {
-      const c = K(i);
+      const c = j(i);
       a = c.startsWith("P-") ? { name: "ECDH", namedCurve: c } : { name: c }, s = [];
       break;
     }
     case "EdDSA":
-      a = { name: K(i) }, s = ["verify"];
+      a = { name: j(i) }, s = ["verify"];
       break;
     default:
-      throw new k('Invalid or unsupported "alg" (Algorithm) value');
+      throw new P('Invalid or unsupported "alg" (Algorithm) value');
   }
-  return U.subtle.importKey(t, i, a, !1, s);
-}, ge = (e, t, o) => Ee(/(?:-----(?:BEGIN|END) PUBLIC KEY-----|\s)/g, "spki", e, t);
-async function Ae(e, t, o) {
+  return $.subtle.importKey(t, i, a, !1, s);
+}, Te = (e, t, o) => ve(/(?:-----(?:BEGIN|END) PUBLIC KEY-----|\s)/g, "spki", e, t);
+async function Re(e, t, o) {
   if (e.indexOf("-----BEGIN PUBLIC KEY-----") !== 0)
     throw new TypeError('"spki" must be SPKI formatted string');
-  return ge(e, t);
+  return Te(e, t);
 }
-const be = (e, t) => {
+const ke = (e, t) => {
   if (!(t instanceof Uint8Array)) {
-    if (!Q(t))
-      throw new TypeError(X(e, t, ...g, "Uint8Array"));
+    if (!re(t))
+      throw new TypeError(te(e, t, ...A, "Uint8Array"));
     if (t.type !== "secret")
-      throw new TypeError(`${g.join(" or ")} instances for symmetric algorithms must be of type "secret"`);
+      throw new TypeError(`${A.join(" or ")} instances for symmetric algorithms must be of type "secret"`);
   }
-}, Ie = (e, t, o) => {
-  if (!Q(t))
-    throw new TypeError(X(e, t, ...g));
+}, Ce = (e, t, o) => {
+  if (!re(t))
+    throw new TypeError(te(e, t, ...A));
   if (t.type === "secret")
-    throw new TypeError(`${g.join(" or ")} instances for asymmetric algorithms must not be of type "secret"`);
+    throw new TypeError(`${A.join(" or ")} instances for asymmetric algorithms must not be of type "secret"`);
   if (t.algorithm && o === "verify" && t.type === "private")
-    throw new TypeError(`${g.join(" or ")} instances for asymmetric algorithm verifying must be of type "public"`);
+    throw new TypeError(`${A.join(" or ")} instances for asymmetric algorithm verifying must be of type "public"`);
   if (t.algorithm && o === "encrypt" && t.type === "private")
-    throw new TypeError(`${g.join(" or ")} instances for asymmetric algorithm encryption must be of type "public"`);
-}, _e = (e, t, o) => {
-  e.startsWith("HS") || e === "dir" || e.startsWith("PBES2") || /^A\d{3}(?:GCM)?KW$/.test(e) ? be(e, t) : Ie(e, t, o);
+    throw new TypeError(`${A.join(" or ")} instances for asymmetric algorithm encryption must be of type "public"`);
+}, Pe = (e, t, o) => {
+  e.startsWith("HS") || e === "dir" || e.startsWith("PBES2") || /^A\d{3}(?:GCM)?KW$/.test(e) ? ke(e, t) : Ce(e, t, o);
 };
-function ve(e, t, o, r, n) {
+function Oe(e, t, o, r, n) {
   if (n.crit !== void 0 && (r == null ? void 0 : r.crit) === void 0)
     throw new e('"crit" (Critical) Header Parameter MUST be integrity protected');
   if (!r || r.crit === void 0)
@@ -358,7 +358,7 @@ function ve(e, t, o, r, n) {
   o !== void 0 ? a = new Map([...Object.entries(o), ...t.entries()]) : a = t;
   for (const s of r.crit) {
     if (!a.has(s))
-      throw new k(`Extension Header Parameter "${s}" is not recognized`);
+      throw new P(`Extension Header Parameter "${s}" is not recognized`);
     if (n[s] === void 0)
       throw new e(`Extension Header Parameter "${s}" is missing`);
     if (a.get(s) && r[s] === void 0)
@@ -366,13 +366,13 @@ function ve(e, t, o, r, n) {
   }
   return new Set(r.crit);
 }
-const Re = (e, t) => {
+const De = (e, t) => {
   if (t !== void 0 && (!Array.isArray(t) || t.some((o) => typeof o != "string")))
     throw new TypeError(`"${e}" option must be an array of strings`);
   if (t)
     return new Set(t);
 };
-function Te(e, t) {
+function Ne(e, t) {
   const o = `SHA-${e.slice(-3)}`;
   switch (e) {
     case "HS256":
@@ -394,104 +394,104 @@ function Te(e, t) {
     case "EdDSA":
       return { name: t.name };
     default:
-      throw new k(`alg ${e} is not supported either by JOSE or your javascript runtime`);
+      throw new P(`alg ${e} is not supported either by JOSE or your javascript runtime`);
   }
 }
-function ke(e, t, o) {
-  if (G(t))
-    return ye(t, e, o), t;
+function He(e, t, o) {
+  if (Q(t))
+    return Ae(t, e, o), t;
   if (t instanceof Uint8Array) {
     if (!e.startsWith("HS"))
-      throw new TypeError(L(t, ...g));
-    return U.subtle.importKey("raw", t, { hash: `SHA-${e.slice(-3)}`, name: "HMAC" }, !1, [o]);
+      throw new TypeError(x(t, ...A));
+    return $.subtle.importKey("raw", t, { hash: `SHA-${e.slice(-3)}`, name: "HMAC" }, !1, [o]);
   }
-  throw new TypeError(L(t, ...g, "Uint8Array"));
+  throw new TypeError(x(t, ...A, "Uint8Array"));
 }
-const Ce = async (e, t, o, r) => {
-  const n = await ke(e, t, "verify");
-  Se(e, n);
-  const a = Te(e, n.algorithm);
+const Ue = async (e, t, o, r) => {
+  const n = await He(e, t, "verify");
+  Ie(e, n);
+  const a = Ne(e, n.algorithm);
   try {
-    return await U.subtle.verify(a, n, o, r);
+    return await $.subtle.verify(a, n, o, r);
   } catch {
     return !1;
   }
 };
-async function Pe(e, t, o) {
-  if (!H(e))
-    throw new l("Flattened JWS must be an object");
+async function Le(e, t, o) {
+  if (!J(e))
+    throw new d("Flattened JWS must be an object");
   if (e.protected === void 0 && e.header === void 0)
-    throw new l('Flattened JWS must have either of the "protected" or "header" members');
+    throw new d('Flattened JWS must have either of the "protected" or "header" members');
   if (e.protected !== void 0 && typeof e.protected != "string")
-    throw new l("JWS Protected Header incorrect type");
+    throw new d("JWS Protected Header incorrect type");
   if (e.payload === void 0)
-    throw new l("JWS Payload missing");
+    throw new d("JWS Payload missing");
   if (typeof e.signature != "string")
-    throw new l("JWS Signature missing or incorrect type");
-  if (e.header !== void 0 && !H(e.header))
-    throw new l("JWS Unprotected Header incorrect type");
+    throw new d("JWS Signature missing or incorrect type");
+  if (e.header !== void 0 && !J(e.header))
+    throw new d("JWS Unprotected Header incorrect type");
   let r = {};
   if (e.protected)
     try {
-      const p = C(e.protected);
-      r = JSON.parse(T.decode(p));
+      const w = D(e.protected);
+      r = JSON.parse(C.decode(w));
     } catch {
-      throw new l("JWS Protected Header is invalid");
+      throw new d("JWS Protected Header is invalid");
     }
-  if (!me(r, e.header))
-    throw new l("JWS Protected and JWS Unprotected Header Parameter names must be disjoint");
+  if (!be(r, e.header))
+    throw new d("JWS Protected and JWS Unprotected Header Parameter names must be disjoint");
   const n = {
     ...r,
     ...e.header
-  }, a = ve(l, /* @__PURE__ */ new Map([["b64", !0]]), o == null ? void 0 : o.crit, r, n);
+  }, a = Oe(d, /* @__PURE__ */ new Map([["b64", !0]]), o == null ? void 0 : o.crit, r, n);
   let s = !0;
   if (a.has("b64") && (s = r.b64, typeof s != "boolean"))
-    throw new l('The "b64" (base64url-encode payload) Header Parameter must be a boolean');
+    throw new d('The "b64" (base64url-encode payload) Header Parameter must be a boolean');
   const { alg: i } = n;
   if (typeof i != "string" || !i)
-    throw new l('JWS "alg" (Algorithm) Header Parameter missing or invalid');
-  const c = o && Re("algorithms", o.algorithms);
+    throw new d('JWS "alg" (Algorithm) Header Parameter missing or invalid');
+  const c = o && De("algorithms", o.algorithms);
   if (c && !c.has(i))
-    throw new le('"alg" (Algorithm) Header Parameter value not allowed');
+    throw new we('"alg" (Algorithm) Header Parameter value not allowed');
   if (s) {
     if (typeof e.payload != "string")
-      throw new l("JWS Payload must be a string");
+      throw new d("JWS Payload must be a string");
   } else if (typeof e.payload != "string" && !(e.payload instanceof Uint8Array))
-    throw new l("JWS Payload must be a string or an Uint8Array instance");
-  let f = !1;
-  typeof t == "function" && (t = await t(r, e), f = !0), _e(i, t, "verify");
-  const w = ue(_.encode(e.protected ?? ""), _.encode("."), typeof e.payload == "string" ? _.encode(e.payload) : e.payload);
-  let h;
+    throw new d("JWS Payload must be a string or an Uint8Array instance");
+  let p = !1;
+  typeof t == "function" && (t = await t(r, e), p = !0), Pe(i, t, "verify");
+  const f = ye(T.encode(e.protected ?? ""), T.encode("."), typeof e.payload == "string" ? T.encode(e.payload) : e.payload);
+  let l;
   try {
-    h = C(e.signature);
+    l = D(e.signature);
   } catch {
-    throw new l("Failed to base64url decode the signature");
+    throw new d("Failed to base64url decode the signature");
   }
-  if (!await Ce(i, t, h, w))
-    throw new he();
-  let u;
+  if (!await Ue(i, t, l, f))
+    throw new Se();
+  let h;
   if (s)
     try {
-      u = C(e.payload);
+      h = D(e.payload);
     } catch {
-      throw new l("Failed to base64url decode the payload");
+      throw new d("Failed to base64url decode the payload");
     }
   else
-    typeof e.payload == "string" ? u = _.encode(e.payload) : u = e.payload;
-  const y = { payload: u };
-  return e.protected !== void 0 && (y.protectedHeader = r), e.header !== void 0 && (y.unprotectedHeader = e.header), f ? { ...y, key: t } : y;
+    typeof e.payload == "string" ? h = T.encode(e.payload) : h = e.payload;
+  const m = { payload: h };
+  return e.protected !== void 0 && (m.protectedHeader = r), e.header !== void 0 && (m.unprotectedHeader = e.header), p ? { ...m, key: t } : m;
 }
-async function Oe(e, t, o) {
-  if (e instanceof Uint8Array && (e = T.decode(e)), typeof e != "string")
-    throw new l("Compact JWS must be a string or Uint8Array");
+async function Je(e, t, o) {
+  if (e instanceof Uint8Array && (e = C.decode(e)), typeof e != "string")
+    throw new d("Compact JWS must be a string or Uint8Array");
   const { 0: r, 1: n, 2: a, length: s } = e.split(".");
   if (s !== 3)
-    throw new l("Invalid Compact JWS");
-  const i = await Pe({ payload: n, protected: r, signature: a }, t, o), c = { payload: i.payload, protectedHeader: i.protectedHeader };
+    throw new d("Invalid Compact JWS");
+  const i = await Le({ payload: n, protected: r, signature: a }, t, o), c = { payload: i.payload, protectedHeader: i.protectedHeader };
   return typeof t == "function" ? { ...c, key: i.key } : c;
 }
-const De = (e) => Math.floor(e.getTime() / 1e3), Z = 60, ee = Z * 60, J = ee * 24, He = J * 7, Ne = J * 365.25, Ue = /^(\+|\-)? ?(\d+|\d+\.\d+) ?(seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)(?: (ago|from now))?$/i, W = (e) => {
-  const t = Ue.exec(e);
+const $e = (e) => Math.floor(e.getTime() / 1e3), oe = 60, ne = oe * 60, K = ne * 24, Ke = K * 7, We = K * 365.25, xe = /^(\+|\-)? ?(\d+|\d+\.\d+) ?(seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)(?: (ago|from now))?$/i, M = (e) => {
+  const t = xe.exec(e);
   if (!t || t[4] && t[1])
     throw new TypeError("Invalid time period format");
   const o = parseFloat(t[2]), r = t[3].toLowerCase();
@@ -509,108 +509,110 @@ const De = (e) => Math.floor(e.getTime() / 1e3), Z = 60, ee = Z * 60, J = ee * 2
     case "min":
     case "mins":
     case "m":
-      n = Math.round(o * Z);
+      n = Math.round(o * oe);
       break;
     case "hour":
     case "hours":
     case "hr":
     case "hrs":
     case "h":
-      n = Math.round(o * ee);
+      n = Math.round(o * ne);
       break;
     case "day":
     case "days":
     case "d":
-      n = Math.round(o * J);
+      n = Math.round(o * K);
       break;
     case "week":
     case "weeks":
     case "w":
-      n = Math.round(o * He);
+      n = Math.round(o * Ke);
       break;
     default:
-      n = Math.round(o * Ne);
+      n = Math.round(o * We);
       break;
   }
   return t[1] === "-" || t[4] === "ago" ? -n : n;
-}, x = (e) => e.toLowerCase().replace(/^application\//, ""), Je = (e, t) => typeof e == "string" ? t.includes(e) : Array.isArray(e) ? t.some(Set.prototype.has.bind(new Set(e))) : !1, $e = (e, t, o = {}) => {
+}, V = (e) => e.toLowerCase().replace(/^application\//, ""), je = (e, t) => typeof e == "string" ? t.includes(e) : Array.isArray(e) ? t.some(Set.prototype.has.bind(new Set(e))) : !1, Me = (e, t, o = {}) => {
   let r;
   try {
-    r = JSON.parse(T.decode(t));
+    r = JSON.parse(C.decode(t));
   } catch {
   }
-  if (!H(r))
-    throw new q("JWT Claims Set must be a top-level JSON object");
+  if (!J(r))
+    throw new Z("JWT Claims Set must be a top-level JSON object");
   const { typ: n } = o;
-  if (n && (typeof e.typ != "string" || x(e.typ) !== x(n)))
-    throw new m('unexpected "typ" JWT header value', r, "typ", "check_failed");
-  const { requiredClaims: a = [], issuer: s, subject: i, audience: c, maxTokenAge: f } = o, w = [...a];
-  f !== void 0 && w.push("iat"), c !== void 0 && w.push("aud"), i !== void 0 && w.push("sub"), s !== void 0 && w.push("iss");
-  for (const p of new Set(w.reverse()))
-    if (!(p in r))
-      throw new m(`missing required "${p}" claim`, r, p, "missing");
+  if (n && (typeof e.typ != "string" || V(e.typ) !== V(n)))
+    throw new S('unexpected "typ" JWT header value', r, "typ", "check_failed");
+  const { requiredClaims: a = [], issuer: s, subject: i, audience: c, maxTokenAge: p } = o, f = [...a];
+  p !== void 0 && f.push("iat"), c !== void 0 && f.push("aud"), i !== void 0 && f.push("sub"), s !== void 0 && f.push("iss");
+  for (const w of new Set(f.reverse()))
+    if (!(w in r))
+      throw new S(`missing required "${w}" claim`, r, w, "missing");
   if (s && !(Array.isArray(s) ? s : [s]).includes(r.iss))
-    throw new m('unexpected "iss" claim value', r, "iss", "check_failed");
+    throw new S('unexpected "iss" claim value', r, "iss", "check_failed");
   if (i && r.sub !== i)
-    throw new m('unexpected "sub" claim value', r, "sub", "check_failed");
-  if (c && !Je(r.aud, typeof c == "string" ? [c] : c))
-    throw new m('unexpected "aud" claim value', r, "aud", "check_failed");
-  let h;
+    throw new S('unexpected "sub" claim value', r, "sub", "check_failed");
+  if (c && !je(r.aud, typeof c == "string" ? [c] : c))
+    throw new S('unexpected "aud" claim value', r, "aud", "check_failed");
+  let l;
   switch (typeof o.clockTolerance) {
     case "string":
-      h = W(o.clockTolerance);
+      l = M(o.clockTolerance);
       break;
     case "number":
-      h = o.clockTolerance;
+      l = o.clockTolerance;
       break;
     case "undefined":
-      h = 0;
+      l = 0;
       break;
     default:
       throw new TypeError("Invalid clockTolerance option type");
   }
-  const { currentDate: u } = o, y = De(u || /* @__PURE__ */ new Date());
-  if ((r.iat !== void 0 || f) && typeof r.iat != "number")
-    throw new m('"iat" claim must be a number', r, "iat", "invalid");
+  const { currentDate: h } = o, m = $e(h || /* @__PURE__ */ new Date());
+  if ((r.iat !== void 0 || p) && typeof r.iat != "number")
+    throw new S('"iat" claim must be a number', r, "iat", "invalid");
   if (r.nbf !== void 0) {
     if (typeof r.nbf != "number")
-      throw new m('"nbf" claim must be a number', r, "nbf", "invalid");
-    if (r.nbf > y + h)
-      throw new m('"nbf" claim timestamp check failed', r, "nbf", "check_failed");
+      throw new S('"nbf" claim must be a number', r, "nbf", "invalid");
+    if (r.nbf > m + l)
+      throw new S('"nbf" claim timestamp check failed', r, "nbf", "check_failed");
   }
   if (r.exp !== void 0) {
     if (typeof r.exp != "number")
-      throw new m('"exp" claim must be a number', r, "exp", "invalid");
-    if (r.exp <= y - h)
-      throw new $('"exp" claim timestamp check failed', r, "exp", "check_failed");
+      throw new S('"exp" claim must be a number', r, "exp", "invalid");
+    if (r.exp <= m - l)
+      throw new W('"exp" claim timestamp check failed', r, "exp", "check_failed");
   }
-  if (f) {
-    const p = y - r.iat, oe = typeof f == "number" ? f : W(f);
-    if (p - h > oe)
-      throw new $('"iat" claim timestamp check failed (too far in the past)', r, "iat", "check_failed");
-    if (p < 0 - h)
-      throw new m('"iat" claim timestamp check failed (it should be in the past)', r, "iat", "check_failed");
+  if (p) {
+    const w = m - r.iat, O = typeof p == "number" ? p : M(p);
+    if (w - l > O)
+      throw new W('"iat" claim timestamp check failed (too far in the past)', r, "iat", "check_failed");
+    if (w < 0 - l)
+      throw new S('"iat" claim timestamp check failed (it should be in the past)', r, "iat", "check_failed");
   }
   return r;
 };
-async function Le(e, t, o) {
+async function Ve(e, t, o) {
   var r;
-  const n = await Oe(e, t, o);
+  const n = await Je(e, t, o);
   if ((r = n.protectedHeader.crit) != null && r.includes("b64") && n.protectedHeader.b64 === !1)
-    throw new q("JWTs MUST NOT use unencoded payload");
-  const a = { payload: $e(n.protectedHeader, n.payload, o), protectedHeader: n.protectedHeader };
+    throw new Z("JWTs MUST NOT use unencoded payload");
+  const a = { payload: Me(n.protectedHeader, n.payload, o), protectedHeader: n.protectedHeader };
   return typeof t == "function" ? { ...a, key: n.key } : a;
 }
-const Ke = {
-  ID_TOKEN: "id_token"
-}, We = {
+const Be = {
+  ID_TOKEN: "id_token",
+  ACCESS_TOKEN: "token",
+  ID_AND_ACCESS_TOKEN: "id_token token"
+}, Fe = {
   CLIENT_ID: "X-Auth-ClientId"
-}, A = {
+}, b = {
   ALG: "RS256",
   USER_ID_KEY: "_id",
   TOKEN_ID_KEY: "__raw",
   ISSUER: "gizmette.com"
-}, xe = `-----BEGIN PUBLIC KEY-----
+}, Ge = `-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsF6i3Jd9fY/3COqCw/m7
 w5PKyTYLGAI2I6SIIdpe6i6DOCbEkmDz7LdVsBqwNtVi8gvWYIj+8ol6rU3qu1v5
 i1Jd45GSK4kzkVdgCmQZbM5ak0KI99q5wsrAIzUd+LRJ2HRvWtr5IYdsIiXaQjle
@@ -618,40 +620,40 @@ aMwPFOIcJH+rKfFgNcHLcaS5syp7zU1ANwZ+trgR+DifBr8TLVkBynmNeTyhDm2+
 l0haqjMk0UoNPPE8iYBWUHQJJE1Dqstj65d6Eh5g64Pao25y4cmYJbKjiblIGEkE
 sjqybA9mARAqh9k/eiIopecWSiffNQTwVQVd2I9ZH3BalhEXHlqFgrjz51kFqg81
 awIDAQAB
------END PUBLIC KEY-----`, N = async (e, t) => {
+-----END PUBLIC KEY-----`, ae = async (e, t) => {
   try {
-    const o = A.ALG, r = await Ae(xe, o);
-    return await Le(e, r, {
-      issuer: A.ISSUER,
+    const o = b.ALG, r = await Re(Ge, o);
+    return await Ve(e, r, {
+      issuer: b.ISSUER,
       audience: t
     });
   } catch {
     return;
   }
 };
-function te(e, t) {
+function se(e, t) {
   window.dispatchEvent(new StorageEvent("storage", { key: e, newValue: t }));
 }
-const j = (e, t) => {
+const B = (e, t) => {
   const o = JSON.stringify(
     typeof t == "function" ? t() : t
   );
-  window.localStorage.setItem(e, o), te(e, o);
-}, je = (e) => {
-  window.localStorage.removeItem(e), te(e, null);
-}, M = (e) => window.localStorage.getItem(e), Me = (e) => (window.addEventListener("storage", e), () => window.removeEventListener("storage", e));
-function Ve({
+  window.localStorage.setItem(e, o), se(e, o);
+}, Ye = (e) => {
+  window.localStorage.removeItem(e), se(e, null);
+}, F = (e) => window.localStorage.getItem(e), qe = (e) => (window.addEventListener("storage", e), () => window.removeEventListener("storage", e));
+function G({
   key: e,
   initialValue: t
 }) {
-  const o = () => M(e), r = I.useSyncExternalStore(
-    Me,
+  const o = () => F(e), r = I.useSyncExternalStore(
+    qe,
     o
   ), n = I.useCallback(
     (i) => {
       try {
         const c = typeof i == "function" ? i(JSON.parse(r)) : i;
-        c == null ? je(e) : j(e, c);
+        c == null ? Ye(e) : B(e, c);
       } catch (c) {
         console.warn(c);
       }
@@ -664,49 +666,49 @@ function Ve({
   }, [n]);
   return I.useEffect(() => {
     try {
-      M(e) === null && typeof t < "u" && j(e, t);
+      F(e) === null && typeof t < "u" && B(e, t);
     } catch (i) {
       console.warn(i);
     }
   }, [e, t]), [r ? JSON.parse(r) : null, n, a, s];
 }
-const V = "Oops! It looks like your session has expired. For your security, please log in again to continue.", Be = "Your session has been successfully terminated.", Fe = "You forgot to wrap your component in <AuthProvider>.", B = {
+const H = "Oops! It looks like your session has expired. For your security, please log in again to continue.", ze = "Your session has been successfully terminated.", Xe = "Login failed. Please try again.", Qe = "You forgot to wrap your component in <AuthProvider>.", Y = {
   dev: "https://auth.gizmette.local.com:3003",
   prod: "https://mylogin.gizmette.com"
-}, Ye = "@@auth@@";
-var d = [];
-for (var O = 0; O < 256; ++O)
-  d.push((O + 256).toString(16).slice(1));
-function Ge(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 R, qe = new Uint8Array(16);
-function ze() {
-  if (!R && (R = typeof crypto < "u" && crypto.getRandomValues && crypto.getRandomValues.bind(crypto), !R))
+}, q = "@@auth@@";
+var u = [];
+for (var U = 0; U < 256; ++U)
+  u.push((U + 256).toString(16).slice(1));
+function Ze(e, t = 0) {
+  return (u[e[t + 0]] + u[e[t + 1]] + u[e[t + 2]] + u[e[t + 3]] + "-" + u[e[t + 4]] + u[e[t + 5]] + "-" + u[e[t + 6]] + u[e[t + 7]] + "-" + u[e[t + 8]] + u[e[t + 9]] + "-" + u[e[t + 10]] + u[e[t + 11]] + u[e[t + 12]] + u[e[t + 13]] + u[e[t + 14]] + u[e[t + 15]]).toLowerCase();
+}
+var k, et = new Uint8Array(16);
+function tt() {
+  if (!k && (k = typeof crypto < "u" && crypto.getRandomValues && crypto.getRandomValues.bind(crypto), !k))
     throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
-  return R(qe);
+  return k(et);
 }
-var Xe = typeof crypto < "u" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
-const F = {
-  randomUUID: Xe
+var rt = typeof crypto < "u" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+const z = {
+  randomUUID: rt
 };
-function Qe(e, t, o) {
-  if (F.randomUUID && !t && !e)
-    return F.randomUUID();
+function ot(e, t, o) {
+  if (z.randomUUID && !t && !e)
+    return z.randomUUID();
   e = e || {};
-  var r = e.random || (e.rng || ze)();
-  return r[6] = r[6] & 15 | 64, r[8] = r[8] & 63 | 128, Ge(r);
+  var r = e.random || (e.rng || tt)();
+  return r[6] = r[6] & 15 | 64, r[8] = r[8] & 63 | 128, Ze(r);
 }
-const Ze = process.env.NODE_ENV === "production", et = !Ze, tt = async ({ params: e = {} }) => {
+const nt = process.env.NODE_ENV === "production", at = !nt, st = async ({ params: e = {} }) => {
   try {
-    const t = Qe(), o = await fetch(
-      et ? `${B.dev}/authenticate` : `${B.prod}/authenticate`,
+    const t = ot(), o = await fetch(
+      at ? `${Y.dev}/authenticate` : `${Y.prod}/authenticate`,
       {
         credentials: "include",
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          [We.CLIENT_ID]: `${e.clientId}`
+          [Fe.CLIENT_ID]: `${e.clientId}`
         },
         body: JSON.stringify({ ...e, nonce: t })
       }
@@ -722,25 +724,26 @@ const Ze = process.env.NODE_ENV === "production", et = !Ze, tt = async ({ params
   } catch (t) {
     return console.error(t), { status: 500, data: [] };
   }
-}, rt = async ({
+}, it = async ({
   username: e,
   password: t,
   clientId: o,
   sessionExpiration: r
 }) => {
   try {
-    const n = await tt({
+    const n = await st({
       params: {
-        type: Ke.ID_TOKEN,
+        type: Be.ID_AND_ACCESS_TOKEN,
         username: e,
         password: t,
         sessionExpiration: r,
         clientId: o
       }
-    }), a = await N(n.data.idToken, o);
-    return a && a.payload[A.USER_ID_KEY] !== "" ? {
+    }), a = await ae(n.data.idToken, o);
+    return a && a.payload[b.USER_ID_KEY] !== "" ? {
       idToken: n.data.idToken,
-      userId: a.payload[A.USER_ID_KEY],
+      accessToken: n.data.accessToken,
+      userId: a.payload[b.USER_ID_KEY],
       status: !0
     } : {
       status: !1
@@ -751,90 +754,92 @@ const Ze = process.env.NODE_ENV === "production", et = !Ze, tt = async ({ params
     };
   }
 };
-function ot(e) {
-  const t = ae();
-  return Y(() => {
+function ct(e) {
+  const t = de();
+  return X(() => {
     t.current = e;
   }), t.current;
 }
-const D = () => {
-  throw new Error(Fe);
-}, re = se({
+const L = () => {
+  throw new Error(Qe);
+}, ie = le({
   isAuthenticated: !1,
-  login: D,
-  logout: D,
-  getIdTokenClaims: D,
-  logoutReason: ""
-}), it = ({
+  isLoading: !1,
+  login: L,
+  logout: L,
+  getAccessToken: L,
+  logoutReason: "",
+  idTokenClaims: null
+}), pt = ({
   children: e,
   sessionExpiration: t,
   clientId: o
 }) => {
-  const [r, n, , a] = Ve({
-    key: `${Ye}::${o}::@@user@@`
-  }), [s, i] = ie({
-    isAuthenticated: !!r,
+  const [r, n, , a] = G({
+    key: `${q}::${o}::@@user@@`
+  }), [s, i, , c] = G({
+    key: `${q}::${o}::@@access@@`
+  }), [p, f] = he({
+    isLoading: !0,
+    isAuthenticated: !1,
     logoutReason: "",
-    userId: ""
-  }), c = ot(r) || "";
-  Y(() => {
-    c !== r && r !== null && (async () => {
+    userId: "",
+    idTokenClaims: null
+  }), l = ct(r) || "", h = pe(
+    (y) => {
+      f({
+        isLoading: !1,
+        isAuthenticated: !1,
+        logoutReason: y || H,
+        userId: "",
+        idTokenClaims: null
+      }), a(), c();
+    },
+    [a, c]
+  );
+  X(() => {
+    l !== r && r !== null && (async () => {
       try {
-        const u = await N(r, o);
-        u && u.payload[A.USER_ID_KEY] !== "" ? i({
+        const y = await ae(r, o);
+        y && y.payload[b.USER_ID_KEY] !== "" ? f({
+          isLoading: !1,
           isAuthenticated: !0,
           logoutReason: "",
-          userId: u.payload[A.USER_ID_KEY]
-        }) : i({
-          isAuthenticated: !1,
-          logoutReason: V,
-          userId: ""
-        });
+          userId: y.payload[b.USER_ID_KEY],
+          idTokenClaims: {
+            ...y == null ? void 0 : y.payload,
+            [b.TOKEN_ID_KEY]: r
+          }
+        }) : h(H);
       } catch {
-        i({
-          isAuthenticated: !1,
-          logoutReason: V,
-          userId: ""
-        });
+        h(H);
       }
     })();
-  }, [r, c, o]);
-  const f = async (u, y) => {
-    const p = await rt({
-      username: u,
-      password: y,
+  }, [r, l, o, h]);
+  const m = async (y, ce) => {
+    const v = await it({
+      username: y,
+      password: ce,
       clientId: o,
       sessionExpiration: t
     });
-    return p.status ? (n(p.idToken), i({
+    return v.status ? (n(v.idToken), i(v.accessToken), f({
+      isLoading: !1,
       isAuthenticated: !0,
-      userId: p.userId
-    }), !0) : !1;
+      userId: v.userId
+    }), !0) : (h(Xe), !1);
   }, w = () => {
-    i({
-      isAuthenticated: !1,
-      logoutReason: Be,
-      userId: ""
-    }), a();
-  }, h = async () => {
-    if (s.isAuthenticated)
-      try {
-        const u = await N(r, o);
-        return { ...u == null ? void 0 : u.payload, [A.TOKEN_ID_KEY]: r };
-      } catch {
-        return {};
-      }
-    return {};
-  };
-  return /* @__PURE__ */ ne(
-    re.Provider,
+    h(ze);
+  }, O = () => s;
+  return /* @__PURE__ */ ue(
+    ie.Provider,
     {
-      value: { ...s, login: f, logout: w, getIdTokenClaims: h },
+      value: { ...p, login: m, logout: w, getAccessToken: O },
       children: e
     }
   );
-}, ct = (e = re) => ce(e);
+}, ft = (e = ie) => fe(e);
 export {
-  it as AuthProvider,
-  ct as useAuth
+  pt as AuthProvider,
+  ft as useAuth
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@versini/auth-provider",
-	"version": "2.3.0",
+	"version": "3.1.0",
 	"license": "MIT",
 	"author": "Arno Versini",
 	"publishConfig": {
@@ -44,10 +44,10 @@
 		"react-dom": "18.3.1"
 	},
 	"dependencies": {
-		"@versini/auth-common": "2.3.0",
+		"@versini/auth-common": "2.5.0",
 		"@versini/ui-hooks": "4.0.0",
 		"jose": "5.4.1",
 		"uuid": "10.0.0"
 	},
-	"gitHead": "db5816d0e48518c40b0aa20ff564a88abf5bc426"
+	"gitHead": "25c60a5226b6f9d95aa3a3fcdbbc8448181e937a"
 }