@versini/auth-provider 2.1.0 → 2.1.2

package/dist/index.js

@@ -1,14 +1,14 @@
-import { jsx as ne } from "react/jsx-runtime";
-import * as A from "react";
-import { useRef as oe, useEffect as G, createContext as ae, useState as se, useContext as ie } from "react";
+import { jsx as oe } from "react/jsx-runtime";
+import * as b from "react";
+import { useRef as ae, useEffect as Y, createContext as se, useState as ie, useContext as ce } from "react";
 /*!
-  @versini/auth-provider v2.1.0
+  @versini/auth-provider v2.1.2
   © 2024 gizmette.com
 */
 try {
   window.__VERSINI_AUTH_CLIENT__ || (window.__VERSINI_AUTH_CLIENT__ = {
-    version: "2.1.0",
-    buildTime: "06/24/2024 02:46 PM EDT",
+    version: "2.1.2",
+    buildTime: "06/24/2024 05:12 PM EDT",
     homepage: "https://github.com/aversini/auth-client",
     license: "MIT"
   });
@@ -21,55 +21,55 @@ try {
 try {
   window.__VERSINI_AUTH_COMMON__ || (window.__VERSINI_AUTH_COMMON__ = {
     version: "2.1.0",
-    buildTime: "06/24/2024 02:46 PM EDT",
+    buildTime: "06/24/2024 05:12 PM EDT",
     homepage: "https://github.com/aversini/auth-client",
     license: "MIT"
   });
 } catch {
 }
-const ce = {
+const ue = {
   ID_TOKEN: "id_token"
-}, ue = {
+}, de = {
   CLIENT_ID: "X-Auth-ClientId"
-}, b = {
+}, A = {
   ALG: "RS256",
   USER_ID_KEY: "_id",
   ISSUER: "gizmette.com"
 };
-function Y(e, t) {
+function q(e, t) {
   window.dispatchEvent(new StorageEvent("storage", { key: e, newValue: t }));
 }
 const D = (e, t) => {
   const n = JSON.stringify(
     typeof t == "function" ? t() : t
   );
-  window.localStorage.setItem(e, n), Y(e, n);
-}, de = (e) => {
-  window.localStorage.removeItem(e), Y(e, null);
-}, K = (e) => window.localStorage.getItem(e), le = (e) => (window.addEventListener("storage", e), () => window.removeEventListener("storage", e));
-function fe({
+  window.localStorage.setItem(e, n), q(e, n);
+}, le = (e) => {
+  window.localStorage.removeItem(e), q(e, null);
+}, K = (e) => window.localStorage.getItem(e), fe = (e) => (window.addEventListener("storage", e), () => window.removeEventListener("storage", e));
+function he({
   key: e,
   initialValue: t
 }) {
-  const n = () => K(e), r = A.useSyncExternalStore(
-    le,
+  const n = () => K(e), r = b.useSyncExternalStore(
+    fe,
     n
-  ), o = A.useCallback(
+  ), o = b.useCallback(
     (i) => {
       try {
         const c = typeof i == "function" ? i(JSON.parse(r)) : i;
-        c == null ? de(e) : D(e, c);
+        c == null ? le(e) : D(e, c);
       } catch (c) {
         console.warn(c);
       }
     },
     [e, r]
-  ), s = A.useCallback(() => {
+  ), s = b.useCallback(() => {
     o(t);
-  }, [t, o]), a = A.useCallback(() => {
+  }, [t, o]), a = b.useCallback(() => {
     o(null);
   }, [o]);
-  return A.useEffect(() => {
+  return b.useEffect(() => {
     try {
       K(e) === null && typeof t < "u" && D(e, t);
     } catch (i) {
@@ -77,7 +77,7 @@ function fe({
     }
   }, [e, t]), [r ? JSON.parse(r) : null, o, s, a];
 }
-const he = "Oops! It looks like your session has expired. For your security, please log in again to continue.", pe = "Your session has been successfully terminated.", me = "You forgot to wrap your component in <AuthProvider>.", L = {
+const L = "Oops! It looks like your session has expired. For your security, please log in again to continue.", pe = "Your session has been successfully terminated.", me = "You forgot to wrap your component in <AuthProvider>.", W = {
   dev: "https://auth.gizmette.local.com:3003",
   prod: "https://mylogin.gizmette.com"
 }, ye = "@@auth@@", Se = `-----BEGIN PUBLIC KEY-----
@@ -88,7 +88,7 @@ aMwPFOIcJH+rKfFgNcHLcaS5syp7zU1ANwZ+trgR+DifBr8TLVkBynmNeTyhDm2+
 l0haqjMk0UoNPPE8iYBWUHQJJE1Dqstj65d6Eh5g64Pao25y4cmYJbKjiblIGEkE
 sjqybA9mARAqh9k/eiIopecWSiffNQTwVQVd2I9ZH3BalhEXHlqFgrjz51kFqg81
 awIDAQAB
------END PUBLIC KEY-----`, J = crypto, q = (e) => e instanceof CryptoKey, _ = new TextEncoder(), R = new TextDecoder();
+-----END PUBLIC KEY-----`, J = crypto, z = (e) => e instanceof CryptoKey, _ = new TextEncoder(), R = new TextDecoder();
 function we(...e) {
   const t = e.reduce((o, { length: s }) => o + s, 0), n = new Uint8Array(t);
   let r = 0;
@@ -127,7 +127,7 @@ class m extends g {
     super(t), this.code = "ERR_JWT_CLAIM_VALIDATION_FAILED", this.claim = r, this.reason = o, this.payload = n;
   }
 }
-class W extends g {
+class H extends g {
   static get code() {
     return "ERR_JWT_EXPIRED";
   }
@@ -159,7 +159,7 @@ class l extends g {
     return "ERR_JWS_INVALID";
   }
 }
-class z extends g {
+class X extends g {
   constructor() {
     super(...arguments), this.code = "ERR_JWT_INVALID";
   }
@@ -167,7 +167,7 @@ class z extends g {
     return "ERR_JWT_INVALID";
   }
 }
-class be extends g {
+class Ae extends g {
   constructor() {
     super(...arguments), this.code = "ERR_JWS_SIGNATURE_VERIFICATION_FAILED", this.message = "signature verification failed";
   }
@@ -184,7 +184,7 @@ function T(e, t) {
 function O(e) {
   return parseInt(e.name.slice(4), 10);
 }
-function Ae(e) {
+function be(e) {
   switch (e) {
     case "ES256":
       return "P-256";
@@ -249,7 +249,7 @@ function _e(e, t, ...n) {
     case "ES512": {
       if (!T(e.algorithm, "ECDSA"))
         throw S("ECDSA");
-      const r = Ae(t);
+      const r = be(t);
       if (e.algorithm.namedCurve !== r)
         throw S(r, "algorithm.namedCurve");
       break;
@@ -259,7 +259,7 @@ function _e(e, t, ...n) {
   }
   Ie(e, n);
 }
-function X(e, t, ...n) {
+function j(e, t, ...n) {
   var r;
   if (n.length > 2) {
     const o = n.pop();
@@ -268,11 +268,11 @@ function X(e, t, ...n) {
     n.length === 2 ? e += `one of type ${n[0]} or ${n[1]}.` : e += `of type ${n[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 H = (e, ...t) => X("Key must be ", e, ...t);
-function j(e, t, ...n) {
-  return X(`Key for the ${e} algorithm must be `, t, ...n);
+const $ = (e, ...t) => j("Key must be ", e, ...t);
+function Q(e, t, ...n) {
+  return j(`Key for the ${e} algorithm must be `, t, ...n);
 }
-const Q = (e) => q(e), E = ["CryptoKey"], Te = (...e) => {
+const Z = (e) => z(e), E = ["CryptoKey"], Te = (...e) => {
   const t = e.filter(Boolean);
   if (t.length === 0 || t.length === 1)
     return !0;
@@ -317,7 +317,7 @@ const Re = (e, t) => {
     return !1;
   const o = e.subarray(r, r + t.length);
   return o.length !== t.length ? !1 : o.every((s, a) => s === t[a]) || w(e, t, r + 1);
-}, $ = (e) => {
+}, M = (e) => {
   switch (!0) {
     case w(e, [42, 134, 72, 206, 61, 3, 1, 7]):
       return "P-256";
@@ -372,12 +372,12 @@ const Re = (e, t) => {
     case "ECDH-ES+A128KW":
     case "ECDH-ES+A192KW":
     case "ECDH-ES+A256KW": {
-      const c = $(i);
+      const c = M(i);
       s = c.startsWith("P-") ? { name: "ECDH", namedCurve: c } : { name: c }, a = [];
       break;
     }
     case "EdDSA":
-      s = { name: $(i) }, a = ["verify"];
+      s = { name: M(i) }, a = ["verify"];
       break;
     default:
       throw new C('Invalid or unsupported "alg" (Algorithm) value');
@@ -391,14 +391,14 @@ async function xe(e, t, n) {
 }
 const Oe = (e, t) => {
   if (!(t instanceof Uint8Array)) {
-    if (!Q(t))
-      throw new TypeError(j(e, t, ...E, "Uint8Array"));
+    if (!Z(t))
+      throw new TypeError(Q(e, t, ...E, "Uint8Array"));
     if (t.type !== "secret")
       throw new TypeError(`${E.join(" or ")} instances for symmetric algorithms must be of type "secret"`);
   }
 }, Ne = (e, t, n) => {
-  if (!Q(t))
-    throw new TypeError(j(e, t, ...E));
+  if (!Z(t))
+    throw new TypeError(Q(e, t, ...E));
   if (t.type === "secret")
     throw new TypeError(`${E.join(" or ")} instances for asymmetric algorithms must not be of type "secret"`);
   if (t.algorithm && n === "verify" && t.type === "private")
@@ -459,14 +459,14 @@ function De(e, t) {
   }
 }
 function Ke(e, t, n) {
-  if (q(t))
+  if (z(t))
     return _e(t, e, n), t;
   if (t instanceof Uint8Array) {
     if (!e.startsWith("HS"))
-      throw new TypeError(H(t, ...E));
+      throw new TypeError($(t, ...E));
     return J.subtle.importKey("raw", t, { hash: `SHA-${e.slice(-3)}`, name: "HMAC" }, !1, [n]);
   }
-  throw new TypeError(H(t, ...E, "Uint8Array"));
+  throw new TypeError($(t, ...E, "Uint8Array"));
 }
 const Le = async (e, t, n, r) => {
   const o = await Ke(e, t, "verify");
@@ -529,7 +529,7 @@ async function We(e, t, n) {
     throw new l("Failed to base64url decode the signature");
   }
   if (!await Le(i, t, u, y))
-    throw new be();
+    throw new Ae();
   let f;
   if (a)
     try {
@@ -551,7 +551,7 @@ async function He(e, t, n) {
   const i = await We({ payload: o, protected: r, signature: s }, t, n), c = { payload: i.payload, protectedHeader: i.protectedHeader };
   return typeof t == "function" ? { ...c, key: i.key } : c;
 }
-const $e = (e) => Math.floor(e.getTime() / 1e3), Z = 60, ee = Z * 60, k = ee * 24, Me = k * 7, Ve = k * 365.25, Be = /^(\+|\-)? ?(\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 $e = (e) => Math.floor(e.getTime() / 1e3), ee = 60, te = ee * 60, k = te * 24, Me = k * 7, Ve = k * 365.25, Be = /^(\+|\-)? ?(\d+|\d+\.\d+) ?(seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)(?: (ago|from now))?$/i, V = (e) => {
   const t = Be.exec(e);
   if (!t || t[4] && t[1])
     throw new TypeError("Invalid time period format");
@@ -570,14 +570,14 @@ const $e = (e) => Math.floor(e.getTime() / 1e3), Z = 60, ee = Z * 60, k = ee * 2
     case "min":
     case "mins":
     case "m":
-      o = Math.round(n * Z);
+      o = Math.round(n * ee);
       break;
     case "hour":
     case "hours":
     case "hr":
     case "hrs":
     case "h":
-      o = Math.round(n * ee);
+      o = Math.round(n * te);
       break;
     case "day":
     case "days":
@@ -594,16 +594,16 @@ const $e = (e) => Math.floor(e.getTime() / 1e3), Z = 60, ee = Z * 60, k = ee * 2
       break;
   }
   return t[1] === "-" || t[4] === "ago" ? -o : o;
-}, V = (e) => e.toLowerCase().replace(/^application\//, ""), Fe = (e, t) => typeof e == "string" ? t.includes(e) : Array.isArray(e) ? t.some(Set.prototype.has.bind(new Set(e))) : !1, Ge = (e, t, n = {}) => {
+}, B = (e) => e.toLowerCase().replace(/^application\//, ""), Fe = (e, t) => typeof e == "string" ? t.includes(e) : Array.isArray(e) ? t.some(Set.prototype.has.bind(new Set(e))) : !1, Ge = (e, t, n = {}) => {
   let r;
   try {
     r = JSON.parse(R.decode(t));
   } catch {
   }
   if (!U(r))
-    throw new z("JWT Claims Set must be a top-level JSON object");
+    throw new X("JWT Claims Set must be a top-level JSON object");
   const { typ: o } = n;
-  if (o && (typeof e.typ != "string" || V(e.typ) !== V(o)))
+  if (o && (typeof e.typ != "string" || B(e.typ) !== B(o)))
     throw new m('unexpected "typ" JWT header value', r, "typ", "check_failed");
   const { requiredClaims: s = [], issuer: a, subject: i, audience: c, maxTokenAge: h } = n, y = [...s];
   h !== void 0 && y.push("iat"), c !== void 0 && y.push("aud"), i !== void 0 && y.push("sub"), a !== void 0 && y.push("iss");
@@ -619,7 +619,7 @@ const $e = (e) => Math.floor(e.getTime() / 1e3), Z = 60, ee = Z * 60, k = ee * 2
   let u;
   switch (typeof n.clockTolerance) {
     case "string":
-      u = M(n.clockTolerance);
+      u = V(n.clockTolerance);
       break;
     case "number":
       u = n.clockTolerance;
@@ -643,12 +643,12 @@ const $e = (e) => Math.floor(e.getTime() / 1e3), Z = 60, ee = Z * 60, k = ee * 2
     if (typeof r.exp != "number")
       throw new m('"exp" claim must be a number', r, "exp", "invalid");
     if (r.exp <= f - u)
-      throw new W('"exp" claim timestamp check failed', r, "exp", "check_failed");
+      throw new H('"exp" claim timestamp check failed', r, "exp", "check_failed");
   }
   if (h) {
-    const p = f - r.iat, P = typeof h == "number" ? h : M(h);
+    const p = f - r.iat, P = typeof h == "number" ? h : V(h);
     if (p - u > P)
-      throw new W('"iat" claim timestamp check failed (too far in the past)', r, "iat", "check_failed");
+      throw new H('"iat" claim timestamp check failed (too far in the past)', r, "iat", "check_failed");
     if (p < 0 - u)
       throw new m('"iat" claim timestamp check failed (it should be in the past)', r, "iat", "check_failed");
   }
@@ -658,7 +658,7 @@ async function Ye(e, t, n) {
   var a;
   const r = await He(e, t, n);
   if ((a = r.protectedHeader.crit) != null && a.includes("b64") && r.protectedHeader.b64 === !1)
-    throw new z("JWTs MUST NOT use unencoded payload");
+    throw new X("JWTs MUST NOT use unencoded payload");
   const s = { payload: Ge(r.protectedHeader, r.payload, n), protectedHeader: r.protectedHeader };
   return typeof t == "function" ? { ...s, key: r.key } : s;
 }
@@ -675,12 +675,12 @@ function Xe() {
   return v(ze);
 }
 var je = typeof crypto < "u" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
-const B = {
+const F = {
   randomUUID: je
 };
 function Qe(e, t, n) {
-  if (B.randomUUID && !t && !e)
-    return B.randomUUID();
+  if (F.randomUUID && !t && !e)
+    return F.randomUUID();
   e = e || {};
   var r = e.random || (e.rng || Xe)();
   return r[6] = r[6] & 15 | 64, r[8] = r[8] & 63 | 128, qe(r);
@@ -688,13 +688,13 @@ function Qe(e, t, n) {
 const Ze = process.env.NODE_ENV === "production", et = !Ze, tt = async ({ params: e = {} }) => {
   try {
     const t = Qe(), n = await fetch(
-      et ? `${L.dev}/authenticate` : `${L.prod}/authenticate`,
+      et ? `${W.dev}/authenticate` : `${W.prod}/authenticate`,
       {
         credentials: "include",
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          [ue.CLIENT_ID]: `${e.clientId}`
+          [de.CLIENT_ID]: `${e.clientId}`
         },
         body: JSON.stringify({ ...e, nonce: t })
       }
@@ -710,11 +710,12 @@ const Ze = process.env.NODE_ENV === "production", et = !Ze, tt = async ({ params
   } catch (t) {
     return console.error(t), { status: 500, data: [] };
   }
-}, te = async (e) => {
+}, re = async (e, t) => {
   try {
-    const t = b.ALG, r = await xe(Se, t);
-    return await Ye(e, r, {
-      issuer: b.ISSUER
+    const n = A.ALG, o = await xe(Se, n);
+    return await Ye(e, o, {
+      issuer: A.ISSUER,
+      audience: t
     });
   } catch {
     return;
@@ -728,16 +729,16 @@ const Ze = process.env.NODE_ENV === "production", et = !Ze, tt = async ({ params
   try {
     const o = await tt({
       params: {
-        type: ce.ID_TOKEN,
+        type: ue.ID_TOKEN,
         username: e,
         password: t,
         sessionExpiration: r,
         clientId: n
       }
-    }), s = await te(o.data.idToken);
-    return s && s.payload[b.USER_ID_KEY] !== "" ? {
+    }), s = await re(o.data.idToken, n);
+    return s && s.payload[A.USER_ID_KEY] !== "" ? {
       idToken: o.data.idToken,
-      userId: s.payload[b.USER_ID_KEY],
+      userId: s.payload[A.USER_ID_KEY],
       status: !0
     } : {
       status: !1
@@ -749,17 +750,17 @@ const Ze = process.env.NODE_ENV === "production", et = !Ze, tt = async ({ params
   }
 };
 function nt(e) {
-  const t = oe();
-  return G(() => {
+  const t = ae();
+  return Y(() => {
     t.current = e;
   }), t.current;
 }
-const F = () => {
+const G = () => {
   throw new Error(me);
-}, re = ae({
+}, ne = se({
   isAuthenticated: !1,
-  login: F,
-  logout: F,
+  login: G,
+  logout: G,
   accessToken: void 0,
   refreshToken: void 0,
   idToken: void 0,
@@ -769,31 +770,35 @@ const F = () => {
   sessionExpiration: t,
   clientId: n
 }) => {
-  const [r, o, , s] = fe({
+  const [r, o, , s] = he({
     key: `${ye}::${n}::@@user@@`
-  }), [a, i] = se({
+  }), [a, i] = ie({
     isAuthenticated: !!r,
     logoutReason: "",
     userId: ""
   }), c = nt(r) || "";
-  G(() => {
+  Y(() => {
     c !== r && r !== null && (async () => {
       try {
-        const u = await te(r);
-        u && u.payload[b.USER_ID_KEY] !== "" && i({
+        const u = await re(r, n);
+        u && u.payload[A.USER_ID_KEY] !== "" ? i({
           isAuthenticated: !0,
           logoutReason: "",
-          userId: u.payload[b.USER_ID_KEY]
+          userId: u.payload[A.USER_ID_KEY]
+        }) : i({
+          isAuthenticated: !1,
+          logoutReason: L,
+          userId: ""
         });
       } catch {
         i({
           isAuthenticated: !1,
-          logoutReason: he,
+          logoutReason: L,
           userId: ""
         });
       }
     })();
-  }, [r, c]);
+  }, [r, c, n]);
   const h = async (u, I) => {
     const f = await rt({
       username: u,
@@ -812,8 +817,8 @@ const F = () => {
       userId: ""
     }), s();
   };
-  return /* @__PURE__ */ ne(re.Provider, { value: { ...a, login: h, logout: y }, children: e });
-}, it = (e = re) => ie(e);
+  return /* @__PURE__ */ oe(ne.Provider, { value: { ...a, login: h, logout: y }, children: e });
+}, it = (e = ne) => ce(e);
 export {
   st as AuthProvider,
   it as useAuth

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@versini/auth-provider",
-	"version": "2.1.0",
+	"version": "2.1.2",
 	"license": "MIT",
 	"author": "Arno Versini",
 	"publishConfig": {
@@ -49,5 +49,5 @@
 		"jose": "5.4.1",
 		"uuid": "10.0.0"
 	},
-	"gitHead": "a94b2706534018d76db4f96687260291b2b3b31e"
+	"gitHead": "3a70e5d3382595c6fad816559e819eacd0431e3b"
 }