authhero 0.88.0 → 0.90.0

package/dist/authhero.mjs

@@ -375,12 +375,12 @@ class Qi extends Ms {
         const L = Array.isArray(m), ee = L ? [] : {}, ce = L ? f : v;
         for (const le in m)
           if (Object.prototype.hasOwnProperty.call(m, le)) {
-            const Me = `${ce}${s}${le}`;
-            ee[le] = this.translate(Me, {
+            const ze = `${ce}${s}${le}`;
+            ee[le] = this.translate(ze, {
               ...n,
               joinArrays: !1,
               ns: c
-            }), ee[le] === Me && (ee[le] = m[le]);
+            }), ee[le] === ze && (ee[le] = m[le]);
           }
         m = ee;
       }
@@ -388,9 +388,9 @@ class Qi extends Ms {
       m = m.join(S), m && (m = this.extendTranslation(m, e, n, r));
     else {
       let L = !1, ee = !1;
-      const ce = n.count !== void 0 && !re(n.count), le = Qi.hasDefaultValue(n), Me = ce ? this.pluralResolver.getSuffix(u, n.count, n) : "", ze = n.ordinal && ce ? this.pluralResolver.getSuffix(u, n.count, {
+      const ce = n.count !== void 0 && !re(n.count), le = Qi.hasDefaultValue(n), ze = ce ? this.pluralResolver.getSuffix(u, n.count, n) : "", De = n.ordinal && ce ? this.pluralResolver.getSuffix(u, n.count, {
         ordinal: !1
-      }) : "", Ye = ce && !n.ordinal && n.count === 0, $ = Ye && n[`defaultValue${this.options.pluralSeparator}zero`] || n[`defaultValue${Me}`] || n[`defaultValue${ze}`] || n.defaultValue;
+      }) : "", Ye = ce && !n.ordinal && n.count === 0, $ = Ye && n[`defaultValue${this.options.pluralSeparator}zero`] || n[`defaultValue${ze}`] || n[`defaultValue${De}`] || n.defaultValue;
       !this.isValidLookup(m) && le && (L = !0, m = $), this.isValidLookup(m) || (ee = !0, m = o);
       const E = (n.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey) && ee ? void 0 : m, x = le && $ !== m && this.options.updateMissing;
       if (ee || L || x) {
@@ -491,10 +491,10 @@ class Qi extends Ms {
           else {
             let le;
             m && (le = this.pluralResolver.getSuffix(T, n.count, n));
-            const Me = `${this.options.pluralSeparator}zero`, ze = `${this.options.pluralSeparator}ordinal${this.options.pluralSeparator}`;
-            if (m && (L.push(p + le), n.ordinal && le.indexOf(ze) === 0 && L.push(p + le.replace(ze, this.options.pluralSeparator)), v && L.push(p + Me)), f) {
+            const ze = `${this.options.pluralSeparator}zero`, De = `${this.options.pluralSeparator}ordinal${this.options.pluralSeparator}`;
+            if (m && (L.push(p + le), n.ordinal && le.indexOf(De) === 0 && L.push(p + le.replace(De, this.options.pluralSeparator)), v && L.push(p + ze)), f) {
               const Ye = `${p}${this.options.contextSeparator}${n.context}`;
-              L.push(Ye), m && (L.push(Ye + le), n.ordinal && le.indexOf(ze) === 0 && L.push(Ye + le.replace(ze, this.options.pluralSeparator)), v && L.push(Ye + Me));
+              L.push(Ye), m && (L.push(Ye + le), n.ordinal && le.indexOf(De) === 0 && L.push(Ye + le.replace(De, this.options.pluralSeparator)), v && L.push(Ye + ze));
             }
           }
           let ee;
@@ -1712,18 +1712,20 @@ const Pm = a.enum([
   request_parameter_supported: a.boolean(),
   token_endpoint_auth_signing_alg_values_supported: a.array(a.string())
 }), Um = a.object({
+  csrf_token: a.string(),
   auth0Client: a.string().optional(),
   authParams: ef,
   expires_at: a.string(),
   deleted_at: a.string().optional(),
   ip: a.string().optional(),
   useragent: a.string().optional(),
+  session: a.string().optional(),
   authorization_url: a.string().optional()
 }).openapi({
   description: "This represents a login sesion"
 }), i5 = a.object({
   ...Um.shape,
-  login_id: a.string().openapi({
+  id: a.string().openapi({
     description: "This is is used as the state in the universal login"
   }),
   created_at: a.string(),
@@ -2414,10 +2416,10 @@ const Qm = {}, e_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
         throw Error("Illegal len: " + C);
       for (; E < x - 1 && k < C && (H = $.charCodeAt(E++), U = H < u.length ? u[H] : -1, H = $.charCodeAt(E++), Q = H < u.length ? u[H] : -1, !(U == -1 || Q == -1 || (pe = U << 2 >>> 0, pe |= (Q & 48) >> 4, O.push(p(pe)), ++k >= C || E >= x) || (H = $.charCodeAt(E++), J = H < u.length ? u[H] : -1, J == -1) || (pe = (Q & 15) << 4 >>> 0, pe |= (J & 60) >> 2, O.push(p(pe)), ++k >= C || E >= x))); )
         H = $.charCodeAt(E++), se = H < u.length ? u[H] : -1, pe = (J & 3) << 6 >>> 0, pe |= se, O.push(p(pe)), ++k;
-      var Ne = [];
+      var je = [];
       for (E = 0; E < k; E++)
-        Ne.push(O[E].charCodeAt(0));
-      return Ne;
+        je.push(O[E].charCodeAt(0));
+      return je;
     }
     var v = function() {
       var $ = {};
@@ -3550,7 +3552,7 @@ const Qm = {}, e_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
       for (J = 0; J < U; J += 2)
         k = ee(k, 0, C, E), E[J] = k[0], E[J + 1] = k[1];
     }
-    function Me($, C, E, x) {
+    function ze($, C, E, x) {
       for (var k = 0, O = [0, 0], U = E.length, Q = x.length, J, se = 0; se < U; se++)
         J = ce(C, k), k = J.offp, E[se] = E[se] ^ J.key;
       for (k = 0, se = 0; se < U; se += 2)
@@ -3558,7 +3560,7 @@ const Qm = {}, e_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
       for (se = 0; se < Q; se += 2)
         J = ce($, k), k = J.offp, O[0] ^= J.key, J = ce($, k), k = J.offp, O[1] ^= J.key, O = ee(O, 0, E, x), x[se] = O[0], x[se + 1] = O[1];
     }
-    function ze($, C, E, x, k) {
+    function De($, C, E, x, k) {
       var O = L.slice(), U = O.length, Q;
       if (E < 4 || E > 31)
         if (Q = Error("Illegal number of rounds (4-31): " + E), x) {
@@ -3574,8 +3576,8 @@ const Qm = {}, e_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
           throw Q;
       E = 1 << E >>> 0;
       var J, se, pe = 0, H;
-      Int32Array ? (J = new Int32Array(N), se = new Int32Array(T)) : (J = N.slice(), se = T.slice()), Me(C, $, J, se);
-      function Ne() {
+      Int32Array ? (J = new Int32Array(N), se = new Int32Array(T)) : (J = N.slice(), se = T.slice()), ze(C, $, J, se);
+      function je() {
         if (k && k(pe / E), pe < E)
           for (var me = Date.now(); pe < E && (pe = pe + 1, le($, J, se), le(C, J, se), !(Date.now() - me > S)); )
             ;
@@ -3583,22 +3585,22 @@ const Qm = {}, e_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
           for (pe = 0; pe < 64; pe++)
             for (H = 0; H < U >> 1; H++)
               ee(O, H << 1, J, se);
-          var Ae = [];
+          var Ee = [];
           for (pe = 0; pe < U; pe++)
-            Ae.push((O[pe] >> 24 & 255) >>> 0), Ae.push((O[pe] >> 16 & 255) >>> 0), Ae.push((O[pe] >> 8 & 255) >>> 0), Ae.push((O[pe] & 255) >>> 0);
+            Ee.push((O[pe] >> 24 & 255) >>> 0), Ee.push((O[pe] >> 16 & 255) >>> 0), Ee.push((O[pe] >> 8 & 255) >>> 0), Ee.push((O[pe] & 255) >>> 0);
           if (x) {
-            x(null, Ae);
+            x(null, Ee);
             return;
           } else
-            return Ae;
+            return Ee;
         }
-        x && o(Ne);
+        x && o(je);
       }
       if (typeof x < "u")
-        Ne();
+        je();
       else
         for (var ln; ; )
-          if (typeof (ln = Ne()) < "u")
+          if (typeof (ln = je()) < "u")
             return ln || [];
     }
     function Ye($, C, E, x) {
@@ -3635,15 +3637,15 @@ const Qm = {}, e_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
           throw k;
       var Q = parseInt(C.substring(U, U + 1), 10) * 10, J = parseInt(C.substring(U + 1, U + 2), 10), se = Q + J, pe = C.substring(U + 3, U + 25);
       $ += O >= "a" ? "\0" : "";
-      var H = c($), Ne = m(pe, f);
+      var H = c($), je = m(pe, f);
       function ln(me) {
-        var Ae = [];
-        return Ae.push("$2"), O >= "a" && Ae.push(O), Ae.push("$"), se < 10 && Ae.push("0"), Ae.push(se.toString()), Ae.push("$"), Ae.push(h(Ne, Ne.length)), Ae.push(h(me, L.length * 4 - 1)), Ae.join("");
+        var Ee = [];
+        return Ee.push("$2"), O >= "a" && Ee.push(O), Ee.push("$"), se < 10 && Ee.push("0"), Ee.push(se.toString()), Ee.push("$"), Ee.push(h(je, je.length)), Ee.push(h(me, L.length * 4 - 1)), Ee.join("");
       }
       if (typeof E > "u")
-        return ln(ze(H, Ne, se));
-      ze(H, Ne, se, function(me, Ae) {
-        me ? E(me, null) : E(null, ln(Ae));
+        return ln(De(H, je, se));
+      De(H, je, se, function(me, Ee) {
+        me ? E(me, null) : E(null, ln(Ee));
       }, x);
     }
     return e.encodeBase64 = h, e.decodeBase64 = m, e;
@@ -3661,7 +3663,7 @@ let i_ = (t) => crypto.getRandomValues(new Uint8Array(t)), s_ = (t, e, n) => {
         if (o += t[c[l] & r] || "", o.length === s) return o;
     }
   };
-}, o_ = (t, e = 21) => s_(t, e, i_), Ke = (t = 21) => {
+}, o_ = (t, e = 21) => s_(t, e, i_), Ae = (t = 21) => {
   let e = "", n = crypto.getRandomValues(new Uint8Array(t));
   for (; t--; )
     e += r_[n[t] & 63];
@@ -4169,11 +4171,11 @@ nl.validate = function(t, e) {
           l += t[s];
         if (l = l.trim(), l[l.length - 1] === "/" && (l = l.substring(0, l.length - 1), s--), !T_(l)) {
           let h;
-          return l.trim().length === 0 ? h = "Invalid space after '<'." : h = "Tag '" + l + "' is an invalid name.", xe("InvalidTag", h, Ue(t, s));
+          return l.trim().length === 0 ? h = "Invalid space after '<'." : h = "Tag '" + l + "' is an invalid name.", xe("InvalidTag", h, Ve(t, s));
         }
         const u = N_(t, s);
         if (u === !1)
-          return xe("InvalidAttr", "Attributes for '" + l + "' have open quote.", Ue(t, s));
+          return xe("InvalidAttr", "Attributes for '" + l + "' have open quote.", Ve(t, s));
         let p = u.value;
         if (s = u.index, p[p.length - 1] === "/") {
           const h = s - p.length;
@@ -4182,32 +4184,32 @@ nl.validate = function(t, e) {
           if (m === !0)
             r = !0;
           else
-            return xe(m.err.code, m.err.msg, Ue(t, h + m.err.line));
+            return xe(m.err.code, m.err.msg, Ve(t, h + m.err.line));
         } else if (c)
           if (u.tagClosed) {
             if (p.trim().length > 0)
-              return xe("InvalidTag", "Closing tag '" + l + "' can't have attributes or invalid starting.", Ue(t, o));
+              return xe("InvalidTag", "Closing tag '" + l + "' can't have attributes or invalid starting.", Ve(t, o));
             if (n.length === 0)
-              return xe("InvalidTag", "Closing tag '" + l + "' has not been opened.", Ue(t, o));
+              return xe("InvalidTag", "Closing tag '" + l + "' has not been opened.", Ve(t, o));
             {
               const h = n.pop();
               if (l !== h.tagName) {
-                let m = Ue(t, h.tagStartPos);
+                let m = Ve(t, h.tagStartPos);
                 return xe(
                   "InvalidTag",
                   "Expected closing tag '" + h.tagName + "' (opened in line " + m.line + ", col " + m.col + ") instead of closing tag '" + l + "'.",
-                  Ue(t, o)
+                  Ve(t, o)
                 );
               }
               n.length == 0 && (i = !0);
             }
-          } else return xe("InvalidTag", "Closing tag '" + l + "' doesn't have proper closing.", Ue(t, s));
+          } else return xe("InvalidTag", "Closing tag '" + l + "' doesn't have proper closing.", Ve(t, s));
         else {
           const h = Vu(p, e);
           if (h !== !0)
-            return xe(h.err.code, h.err.msg, Ue(t, s - p.length + h.err.line));
+            return xe(h.err.code, h.err.msg, Ve(t, s - p.length + h.err.line));
           if (i === !0)
-            return xe("InvalidXml", "Multiple possible root nodes found.", Ue(t, s));
+            return xe("InvalidXml", "Multiple possible root nodes found.", Ve(t, s));
           e.unpairedTags.indexOf(l) !== -1 || n.push({ tagName: l, tagStartPos: o }), r = !0;
         }
         for (s++; s < t.length; s++)
@@ -4222,20 +4224,20 @@ nl.validate = function(t, e) {
           else if (t[s] === "&") {
             const h = O_(t, s);
             if (h == -1)
-              return xe("InvalidChar", "char '&' is not expected.", Ue(t, s));
+              return xe("InvalidChar", "char '&' is not expected.", Ve(t, s));
             s = h;
           } else if (i === !0 && !Ru(t[s]))
-            return xe("InvalidXml", "Extra text at the end", Ue(t, s));
+            return xe("InvalidXml", "Extra text at the end", Ve(t, s));
         t[s] === "<" && s--;
       }
     } else {
       if (Ru(t[s]))
         continue;
-      return xe("InvalidChar", "char '" + t[s] + "' is not expected.", Ue(t, s));
+      return xe("InvalidChar", "char '" + t[s] + "' is not expected.", Ve(t, s));
     }
   if (r) {
     if (n.length == 1)
-      return xe("InvalidTag", "Unclosed tag '" + n[0].tagName + "'.", Ue(t, n[0].tagStartPos));
+      return xe("InvalidTag", "Unclosed tag '" + n[0].tagName + "'.", Ve(t, n[0].tagStartPos));
     if (n.length > 0)
       return xe("InvalidXml", "Invalid '" + JSON.stringify(n.map((s) => s.tagName), null, 4).replace(/\r?\n/g, "") + "' found.", { line: 1, col: 1 });
   } else return xe("InvalidXml", "Start tag expected.", 1);
@@ -4251,7 +4253,7 @@ function Lu(t, e) {
     if (t[e] == "?" || t[e] == " ") {
       const r = t.substr(n, e - n);
       if (e > 5 && r === "xml")
-        return xe("InvalidXml", "XML declaration allowed only at the start of the document.", Ue(t, e));
+        return xe("InvalidXml", "XML declaration allowed only at the start of the document.", Ve(t, e));
       if (t[e] == "?" && t[e + 1] == ">") {
         e++;
         break;
@@ -4361,7 +4363,7 @@ function B_(t) {
 function T_(t) {
   return rl.isName(t);
 }
-function Ue(t, e) {
+function Ve(t, e) {
   const n = t.substring(0, e).split(/\r?\n/);
   return {
     line: n.length,
@@ -5194,7 +5196,7 @@ async function H0(t, e, n, r, i) {
   );
 }
 async function K0(t, e) {
-  const n = e.notBefore || (/* @__PURE__ */ new Date()).toISOString(), r = e.notAfter || new Date(new Date(n).getTime() + 10 * 60 * 1e3).toISOString(), i = e.issueInstant || n, s = e.sessionNotOnOrAfter || r, o = e.responseId || `_${Ke()}`, c = e.assertionId || `_${Ke()}`, l = [
+  const n = e.notBefore || (/* @__PURE__ */ new Date()).toISOString(), r = e.notAfter || new Date(new Date(n).getTime() + 10 * 60 * 1e3).toISOString(), i = e.issueInstant || n, s = e.sessionNotOnOrAfter || r, o = e.responseId || `_${Ae()}`, c = e.assertionId || `_${Ae()}`, l = [
     {
       "samlp:Response": [
         {
@@ -5587,14 +5589,15 @@ async function bf(t, e) {
       ).toISOString(),
       authParams: e.authParams,
       authorization_url: t.req.url,
+      csrf_token: Ae(),
       ...rn(t.req)
     }
   )), {
     code: (await t.env.data.codes.create(e.client.tenant.id, {
-      code_id: Ke(),
+      code_id: Ae(),
       user_id: e.user.user_id,
       code_type: "authorization_code",
-      login_id: e.loginSession.login_id,
+      login_id: e.loginSession.id,
       expires_at: new Date(
         Date.now() + v_ * 1e3
       ).toISOString()
@@ -5613,7 +5616,7 @@ async function Z0(t, e) {
   return await t.env.data.refreshTokens.create(
     n.tenant.id,
     {
-      id: Ke(),
+      id: Ae(),
       session_id: s,
       client_id: n.id,
       expires_at: new Date(
@@ -5641,7 +5644,7 @@ async function Z0(t, e) {
 }
 async function kf(t, e) {
   const { user: n, client: r, scope: i, audience: s } = e, o = await t.env.data.sessions.create(r.tenant.id, {
-    id: Ke(),
+    id: Ae(),
     user_id: n.user_id,
     idle_expires_at: new Date(
       Date.now() + Ds * 1e3
@@ -5683,10 +5686,10 @@ async function sn(t, e) {
       throw new j(500, {
         message: "Login session not found"
       });
-    const f = g_(), _ = Ke(12), w = await t.env.data.codes.create(i.tenant.id, {
-      code_id: Ke(),
+    const f = g_(), _ = Ae(12), w = await t.env.data.codes.create(i.tenant.id, {
+      code_id: Ae(),
       code_type: "ticket",
-      login_id: e.loginSession.login_id,
+      login_id: e.loginSession.id,
       expires_at: new Date(Date.now() + b_).toISOString(),
       // Concat the co_id and co_verifier
       code_verifier: [_, f].join("|")
@@ -6567,9 +6570,9 @@ var Du;
           throw new TypeError();
         if (!me(I))
           throw new TypeError();
-        if (!me(M) && !H(M) && !Ne(M))
+        if (!me(M) && !H(M) && !je(M))
           throw new TypeError();
-        return Ne(M) && (M = void 0), B = wt(B), E(A, I, B, M);
+        return je(M) && (M = void 0), B = wt(B), E(A, I, B, M);
       }
     }
     e("decorate", N);
@@ -6608,18 +6611,18 @@ var Du;
       return H(B) || (B = wt(B)), O(A, I, B);
     }
     e("getMetadata", le);
-    function Me(A, I, B) {
+    function ze(A, I, B) {
       if (!me(I))
         throw new TypeError();
       return H(B) || (B = wt(B)), U(A, I, B);
     }
-    e("getOwnMetadata", Me);
-    function ze(A, I) {
+    e("getOwnMetadata", ze);
+    function De(A, I) {
       if (!me(A))
         throw new TypeError();
       return H(I) || (I = wt(I)), J(A, I);
     }
-    e("getMetadataKeys", ze);
+    e("getMetadataKeys", De);
     function Ye(A, I) {
       if (!me(A))
         throw new TypeError();
@@ -6644,7 +6647,7 @@ var Du;
     function C(A, I) {
       for (var B = A.length - 1; B >= 0; --B) {
         var M = A[B], te = M(I);
-        if (!H(te) && !Ne(te)) {
+        if (!H(te) && !je(te)) {
           if (!du(te))
             throw new TypeError();
           I = te;
@@ -6654,11 +6657,11 @@ var Du;
     }
     function E(A, I, B, M) {
       for (var te = A.length - 1; te >= 0; --te) {
-        var je = A[te], Ie = je(I, B, M);
-        if (!H(Ie) && !Ne(Ie)) {
-          if (!me(Ie))
+        var $e = A[te], Ce = $e(I, B, M);
+        if (!H(Ce) && !je(Ce)) {
+          if (!me(Ce))
             throw new TypeError();
-          M = Ie;
+          M = Ce;
         }
       }
       return M;
@@ -6668,7 +6671,7 @@ var Du;
       if (M)
         return !0;
       var te = Fo(I);
-      return Ne(te) ? !1 : x(A, te, B);
+      return je(te) ? !1 : x(A, te, B);
     }
     function k(A, I, B) {
       var M = kr(
@@ -6684,7 +6687,7 @@ var Du;
       if (M)
         return U(A, I, B);
       var te = Fo(I);
-      if (!Ne(te))
+      if (!je(te))
         return O(A, te, B);
     }
     function U(A, I, B) {
@@ -6715,15 +6718,15 @@ var Du;
         return B;
       if (B.length <= 0)
         return te;
-      for (var je = new v(), Ie = [], oe = 0, F = B; oe < F.length; oe++) {
-        var G = F[oe], Y = je.has(G);
-        Y || (je.add(G), Ie.push(G));
+      for (var $e = new v(), Ce = [], oe = 0, F = B; oe < F.length; oe++) {
+        var G = F[oe], Y = $e.has(G);
+        Y || ($e.add(G), Ce.push(G));
       }
       for (var X = 0, ae = te; X < ae.length; X++) {
-        var G = ae[X], Y = je.has(G);
-        Y || (je.add(G), Ie.push(G));
+        var G = ae[X], Y = $e.has(G);
+        Y || ($e.add(G), Ce.push(G));
       }
-      return Ie;
+      return Ce;
     }
     function se(A, I) {
       var B = kr(
@@ -6757,7 +6760,7 @@ var Du;
     function H(A) {
       return A === void 0;
     }
-    function Ne(A) {
+    function je(A) {
       return A === null;
     }
     function ln(A) {
@@ -6766,7 +6769,7 @@ var Du;
     function me(A) {
       return typeof A == "object" ? A !== null : typeof A == "function";
     }
-    function Ae(A, I) {
+    function Ee(A, I) {
       switch (pe(A)) {
         case 0:
           return A;
@@ -6815,7 +6818,7 @@ var Du;
       return "" + A;
     }
     function wt(A) {
-      var I = Ae(A);
+      var I = Ee(A);
       return ln(I) ? I : Xg(I);
     }
     function uu(A) {
@@ -6881,14 +6884,14 @@ var Du;
     function em() {
       var A;
       !H(_) && typeof n.Reflect < "u" && !(_ in n.Reflect) && typeof n.Reflect.defineMetadata == "function" && (A = rm(n.Reflect));
-      var I, B, M, te = new f(), je = {
-        registerProvider: Ie,
+      var I, B, M, te = new f(), $e = {
+        registerProvider: Ce,
         getProvider: F,
         setProvider: Y
       };
-      return je;
-      function Ie(X) {
-        if (!Object.isExtensible(je))
+      return $e;
+      function Ce(X) {
+        if (!Object.isExtensible($e))
           throw new Error("Cannot add provider to a frozen registry.");
         switch (!0) {
           case A === X:
@@ -6966,9 +6969,9 @@ var Du;
           var X = I.get(G);
           return H(X) ? !1 : X.has(Y);
         },
-        OrdinaryDefineOwnMetadata: Ie,
+        OrdinaryDefineOwnMetadata: Ce,
         OrdinaryHasOwnMetadata: te,
-        OrdinaryGetOwnMetadata: je,
+        OrdinaryGetOwnMetadata: $e,
         OrdinaryOwnMetadataKeys: oe,
         OrdinaryDeleteMetadata: F
       };
@@ -6998,7 +7001,7 @@ var Du;
         );
         return H(ae) ? !1 : lu(ae.has(G));
       }
-      function je(G, Y, X) {
+      function $e(G, Y, X) {
         var ae = M(
           Y,
           X,
@@ -7008,7 +7011,7 @@ var Du;
         if (!H(ae))
           return ae.get(G);
       }
-      function Ie(G, Y, X, ae) {
+      function Ce(G, Y, X, ae) {
         var ye = M(
           X,
           ae,
@@ -7060,16 +7063,16 @@ var Du;
       }
     }
     function rm(A) {
-      var I = A.defineMetadata, B = A.hasOwnMetadata, M = A.getOwnMetadata, te = A.getOwnMetadataKeys, je = A.deleteMetadata, Ie = new f(), oe = {
+      var I = A.defineMetadata, B = A.hasOwnMetadata, M = A.getOwnMetadata, te = A.getOwnMetadataKeys, $e = A.deleteMetadata, Ce = new f(), oe = {
         isProviderFor: function(F, G) {
-          var Y = Ie.get(F);
-          return !H(Y) && Y.has(G) ? !0 : te(F, G).length ? (H(Y) && (Y = new v(), Ie.set(F, Y)), Y.add(G), !0) : !1;
+          var Y = Ce.get(F);
+          return !H(Y) && Y.has(G) ? !0 : te(F, G).length ? (H(Y) && (Y = new v(), Ce.set(F, Y)), Y.add(G), !0) : !1;
         },
         OrdinaryDefineOwnMetadata: I,
         OrdinaryHasOwnMetadata: B,
         OrdinaryGetOwnMetadata: M,
         OrdinaryOwnMetadataKeys: te,
-        OrdinaryDeleteMetadata: je
+        OrdinaryDeleteMetadata: $e
       };
       return oe;
     }
@@ -7156,9 +7159,9 @@ var Du;
           }, oe.prototype.keys = function() {
             return new B(this._keys, this._values, te);
           }, oe.prototype.values = function() {
-            return new B(this._keys, this._values, je);
+            return new B(this._keys, this._values, $e);
           }, oe.prototype.entries = function() {
-            return new B(this._keys, this._values, Ie);
+            return new B(this._keys, this._values, Ce);
           }, oe.prototype["@@iterator"] = function() {
             return this.entries();
           }, oe.prototype[o] = function() {
@@ -7180,10 +7183,10 @@ var Du;
       function te(oe, F) {
         return oe;
       }
-      function je(oe, F) {
+      function $e(oe, F) {
         return F;
       }
-      function Ie(oe, F) {
+      function Ce(oe, F) {
         return [oe, F];
       }
     }
@@ -7279,20 +7282,20 @@ var Du;
         }
         return F[B];
       }
-      function je(F, G) {
+      function $e(F, G) {
         for (var Y = 0; Y < G; ++Y)
           F[Y] = Math.random() * 255 | 0;
         return F;
       }
-      function Ie(F) {
+      function Ce(F) {
         if (typeof Uint8Array == "function") {
           var G = new Uint8Array(F);
-          return typeof crypto < "u" ? crypto.getRandomValues(G) : typeof msCrypto < "u" ? msCrypto.getRandomValues(G) : je(G, F), G;
+          return typeof crypto < "u" ? crypto.getRandomValues(G) : typeof msCrypto < "u" ? msCrypto.getRandomValues(G) : $e(G, F), G;
         }
-        return je(new Array(F), F);
+        return $e(new Array(F), F);
       }
       function oe() {
-        var F = Ie(A);
+        var F = Ce(A);
         F[6] = F[6] & 79 | 64, F[8] = F[8] & 191 | 128;
         for (var G = "", Y = 0; Y < A; ++Y) {
           var X = F[Y];
@@ -7763,7 +7766,7 @@ class Js {
     return ol(this.items);
   }
 }
-const Er = [new Uint8Array([1])], Hu = "0123456789", Zo = "name", Ku = "valueHexView", py = "isHexOnly", fy = "idBlock", hy = "tagClass", gy = "tagNumber", my = "isConstructed", _y = "fromBER", yy = "toBER", vy = "local", Fe = "", yt = new ArrayBuffer(0), Zs = new Uint8Array(0), Mr = "EndOfContent", If = "OCTET STRING", Cf = "BIT STRING";
+const Er = [new Uint8Array([1])], Hu = "0123456789", Zo = "name", Ku = "valueHexView", py = "isHexOnly", fy = "idBlock", hy = "tagClass", gy = "tagNumber", my = "isConstructed", _y = "fromBER", yy = "toBER", vy = "local", He = "", yt = new ArrayBuffer(0), Zs = new Uint8Array(0), Mr = "EndOfContent", If = "OCTET STRING", Cf = "BIT STRING";
 function Ct(t) {
   var e;
   return e = class extends t {
@@ -7799,7 +7802,7 @@ function Ct(t) {
   }, e.NAME = "hexBlock", e;
 }
 class On {
-  constructor({ blockLength: e = 0, error: n = Fe, warnings: r = [], valueBeforeDecode: i = Zs } = {}) {
+  constructor({ blockLength: e = 0, error: n = He, warnings: r = [], valueBeforeDecode: i = Zs } = {}) {
     this.blockLength = e, this.error = n, this.warnings = r, this.valueBeforeDecodeView = D.toUint8Array(i);
   }
   static blockName() {
@@ -7822,7 +7825,7 @@ class On {
   }
 }
 On.NAME = "baseBlock";
-class qe extends On {
+class Me extends On {
   fromBER(e, n, r) {
     throw TypeError("User need to make a specific function in a class which extends 'ValueBlock'");
   }
@@ -7830,7 +7833,7 @@ class qe extends On {
     throw TypeError("User need to make a specific function in a class which extends 'ValueBlock'");
   }
 }
-qe.NAME = "valueBlock";
+Me.NAME = "valueBlock";
 class Nf extends Ct(On) {
   constructor({ idBlock: e = {} } = {}) {
     var n, r, i, s;
@@ -8010,9 +8013,9 @@ class jf extends On {
 }
 jf.NAME = "lengthBlock";
 const W = {};
-class Te extends On {
-  constructor({ name: e = Fe, optional: n = !1, primitiveSchema: r, ...i } = {}, s) {
-    super(i), this.name = e, this.optional = n, r && (this.primitiveSchema = r), this.idBlock = new Nf(i), this.lenBlock = new jf(i), this.valueBlock = s ? new s(i) : new qe(i);
+class Pe extends On {
+  constructor({ name: e = He, optional: n = !1, primitiveSchema: r, ...i } = {}, s) {
+    super(i), this.name = e, this.optional = n, r && (this.primitiveSchema = r), this.idBlock = new Nf(i), this.lenBlock = new jf(i), this.valueBlock = s ? new s(i) : new Me(i);
   }
   fromBER(e, n, r) {
     const i = this.valueBlock.fromBER(e, n, this.lenBlock.isIndefiniteForm ? r : this.lenBlock.length);
@@ -8058,15 +8061,15 @@ class Te extends On {
     return dy(n, r);
   }
 }
-Te.NAME = "BaseBlock";
+Pe.NAME = "BaseBlock";
 function $f(t) {
   if (t instanceof W.Constructed)
     for (const e of t.valueBlock.value)
       $f(e) && (t.lenBlock.isIndefiniteForm = !0);
   return !!t.lenBlock.isIndefiniteForm;
 }
-class al extends Te {
-  constructor({ value: e = Fe, ...n } = {}, r) {
+class al extends Pe {
+  constructor({ value: e = He, ...n } = {}, r) {
     super(n, r), e && this.fromString(e);
   }
   getValue() {
@@ -8084,14 +8087,14 @@ class al extends Te {
   }
 }
 al.NAME = "BaseStringBlock";
-class Of extends Ct(qe) {
+class Of extends Ct(Me) {
   constructor({ isHexOnly: e = !0, ...n } = {}) {
     super(n), this.isHexOnly = e;
   }
 }
 Of.NAME = "PrimitiveValueBlock";
 var Bf;
-class ai extends Te {
+class ai extends Pe {
   constructor(e = {}) {
     super(e, Of), this.idBlock.isConstructed = !1;
   }
@@ -8107,7 +8110,7 @@ function wy(t, e) {
 }
 function ur(t, e = 0, n = t.length) {
   const r = e;
-  let i = new Te({}, qe);
+  let i = new Pe({}, Me);
   const s = new On();
   if (!zt(s, t, e, n))
     return i.error = s.error, {
@@ -8135,7 +8138,7 @@ function ur(t, e = 0, n = t.length) {
       offset: -1,
       result: i
     };
-  let l = Te;
+  let l = Pe;
   switch (i.idBlock.tagClass) {
     case 1:
       if (i.idBlock.tagNumber >= 37 && i.idBlock.isHexOnly === !1)
@@ -8263,7 +8266,7 @@ function ur(t, e = 0, n = t.length) {
 }
 function Hn(t) {
   if (!t.byteLength) {
-    const e = new Te({}, qe);
+    const e = new Pe({}, Me);
     return e.error = "Input buffer has zero length", {
       offset: -1,
       result: e
@@ -8274,7 +8277,7 @@ function Hn(t) {
 function by(t, e) {
   return t ? 1 : e;
 }
-class Wt extends qe {
+class Wt extends Me {
   constructor({ value: e = [], isIndefiniteForm: n = !1, ...r } = {}) {
     super(r), this.value = e, this.isIndefiniteForm = n;
   }
@@ -8313,7 +8316,7 @@ class Wt extends qe {
 }
 Wt.NAME = "ConstructedValueBlock";
 var Tf;
-class He extends Te {
+class Ke extends Pe {
   constructor(e = {}) {
     super(e, Wt), this.idBlock.isConstructed = !0;
   }
@@ -8334,10 +8337,10 @@ ${e.join(`
 `)}` : `${n} :`;
   }
 }
-Tf = He;
+Tf = Ke;
 W.Constructed = Tf;
-He.NAME = "CONSTRUCTED";
-class Pf extends qe {
+Ke.NAME = "CONSTRUCTED";
+class Pf extends Me {
   fromBER(e, n, r) {
     return n;
   }
@@ -8347,7 +8350,7 @@ class Pf extends qe {
 }
 Pf.override = "EndOfContentValueBlock";
 var Rf;
-class cl extends Te {
+class cl extends Pe {
   constructor(e = {}) {
     super(e, Pf), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 0;
   }
@@ -8356,9 +8359,9 @@ Rf = cl;
 W.EndOfContent = Rf;
 cl.NAME = Mr;
 var Lf;
-class wn extends Te {
+class wn extends Pe {
   constructor(e = {}) {
-    super(e, qe), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 5;
+    super(e, Me), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 5;
   }
   fromBER(e, n, r) {
     return this.lenBlock.length > 0 && this.warnings.push("Non-zero length of value block for Null type"), this.idBlock.error.length || (this.blockLength += this.idBlock.blockLength), this.lenBlock.error.length || (this.blockLength += this.lenBlock.blockLength), this.blockLength += r, n + r > e.byteLength ? (this.error = "End of input reached before message was fully decoded (inconsistent offset and length values)", -1) : n + r;
@@ -8378,7 +8381,7 @@ class wn extends Te {
 Lf = wn;
 W.Null = Lf;
 wn.NAME = "NULL";
-class Uf extends Ct(qe) {
+class Uf extends Ct(Me) {
   constructor({ value: e, ...n } = {}) {
     super(n), n.valueHex ? this.valueHexView = D.toUint8Array(n.valueHex) : this.valueHexView = new Uint8Array(1), e && (this.value = e);
   }
@@ -8407,7 +8410,7 @@ class Uf extends Ct(qe) {
 }
 Uf.NAME = "BooleanValueBlock";
 var Vf;
-class Ys extends Te {
+class Ys extends Pe {
   constructor(e = {}) {
     super(e, Uf), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 1;
   }
@@ -8459,7 +8462,7 @@ class qf extends Ct(Wt) {
 }
 qf.NAME = "OctetStringValueBlock";
 var Mf;
-let mn = class zf extends Te {
+let mn = class zf extends Pe {
   constructor({ idBlock: e = {}, lenBlock: n = {}, ...r } = {}) {
     var i, s;
     (i = r.isConstructed) !== null && i !== void 0 || (r.isConstructed = !!(!((s = r.value) === null || s === void 0) && s.length)), super({
@@ -8490,7 +8493,7 @@ let mn = class zf extends Te {
     return super.fromBER(e, n, r);
   }
   onAsciiEncoding() {
-    return this.valueBlock.isConstructed || this.valueBlock.value && this.valueBlock.value.length ? He.prototype.onAsciiEncoding.call(this) : `${this.constructor.NAME} : ${Z.ToHex(this.valueBlock.valueHexView)}`;
+    return this.valueBlock.isConstructed || this.valueBlock.value && this.valueBlock.value.length ? Ke.prototype.onAsciiEncoding.call(this) : `${this.constructor.NAME} : ${Z.ToHex(this.valueBlock.valueHexView)}`;
   }
   getValue() {
     if (!this.idBlock.isConstructed)
@@ -8569,7 +8572,7 @@ class Df extends Ct(Wt) {
 }
 Df.NAME = "BitStringValueBlock";
 var Ff;
-let _n = class extends Te {
+let _n = class extends Pe {
   constructor({ idBlock: e = {}, lenBlock: n = {}, ...r } = {}) {
     var i, s;
     (i = r.isConstructed) !== null && i !== void 0 || (r.isConstructed = !!(!((s = r.value) === null || s === void 0) && s.length)), super({
@@ -8589,7 +8592,7 @@ let _n = class extends Te {
   }
   onAsciiEncoding() {
     if (this.valueBlock.isConstructed || this.valueBlock.value && this.valueBlock.value.length)
-      return He.prototype.onAsciiEncoding.call(this);
+      return Ke.prototype.onAsciiEncoding.call(this);
     {
       const e = [], n = this.valueBlock.valueHexView;
       for (const i of n)
@@ -8663,7 +8666,7 @@ function xy(t, e) {
       }
   return s.slice();
 }
-class ll extends Ct(qe) {
+class ll extends Ct(Me) {
   constructor({ value: e, ...n } = {}) {
     super(n), this._valueDec = 0, n.valueHex && this.setValueHex(), e !== void 0 && (this.valueDec = e);
   }
@@ -8746,7 +8749,7 @@ Object.defineProperty(Hf.prototype, "valueHex", {
   }
 });
 var Kf;
-class St extends Te {
+class St extends Pe {
   constructor(e = {}) {
     super(e, ll), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 2;
   }
@@ -8792,7 +8795,7 @@ class Xs extends St {
 Wf = Xs;
 W.Enumerated = Wf;
 Xs.NAME = "ENUMERATED";
-class Na extends Ct(qe) {
+class Na extends Ct(Me) {
   constructor({ valueDec: e = -1, isFirstSid: n = !1, ...r } = {}) {
     super(r), this.valueDec = e, this.isFirstSid = n;
   }
@@ -8862,8 +8865,8 @@ class Na extends Ct(qe) {
   }
 }
 Na.NAME = "sidBlock";
-class Gf extends qe {
-  constructor({ value: e = Fe, ...n } = {}) {
+class Gf extends Me {
+  constructor({ value: e = He, ...n } = {}) {
     super(n), this.value = [], e && this.fromString(e);
   }
   fromBER(e, n, r) {
@@ -8944,7 +8947,7 @@ class Gf extends qe {
 }
 Gf.NAME = "ObjectIdentifierValueBlock";
 var Jf;
-class Qs extends Te {
+class Qs extends Pe {
   constructor(e = {}) {
     super(e, Gf), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 6;
   }
@@ -9019,8 +9022,8 @@ class ja extends Ct(On) {
   }
 }
 ja.NAME = "relativeSidBlock";
-class Zf extends qe {
-  constructor({ value: e = Fe, ...n } = {}) {
+class Zf extends Me {
+  constructor({ value: e = He, ...n } = {}) {
     super(n), this.value = [], e && this.fromString(e);
   }
   fromBER(e, n, r) {
@@ -9077,7 +9080,7 @@ class Zf extends qe {
 }
 Zf.NAME = "RelativeObjectIdentifierValueBlock";
 var Yf;
-class ul extends Te {
+class ul extends Pe {
   constructor(e = {}) {
     super(e, Zf), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 13;
   }
@@ -9101,7 +9104,7 @@ Yf = ul;
 W.RelativeObjectIdentifier = Yf;
 ul.NAME = "RelativeObjectIdentifier";
 var Xf;
-class Pt extends He {
+class Pt extends Ke {
   constructor(e = {}) {
     super(e), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 16;
   }
@@ -9110,7 +9113,7 @@ Xf = Pt;
 W.Sequence = Xf;
 Pt.NAME = "SEQUENCE";
 var Qf;
-let Rt = class extends He {
+let Rt = class extends Ke {
   constructor(e = {}) {
     super(e), this.idBlock.tagClass = 1, this.idBlock.tagNumber = 17;
   }
@@ -9118,9 +9121,9 @@ let Rt = class extends He {
 Qf = Rt;
 W.Set = Qf;
 Rt.NAME = "SET";
-class eh extends Ct(qe) {
+class eh extends Ct(Me) {
   constructor({ ...e } = {}) {
-    super(e), this.isHexOnly = !0, this.value = Fe;
+    super(e), this.isHexOnly = !0, this.value = He;
   }
   toJSON() {
     return {
@@ -9529,7 +9532,7 @@ xh = gl;
 W.TIME = xh;
 gl.NAME = "TIME";
 class bn {
-  constructor({ name: e = Fe, optional: n = !1 } = {}) {
+  constructor({ name: e = He, optional: n = !1 } = {}) {
     this.name = e, this.optional = n;
   }
 }
@@ -9684,7 +9687,7 @@ function fn(t, e, n) {
           result: t
         };
   }
-  if (n.name && (n.name = n.name.replace(/^\s+|\s+$/g, Fe), n.name && (t[n.name] = e)), n instanceof W.Constructed) {
+  if (n.name && (n.name = n.name.replace(/^\s+|\s+$/g, He), n.name && (t[n.name] = e)), n instanceof W.Constructed) {
     let s = 0, o = {
       verified: !1,
       result: {
@@ -9703,7 +9706,7 @@ function fn(t, e, n) {
       return l ? {
         verified: !0,
         result: t
-      } : (n.name && (n.name = n.name.replace(/^\s+|\s+$/g, Fe), n.name && delete t[n.name]), t.error = "Inconsistent object length", {
+      } : (n.name && (n.name = n.name.replace(/^\s+|\s+$/g, He), n.name && delete t[n.name]), t.error = "Inconsistent object length", {
         verified: !1,
         result: t
       });
@@ -9715,14 +9718,14 @@ function fn(t, e, n) {
             verified: !1,
             result: t
           };
-          return t.error = "Inconsistent length between ASN.1 data and schema", n.name && (n.name = n.name.replace(/^\s+|\s+$/g, Fe), n.name && (delete t[n.name], u.name = n.name)), u;
+          return t.error = "Inconsistent length between ASN.1 data and schema", n.name && (n.name = n.name.replace(/^\s+|\s+$/g, He), n.name && (delete t[n.name], u.name = n.name)), u;
         }
       } else if (n.valueBlock.value[0] instanceof is) {
         if (o = fn(t, e.valueBlock.value[l], n.valueBlock.value[0].value), o.verified === !1)
           if (n.valueBlock.value[0].optional)
             s++;
           else
-            return n.name && (n.name = n.name.replace(/^\s+|\s+$/g, Fe), n.name && delete t[n.name]), o;
+            return n.name && (n.name = n.name.replace(/^\s+|\s+$/g, He), n.name && delete t[n.name]), o;
         if (Zo in n.valueBlock.value[0] && n.valueBlock.value[0].name.length > 0) {
           let u = {};
           vy in n.valueBlock.value[0] && n.valueBlock.value[0].local ? u = e : u = t, typeof u[n.valueBlock.value[0].name] > "u" && (u[n.valueBlock.value[0].name] = []), u[n.valueBlock.value[0].name].push(e.valueBlock.value[l]);
@@ -9731,13 +9734,13 @@ function fn(t, e, n) {
         if (n.valueBlock.value[l].optional)
           s++;
         else
-          return n.name && (n.name = n.name.replace(/^\s+|\s+$/g, Fe), n.name && delete t[n.name]), o;
+          return n.name && (n.name = n.name.replace(/^\s+|\s+$/g, He), n.name && delete t[n.name]), o;
     if (o.verified === !1) {
       const l = {
         verified: !1,
         result: t
       };
-      return n.name && (n.name = n.name.replace(/^\s+|\s+$/g, Fe), n.name && (delete t[n.name], l.name = n.name)), l;
+      return n.name && (n.name = n.name.replace(/^\s+|\s+$/g, He), n.name && (delete t[n.name], l.name = n.name)), l;
     }
     return {
       verified: !0,
@@ -9751,7 +9754,7 @@ function fn(t, e, n) {
         verified: !1,
         result: s.result
       };
-      return n.name && (n.name = n.name.replace(/^\s+|\s+$/g, Fe), n.name && (delete t[n.name], o.name = n.name)), o;
+      return n.name && (n.name = n.name.replace(/^\s+|\s+$/g, He), n.name && (delete t[n.name], o.name = n.name)), o;
     }
     return fn(t, s.result, n.primitiveSchema);
   }
@@ -9775,14 +9778,14 @@ function Ay(t, e) {
 const Sh = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   Any: bn,
-  BaseBlock: Te,
+  BaseBlock: Pe,
   BaseStringBlock: al,
   BitString: _n,
   BmpString: eo,
   Boolean: Ys,
   CharacterString: lo,
   Choice: ml,
-  Constructed: He,
+  Constructed: Ke,
   DATE: dl,
   DateTime: fl,
   Duration: hl,
@@ -9811,7 +9814,7 @@ const Sh = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   UTCTime: li,
   UniversalString: to,
   Utf8String: Dt,
-  ValueBlock: qe,
+  ValueBlock: Me,
   VideotexString: so,
   ViewWriter: Js,
   VisibleString: ci,
@@ -10064,7 +10067,7 @@ class Gy {
       if (o.context !== null && o.context !== void 0)
         if (o.implicit)
           if (typeof o.type == "number" || Tt(o.type)) {
-            const p = o.repeated ? He : ai;
+            const p = o.repeated ? Ke : ai;
             i.push(new p({
               name: c,
               optional: u,
@@ -10077,7 +10080,7 @@ class Gy {
             this.cache(o.type);
             const p = !!o.repeated;
             let h = p ? l : this.get(o.type, !0).schema;
-            h = "valueBlock" in h ? h.valueBlock.value : h.value, i.push(new He({
+            h = "valueBlock" in h ? h.valueBlock.value : h.value, i.push(new Ke({
               name: p ? "" : c,
               optional: u,
               idBlock: {
@@ -10088,7 +10091,7 @@ class Gy {
             }));
           }
         else
-          i.push(new He({
+          i.push(new Ke({
             optional: u,
             idBlock: {
               tagClass: 3,
@@ -10153,8 +10156,8 @@ class Jy {
       const i = rt.get(n);
       rt.cache(n);
       let s = i.schema;
-      if (e.constructor === He && i.type !== P.Choice) {
-        s = new He({
+      if (e.constructor === Ke && i.type !== P.Choice) {
+        s = new Ke({
           idBlock: {
             tagClass: 3,
             tagNumber: e.idBlock.tagNumber
@@ -10233,7 +10236,7 @@ class Jy {
 }
 class yl {
   static serialize(e) {
-    return e instanceof Te ? e.toBER(!1) : this.toASN(e).toBER(!1);
+    return e instanceof Pe ? e.toBER(!1) : this.toASN(e).toBER(!1);
   }
   static toASN(e) {
     if (e && typeof e == "object" && Tt(e))
@@ -10272,7 +10275,7 @@ class yl {
                 ...p
               }));
             } else
-              i.push(new He({
+              i.push(new Ke({
                 optional: c.optional,
                 idBlock: {
                   tagClass: 3,
@@ -10281,7 +10284,7 @@ class yl {
                 value: u.valueBlock.value
               }));
           else
-            i.push(new He({
+            i.push(new Ke({
               optional: c.optional,
               idBlock: {
                 tagClass: 3,
@@ -10883,7 +10886,7 @@ class Zu {
   }
 }
 var $a, Oa, Ba;
-let Pe = class {
+let Re = class {
   constructor(e = {}) {
     Object.assign(this, e);
   }
@@ -10893,23 +10896,23 @@ let Pe = class {
 };
 d([
   g({ type: b.TeletexString })
-], Pe.prototype, "teletexString", void 0);
+], Re.prototype, "teletexString", void 0);
 d([
   g({ type: b.PrintableString })
-], Pe.prototype, "printableString", void 0);
+], Re.prototype, "printableString", void 0);
 d([
   g({ type: b.UniversalString })
-], Pe.prototype, "universalString", void 0);
+], Re.prototype, "universalString", void 0);
 d([
   g({ type: b.Utf8String })
-], Pe.prototype, "utf8String", void 0);
+], Re.prototype, "utf8String", void 0);
 d([
   g({ type: b.BmpString })
-], Pe.prototype, "bmpString", void 0);
-Pe = d([
+], Re.prototype, "bmpString", void 0);
+Re = d([
   R({ type: P.Choice })
-], Pe);
-let Zn = class extends Pe {
+], Re);
+let Zn = class extends Re {
   constructor(e = {}) {
     super(e), Object.assign(this, e);
   }
@@ -10978,14 +10981,14 @@ d([
 ], zr.prototype, "value", void 0);
 class vl {
   constructor(e = {}) {
-    this.partyName = new Pe(), Object.assign(this, e);
+    this.partyName = new Re(), Object.assign(this, e);
   }
 }
 d([
-  g({ type: Pe, optional: !0, context: 0, implicit: !0 })
+  g({ type: Re, optional: !0, context: 0, implicit: !0 })
 ], vl.prototype, "nameAssigner", void 0);
 d([
-  g({ type: Pe, context: 1, implicit: !0 })
+  g({ type: Re, context: 1, implicit: !0 })
 ], vl.prototype, "partyName", void 0);
 let ie = class {
   constructor(e = {}) {
@@ -11080,16 +11083,16 @@ d([
   g({ type: b.Integer, optional: !0 })
 ], os.prototype, "pathLenConstraint", void 0);
 var Ua;
-let Ve = Ua = class extends ge {
+let qe = Ua = class extends ge {
   constructor(e) {
     super(e), Object.setPrototypeOf(this, Ua.prototype);
   }
 };
-Ve = Ua = d([
+qe = Ua = d([
   R({ type: P.Sequence, itemType: ie })
-], Ve);
+], qe);
 var Va;
-let td = Va = class extends Ve {
+let td = Va = class extends qe {
   constructor(e) {
     super(e), Object.setPrototypeOf(this, Va.prototype);
   }
@@ -11264,30 +11267,30 @@ let rd = Da = class extends Kn {
 rd = Da = d([
   R({ type: P.Sequence, itemType: pr })
 ], rd);
-class Le {
+class Ue {
   constructor(e = {}) {
-    this.onlyContainsUserCerts = Le.ONLY, this.onlyContainsCACerts = Le.ONLY, this.indirectCRL = Le.ONLY, this.onlyContainsAttributeCerts = Le.ONLY, Object.assign(this, e);
+    this.onlyContainsUserCerts = Ue.ONLY, this.onlyContainsCACerts = Ue.ONLY, this.indirectCRL = Ue.ONLY, this.onlyContainsAttributeCerts = Ue.ONLY, Object.assign(this, e);
   }
 }
-Le.ONLY = !1;
+Ue.ONLY = !1;
 d([
   g({ type: kn, context: 0, optional: !0 })
-], Le.prototype, "distributionPoint", void 0);
+], Ue.prototype, "distributionPoint", void 0);
 d([
-  g({ type: b.Boolean, context: 1, defaultValue: Le.ONLY, implicit: !0 })
-], Le.prototype, "onlyContainsUserCerts", void 0);
+  g({ type: b.Boolean, context: 1, defaultValue: Ue.ONLY, implicit: !0 })
+], Ue.prototype, "onlyContainsUserCerts", void 0);
 d([
-  g({ type: b.Boolean, context: 2, defaultValue: Le.ONLY, implicit: !0 })
-], Le.prototype, "onlyContainsCACerts", void 0);
+  g({ type: b.Boolean, context: 2, defaultValue: Ue.ONLY, implicit: !0 })
+], Ue.prototype, "onlyContainsCACerts", void 0);
 d([
   g({ type: jh, context: 3, optional: !0, implicit: !0 })
-], Le.prototype, "onlySomeReasons", void 0);
+], Ue.prototype, "onlySomeReasons", void 0);
 d([
-  g({ type: b.Boolean, context: 4, defaultValue: Le.ONLY, implicit: !0 })
-], Le.prototype, "indirectCRL", void 0);
+  g({ type: b.Boolean, context: 4, defaultValue: Ue.ONLY, implicit: !0 })
+], Ue.prototype, "indirectCRL", void 0);
 d([
-  g({ type: b.Boolean, context: 5, defaultValue: Le.ONLY, implicit: !0 })
-], Le.prototype, "onlyContainsAttributeCerts", void 0);
+  g({ type: b.Boolean, context: 5, defaultValue: Ue.ONLY, implicit: !0 })
+], Ue.prototype, "onlyContainsAttributeCerts", void 0);
 var Tr;
 (function(t) {
   t[t.unspecified = 0] = "unspecified", t[t.keyCompromise = 1] = "keyCompromise", t[t.cACompromise = 2] = "cACompromise", t[t.affiliationChanged = 3] = "affiliationChanged", t[t.superseded = 4] = "superseded", t[t.cessationOfOperation = 5] = "cessationOfOperation", t[t.certificateHold = 6] = "certificateHold", t[t.removeFromCRL = 8] = "removeFromCRL", t[t.privilegeWithdrawn = 9] = "privilegeWithdrawn", t[t.aACompromise = 10] = "aACompromise";
@@ -11343,7 +11346,7 @@ Wa = d([
   R({ type: P.Choice })
 ], Wa);
 var Ga;
-let id = Ga = class extends Ve {
+let id = Ga = class extends qe {
   constructor(e) {
     super(e), Object.setPrototypeOf(this, Ga.prototype);
   }
@@ -11444,7 +11447,7 @@ sd = Za = d([
 ], sd);
 var Ya;
 const Ph = `${on}.17`;
-let Xa = Ya = class extends Ve {
+let Xa = Ya = class extends qe {
   constructor(e) {
     super(e), Object.setPrototypeOf(this, Ya.prototype);
   }
@@ -11549,7 +11552,7 @@ d([
 d([
   g({ type: b.BitString })
 ], ft.prototype, "subjectPublicKey", void 0);
-let Be = class {
+let Te = class {
   constructor(e) {
     if (e)
       if (typeof e == "string" || typeof e == "number" || e instanceof Date) {
@@ -11569,25 +11572,25 @@ d([
   g({
     type: b.UTCTime
   })
-], Be.prototype, "utcTime", void 0);
+], Te.prototype, "utcTime", void 0);
 d([
   g({
     type: b.GeneralizedTime
   })
-], Be.prototype, "generalTime", void 0);
-Be = d([
+], Te.prototype, "generalTime", void 0);
+Te = d([
   R({ type: P.Choice })
-], Be);
+], Te);
 class di {
   constructor(e) {
-    this.notBefore = new Be(/* @__PURE__ */ new Date()), this.notAfter = new Be(/* @__PURE__ */ new Date()), e && (this.notBefore = new Be(e.notBefore), this.notAfter = new Be(e.notAfter));
+    this.notBefore = new Te(/* @__PURE__ */ new Date()), this.notAfter = new Te(/* @__PURE__ */ new Date()), e && (this.notBefore = new Te(e.notBefore), this.notAfter = new Te(e.notAfter));
   }
 }
 d([
-  g({ type: Be })
+  g({ type: Te })
 ], di.prototype, "notBefore", void 0);
 d([
-  g({ type: Be })
+  g({ type: Te })
 ], di.prototype, "notAfter", void 0);
 var tc;
 let ot = class qh {
@@ -11683,21 +11686,21 @@ d([
 ], Sn.prototype, "signatureValue", void 0);
 class _o {
   constructor(e = {}) {
-    this.userCertificate = new ArrayBuffer(0), this.revocationDate = new Be(), Object.assign(this, e);
+    this.userCertificate = new ArrayBuffer(0), this.revocationDate = new Te(), Object.assign(this, e);
   }
 }
 d([
   g({ type: b.Integer, converter: ve })
 ], _o.prototype, "userCertificate", void 0);
 d([
-  g({ type: Be })
+  g({ type: Te })
 ], _o.prototype, "revocationDate", void 0);
 d([
   g({ type: ot, optional: !0, repeated: "sequence" })
 ], _o.prototype, "crlEntryExtensions", void 0);
 class Ft {
   constructor(e = {}) {
-    this.signature = new K(), this.issuer = new Se(), this.thisUpdate = new Be(), Object.assign(this, e);
+    this.signature = new K(), this.issuer = new Se(), this.thisUpdate = new Te(), Object.assign(this, e);
   }
 }
 d([
@@ -11710,10 +11713,10 @@ d([
   g({ type: Se })
 ], Ft.prototype, "issuer", void 0);
 d([
-  g({ type: Be })
+  g({ type: Te })
 ], Ft.prototype, "thisUpdate", void 0);
 d([
-  g({ type: Be, optional: !0 })
+  g({ type: Te, optional: !0 })
 ], Ft.prototype, "nextUpdate", void 0);
 d([
   g({ type: _o, repeated: "sequence", optional: !0 })
@@ -11840,7 +11843,7 @@ let hs = rc = class extends ge {
 hs = rc = d([
   R({ type: P.Set, itemType: Nt })
 ], hs);
-let ld = class extends Be {
+let ld = class extends Te {
 };
 ld = d([
   R({ type: P.Choice })
@@ -11892,11 +11895,11 @@ d([
 ], yo.prototype, "permitUnSpecified", void 0);
 class Bn {
   constructor(e = {}) {
-    this.issuer = new Ve(), this.serial = new ArrayBuffer(0), this.issuerUID = new ArrayBuffer(0), Object.assign(this, e);
+    this.issuer = new qe(), this.serial = new ArrayBuffer(0), this.issuerUID = new ArrayBuffer(0), Object.assign(this, e);
   }
 }
 d([
-  g({ type: Ve })
+  g({ type: qe })
 ], Bn.prototype, "issuer", void 0);
 d([
   g({ type: b.Integer, converter: ve })
@@ -11931,7 +11934,7 @@ class vo {
   }
 }
 d([
-  g({ type: Ve, optional: !0 })
+  g({ type: qe, optional: !0 })
 ], vo.prototype, "issuerName", void 0);
 d([
   g({ type: Bn, context: 0, implicit: !0, optional: !0 })
@@ -11973,7 +11976,7 @@ d([
   g({ type: Bn, implicit: !0, context: 0, optional: !0 })
 ], pi.prototype, "baseCertificateID", void 0);
 d([
-  g({ type: Ve, implicit: !0, context: 1, optional: !0 })
+  g({ type: qe, implicit: !0, context: 1, optional: !0 })
 ], pi.prototype, "entityName", void 0);
 d([
   g({ type: Tn, implicit: !0, context: 2, optional: !0 })
@@ -12079,7 +12082,7 @@ class Mh {
   }
 }
 d([
-  g({ type: Ve, implicit: !0, context: 0, optional: !0 })
+  g({ type: qe, implicit: !0, context: 0, optional: !0 })
 ], Mh.prototype, "policyAuthority", void 0);
 d([
   g({ type: ko, repeated: "sequence" })
@@ -12139,7 +12142,7 @@ class zh {
   }
 }
 d([
-  g({ type: Ve, implicit: !0, context: 0, optional: !0 })
+  g({ type: qe, implicit: !0, context: 0, optional: !0 })
 ], zh.prototype, "roleAuthority", void 0);
 d([
   g({ type: ie, implicit: !0, context: 1 })
@@ -12708,18 +12711,18 @@ d([
   g({ type: b.Integer, converter: ve })
 ], xs.prototype, "s", void 0);
 const Je = "1.2.840.113549.1.1", En = `${Je}.1`, uv = `${Je}.7`, dv = `${Je}.9`, Rr = `${Je}.10`, pv = `${Je}.2`, fv = `${Je}.4`, Ss = `${Je}.5`, hv = `${Je}.14`, vc = `${Je}.11`, As = `${Je}.12`, Es = `${Je}.13`, Fh = `${Je}.15`, Hh = `${Je}.16`, Is = "1.3.14.3.2.26", Kh = "2.16.840.1.101.3.4.2.4", Cs = "2.16.840.1.101.3.4.2.1", Ns = "2.16.840.1.101.3.4.2.2", js = "2.16.840.1.101.3.4.2.3", gv = "2.16.840.1.101.3.4.2.5", mv = "2.16.840.1.101.3.4.2.6", _v = "1.2.840.113549.2.2", yv = "1.2.840.113549.2.5", No = `${Je}.8`;
-function Ce(t) {
+function Ne(t) {
   return new K({ algorithm: t, parameters: null });
 }
-Ce(_v);
-Ce(yv);
-const In = Ce(Is);
-Ce(Kh);
-Ce(Cs);
-Ce(Ns);
-Ce(js);
-Ce(gv);
-Ce(mv);
+Ne(_v);
+Ne(yv);
+const In = Ne(Is);
+Ne(Kh);
+Ne(Cs);
+Ne(Ns);
+Ne(js);
+Ne(gv);
+Ne(mv);
 const Wh = new K({
   algorithm: No,
   parameters: z.serialize(In)
@@ -12727,16 +12730,16 @@ const Wh = new K({
   algorithm: dv,
   parameters: z.serialize(ss.toASN(new Uint8Array([218, 57, 163, 238, 94, 107, 75, 13, 50, 85, 191, 239, 149, 96, 24, 144, 175, 216, 7, 9]).buffer))
 });
-Ce(En);
-Ce(pv);
-Ce(fv);
-Ce(Ss);
-Ce(Fh);
-Ce(Hh);
-Ce(As);
-Ce(Es);
-Ce(Fh);
-Ce(Hh);
+Ne(En);
+Ne(pv);
+Ne(fv);
+Ne(Ss);
+Ne(Fh);
+Ne(Hh);
+Ne(As);
+Ne(Es);
+Ne(Fh);
+Ne(Hh);
 class jo {
   constructor(e = {}) {
     this.hashAlgorithm = new K(In), this.maskGenAlgorithm = new K({
@@ -12866,7 +12869,7 @@ var kc;
 (function(t) {
   t[t.Transient = 0] = "Transient", t[t.Singleton = 1] = "Singleton", t[t.ResolutionScoped = 2] = "ResolutionScoped", t[t.ContainerScoped = 3] = "ContainerScoped";
 })(kc || (kc = {}));
-const De = kc;
+const Fe = kc;
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -13162,7 +13165,7 @@ var $v = function(t) {
     this.parent = e, this._registry = new Ev(), this.interceptors = new Bv(), this.disposed = !1, this.disposables = /* @__PURE__ */ new Set();
   }
   return t.prototype.register = function(e, n, r) {
-    r === void 0 && (r = { lifecycle: De.Transient }), this.ensureNotDisposed();
+    r === void 0 && (r = { lifecycle: Fe.Transient }), this.ensureNotDisposed();
     var i;
     if (Av(n) ? i = n : i = { useClass: n }, Vi(i))
       for (var s = [e], o = i; o != null; ) {
@@ -13173,8 +13176,8 @@ var $v = function(t) {
         var l = this._registry.get(c);
         l && Vi(l.provider) ? o = l.provider : o = null;
       }
-    if ((r.lifecycle === De.Singleton || r.lifecycle == De.ContainerScoped || r.lifecycle == De.ResolutionScoped) && (qi(i) || Sc(i)))
-      throw new Error('Cannot use lifecycle "' + De[r.lifecycle] + '" with ValueProviders or FactoryProviders');
+    if ((r.lifecycle === Fe.Singleton || r.lifecycle == Fe.ContainerScoped || r.lifecycle == Fe.ResolutionScoped) && (qi(i) || Sc(i)))
+      throw new Error('Cannot use lifecycle "' + Fe[r.lifecycle] + '" with ValueProviders or FactoryProviders');
     return this._registry.set(e, { provider: i, options: r }), this;
   }, t.prototype.registerType = function(e, n) {
     return this.ensureNotDisposed(), Mn(n) ? this.register(e, {
@@ -13191,17 +13194,17 @@ var $v = function(t) {
       if (Mn(n))
         return this.register(e, {
           useToken: n
-        }, { lifecycle: De.Singleton });
+        }, { lifecycle: Fe.Singleton });
       if (n)
         return this.register(e, {
           useClass: n
-        }, { lifecycle: De.Singleton });
+        }, { lifecycle: Fe.Singleton });
       throw new Error('Cannot register a type name as a singleton without a "to" token');
     }
     var r = e;
     return n && !Mn(n) && (r = n), this.register(e, {
       useClass: r
-    }, { lifecycle: De.Singleton });
+    }, { lifecycle: Fe.Singleton });
   }, t.prototype.resolve = function(e, n) {
     n === void 0 && (n = new md()), this.ensureNotDisposed();
     var r = this.getRegistration(e);
@@ -13257,10 +13260,10 @@ var $v = function(t) {
       this.interceptors.postResolution.setAll(e, o);
     }
   }, t.prototype.resolveRegistration = function(e, n) {
-    if (this.ensureNotDisposed(), e.options.lifecycle === De.ResolutionScoped && n.scopedResolutions.has(e))
+    if (this.ensureNotDisposed(), e.options.lifecycle === Fe.ResolutionScoped && n.scopedResolutions.has(e))
       return n.scopedResolutions.get(e);
-    var r = e.options.lifecycle === De.Singleton, i = e.options.lifecycle === De.ContainerScoped, s = r || i, o;
-    return qi(e.provider) ? o = e.provider.useValue : Vi(e.provider) ? o = s ? e.instance || (e.instance = this.resolve(e.provider.useToken, n)) : this.resolve(e.provider.useToken, n) : Jh(e.provider) ? o = s ? e.instance || (e.instance = this.construct(e.provider.useClass, n)) : this.construct(e.provider.useClass, n) : Sc(e.provider) ? o = e.provider.useFactory(this) : o = this.construct(e.provider, n), e.options.lifecycle === De.ResolutionScoped && n.scopedResolutions.set(e, o), o;
+    var r = e.options.lifecycle === Fe.Singleton, i = e.options.lifecycle === Fe.ContainerScoped, s = r || i, o;
+    return qi(e.provider) ? o = e.provider.useValue : Vi(e.provider) ? o = s ? e.instance || (e.instance = this.resolve(e.provider.useToken, n)) : this.resolve(e.provider.useToken, n) : Jh(e.provider) ? o = s ? e.instance || (e.instance = this.construct(e.provider.useClass, n)) : this.construct(e.provider.useClass, n) : Sc(e.provider) ? o = e.provider.useFactory(this) : o = this.construct(e.provider, n), e.options.lifecycle === Fe.ResolutionScoped && n.scopedResolutions.set(e, o), o;
   }, t.prototype.resolveAll = function(e, n) {
     var r = this;
     n === void 0 && (n = new md()), this.ensureNotDisposed();
@@ -13309,9 +13312,9 @@ var $v = function(t) {
         var o = $s(s.value, 2), c = o[0], l = o[1];
         l.some(function(u) {
           var p = u.options;
-          return p.lifecycle === De.ContainerScoped;
+          return p.lifecycle === Fe.ContainerScoped;
         }) && r._registry.setAll(c, l.map(function(u) {
-          return u.options.lifecycle === De.ContainerScoped ? {
+          return u.options.lifecycle === Fe.ContainerScoped ? {
             provider: u.provider,
             options: u.options
           } : u;
@@ -13387,7 +13390,7 @@ var $v = function(t) {
     if (this.disposed)
       throw new Error("This container has been disposed, you cannot interact with a disposed container");
   }, t;
-}(), Re = new Tv();
+}(), Le = new Tv();
 function Bo() {
   return function(t) {
     Yh.set(t, kv(t));
@@ -13564,7 +13567,7 @@ bd = jc = d([
 ], bd);
 var $c, Oc, Bc;
 const rg = "1.2.840.113549.1.9", ig = `${rg}.7`, Dl = `${rg}.14`;
-let Os = class extends Pe {
+let Os = class extends Re {
   constructor(e = {}) {
     super(e);
   }
@@ -13612,7 +13615,7 @@ let Ad = class extends Os {
 Ad = d([
   R({ type: P.Choice })
 ], Ad);
-let Ed = class extends Pe {
+let Ed = class extends Re {
 };
 Ed = d([
   R({ type: P.Choice })
@@ -13628,7 +13631,7 @@ d([
 Pc = d([
   R({ type: P.Choice })
 ], Pc);
-let Id = class extends Pe {
+let Id = class extends Re {
 };
 Id = d([
   R({ type: P.Choice })
@@ -13666,7 +13669,7 @@ let Cd = class extends Bs {
 Cd = d([
   R({ type: P.Choice })
 ], Cd);
-let Nd = class extends Pe {
+let Nd = class extends Re {
 };
 Nd = d([
   R({ type: P.Choice })
@@ -13685,7 +13688,7 @@ d([
 Lc = d([
   R({ type: P.Choice })
 ], Lc);
-let jd = class extends Be {
+let jd = class extends Te {
 };
 jd = d([
   R({ type: P.Choice })
@@ -13709,7 +13712,7 @@ let $d = class extends Nt {
 $d = d([
   R({ type: P.Sequence })
 ], $d);
-let Ts = class extends Pe {
+let Ts = class extends Re {
 };
 Ts = d([
   R({ type: P.Choice })
@@ -13824,7 +13827,7 @@ d([
 const ki = "crypto.algorithm";
 class Pv {
   getAlgorithms() {
-    return Re.resolveAll(ki);
+    return Le.resolveAll(ki);
   }
   toAsnAlgorithm(e) {
     ({ ...e });
@@ -13858,7 +13861,7 @@ class Pv {
   }
 }
 const Nn = "crypto.algorithmProvider";
-Re.registerSingleton(Nn, Pv);
+Le.registerSingleton(Nn, Pv);
 var Mi;
 const Ze = "1.3.36.3.3.2.8.1.1", Pd = `${Ze}.1`, Rd = `${Ze}.2`, Ld = `${Ze}.3`, Ud = `${Ze}.4`, Vd = `${Ze}.5`, qd = `${Ze}.6`, Md = `${Ze}.7`, zd = `${Ze}.8`, Dd = `${Ze}.9`, Fd = `${Ze}.10`, Hd = `${Ze}.11`, Kd = `${Ze}.12`, Wd = `${Ze}.13`, Gd = `${Ze}.14`, Jd = "brainpoolP160r1", Zd = "brainpoolP160t1", Yd = "brainpoolP192r1", Xd = "brainpoolP192t1", Qd = "brainpoolP224r1", ep = "brainpoolP224t1", tp = "brainpoolP256r1", np = "brainpoolP256t1", rp = "brainpoolP320r1", ip = "brainpoolP320t1", sp = "brainpoolP384r1", op = "brainpoolP384t1", ap = "brainpoolP512r1", cp = "brainpoolP512t1", we = "ECDSA";
 let Jr = Mi = class {
@@ -14003,7 +14006,7 @@ Jr.SECP256K1 = "1.3.132.0.10";
 Jr = Mi = d([
   Bo()
 ], Jr);
-Re.registerSingleton(ki, Jr);
+Le.registerSingleton(ki, Jr);
 const sg = Symbol("name"), og = Symbol("value");
 class fe {
   constructor(e, n = {}, r = "") {
@@ -14235,7 +14238,7 @@ class Ht {
 }
 ag = Symbol.toStringTag;
 Ht.DEFAULT = "default";
-const Oe = new Ht(), Lv = /^[0-2](?:\.[1-9][0-9]*)+$/;
+const Be = new Ht(), Lv = /^[0-2](?:\.[1-9][0-9]*)+$/;
 function Uv(t) {
   return new RegExp(Lv).test(t);
 }
@@ -14396,7 +14399,7 @@ class it {
   async getThumbprint(...e) {
     var n;
     let r, i = "SHA-1";
-    return e.length >= 1 && !(!((n = e[0]) === null || n === void 0) && n.subtle) ? (i = e[0] || i, r = e[1] || Oe.get()) : r = e[0] || Oe.get(), await r.subtle.digest(i, this.toArrayBuffer());
+    return e.length >= 1 && !(!((n = e[0]) === null || n === void 0) && n.subtle) ? (i = e[0] || i, r = e[1] || Be.get()) : r = e[0] || Be.get(), await r.subtle.digest(i, this.toArrayBuffer());
   }
 }
 const lg = "Cannot initialize GeneralName from ASN.1 data.", lp = `${lg} Unsupported string format in use.`, Mv = `${lg} Value doesn't match to GUID regular expression.`, up = /^([0-9a-f]{8})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{12})$/i, dp = "1.3.6.1.4.1.311.25.1", pp = "1.3.6.1.4.1.311.20.2.3", Xo = "dns", Qo = "dn", ea = "email", ta = "ip", na = "url", ra = "guid", ia = "upn", Bi = "id";
@@ -14474,7 +14477,7 @@ class Kt extends cn {
           throw new Error(Mv);
         this.value = r.slice(1).map((i, s) => s < 3 ? Z.ToHex(new Uint8Array(Z.FromHex(i)).reverse()) : i).join("-");
       } else if (e.otherName.typeId === pp)
-        this.type = ia, this.value = z.parse(e.otherName.value, Pe).toString();
+        this.type = ia, this.value = z.parse(e.otherName.value, Re).toString();
       else
         throw new Error(lp);
     else
@@ -14511,7 +14514,7 @@ class Kt extends cn {
 class Zr extends cn {
   constructor(e) {
     let n;
-    if (e instanceof Ve)
+    if (e instanceof qe)
       n = e;
     else if (Array.isArray(e)) {
       const r = [];
@@ -14522,9 +14525,9 @@ class Zr extends cn {
           const s = z.parse(new Kt(i.type, i.value).rawData, ie);
           r.push(s);
         }
-      n = new Ve(r);
+      n = new qe(r);
     } else if (D.isBufferSource(e))
-      n = z.parse(e, Ve);
+      n = z.parse(e, qe);
     else
       throw new Error("Cannot initialize GeneralNames. Incorrect incoming arguments");
     super(n);
@@ -14679,7 +14682,7 @@ class Mt extends cn {
   }
 }
 class ht extends Mt {
-  static async create(e, n = Oe.get()) {
+  static async create(e, n = Be.get()) {
     if (e instanceof ht)
       return e;
     if (Ht.isCryptoKey(e)) {
@@ -14700,13 +14703,13 @@ class ht extends Mt {
   }
   async export(...e) {
     let n, r = ["verify"], i = { hash: "SHA-256", ...this.algorithm };
-    e.length > 1 ? (i = e[0] || i, r = e[1] || r, n = e[2] || Oe.get()) : n = e[0] || Oe.get();
+    e.length > 1 ? (i = e[0] || i, r = e[1] || r, n = e[2] || Be.get()) : n = e[0] || Be.get();
     let s = this.rawData;
     const o = z.parse(this.rawData, ft);
     return o.algorithm.algorithm === Rr && (s = Jv(o, s)), n.subtle.importKey("spki", s, i, !0, r);
   }
   onInit(e) {
-    const n = Re.resolve(Nn), r = this.algorithm = n.toWebAlgorithm(e.algorithm);
+    const n = Le.resolve(Nn), r = this.algorithm = n.toWebAlgorithm(e.algorithm);
     switch (e.algorithm.algorithm) {
       case En: {
         const i = z.parse(e.subjectPublicKey, ql), s = D.toUint8Array(i.modulus);
@@ -14718,11 +14721,11 @@ class ht extends Mt {
   async getThumbprint(...e) {
     var n;
     let r, i = "SHA-1";
-    return e.length >= 1 && !(!((n = e[0]) === null || n === void 0) && n.subtle) ? (i = e[0] || i, r = e[1] || Oe.get()) : r = e[0] || Oe.get(), await r.subtle.digest(i, this.rawData);
+    return e.length >= 1 && !(!((n = e[0]) === null || n === void 0) && n.subtle) ? (i = e[0] || i, r = e[1] || Be.get()) : r = e[0] || Be.get(), await r.subtle.digest(i, this.rawData);
   }
   async getKeyIdentifier(...e) {
     let n, r = "SHA-1";
-    e.length === 1 ? typeof e[0] == "string" ? (r = e[0], n = Oe.get()) : n = e[0] : e.length === 2 ? (r = e[0], n = e[1]) : n = Oe.get();
+    e.length === 1 ? typeof e[0] == "string" ? (r = e[0], n = Be.get()) : n = e[0] : e.length === 2 ? (r = e[0], n = e[1]) : n = Be.get();
     const i = z.parse(this.rawData, ft);
     return await n.subtle.digest(r, i.subjectPublicKey);
   }
@@ -14746,7 +14749,7 @@ function Jv(t, e) {
   }), e = z.serialize(t), e;
 }
 class Xr extends ct {
-  static async create(e, n = !1, r = Oe.get()) {
+  static async create(e, n = !1, r = Be.get()) {
     if ("name" in e && "serialNumber" in e)
       return new Xr(e, n);
     const s = await (await ht.create(e, r)).getKeyIdentifier(r);
@@ -14759,7 +14762,7 @@ class Xr extends ct {
       const n = new hn({ keyIdentifier: new bl(Z.FromHex(e[0])) });
       super(La, e[1], z.serialize(n));
     } else {
-      const n = e[0], r = n.name instanceof Zr ? z.parse(n.name.rawData, Ve) : n.name, i = new hn({
+      const n = e[0], r = n.name instanceof Zr ? z.parse(n.name.rawData, qe) : n.name, i = new hn({
         authorityCertIssuer: r,
         authorityCertSerialNumber: Z.FromHex(n.serialNumber)
       });
@@ -14843,7 +14846,7 @@ class Kl extends ct {
 }
 Kl.NAME = "Key Usages";
 class xi extends ct {
-  static async create(e, n = !1, r = Oe.get()) {
+  static async create(e, n = !1, r = Be.get()) {
     const s = await (await ht.create(e, r)).getKeyIdentifier(r);
     return new xi(Z.ToHex(s), n);
   }
@@ -15112,7 +15115,7 @@ let zc = zi = class {
     }) : null;
   }
   static getHashAlgorithm(e) {
-    const n = Re.resolve(Nn);
+    const n = Le.resolve(Nn);
     return typeof e == "string" ? n.toAsnAlgorithm({ name: e }) : typeof e == "object" && e && "name" in e ? n.toAsnAlgorithm(e) : null;
   }
   toAsnAlgorithm(e) {
@@ -15169,7 +15172,7 @@ let zc = zi = class {
           const n = z.parse(e.parameters, Cn);
           return {
             name: "RSA-PSS",
-            hash: Re.resolve(Nn).toWebAlgorithm(n.hashAlgorithm),
+            hash: Le.resolve(Nn).toWebAlgorithm(n.hashAlgorithm),
             saltLength: n.saltLength
           };
         } else
@@ -15181,7 +15184,7 @@ let zc = zi = class {
 zc = zi = d([
   Bo()
 ], zc);
-Re.registerSingleton(ki, zc);
+Le.registerSingleton(ki, zc);
 let Dc = class {
   toAsnAlgorithm(e) {
     switch (e.name.toLowerCase()) {
@@ -15213,7 +15216,7 @@ let Dc = class {
 Dc = d([
   Bo()
 ], Dc);
-Re.registerSingleton(ki, Dc);
+Le.registerSingleton(ki, Dc);
 class st {
   addPadding(e, n) {
     const r = D.toUint8Array(n), i = new Uint8Array(e);
@@ -15301,14 +15304,14 @@ let Fc = class {
 Fc = d([
   Bo()
 ], Fc);
-Re.registerSingleton(ki, Fc);
+Le.registerSingleton(ki, Fc);
 class Yv extends Mt {
   constructor(e) {
     Mt.isAsnEncoded(e) ? super(e, Gr) : super(e), this.tag = Qe.CertificateRequestTag;
   }
   onInit(e) {
     this.tbs = z.serialize(e.certificationRequestInfo), this.publicKey = new ht(e.certificationRequestInfo.subjectPKInfo);
-    const n = Re.resolve(Nn);
+    const n = Le.resolve(Nn);
     this.signatureAlgorithm = n.toWebAlgorithm(e.signatureAlgorithm), this.signature = e.signature, this.attributes = e.certificationRequestInfo.attributes.map((i) => Uo.create(z.serialize(i)));
     const r = this.getAttribute(Dl);
     this.extensions = [], r instanceof Wl && (this.extensions = r.items), this.subjectName = new it(e.certificationRequestInfo.subject), this.subject = this.subjectName.toString();
@@ -15331,8 +15334,8 @@ class Yv extends Mt {
   getExtensions(e) {
     return this.extensions.filter((n) => n.type === e);
   }
-  async verify(e = Oe.get()) {
-    const n = { ...this.publicKey.algorithm, ...this.signatureAlgorithm }, r = await this.publicKey.export(n, ["verify"], e), i = Re.resolveAll(Si).reverse();
+  async verify(e = Be.get()) {
+    const n = { ...this.publicKey.algorithm, ...this.signatureAlgorithm }, r = await this.publicKey.export(n, ["verify"], e), i = Le.resolveAll(Si).reverse();
     let s = null;
     for (const c of i)
       if (s = c.toWebSignature(n, this.signature), s)
@@ -15369,7 +15372,7 @@ class Gl extends Mt {
   onInit(e) {
     const n = e.tbsCertificate;
     this.tbs = z.serialize(n), this.serialNumber = Z.ToHex(n.serialNumber), this.subjectName = new it(n.subject), this.subject = new it(n.subject).toString(), this.issuerName = new it(n.issuer), this.issuer = this.issuerName.toString();
-    const r = Re.resolve(Nn);
+    const r = Le.resolve(Nn);
     this.signatureAlgorithm = r.toWebAlgorithm(e.signatureAlgorithm), this.signature = e.signatureValue;
     const i = n.validity.notBefore.utcTime || n.validity.notBefore.generalTime;
     if (!i)
@@ -15392,7 +15395,7 @@ class Gl extends Mt {
   getExtensions(e) {
     return this.extensions.filter((n) => typeof e == "string" ? n.type === e : n instanceof e);
   }
-  async verify(e = {}, n = Oe.get()) {
+  async verify(e = {}, n = Be.get()) {
     let r, i;
     const s = e.publicKey;
     try {
@@ -15410,7 +15413,7 @@ class Gl extends Mt {
     } catch {
       return !1;
     }
-    const o = Re.resolveAll(Si).reverse();
+    const o = Le.resolveAll(Si).reverse();
     let c = null;
     for (const u of o)
       if (c = u.toWebSignature(r, this.signature), c)
@@ -15427,9 +15430,9 @@ class Gl extends Mt {
   }
   async getThumbprint(...e) {
     let n, r = "SHA-1";
-    return e[0] && (e[0].subtle ? n = e[0] : (r = e[0] || r, n = e[1])), n ?? (n = Oe.get()), await n.subtle.digest(r, this.rawData);
+    return e[0] && (e[0].subtle ? n = e[0] : (r = e[0] || r, n = e[1])), n ?? (n = Be.get()), await n.subtle.digest(r, this.rawData);
   }
-  async isSelfSigned(e = Oe.get()) {
+  async isSelfSigned(e = Be.get()) {
     return this.subject === this.issuer && await this.verify({ signatureOnly: !0 }, e);
   }
   toTextObject() {
@@ -15461,7 +15464,7 @@ class Gl extends Mt {
 }
 Gl.NAME = "Certificate";
 class Xv {
-  static async createSelfSigned(e, n = Oe.get()) {
+  static async createSelfSigned(e, n = Be.get()) {
     if (!e.keys.privateKey)
       throw new Error("Bad field 'keys' in 'params' argument. 'privateKey' is empty");
     if (!e.keys.publicKey)
@@ -15478,7 +15481,7 @@ class Xv {
       extensions: e.extensions
     }, n);
   }
-  static async create(e, n = Oe.get()) {
+  static async create(e, n = Be.get()) {
     var r;
     let i;
     e.publicKey instanceof ht ? i = e.publicKey.rawData : "publicKey" in e.publicKey ? i = e.publicKey.publicKey.rawData : D.isBufferSource(e.publicKey) ? i = e.publicKey : i = await n.subtle.exportKey("spki", e.publicKey);
@@ -15506,9 +15509,9 @@ class Xv {
     }
     const u = {
       hash: "SHA-256"
-    }, p = "signingKey" in e ? { ...u, ...e.signingAlgorithm, ...e.signingKey.algorithm } : { ...u, ...e.signingAlgorithm }, h = Re.resolve(Nn);
+    }, p = "signingKey" in e ? { ...u, ...e.signingAlgorithm, ...e.signingKey.algorithm } : { ...u, ...e.signingAlgorithm }, h = Le.resolve(Nn);
     l.tbsCertificate.signature = l.signatureAlgorithm = h.toAsnAlgorithm(p);
-    const m = z.serialize(l.tbsCertificate), v = "signingKey" in e ? await n.subtle.sign(p, e.signingKey, m) : e.signature, f = Re.resolveAll(Si).reverse();
+    const m = z.serialize(l.tbsCertificate), v = "signingKey" in e ? await n.subtle.sign(p, e.signingKey, m) : e.signature, f = Le.resolveAll(Si).reverse();
     let _ = null;
     for (const w of f)
       if (_ = w.toAsnSignature(p, v), _)
@@ -15532,8 +15535,8 @@ lt.register(za, pg);
 lt.register(Ra, fg);
 Uo.register(ig, hg);
 Uo.register(Dl, Wl);
-Re.registerSingleton(Si, Zv);
-Re.registerSingleton(Si, st);
+Le.registerSingleton(Si, Zv);
+Le.registerSingleton(Si, st);
 st.namedCurveSize.set("P-256", 32);
 st.namedCurveSize.set("K-256", 32);
 st.namedCurveSize.set("P-384", 48);
@@ -15544,7 +15547,7 @@ async function Hc(t) {
     hash: "SHA-256",
     publicExponent: new Uint8Array([1, 0, 1]),
     modulusLength: 2048
-  }, n = await crypto.subtle.generateKey(e, !0, ["sign", "verify"]), r = Ke(), i = Sa(new TextEncoder().encode(r)), s = await Xv.createSelfSigned({
+  }, n = await crypto.subtle.generateKey(e, !0, ["sign", "verify"]), r = Ae(), i = Sa(new TextEncoder().encode(r)), s = await Xv.createSelfSigned({
     serialNumber: i,
     name: t.name,
     notBefore: /* @__PURE__ */ new Date(),
@@ -15947,8 +15950,8 @@ const tw = 1e3 * 60 * 60 * 24, nw = new de().openapi(
   async (t) => {
     const { "tenant-id": e } = t.req.valid("header"), n = t.req.valid("json"), r = {
       ...n,
-      id: n.id || Ke(),
-      client_secret: n.client_secret || Ke()
+      id: n.id || Ae(),
+      client_secret: n.client_secret || Ae()
     }, i = await t.env.data.applications.create(
       e,
       r
@@ -17970,7 +17973,7 @@ function Kw(t) {
 function Et(t) {
   return t.UNIVERSAL_LOGIN_URL || `${t.ISSUER}u/`;
 }
-function $e(t) {
+function Oe(t) {
   return t.OAUTH_API_URL || t.ISSUER;
 }
 function Sg(t) {
@@ -17987,8 +17990,8 @@ async function Ww(t, e) {
     n.team_id,
     n.kid,
     r,
-    `${$e(t.env)}callback`
-  ), s = Ke(), o = await i.createAuthorizationURL(
+    `${Oe(t.env)}callback`
+  ), s = Ae(), o = await i.createAuthorizationURL(
     s,
     ((l = n.scope) == null ? void 0 : l.split(" ")) || ["name", "email"]
   );
@@ -18003,7 +18006,7 @@ async function Gw(t, e, n) {
     r.team_id,
     r.kid,
     i,
-    `${$e(t.env)}callback`
+    `${Oe(t.env)}callback`
   ).validateAuthorizationCode(n), c = el(o.idToken());
   if (!c)
     throw new Error("Invalid ID token");
@@ -18031,8 +18034,8 @@ async function Zw(t, e) {
   const r = new kg(
     n.client_id,
     n.client_secret,
-    `${$e(t.env)}callback`
-  ), i = Ke();
+    `${Oe(t.env)}callback`
+  ), i = Ae();
   return {
     redirectUrl: r.createAuthorizationURL(
       i,
@@ -18048,7 +18051,7 @@ async function Yw(t, e, n) {
   const s = await new kg(
     r.client_id,
     r.client_secret,
-    `${$e(t.env)}callback`
+    `${Oe(t.env)}callback`
   ).validateAuthorizationCode(n), o = await fetch(
     "https://graph.facebook.com/v16.0/me?fields=id,email,name",
     {
@@ -18079,8 +18082,8 @@ async function Qw(t, e) {
   const r = new xg(
     n.client_id,
     n.client_secret,
-    `${$e(t.env)}callback`
-  ), i = Ke(), s = Bw();
+    `${Oe(t.env)}callback`
+  ), i = Ae(), s = Bw();
   return {
     redirectUrl: r.createAuthorizationURL(
       i,
@@ -18098,7 +18101,7 @@ async function eb(t, e, n, r) {
   const o = await new xg(
     i.client_id,
     i.client_secret,
-    `${$e(t.env)}callback`
+    `${Oe(t.env)}callback`
   ).validateAuthorizationCode(n, r), c = el(o.idToken());
   if (!c)
     throw new Error("Invalid ID token");
@@ -18126,8 +18129,8 @@ async function nb(t, e) {
   const r = new Jl(
     n.client_id,
     n.client_secret,
-    `${$e(t.env)}callback`
-  ), i = Ke(), s = r.createAuthorizationURL(
+    `${Oe(t.env)}callback`
+  ), i = Ae(), s = r.createAuthorizationURL(
     "https://api.vipps.no/access-management-1.0/access/oauth2/auth",
     i,
     ((o = n.scope) == null ? void 0 : o.split(" ")) || [
@@ -18151,7 +18154,7 @@ async function rb(t, e, n) {
   const s = await new Jl(
     r.client_id,
     r.client_secret,
-    `${$e(t.env)}callback`
+    `${Oe(t.env)}callback`
   ).validateAuthorizationCode(
     "https://api.vipps.no/access-management-1.0/access/oauth2/token",
     n,
@@ -18288,11 +18291,12 @@ async function ob(t, e, n, r) {
       Date.now() + Gn * 1e3
     ).toISOString(),
     authParams: r,
+    csrf_token: Ae(),
     ...rn(t.req)
   }));
   const c = await Ag(t, i.strategy).getRedirect(t, i);
   return await t.env.data.codes.create(e.tenant.id, {
-    login_id: s.login_id,
+    login_id: s.id,
     code_id: c.code,
     code_type: "oauth2_state",
     connection_id: i.id,
@@ -18408,7 +18412,7 @@ async function Cp(t, e, n, r, i, s) {
     error_code: i,
     state: c.authParams.state
   }), t.redirect(
-    `${Et(t.env)}enter-email?state=${c.login_id}&error=${n}`
+    `${Et(t.env)}enter-email?state=${c.id}&error=${n}`
   );
 }
 const ab = new de().openapi(
@@ -18685,14 +18689,14 @@ const ab = new de().openapi(
   async (t) => {
     const e = $u.parse({
       issuer: Kw(t.env),
-      authorization_endpoint: `${$e(t.env)}authorize`,
-      token_endpoint: `${$e(t.env)}oauth/token`,
-      device_authorization_endpoint: `${$e(t.env)}oauth/device/code`,
-      userinfo_endpoint: `${$e(t.env)}userinfo`,
-      mfa_challenge_endpoint: `${$e(t.env)}mfa/challenge`,
-      jwks_uri: `${$e(t.env)}.well-known/jwks.json`,
-      registration_endpoint: `${$e(t.env)}oidc/register`,
-      revocation_endpoint: `${$e(t.env)}oauth/revoke`,
+      authorization_endpoint: `${Oe(t.env)}authorize`,
+      token_endpoint: `${Oe(t.env)}oauth/token`,
+      device_authorization_endpoint: `${Oe(t.env)}oauth/device/code`,
+      userinfo_endpoint: `${Oe(t.env)}userinfo`,
+      mfa_challenge_endpoint: `${Oe(t.env)}mfa/challenge`,
+      jwks_uri: `${Oe(t.env)}.well-known/jwks.json`,
+      registration_endpoint: `${Oe(t.env)}oidc/register`,
+      revocation_endpoint: `${Oe(t.env)}oauth/revoke`,
       scopes_supported: [
         "openid",
         "profile",
@@ -19152,7 +19156,7 @@ async function Ql(t, e, n, r) {
     throw new j(500, { message: "Tenant not found" });
   if (!r.redirect_uri)
     throw new j(400, { message: "redirect_uri is required" });
-  const s = new URL($e(t.env));
+  const s = new URL(Oe(t.env));
   s.pathname = "passwordless/verify_redirect", s.searchParams.set("verification_code", n), s.searchParams.set("connection", "email"), s.searchParams.set("client_id", r.client_id), s.searchParams.set("redirect_uri", r.redirect_uri), s.searchParams.set("email", e), r.response_type && s.searchParams.set("response_type", r.response_type), r.scope && s.searchParams.set("scope", r.scope), r.state && s.searchParams.set("state", r.state), r.nonce && s.searchParams.set("nonce", r.nonce), r.code_challenge && s.searchParams.set("code_challenge", r.code_challenge), r.code_challenge_method && s.searchParams.set(
     "code_challenge_method",
     r.code_challenge_method
@@ -19346,13 +19350,14 @@ const wb = new de().openapi(
           Date.now() + Gn * 1e3
         ).toISOString(),
         authParams: s,
+        csrf_token: Ae(),
         ...rn(t.req)
       }
     );
     return await Cg(
       t,
       e,
-      o.login_id,
+      o.id,
       o.authParams.state
     ), t.html(
       "If an account with that email exists, we've sent instructions to reset your password."
@@ -19395,7 +19400,7 @@ async function tu(t, e, n, r, i, s, o) {
   const p = rn(t.req);
   if (o && u.ip !== p.ip)
     return t.redirect(
-      `${Et(t.env)}invalid-session?state=${u.login_id}`
+      `${Et(t.env)}invalid-session?state=${u.id}`
     );
   if (n.redirect_uri && !Mo(n.redirect_uri, e.callbacks, {
     allowPathWildcards: !0
@@ -19457,12 +19462,13 @@ const bb = new de().openapi(
       {
         authParams: { ...o, client_id: r, username: i },
         expires_at: new Date(Date.now() + Aa).toISOString(),
+        csrf_token: Ae(),
         ...rn(t.req)
       }
     ), u = await n.data.codes.create(c.tenant.id, {
       code_id: or(),
       code_type: "otp",
-      login_id: l.login_id,
+      login_id: l.id,
       expires_at: new Date(Date.now() + Aa).toISOString()
     });
     return s === "link" ? await Ql(t, i, u.code_id, { ...o, client_id: r }) : await Ng(t, i, u.code_id), t.html("OK");
@@ -19644,12 +19650,13 @@ async function kb(t, e, n, r) {
         client_id: e.id,
         username: n
       },
+      csrf_token: Ae(),
       ...rn(t.req)
     }
   ), c = await t.env.data.codes.create(e.tenant.id, {
     code_id: i,
     code_type: "password_reset",
-    login_id: o.login_id,
+    login_id: o.id,
     expires_at: new Date(
       Date.now() + k_
     ).toISOString()
@@ -19727,6 +19734,7 @@ const xb = new de().openapi(
             client_id: n,
             username: s
           },
+          csrf_token: Ae(),
           ...rn(t.req)
         }
       );
@@ -19781,6 +19789,7 @@ async function Ab({
         Date.now() + Gn * 1e3
       ).toISOString(),
       authParams: r,
+      csrf_token: Ae(),
       authorization_url: t.req.url,
       ...rn(t.req)
     }
@@ -19804,13 +19813,13 @@ async function Ab({
     return await t.env.data.codes.create(n.tenant.id, {
       code_id: c,
       code_type: "otp",
-      login_id: o.login_id,
+      login_id: o.id,
       expires_at: new Date(
         Date.now() + Gn * 1e3
       ).toISOString()
-    }), await Ql(t, s, c, r), t.redirect(`/u/enter-code?state=${o.login_id}`);
+    }), await Ql(t, s, c, r), t.redirect(`/u/enter-code?state=${o.id}`);
   }
-  return e ? t.redirect(`/u/check-account?state=${o.login_id}`) : t.redirect(`/u/enter-email?state=${o.login_id}`);
+  return e ? t.redirect(`/u/check-account?state=${o.id}`) : t.redirect(`/u/enter-email?state=${o.id}`);
 }
 function Eb(t) {
   if (t === "Username-Password-Authentication")
@@ -20076,10 +20085,10 @@ const Nb = new de().openapi(
       throw new j(400, {
         message: `Invalid redirect URI - ${ce.redirect_uri}`
       });
-    const Me = ts(
+    const ze = ts(
       ee.tenant.id,
       t.req.header("cookie")
-    ), ze = Me ? await e.data.sessions.get(ee.tenant.id, Me) : void 0;
+    ), De = ze ? await e.data.sessions.get(ee.tenant.id, ze) : void 0;
     if (f == "none") {
       if (!p)
         throw new j(400, {
@@ -20087,7 +20096,7 @@ const Nb = new de().openapi(
         });
       return Cb({
         ctx: t,
-        session: ze || void 0,
+        session: De || void 0,
         redirect_uri: i,
         state: o,
         response_type: p,
@@ -20110,7 +20119,7 @@ const Nb = new de().openapi(
       client: ee,
       auth0Client: S,
       authParams: ce,
-      session: ze || void 0,
+      session: De || void 0,
       connection: u,
       login_hint: N
     });
@@ -20218,7 +20227,7 @@ var $b = {
     }
   }
   return n[0] += t[t.length - 1], n.length === 1 ? "callbacks" in n ? gt($g(gt(n[0], n.callbacks))) : gt(n[0]) : jg(n, n.callbacks);
-}, ru = Symbol("RENDERER"), Kc = Symbol("ERROR_HANDLER"), Ee = Symbol("STASH"), Og = Symbol("INTERNAL"), Tb = Symbol("MEMO"), Vs = Symbol("PERMALINK"), Op = (t) => (t[Og] = !0, t), Bg = (t) => ({ value: e, children: n }) => {
+}, ru = Symbol("RENDERER"), Kc = Symbol("ERROR_HANDLER"), Ie = Symbol("STASH"), Og = Symbol("INTERNAL"), Tb = Symbol("MEMO"), Vs = Symbol("PERMALINK"), Op = (t) => (t[Og] = !0, t), Bg = (t) => ({ value: e, children: n }) => {
   if (!n)
     return;
   const r = {
@@ -20620,7 +20629,7 @@ async function Ge(t, e) {
     },
     client: i,
     tenant: s,
-    session: r
+    loginSession: r
   };
 }
 async function Zb(t, e, n, r) {
@@ -21170,7 +21179,7 @@ const d1 = new de().openapi(
     }
   }),
   async (t) => {
-    const { state: e, impersonation: n } = t.req.valid("query"), { vendorSettings: r, session: i, client: s } = await Ge(
+    const { state: e, impersonation: n } = t.req.valid("query"), { vendorSettings: r, loginSession: i, client: s } = await Ge(
       t,
       e
     );
@@ -21219,7 +21228,7 @@ const d1 = new de().openapi(
   async (t) => {
     const { env: e } = t, { state: n } = t.req.valid("query"), r = t.req.valid("form");
     t.set("body", r), t.set("username", r.username);
-    const { client: i, session: s, vendorSettings: o } = await Ge(
+    const { client: i, loginSession: s, vendorSettings: o } = await Ge(
       t,
       n
     );
@@ -21253,7 +21262,7 @@ const d1 = new de().openapi(
       }
     if (s.authParams.username = r.username, s.authParams.act_as = r.act_as, await e.data.loginSessions.update(
       i.tenant.id,
-      s.login_id,
+      s.id,
       s
     ), await Zb(
       t,
@@ -21276,10 +21285,12 @@ const d1 = new de().openapi(
     const h = await t.env.data.codes.create(i.tenant.id, {
       code_id: u,
       code_type: "otp",
-      login_id: s.login_id,
+      login_id: s.id,
       expires_at: new Date(Date.now() + Aa).toISOString()
     });
-    return u1(s.auth0Client) === "link" && !r.username.includes("online.no") ? nt(
+    return u1(
+      s.auth0Client
+    ) === "link" && !r.username.includes("online.no") ? nt(
       t,
       Ql(
         t,
@@ -21365,7 +21376,7 @@ var ri = "_hp", p1 = {
       }
     }
 }, m1 = (t, e) => {
-  e[Ee][0] = 0, ii.push([t, e]);
+  e[Ie][0] = 0, ii.push([t, e]);
   const n = e.tag[ru] || e.tag, r = n.defaultProps ? {
     ...n.defaultProps,
     ...e.props
@@ -21377,7 +21388,7 @@ var ri = "_hp", p1 = {
   }
 }, Mg = (t, e, n, r, i) => {
   var s, o;
-  (s = t.vR) != null && s.length && (r.push(...t.vR), delete t.vR), typeof t.tag == "function" && ((o = t[Ee][1][Hg]) == null || o.forEach((c) => i.push(c))), t.vC.forEach((c) => {
+  (s = t.vR) != null && s.length && (r.push(...t.vR), delete t.vR), typeof t.tag == "function" && ((o = t[Ie][1][Hg]) == null || o.forEach((c) => i.push(c))), t.vC.forEach((c) => {
     var l;
     if (Bt(c))
       n.push(c);
@@ -21401,10 +21412,10 @@ var ri = "_hp", p1 = {
   }
 }, zg = (t) => {
   var e, n, r, i, s, o;
-  Bt(t) || ((n = (e = t[Ee]) == null ? void 0 : e[1][Hg]) == null || n.forEach((c) => {
+  Bt(t) || ((n = (e = t[Ie]) == null ? void 0 : e[1][Hg]) == null || n.forEach((c) => {
     var l;
     return (l = c[2]) == null ? void 0 : l.call(c);
-  }), (r = Gc.get(t.e)) == null || r(), t.p === 2 && ((i = t.vC) == null || i.forEach((c) => c.p = 2)), (s = t.vC) == null || s.forEach(zg)), t.p || ((o = t.e) == null || o.remove(), delete t.e), typeof t.tag == "function" && ($r.delete(t), Gi.delete(t), delete t[Ee][3], t.a = !0);
+  }), (r = Gc.get(t.e)) == null || r(), t.p === 2 && ((i = t.vC) == null || i.forEach((c) => c.p = 2)), (s = t.vC) == null || s.forEach(zg)), t.p || ((o = t.e) == null || o.remove(), delete t.e), typeof t.tag == "function" && ($r.delete(t), Gi.delete(t), delete t[Ie][3], t.a = !0);
 }, Dg = (t, e, n) => {
   t.c = e, Fg(t, e, n);
 }, zp = (t, e) => {
@@ -21459,7 +21470,7 @@ var ri = "_hp", p1 = {
       Array.isArray(n[f]) && n.splice(f, 1, ...n[f].flat());
       let _ = y1(n[f]);
       if (_) {
-        typeof _.tag == "function" && !_.tag[Og] && (ar.length > 0 && (_[Ee][2] = ar.map((S) => [S, S.values.at(-1)])), (o = t[5]) != null && o.length && (_[Ee][3] = t[5].at(-1)));
+        typeof _.tag == "function" && !_.tag[Og] && (ar.length > 0 && (_[Ie][2] = ar.map((S) => [S, S.values.at(-1)])), (o = t[5]) != null && o.length && (_[Ie][3] = t[5].at(-1)));
         let w;
         if (h && h.length) {
           const S = h.findIndex(
@@ -21472,7 +21483,7 @@ var ri = "_hp", p1 = {
             w.t !== _.t && (w.t = _.t, w.d = !0), _ = w;
           else {
             const S = w.pP = w.props;
-            w.props = _.props, w.f || (w.f = _.f || e.f), typeof _.tag == "function" && (w[Ee][2] = _[Ee][2] || [], w[Ee][3] = _[Ee][3], !w.f && ((w.o || w) === _.o || (l = (c = w.tag)[Tb]) != null && l.call(c, S, w.props)) && (w.s = !0)), _ = w;
+            w.props = _.props, w.f || (w.f = _.f || e.f), typeof _.tag == "function" && (w[Ie][2] = _[Ie][2] || [], w[Ie][3] = _[Ie][3], !w.f && ((w.o || w) === _.o || (l = (c = w.tag)[Tb]) != null && l.call(c, S, w.props)) && (w.s = !0)), _ = w;
           }
         else if (!Bt(_) && cr) {
           const S = wr(cr);
@@ -21491,7 +21502,7 @@ var ri = "_hp", p1 = {
         return;
       throw h;
     }
-    const [m, v, f] = ((p = e[Ee]) == null ? void 0 : p[3]) || [];
+    const [m, v, f] = ((p = e[Ie]) == null ? void 0 : p[3]) || [];
     if (v) {
       const _ = () => Ji([0, !1, t[2]], f), w = Gi.get(f) || [];
       w.push(_), Gi.set(f, w);
@@ -21530,7 +21541,7 @@ var ri = "_hp", p1 = {
       ref: t.props.ref,
       o: t.o || t
     }), typeof t.tag == "function")
-      t[Ee] = [0, []];
+      t[Ie] = [0, []];
     else {
       const e = f1[t.tag];
       e && (cr || (cr = Tg("")), t.props.children = [
@@ -21547,7 +21558,7 @@ var ri = "_hp", p1 = {
   }
 }, Fp = (t, e) => {
   var n, r;
-  (n = e[Ee][2]) == null || n.forEach(([i, s]) => {
+  (n = e[Ie][2]) == null || n.forEach(([i, s]) => {
     i.values.push(s);
   });
   try {
@@ -21559,7 +21570,7 @@ var ri = "_hp", p1 = {
     delete e.a;
     return;
   }
-  (r = e[Ee][2]) == null || r.forEach(([i]) => {
+  (r = e[Ie][2]) == null || r.forEach(([i]) => {
     i.values.pop();
   }), (t[0] !== 1 || !t[1]) && Dg(e, e.c, !1);
 }, $r = /* @__PURE__ */ new WeakMap(), Hp = [], Ji = async (t, e) => {
@@ -21597,7 +21608,7 @@ var ri = "_hp", p1 = {
   if (!n)
     return [e(), () => {
     }];
-  const [, r] = n, i = (o = r[Ee][1])[pa] || (o[pa] = []), s = r[Ee][0]++;
+  const [, r] = n, i = (o = r[Ie][1])[pa] || (o[pa] = []), s = r[Ie][0]++;
   return i[s] || (i[s] = [
     e(),
     (c) => {
@@ -21627,7 +21638,7 @@ var ri = "_hp", p1 = {
   const n = ii.at(-1);
   if (!n)
     return t;
-  const [, r] = n, i = (c = r[Ee][1])[fa] || (c[fa] = []), s = r[Ee][0]++, o = i[s];
+  const [, r] = n, i = (c = r[Ie][1])[fa] || (c[fa] = []), s = r[Ie][0]++, o = i[s];
   return Kg(o == null ? void 0 : o[1], e) ? i[s] = [t, e] : t = i[s][0], t;
 }, k1 = (t) => {
   const e = ga.get(t);
@@ -21645,7 +21656,7 @@ var ri = "_hp", p1 = {
   const n = ii.at(-1);
   if (!n)
     return t();
-  const [, r] = n, i = (c = r[Ee][1])[ha] || (c[ha] = []), s = r[Ee][0]++, o = i[s];
+  const [, r] = n, i = (c = r[Ie][1])[ha] || (c[ha] = []), s = r[Ie][0]++, o = i[s];
   return Kg(o == null ? void 0 : o[1], e) && (i[s] = [t(), e]), i[s][0];
 }, S1 = Tg({
   pending: !1,
@@ -21971,7 +21982,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e } = t.req.valid("query"), { vendorSettings: n, session: r, client: i } = await Ge(
+    const { state: e } = t.req.valid("query"), { vendorSettings: n, loginSession: r, client: i } = await Ge(
       t,
       e
     );
@@ -22026,7 +22037,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e } = t.req.valid("query"), { code: n } = t.req.valid("form"), { session: r, client: i, vendorSettings: s } = await Ge(
+    const { state: e } = t.req.valid("query"), { code: n } = t.req.valid("form"), { loginSession: r, client: i, vendorSettings: s } = await Ge(
       t,
       e
     );
@@ -22168,7 +22179,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e } = t.req.valid("query"), { vendorSettings: n, client: r, session: i } = await Ge(
+    const { state: e } = t.req.valid("query"), { vendorSettings: n, client: r, loginSession: i } = await Ge(
       t,
       e
     );
@@ -22214,7 +22225,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e } = t.req.valid("query"), n = t.req.valid("form"), { password: r } = n, { vendorSettings: i, client: s, session: o } = await Ge(
+    const { state: e } = t.req.valid("query"), n = t.req.valid("form"), { password: r } = n, { vendorSettings: i, client: s, loginSession: o } = await Ge(
       t,
       e
     ), { username: c } = o.authParams;
@@ -22348,7 +22359,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e, code: n } = t.req.valid("query"), { vendorSettings: r, session: i } = await Ge(t, e), { username: s } = i.authParams;
+    const { state: e, code: n } = t.req.valid("query"), { vendorSettings: r, loginSession: i } = await Ge(t, e), { username: s } = i.authParams;
     if (!s)
       throw new j(400, { message: "Username required" });
     return n ? t.html(
@@ -22403,7 +22414,7 @@ const Jg = (t) => {
   }),
   //TODO: merge logic with dbconnections/signup
   async (t) => {
-    const { state: e } = t.req.valid("query"), n = t.req.valid("form"), { env: r } = t, { vendorSettings: i, client: s, session: o } = await Ge(
+    const { state: e } = t.req.valid("query"), n = t.req.valid("form"), { env: r } = t, { vendorSettings: i, client: s, loginSession: o } = await Ge(
       t,
       e
     ), c = "Username-Password-Authentication";
@@ -22566,7 +22577,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e } = t.req.valid("query"), { vendorSettings: n, session: r } = await Ge(t, e);
+    const { state: e } = t.req.valid("query"), { vendorSettings: n, loginSession: r } = await Ge(t, e);
     if (!r.authParams.username)
       throw new j(400, { message: "Username required" });
     return t.html(
@@ -22611,7 +22622,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e, code: n } = t.req.valid("query"), { password: r, "re-enter-password": i } = t.req.valid("form"), { env: s } = t, { vendorSettings: o, client: c, session: l } = await Ge(
+    const { state: e, code: n } = t.req.valid("query"), { password: r, "re-enter-password": i } = t.req.valid("form"), { env: s } = t, { vendorSettings: o, client: c, loginSession: l } = await Ge(
       t,
       e
     );
@@ -22763,7 +22774,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e } = t.req.valid("query"), { vendorSettings: n, session: r } = await Ge(t, e);
+    const { state: e } = t.req.valid("query"), { vendorSettings: n, loginSession: r } = await Ge(t, e);
     return t.html(
       /* @__PURE__ */ y(
         V1,
@@ -22794,7 +22805,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { state: e } = t.req.valid("query"), { vendorSettings: n, client: r, session: i } = await Ge(
+    const { state: e } = t.req.valid("query"), { vendorSettings: n, client: r, loginSession: i } = await Ge(
       t,
       e
     );
@@ -22802,7 +22813,7 @@ const Jg = (t) => {
       t,
       r,
       i.authParams.username,
-      i.login_id
+      i.id
     ), t.html(
       /* @__PURE__ */ y(
         q1,
@@ -22904,7 +22915,7 @@ const Jg = (t) => {
     }
   }),
   async (t) => {
-    const { env: e } = t, { state: n } = t.req.valid("query"), { session: r, client: i } = await Ge(t, n), s = ts(
+    const { env: e } = t, { state: n } = t.req.valid("query"), { loginSession: r, client: i } = await Ge(t, n), s = ts(
       i.tenant.id,
       t.req.header("cookie")
     ), o = s ? await e.data.sessions.get(i.tenant.id, s) : null;