@versini/auth-common 3.3.0 → 3.4.0

package/dist/index.d.ts

@@ -24,6 +24,7 @@ declare const JWT: {
     EXPIRES_AT_KEY: string;
     CREATED_AT_KEY: string;
     SCOPES_KEY: string;
+    CLIENT_ID_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-----";
@@ -133,4 +134,17 @@ type ScopesGrants = {
  */
 declare const isGranted: (token: string, scopes: ScopesGrants) => Promise<boolean>;
 
-export { API_TYPE, AUTH_TYPES, BODY, type BodyLike, HEADERS, type HeadersLike, JWT, JWT_PUBLIC_KEY, type ScopesGrants, TOKEN_EXPIRATION, decodeToken, generateCodeChallenge, getToken, isGranted, pkceChallengePair, verifyAndExtractToken, verifyChallenge };
+/**
+ * Get a Session Id from a request.
+ *
+ * @param headers An object containing the request headers, usually `req.headers`.
+ * @param clientId The client ID to use.
+ *
+ */
+type GetSessionProps = {
+    clientId: string;
+    headers: HeadersLike;
+};
+declare const getSession: ({ headers, clientId }: GetSessionProps) => string;
+
+export { API_TYPE, AUTH_TYPES, BODY, type BodyLike, HEADERS, type HeadersLike, JWT, JWT_PUBLIC_KEY, type ScopesGrants, TOKEN_EXPIRATION, decodeToken, generateCodeChallenge, getSession, getToken, isGranted, pkceChallengePair, verifyAndExtractToken, verifyChallenge };

package/dist/index.js

@@ -1,28 +1,28 @@
 /*!
-  @versini/auth-common v3.3.0
+  @versini/auth-common v3.4.0
   © 2024 gizmette.com
 */
 try {
   window.__VERSINI_AUTH_COMMON__ || (window.__VERSINI_AUTH_COMMON__ = {
-    version: "3.3.0",
-    buildTime: "07/21/2024 07:33 PM EDT",
+    version: "3.4.0",
+    buildTime: "08/19/2024 11:57 AM EDT",
     homepage: "https://github.com/aversini/auth-client",
     license: "MIT"
   });
 } catch {
 }
-const je = {
+const et = {
   ID_TOKEN: "id_token",
   ACCESS_TOKEN: "token",
   ID_AND_ACCESS_TOKEN: "id_token token",
   CODE: "code",
   REFRESH_TOKEN: "refresh_token",
   PASSKEY: "passkey"
-}, et = {
+}, tt = {
   CLIENT_ID: "X-Auth-ClientId"
 }, ne = {
   ACCESS_TOKEN: "access_token"
-}, I = {
+}, R = {
   ALG: "RS256",
   USER_ID_KEY: "sub",
   TOKEN_ID_KEY: "__raw",
@@ -32,6 +32,7 @@ const je = {
   EXPIRES_AT_KEY: "exp",
   CREATED_AT_KEY: "iat",
   SCOPES_KEY: "scopes",
+  CLIENT_ID_KEY: "aud",
   ISSUER: "gizmette.com"
 }, ae = `-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsF6i3Jd9fY/3COqCw/m7
@@ -41,11 +42,11 @@ aMwPFOIcJH+rKfFgNcHLcaS5syp7zU1ANwZ+trgR+DifBr8TLVkBynmNeTyhDm2+
 l0haqjMk0UoNPPE8iYBWUHQJJE1Dqstj65d6Eh5g64Pao25y4cmYJbKjiblIGEkE
 sjqybA9mARAqh9k/eiIopecWSiffNQTwVQVd2I9ZH3BalhEXHlqFgrjz51kFqg81
 awIDAQAB
------END PUBLIC KEY-----`, tt = {
+-----END PUBLIC KEY-----`, rt = {
   ACCESS: "5m",
   ID: "90d",
   REFRESH: "90d"
-}, rt = {
+}, nt = {
   AUTHENTICATE: "authenticate",
   CODE: "code",
   LOGOUT: "logout"
@@ -139,7 +140,7 @@ class se extends A {
 function m(e, t = "algorithm.name") {
   return new TypeError(`CryptoKey does not support this operation, its ${t} must be ${e}`);
 }
-function v(e, t) {
+function _(e, t) {
   return e.name === t;
 }
 function W(e) {
@@ -172,7 +173,7 @@ function le(e, t, ...r) {
     case "HS256":
     case "HS384":
     case "HS512": {
-      if (!v(e.algorithm, "HMAC"))
+      if (!_(e.algorithm, "HMAC"))
         throw m("HMAC");
       const n = parseInt(t.slice(2), 10);
       if (W(e.algorithm.hash) !== n)
@@ -182,7 +183,7 @@ function le(e, t, ...r) {
     case "RS256":
     case "RS384":
     case "RS512": {
-      if (!v(e.algorithm, "RSASSA-PKCS1-v1_5"))
+      if (!_(e.algorithm, "RSASSA-PKCS1-v1_5"))
         throw m("RSASSA-PKCS1-v1_5");
       const n = parseInt(t.slice(2), 10);
       if (W(e.algorithm.hash) !== n)
@@ -192,7 +193,7 @@ function le(e, t, ...r) {
     case "PS256":
     case "PS384":
     case "PS512": {
-      if (!v(e.algorithm, "RSA-PSS"))
+      if (!_(e.algorithm, "RSA-PSS"))
         throw m("RSA-PSS");
       const n = parseInt(t.slice(2), 10);
       if (W(e.algorithm.hash) !== n)
@@ -207,7 +208,7 @@ function le(e, t, ...r) {
     case "ES256":
     case "ES384":
     case "ES512": {
-      if (!v(e.algorithm, "ECDSA"))
+      if (!_(e.algorithm, "ECDSA"))
         throw m("ECDSA");
       const n = de(t);
       if (e.algorithm.namedCurve !== n)
@@ -231,7 +232,7 @@ const L = (e, ...t) => q("Key must be ", e, ...t);
 function z(e, t, ...r) {
   return q(`Key for the ${e} algorithm must be `, t, ...r);
 }
-const X = (e) => G(e) ? !0 : (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", R = ["CryptoKey"], fe = (...e) => {
+const X = (e) => G(e) ? !0 : (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", P = ["CryptoKey"], fe = (...e) => {
   const t = e.filter(Boolean);
   if (t.length === 0 || t.length === 1)
     return !0;
@@ -352,7 +353,7 @@ const Se = async (e) => {
   ], a = { ...e };
   return delete a.alg, delete a.use, O.subtle.importKey("jwk", a, ...n);
 }, Q = (e) => b(e);
-let J, D;
+let D, J;
 const Z = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", j = async (e, t, r, n) => {
   let a = e.get(t);
   if (a != null && a[n])
@@ -362,13 +363,13 @@ const Z = (e) => (e == null ? void 0 : e[Symbol.toStringTag]) === "KeyObject", j
 }, ye = (e, t) => {
   if (Z(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 ? Q(r.k) : (D || (D = /* @__PURE__ */ new WeakMap()), j(D, e, r, t));
+    return delete r.d, delete r.dp, delete r.dq, delete r.p, delete r.q, delete r.qi, r.k ? Q(r.k) : (J || (J = /* @__PURE__ */ new WeakMap()), j(J, e, r, t));
   }
   return e;
 }, Ee = (e, t) => {
   if (Z(e)) {
     let r = e.export({ format: "jwk" });
-    return r.k ? Q(r.k) : (J || (J = /* @__PURE__ */ new WeakMap()), j(J, e, r, t));
+    return r.k ? Q(r.k) : (D || (D = /* @__PURE__ */ new WeakMap()), j(D, e, r, t));
   }
   return e;
 }, we = { normalizePublicKey: ye, normalizePrivateKey: Ee }, E = (e, t, r = 0) => {
@@ -450,26 +451,26 @@ async function be(e, t, r) {
     throw new TypeError('"spki" must be SPKI formatted string');
   return Ae(e, t);
 }
-const P = (e) => e == null ? void 0 : e[Symbol.toStringTag], Ce = (e, t) => {
+const I = (e) => e == null ? void 0 : e[Symbol.toStringTag], Ce = (e, t) => {
   if (!(t instanceof Uint8Array)) {
     if (!X(t))
-      throw new TypeError(z(e, t, ...R, "Uint8Array"));
+      throw new TypeError(z(e, t, ...P, "Uint8Array"));
     if (t.type !== "secret")
-      throw new TypeError(`${P(t)} instances for symmetric algorithms must be of type "secret"`);
+      throw new TypeError(`${I(t)} instances for symmetric algorithms must be of type "secret"`);
   }
 }, Te = (e, t, r) => {
   if (!X(t))
-    throw new TypeError(z(e, t, ...R));
+    throw new TypeError(z(e, t, ...P));
   if (t.type === "secret")
-    throw new TypeError(`${P(t)} instances for asymmetric algorithms must not be of type "secret"`);
+    throw new TypeError(`${I(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(`${I(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"`);
-}, ve = (e, t, r) => {
+    throw new TypeError(`${I(t)} instances for asymmetric algorithm encryption must be of type "public"`);
+}, _e = (e, t, r) => {
   e.startsWith("HS") || e === "dir" || e.startsWith("PBES2") || /^A\d{3}(?:GCM)?KW$/.test(e) ? Ce(e, t) : Te(e, t, r);
 };
-function _e(e, t, r, n, a) {
+function ve(e, t, r, n, a) {
   if (a.crit !== void 0 && (n == null ? void 0 : n.crit) === void 0)
     throw new e('"crit" (Critical) Header Parameter MUST be integrity protected');
   if (!n || n.crit === void 0)
@@ -488,13 +489,13 @@ function _e(e, t, r, n, a) {
   }
   return new Set(n.crit);
 }
-const Pe = (e, t) => {
+const Ie = (e, t) => {
   if (t !== void 0 && (!Array.isArray(t) || t.some((r) => typeof r != "string")))
     throw new TypeError(`"${e}" option must be an array of strings`);
   if (t)
     return new Set(t);
 };
-function Ie(e, t) {
+function Re(e, t) {
   const r = `SHA-${e.slice(-3)}`;
   switch (e) {
     case "HS256":
@@ -519,20 +520,20 @@ function Ie(e, t) {
       throw new w(`alg ${e} is not supported either by JOSE or your javascript runtime`);
   }
 }
-async function Re(e, t, r) {
+async function Pe(e, t, r) {
   if (t = await we.normalizePublicKey(t, e), G(t))
     return le(t, e, r), t;
   if (t instanceof Uint8Array) {
     if (!e.startsWith("HS"))
-      throw new TypeError(L(t, ...R));
+      throw new TypeError(L(t, ...P));
     return O.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, ...P, "Uint8Array"));
 }
 const Ke = async (e, t, r, n) => {
-  const a = await Re(e, t, "verify");
+  const a = await Pe(e, t, "verify");
   pe(e, a);
-  const o = Ie(e, a.algorithm);
+  const o = Re(e, a.algorithm);
   try {
     return await O.subtle.verify(o, a, r, n);
   } catch {
@@ -565,14 +566,14 @@ async function Oe(e, t, r) {
   const a = {
     ...n,
     ...e.header
-  }, o = _e(u, /* @__PURE__ */ new Map([["b64", !0]]), r == null ? void 0 : r.crit, n, a);
+  }, o = ve(u, /* @__PURE__ */ new Map([["b64", !0]]), r == null ? void 0 : r.crit, n, a);
   let i = !0;
   if (o.has("b64") && (i = n.b64, typeof i != "boolean"))
     throw new u('The "b64" (base64url-encode payload) Header Parameter must be a boolean');
   const { alg: c } = a;
   if (typeof c != "string" || !c)
     throw new u('JWS "alg" (Algorithm) Header Parameter missing or invalid');
-  const s = r && Pe("algorithms", r.algorithms);
+  const s = r && Ie("algorithms", r.algorithms);
   if (s && !s.has(c))
     throw new ce('"alg" (Algorithm) Header Parameter value not allowed');
   if (i) {
@@ -581,7 +582,7 @@ async function Oe(e, t, r) {
   } else if (typeof e.payload != "string" && !(e.payload instanceof Uint8Array))
     throw new u("JWS Payload must be a string or an Uint8Array instance");
   let p = !1;
-  typeof t == "function" && (t = await t(n, e), p = !0), ve(c, t, "verify");
+  typeof t == "function" && (t = await t(n, e), p = !0), _e(c, t, "verify");
   const g = oe(T.encode(e.protected ?? ""), T.encode("."), typeof e.payload == "string" ? T.encode(e.payload) : e.payload);
   let f;
   try {
@@ -611,7 +612,7 @@ async function xe(e, t, r) {
   const c = await Oe({ payload: a, protected: n, signature: o }, t, r), s = { payload: c.payload, protectedHeader: c.protectedHeader };
   return typeof t == "function" ? { ...s, key: c.key } : s;
 }
-const We = (e) => Math.floor(e.getTime() / 1e3), ee = 60, te = ee * 60, N = te * 24, Je = N * 7, De = N * 365.25, He = /^(\+|\-)? ?(\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 We = (e) => Math.floor(e.getTime() / 1e3), ee = 60, te = ee * 60, N = te * 24, De = N * 7, Je = N * 365.25, He = /^(\+|\-)? ?(\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 = He.exec(e);
   if (!t || t[4] && t[1])
     throw new TypeError("Invalid time period format");
@@ -647,10 +648,10 @@ const We = (e) => Math.floor(e.getTime() / 1e3), ee = 60, te = ee * 60, N = te *
     case "week":
     case "weeks":
     case "w":
-      a = Math.round(r * Je);
+      a = Math.round(r * De);
       break;
     default:
-      a = Math.round(r * De);
+      a = Math.round(r * Je);
       break;
   }
   return t[1] === "-" || t[4] === "ago" ? -a : a;
@@ -751,14 +752,14 @@ function ke(e) {
 }
 const Me = async (e) => {
   try {
-    const t = I.ALG, n = await be(ae, t);
+    const t = R.ALG, n = await be(ae, t);
     return await $e(e, n, {
-      issuer: I.ISSUER
+      issuer: R.ISSUER
     });
   } catch {
     return;
   }
-}, nt = (e) => {
+}, at = (e) => {
   try {
     return ke(e);
   } catch {
@@ -771,35 +772,35 @@ for (var H = 0; H < 256; ++H)
 function Be(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 _, Fe = new Uint8Array(16);
-function Ve() {
-  if (!_ && (_ = typeof crypto < "u" && crypto.getRandomValues && crypto.getRandomValues.bind(crypto), !_))
+var v, Fe = new Uint8Array(16);
+function Ye() {
+  if (!v && (v = typeof crypto < "u" && crypto.getRandomValues && crypto.getRandomValues.bind(crypto), !v))
     throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
-  return _(Fe);
+  return v(Fe);
 }
-var Ye = typeof crypto < "u" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+var Ve = typeof crypto < "u" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
 const F = {
-  randomUUID: Ye
+  randomUUID: Ve
 };
-function V(e, t, r) {
+function Y(e, t, r) {
   if (F.randomUUID && !t && !e)
     return F.randomUUID();
   e = e || {};
-  var n = e.random || (e.rng || Ve)();
+  var n = e.random || (e.rng || Ye)();
   return n[6] = n[6] & 15 | 64, n[8] = n[8] & 63 | 128, Be(n);
 }
-const Y = globalThis.crypto, Ge = (e) => `${V()}${V()}`.slice(0, e), qe = (e) => btoa(
+const V = globalThis.crypto, Ge = (e) => `${Y()}${Y()}`.slice(0, e), qe = (e) => btoa(
   [...new Uint8Array(e)].map((t) => String.fromCharCode(t)).join("")
 );
 async function re(e) {
-  if (!Y.subtle)
+  if (!V.subtle)
     throw new Error(
       "crypto.subtle is available only in secure contexts (HTTPS)."
     );
-  const t = new TextEncoder().encode(e), r = await Y.subtle.digest("SHA-256", t);
+  const t = new TextEncoder().encode(e), r = await V.subtle.digest("SHA-256", t);
   return qe(r).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
-async function at(e) {
+async function ot(e) {
   const t = e || 43;
   if (t < 43 || t > 128)
     throw `Expected a length between 43 and 128. Received ${e}.`;
@@ -809,7 +810,7 @@ async function at(e) {
     code_challenge: n
   };
 }
-async function ot(e, t) {
+async function it(e, t) {
   return t === await re(e);
 }
 const ze = /^Bearer (.+)$/i, Xe = (e) => {
@@ -829,32 +830,40 @@ const ze = /^Bearer (.+)$/i, Xe = (e) => {
   const t = e == null ? void 0 : e[ne.ACCESS_TOKEN];
   if (typeof t == "string")
     return t;
-}, it = ({ headers: e, body: t, clientId: r }) => {
+}, ct = ({ headers: e, body: t, clientId: r }) => {
   const n = Xe(e), a = Qe(e, r);
   return Ze(t) || a || n || "";
-}, ct = async (e, t) => {
+}, st = async (e, t) => {
   var a;
   const r = await Me(e);
-  if (!r || !Array.isArray((a = r.payload) == null ? void 0 : a[I.SCOPES_KEY]))
+  if (!r || !Array.isArray((a = r.payload) == null ? void 0 : a[R.SCOPES_KEY]))
     return !1;
-  const n = r.payload[I.SCOPES_KEY];
+  const n = r.payload[R.SCOPES_KEY];
   return Array.isArray(t) ? t.every((o) => n.includes(o)) : Object.keys(t).some(
     (o) => t[o].every((i) => n.includes(i))
   );
-};
+}, je = (e, t) => {
+  const r = e == null ? void 0 : e.cookie;
+  if (typeof r != "string")
+    return;
+  const n = new RegExp(`auth.${t}.session=(.+?)(?:;|$)`), a = r.match(n);
+  if (a)
+    return a[1];
+}, dt = ({ headers: e, clientId: t }) => je(e, t) || "";
 export {
-  rt as API_TYPE,
-  je as AUTH_TYPES,
+  nt as API_TYPE,
+  et as AUTH_TYPES,
   ne as BODY,
-  et as HEADERS,
-  I as JWT,
+  tt as HEADERS,
+  R as JWT,
   ae as JWT_PUBLIC_KEY,
-  tt as TOKEN_EXPIRATION,
-  nt as decodeToken,
+  rt as TOKEN_EXPIRATION,
+  at as decodeToken,
   re as generateCodeChallenge,
-  it as getToken,
-  ct as isGranted,
-  at as pkceChallengePair,
+  dt as getSession,
+  ct as getToken,
+  st as isGranted,
+  ot as pkceChallengePair,
   Me as verifyAndExtractToken,
-  ot as verifyChallenge
+  it as verifyChallenge
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@versini/auth-common",
-	"version": "3.3.0",
+	"version": "3.4.0",
 	"license": "MIT",
 	"author": "Arno Versini",
 	"publishConfig": {
@@ -36,5 +36,5 @@
 		"jose": "5.6.3",
 		"uuid": "10.0.0"
 	},
-	"gitHead": "8df31ef170a75c2983d7ac821fe0371641139815"
+	"gitHead": "fc7db509578caa068384544279e347f089720ebe"
 }