@versini/auth-common 2.10.0 → 2.11.0

package/dist/index.d.ts

@@ -15,6 +15,7 @@ declare const JWT: {
     USER_ID_KEY: string;
     TOKEN_ID_KEY: string;
     NONCE_KEY: string;
+    USERNAME_KEY: string;
     ISSUER: string;
 };
 declare const JWT_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsF6i3Jd9fY/3COqCw/m7\nw5PKyTYLGAI2I6SIIdpe6i6DOCbEkmDz7LdVsBqwNtVi8gvWYIj+8ol6rU3qu1v5\ni1Jd45GSK4kzkVdgCmQZbM5ak0KI99q5wsrAIzUd+LRJ2HRvWtr5IYdsIiXaQjle\naMwPFOIcJH+rKfFgNcHLcaS5syp7zU1ANwZ+trgR+DifBr8TLVkBynmNeTyhDm2+\nl0haqjMk0UoNPPE8iYBWUHQJJE1Dqstj65d6Eh5g64Pao25y4cmYJbKjiblIGEkE\nsjqybA9mARAqh9k/eiIopecWSiffNQTwVQVd2I9ZH3BalhEXHlqFgrjz51kFqg81\nawIDAQAB\n-----END PUBLIC KEY-----";
@@ -58,4 +59,18 @@ declare function pkceChallengePair(length?: number): Promise<{
  */
 declare function verifyChallenge(code_verifier: string, expectedChallenge: string): Promise<boolean>;
 
-export { API_TYPE, AUTH_TYPES, HEADERS, JWT, JWT_PUBLIC_KEY, TOKEN_EXPIRATION, decodeToken, generateCodeChallenge, pkceChallengePair, verifyAndExtractToken, verifyChallenge };
+type HeadersLike = Record<string, unknown> & {
+    authorization?: string;
+    "content-type"?: string;
+    cookie?: string;
+};
+/**
+ * Get a Bearer Token from a request.
+ *
+ * @param headers An object containing the request headers, usually `req.headers`.
+ * @param clientId The client ID to use.
+ *
+ */
+declare const getToken: (headers: HeadersLike, clientId: string) => string;
+
+export { API_TYPE, AUTH_TYPES, HEADERS, JWT, JWT_PUBLIC_KEY, TOKEN_EXPIRATION, decodeToken, generateCodeChallenge, getToken, pkceChallengePair, verifyAndExtractToken, verifyChallenge };

package/dist/index.js

@@ -1,29 +1,30 @@
 /*!
-  @versini/auth-common v2.10.0
+  @versini/auth-common v2.11.0
   © 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.11.0",
+    buildTime: "07/07/2024 10:25 AM EDT",
     homepage: "https://github.com/aversini/auth-client",
     license: "MIT"
   });
 } catch {
 }
-const Ge = {
+const Qe = {
   ID_TOKEN: "id_token",
   ACCESS_TOKEN: "token",
   ID_AND_ACCESS_TOKEN: "id_token token",
   CODE: "code",
   REFRESH_TOKEN: "refresh_token"
-}, ze = {
+}, Xe = {
   CLIENT_ID: "X-Auth-ClientId"
 }, N = {
   ALG: "RS256",
   USER_ID_KEY: "sub",
   TOKEN_ID_KEY: "__raw",
   NONCE_KEY: "_nonce",
+  USERNAME_KEY: "username",
   ISSUER: "gizmette.com"
 }, ne = `-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsF6i3Jd9fY/3COqCw/m7
@@ -33,15 +34,15 @@ aMwPFOIcJH+rKfFgNcHLcaS5syp7zU1ANwZ+trgR+DifBr8TLVkBynmNeTyhDm2+
 l0haqjMk0UoNPPE8iYBWUHQJJE1Dqstj65d6Eh5g64Pao25y4cmYJbKjiblIGEkE
 sjqybA9mARAqh9k/eiIopecWSiffNQTwVQVd2I9ZH3BalhEXHlqFgrjz51kFqg81
 awIDAQAB
------END PUBLIC KEY-----`, Ye = {
+-----END PUBLIC KEY-----`, Ze = {
   ACCESS: "5m",
   ID: "90d",
   REFRESH: "90d"
-}, Qe = {
+}, je = {
   AUTHENTICATE: "authenticate",
   CODE: "code",
   LOGOUT: "logout"
-}, x = crypto, G = (e) => e instanceof CryptoKey, v = new TextEncoder(), C = new TextDecoder();
+}, x = crypto, z = (e) => e instanceof CryptoKey, v = new TextEncoder(), C = new TextDecoder();
 function ae(...e) {
   const t = e.reduce((a, { length: i }) => a + i, 0), r = new Uint8Array(t);
   let n = 0;
@@ -54,7 +55,7 @@ const oe = (e) => {
   for (let n = 0; n < t.length; n++)
     r[n] = t.charCodeAt(n);
   return r;
-}, A = (e) => {
+}, b = (e) => {
   let t = e;
   t instanceof Uint8Array && (t = C.decode(t)), t = t.replace(/-/g, "+").replace(/_/g, "/").replace(/\s/g, "");
   try {
@@ -63,7 +64,7 @@ const oe = (e) => {
     throw new TypeError("The input to be decoded is not correctly encoded.");
   }
 };
-class b extends Error {
+class A extends Error {
   static get code() {
     return "ERR_JOSE_GENERIC";
   }
@@ -72,7 +73,7 @@ class b 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 f extends b {
+class h extends A {
   static get code() {
     return "ERR_JWT_CLAIM_VALIDATION_FAILED";
   }
@@ -80,7 +81,7 @@ class f extends b {
     super(t), this.code = "ERR_JWT_CLAIM_VALIDATION_FAILED", this.claim = n, this.reason = a, this.payload = r;
   }
 }
-class $ extends b {
+class $ extends A {
   static get code() {
     return "ERR_JWT_EXPIRED";
   }
@@ -88,7 +89,7 @@ class $ extends b {
     super(t), this.code = "ERR_JWT_EXPIRED", this.claim = n, this.reason = a, this.payload = r;
   }
 }
-class ie extends b {
+class ie extends A {
   constructor() {
     super(...arguments), this.code = "ERR_JOSE_ALG_NOT_ALLOWED";
   }
@@ -96,7 +97,7 @@ class ie extends b {
     return "ERR_JOSE_ALG_NOT_ALLOWED";
   }
 }
-class w extends b {
+class w extends A {
   constructor() {
     super(...arguments), this.code = "ERR_JOSE_NOT_SUPPORTED";
   }
@@ -104,7 +105,7 @@ class w extends b {
     return "ERR_JOSE_NOT_SUPPORTED";
   }
 }
-class u extends b {
+class u extends A {
   constructor() {
     super(...arguments), this.code = "ERR_JWS_INVALID";
   }
@@ -112,7 +113,7 @@ class u extends b {
     return "ERR_JWS_INVALID";
   }
 }
-class S extends b {
+class S extends A {
   constructor() {
     super(...arguments), this.code = "ERR_JWT_INVALID";
   }
@@ -120,7 +121,7 @@ class S extends b {
     return "ERR_JWT_INVALID";
   }
 }
-class ce extends b {
+class ce extends A {
   constructor() {
     super(...arguments), this.code = "ERR_JWS_SIGNATURE_VERIFICATION_FAILED", this.message = "signature verification failed";
   }
@@ -134,7 +135,7 @@ function m(e, t = "algorithm.name") {
 function T(e, t) {
   return e.name === t;
 }
-function K(e) {
+function O(e) {
   return parseInt(e.name.slice(4), 10);
 }
 function se(e) {
@@ -168,7 +169,7 @@ function ue(e, t, ...r) {
       if (!T(e.algorithm, "HMAC"))
         throw m("HMAC");
       const n = parseInt(t.slice(2), 10);
-      if (K(e.algorithm.hash) !== n)
+      if (O(e.algorithm.hash) !== n)
         throw m(`SHA-${n}`, "algorithm.hash");
       break;
     }
@@ -178,7 +179,7 @@ function ue(e, t, ...r) {
       if (!T(e.algorithm, "RSASSA-PKCS1-v1_5"))
         throw m("RSASSA-PKCS1-v1_5");
       const n = parseInt(t.slice(2), 10);
-      if (K(e.algorithm.hash) !== n)
+      if (O(e.algorithm.hash) !== n)
         throw m(`SHA-${n}`, "algorithm.hash");
       break;
     }
@@ -188,7 +189,7 @@ function ue(e, t, ...r) {
       if (!T(e.algorithm, "RSA-PSS"))
         throw m("RSA-PSS");
       const n = parseInt(t.slice(2), 10);
-      if (K(e.algorithm.hash) !== n)
+      if (O(e.algorithm.hash) !== n)
         throw m(`SHA-${n}`, "algorithm.hash");
       break;
     }
@@ -212,7 +213,7 @@ function ue(e, t, ...r) {
   }
   de(e, r);
 }
-function z(e, t, ...r) {
+function G(e, t, ...r) {
   var n;
   if (r.length > 2) {
     const a = r.pop();
@@ -221,11 +222,11 @@ function z(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 && (n = t.constructor) != null && n.name && (e += ` Received an instance of ${t.constructor.name}`), e;
 }
-const L = (e, ...t) => z("Key must be ", e, ...t);
+const L = (e, ...t) => G("Key must be ", e, ...t);
 function Y(e, t, ...r) {
-  return z(`Key for the ${e} algorithm must be `, t, ...r);
+  return G(`Key for the ${e} algorithm must be `, t, ...r);
 }
-const Q = (e) => G(e) ? !0 : (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", R = ["CryptoKey"], le = (...e) => {
+const Q = (e) => z(e) ? !0 : (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", _ = ["CryptoKey"], le = (...e) => {
   const t = e.filter(Boolean);
   if (t.length === 0 || t.length === 1)
     return !0;
@@ -244,11 +245,11 @@ const Q = (e) => G(e) ? !0 : (e == null ? void 0 : e[Symbol.toStringTag]) === "K
   }
   return !0;
 };
-function he(e) {
+function fe(e) {
   return typeof e == "object" && e !== null;
 }
-function _(e) {
-  if (!he(e) || Object.prototype.toString.call(e) !== "[object Object]")
+function P(e) {
+  if (!fe(e) || Object.prototype.toString.call(e) !== "[object Object]")
     return !1;
   if (Object.getPrototypeOf(e) === null)
     return !0;
@@ -257,7 +258,7 @@ function _(e) {
     t = Object.getPrototypeOf(t);
   return Object.getPrototypeOf(e) === t;
 }
-const fe = (e, t) => {
+const he = (e, t) => {
   if (e.startsWith("RS") || e.startsWith("PS")) {
     const { modulusLength: r } = t.algorithm;
     if (typeof r != "number" || r < 2048)
@@ -345,7 +346,7 @@ const me = async (e) => {
     e.key_ops ?? r
   ], a = { ...e };
   return delete a.alg, delete a.use, x.subtle.importKey("jwk", a, ...n);
-}, X = (e) => A(e);
+}, X = (e) => b(e);
 let W, J;
 const Z = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", j = async (e, t, r, n) => {
   let a = e.get(t);
@@ -439,29 +440,29 @@ const Z = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", j
   }
   return x.subtle.importKey(t, c, i, !1, o);
 }, ge = (e, t, r) => we(/(?:-----(?:BEGIN|END) PUBLIC KEY-----|\s)/g, "spki", e, t);
-async function be(e, t, r) {
+async function Ae(e, t, r) {
   if (e.indexOf("-----BEGIN PUBLIC KEY-----") !== 0)
     throw new TypeError('"spki" must be SPKI formatted string');
   return ge(e, t);
 }
-const P = (e) => e == null ? void 0 : e[Symbol.toStringTag], Ae = (e, t) => {
+const R = (e) => e == null ? void 0 : e[Symbol.toStringTag], be = (e, t) => {
   if (!(t instanceof Uint8Array)) {
     if (!Q(t))
-      throw new TypeError(Y(e, t, ...R, "Uint8Array"));
+      throw new TypeError(Y(e, t, ..._, "Uint8Array"));
     if (t.type !== "secret")
-      throw new TypeError(`${P(t)} instances for symmetric algorithms must be of type "secret"`);
+      throw new TypeError(`${R(t)} instances for symmetric algorithms must be of type "secret"`);
   }
 }, Ce = (e, t, r) => {
   if (!Q(t))
-    throw new TypeError(Y(e, t, ...R));
+    throw new TypeError(Y(e, t, ..._));
   if (t.type === "secret")
-    throw new TypeError(`${P(t)} instances for asymmetric algorithms must not be of type "secret"`);
+    throw new TypeError(`${R(t)} instances for asymmetric algorithms must not be of type "secret"`);
   if (t.algorithm && r === "verify" && t.type === "private")
-    throw new TypeError(`${P(t)} instances for asymmetric algorithm verifying must be of type "public"`);
+    throw new TypeError(`${R(t)} instances for asymmetric algorithm verifying must be of type "public"`);
   if (t.algorithm && r === "encrypt" && t.type === "private")
-    throw new TypeError(`${P(t)} instances for asymmetric algorithm encryption must be of type "public"`);
+    throw new TypeError(`${R(t)} instances for asymmetric algorithm encryption must be of type "public"`);
 }, ve = (e, t, r) => {
-  e.startsWith("HS") || e === "dir" || e.startsWith("PBES2") || /^A\d{3}(?:GCM)?KW$/.test(e) ? Ae(e, t) : Ce(e, t, r);
+  e.startsWith("HS") || e === "dir" || e.startsWith("PBES2") || /^A\d{3}(?:GCM)?KW$/.test(e) ? be(e, t) : Ce(e, t, r);
 };
 function Te(e, t, r, n, a) {
   if (a.crit !== void 0 && (n == null ? void 0 : n.crit) === void 0)
@@ -488,7 +489,7 @@ const Ie = (e, t) => {
   if (t)
     return new Set(t);
 };
-function Pe(e, t) {
+function Re(e, t) {
   const r = `SHA-${e.slice(-3)}`;
   switch (e) {
     case "HS256":
@@ -513,20 +514,20 @@ function Pe(e, t) {
       throw new w(`alg ${e} is not supported either by JOSE or your javascript runtime`);
   }
 }
-async function Re(e, t, r) {
-  if (t = await Ee.normalizePublicKey(t, e), G(t))
+async function _e(e, t, r) {
+  if (t = await Ee.normalizePublicKey(t, e), z(t))
     return ue(t, e, r), t;
   if (t instanceof Uint8Array) {
     if (!e.startsWith("HS"))
-      throw new TypeError(L(t, ...R));
+      throw new TypeError(L(t, ..._));
     return x.subtle.importKey("raw", t, { hash: `SHA-${e.slice(-3)}`, name: "HMAC" }, !1, [r]);
   }
-  throw new TypeError(L(t, ...R, "Uint8Array"));
+  throw new TypeError(L(t, ..._, "Uint8Array"));
 }
-const _e = async (e, t, r, n) => {
-  const a = await Re(e, t, "verify");
-  fe(e, a);
-  const i = Pe(e, a.algorithm);
+const Pe = async (e, t, r, n) => {
+  const a = await _e(e, t, "verify");
+  he(e, a);
+  const i = Re(e, a.algorithm);
   try {
     return await x.subtle.verify(i, a, r, n);
   } catch {
@@ -534,7 +535,7 @@ const _e = async (e, t, r, n) => {
   }
 };
 async function xe(e, t, r) {
-  if (!_(e))
+  if (!P(e))
     throw new u("Flattened JWS must be an object");
   if (e.protected === void 0 && e.header === void 0)
     throw new u('Flattened JWS must have either of the "protected" or "header" members');
@@ -544,13 +545,13 @@ async function xe(e, t, r) {
     throw new u("JWS Payload missing");
   if (typeof e.signature != "string")
     throw new u("JWS Signature missing or incorrect type");
-  if (e.header !== void 0 && !_(e.header))
+  if (e.header !== void 0 && !P(e.header))
     throw new u("JWS Unprotected Header incorrect type");
   let n = {};
   if (e.protected)
     try {
-      const O = A(e.protected);
-      n = JSON.parse(C.decode(O));
+      const K = b(e.protected);
+      n = JSON.parse(C.decode(K));
     } catch {
       throw new u("JWS Protected Header is invalid");
     }
@@ -577,18 +578,18 @@ async function xe(e, t, r) {
   let p = !1;
   typeof t == "function" && (t = await t(n, e), p = !0), ve(c, t, "verify");
   const g = ae(v.encode(e.protected ?? ""), v.encode("."), typeof e.payload == "string" ? v.encode(e.payload) : e.payload);
-  let h;
+  let f;
   try {
-    h = A(e.signature);
+    f = b(e.signature);
   } catch {
     throw new u("Failed to base64url decode the signature");
   }
-  if (!await _e(c, t, h, g))
+  if (!await Pe(c, t, f, g))
     throw new ce();
   let y;
   if (o)
     try {
-      y = A(e.payload);
+      y = b(e.payload);
     } catch {
       throw new u("Failed to base64url decode the payload");
     }
@@ -597,7 +598,7 @@ async function xe(e, t, r) {
   const l = { payload: y };
   return e.protected !== void 0 && (l.protectedHeader = n), e.header !== void 0 && (l.unprotectedHeader = e.header), p ? { ...l, key: t } : l;
 }
-async function Oe(e, t, r) {
+async function Ke(e, t, r) {
   if (e instanceof Uint8Array && (e = C.decode(e)), typeof e != "string")
     throw new u("Compact JWS must be a string or Uint8Array");
   const { 0: n, 1: a, 2: i, length: o } = e.split(".");
@@ -606,7 +607,7 @@ async function Oe(e, t, r) {
   const c = await xe({ payload: a, protected: n, signature: i }, t, r), s = { payload: c.payload, protectedHeader: c.protectedHeader };
   return typeof t == "function" ? { ...s, key: c.key } : s;
 }
-const Ke = (e) => Math.floor(e.getTime() / 1e3), ee = 60, te = ee * 60, H = te * 24, We = H * 7, Je = H * 365.25, De = /^(\+|\-)? ?(\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 Oe = (e) => Math.floor(e.getTime() / 1e3), ee = 60, te = ee * 60, H = te * 24, We = H * 7, Je = H * 365.25, De = /^(\+|\-)? ?(\d+|\d+\.\d+) ?(seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)(?: (ago|from now))?$/i, k = (e) => {
   const t = De.exec(e);
   if (!t || t[4] && t[1])
     throw new TypeError("Invalid time period format");
@@ -649,75 +650,75 @@ const Ke = (e) => Math.floor(e.getTime() / 1e3), ee = 60, te = ee * 60, H = te *
       break;
   }
   return t[1] === "-" || t[4] === "ago" ? -a : a;
-}, k = (e) => e.toLowerCase().replace(/^application\//, ""), He = (e, t) => typeof e == "string" ? t.includes(e) : Array.isArray(e) ? t.some(Set.prototype.has.bind(new Set(e))) : !1, Ue = (e, t, r = {}) => {
+}, V = (e) => e.toLowerCase().replace(/^application\//, ""), He = (e, t) => typeof e == "string" ? t.includes(e) : Array.isArray(e) ? t.some(Set.prototype.has.bind(new Set(e))) : !1, Ue = (e, t, r = {}) => {
   let n;
   try {
     n = JSON.parse(C.decode(t));
   } catch {
   }
-  if (!_(n))
+  if (!P(n))
     throw new S("JWT Claims Set must be a top-level JSON object");
   const { typ: a } = r;
-  if (a && (typeof e.typ != "string" || k(e.typ) !== k(a)))
-    throw new f('unexpected "typ" JWT header value', n, "typ", "check_failed");
+  if (a && (typeof e.typ != "string" || V(e.typ) !== V(a)))
+    throw new h('unexpected "typ" JWT header value', n, "typ", "check_failed");
   const { requiredClaims: i = [], issuer: o, subject: c, audience: s, maxTokenAge: p } = r, g = [...i];
   p !== void 0 && g.push("iat"), s !== void 0 && g.push("aud"), c !== void 0 && g.push("sub"), o !== void 0 && g.push("iss");
   for (const l of new Set(g.reverse()))
     if (!(l in n))
-      throw new f(`missing required "${l}" claim`, n, l, "missing");
+      throw new h(`missing required "${l}" claim`, n, l, "missing");
   if (o && !(Array.isArray(o) ? o : [o]).includes(n.iss))
-    throw new f('unexpected "iss" claim value', n, "iss", "check_failed");
+    throw new h('unexpected "iss" claim value', n, "iss", "check_failed");
   if (c && n.sub !== c)
-    throw new f('unexpected "sub" claim value', n, "sub", "check_failed");
+    throw new h('unexpected "sub" claim value', n, "sub", "check_failed");
   if (s && !He(n.aud, typeof s == "string" ? [s] : s))
-    throw new f('unexpected "aud" claim value', n, "aud", "check_failed");
-  let h;
+    throw new h('unexpected "aud" claim value', n, "aud", "check_failed");
+  let f;
   switch (typeof r.clockTolerance) {
     case "string":
-      h = V(r.clockTolerance);
+      f = k(r.clockTolerance);
       break;
     case "number":
-      h = r.clockTolerance;
+      f = r.clockTolerance;
       break;
     case "undefined":
-      h = 0;
+      f = 0;
       break;
     default:
       throw new TypeError("Invalid clockTolerance option type");
   }
-  const { currentDate: U } = r, y = Ke(U || /* @__PURE__ */ new Date());
+  const { currentDate: U } = r, y = Oe(U || /* @__PURE__ */ new Date());
   if ((n.iat !== void 0 || p) && typeof n.iat != "number")
-    throw new f('"iat" claim must be a number', n, "iat", "invalid");
+    throw new h('"iat" claim must be a number', n, "iat", "invalid");
   if (n.nbf !== void 0) {
     if (typeof n.nbf != "number")
-      throw new f('"nbf" claim must be a number', n, "nbf", "invalid");
-    if (n.nbf > y + h)
-      throw new f('"nbf" claim timestamp check failed', n, "nbf", "check_failed");
+      throw new h('"nbf" claim must be a number', n, "nbf", "invalid");
+    if (n.nbf > y + f)
+      throw new h('"nbf" claim timestamp check failed', n, "nbf", "check_failed");
   }
   if (n.exp !== void 0) {
     if (typeof n.exp != "number")
-      throw new f('"exp" claim must be a number', n, "exp", "invalid");
-    if (n.exp <= y - h)
+      throw new h('"exp" claim must be a number', n, "exp", "invalid");
+    if (n.exp <= y - f)
       throw new $('"exp" claim timestamp check failed', n, "exp", "check_failed");
   }
   if (p) {
-    const l = y - n.iat, O = typeof p == "number" ? p : V(p);
-    if (l - h > O)
+    const l = y - n.iat, K = typeof p == "number" ? p : k(p);
+    if (l - f > K)
       throw new $('"iat" claim timestamp check failed (too far in the past)', n, "iat", "check_failed");
-    if (l < 0 - h)
-      throw new f('"iat" claim timestamp check failed (it should be in the past)', n, "iat", "check_failed");
+    if (l < 0 - f)
+      throw new h('"iat" claim timestamp check failed (it should be in the past)', n, "iat", "check_failed");
   }
   return n;
 };
 async function Ne(e, t, r) {
   var o;
-  const n = await Oe(e, t, r);
+  const n = await Ke(e, t, r);
   if ((o = n.protectedHeader.crit) != null && o.includes("b64") && n.protectedHeader.b64 === !1)
     throw new S("JWTs MUST NOT use unencoded payload");
   const i = { payload: Ue(n.protectedHeader, n.payload, r), protectedHeader: n.protectedHeader };
   return typeof t == "function" ? { ...i, key: n.key } : i;
 }
-const $e = A;
+const $e = b;
 function Le(e) {
   if (typeof e != "string")
     throw new S("JWTs must use Compact JWS serialization, JWT must be a string");
@@ -740,20 +741,20 @@ function Le(e) {
   } catch {
     throw new S("Failed to parse the decoded payload as JSON");
   }
-  if (!_(a))
+  if (!P(a))
     throw new S("Invalid JWT Claims Set");
   return a;
 }
-const Xe = async (e) => {
+const et = async (e) => {
   try {
-    const t = N.ALG, n = await be(ne, t);
+    const t = N.ALG, n = await Ae(ne, t);
     return await Ne(e, n, {
       issuer: N.ISSUER
     });
   } catch {
     return;
   }
-}, Ze = (e) => {
+}, tt = (e) => {
   try {
     return Le(e);
   } catch {
@@ -766,11 +767,11 @@ for (var D = 0; D < 256; ++D)
 function Me(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 I, Ve = new Uint8Array(16);
-function ke() {
+var I, ke = new Uint8Array(16);
+function Ve() {
   if (!I && (I = typeof crypto < "u" && crypto.getRandomValues && crypto.getRandomValues.bind(crypto), !I))
     throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
-  return I(Ve);
+  return I(ke);
 }
 var Be = typeof crypto < "u" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
 const B = {
@@ -780,7 +781,7 @@ function F(e, t, r) {
   if (B.randomUUID && !t && !e)
     return B.randomUUID();
   e = e || {};
-  var n = e.random || (e.rng || ke)();
+  var n = e.random || (e.rng || Ve)();
   return n[6] = n[6] & 15 | 64, n[8] = n[8] & 63 | 128, Me(n);
 }
 const q = globalThis.crypto, Fe = (e) => `${F()}${F()}`.slice(0, e), qe = (e) => btoa(
@@ -794,7 +795,7 @@ async function re(e) {
   const t = new TextEncoder().encode(e), r = await q.subtle.digest("SHA-256", t);
   return qe(r).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
-async function je(e) {
+async function rt(e) {
   const t = e || 43;
   if (t < 43 || t > 128)
     throw `Expected a length between 43 and 128. Received ${e}.`;
@@ -804,19 +805,37 @@ async function je(e) {
     code_challenge: n
   };
 }
-async function et(e, t) {
+async function nt(e, t) {
   return t === await re(e);
 }
+const ze = /^Bearer (.+)$/i, Ge = (e) => {
+  if (typeof e.authorization != "string")
+    return;
+  const t = e.authorization.match(ze);
+  if (t)
+    return t[1];
+}, Ye = (e, t) => {
+  const r = e.cookie, n = new RegExp(`auth.${t}=(.+?)(?:;|$)`);
+  if (typeof r != "string")
+    return;
+  const a = r.match(n);
+  if (a)
+    return a[1];
+}, at = (e, t) => {
+  const r = Ge(e), n = Ye(e, t);
+  return !n && !r ? "" : n || r;
+};
 export {
-  Qe as API_TYPE,
-  Ge as AUTH_TYPES,
-  ze as HEADERS,
+  je as API_TYPE,
+  Qe as AUTH_TYPES,
+  Xe as HEADERS,
   N as JWT,
   ne as JWT_PUBLIC_KEY,
-  Ye as TOKEN_EXPIRATION,
-  Ze as decodeToken,
+  Ze as TOKEN_EXPIRATION,
+  tt as decodeToken,
   re as generateCodeChallenge,
-  je as pkceChallengePair,
-  Xe as verifyAndExtractToken,
-  et as verifyChallenge
+  at as getToken,
+  rt as pkceChallengePair,
+  et as verifyAndExtractToken,
+  nt as verifyChallenge
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@versini/auth-common",
-	"version": "2.10.0",
+	"version": "2.11.0",
 	"license": "MIT",
 	"author": "Arno Versini",
 	"publishConfig": {
@@ -32,8 +32,8 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"jose": "5.6.2",
+		"jose": "5.6.3",
 		"uuid": "10.0.0"
 	},
-	"gitHead": "5abd68fc5595a95360b4e80088cc39c067722085"
+	"gitHead": "e6e92b161c834eba2f655e9e6b80bdd7b5cb2316"
 }