@crossauth/backend 0.0.30 → 0.0.32

package/dist/index.js

@@ -4,8 +4,8 @@ var h = (S, s, e) => Ie(S, typeof s != "symbol" ? s + "" : s, e);
 import { CrossauthError as o, ErrorCode as l, UserState as E, CrossauthLogger as u, j as f, OAuthFlows as b, KeyPrefix as U, OAuthTokenConsumerBase as Pe, OAuthClientBase as Ke } from "@crossauth/common";
 import { PrismaClient as ce, Prisma as X } from "@prisma/client";
 import ye from "@mbakereth/ldapjs";
-import { timingSafeEqual as he, randomBytes as ue, randomUUID as Fe, createHash as Oe, pbkdf2 as Ne, createHmac as ie, createCipheriv as Re, createDecipheriv as xe, randomInt as ee } from "node:crypto";
-import { promisify as De } from "node:util";
+import { timingSafeEqual as he, randomBytes as ue, randomUUID as Fe, createHash as Oe, pbkdf2 as Ne, createHmac as ie, createCipheriv as Re, createDecipheriv as De, randomInt as ee } from "node:crypto";
+import { promisify as xe } from "node:util";
 import W from "nunjucks";
 import Ee from "nodemailer";
 import Be from "twilio";
@@ -16,7 +16,7 @@ import { createPublicKey as ze } from "crypto";
 import te from "node:fs";
 import * as He from "jose";
 var g = /* @__PURE__ */ ((S) => (S[S.String = 0] = "String", S[S.Number = 1] = "Number", S[S.Boolean = 2] = "Boolean", S[S.Json = 3] = "Json", S[S.JsonArray = 4] = "JsonArray", S))(g || {});
-function Me(S, s) {
+function je(S, s) {
   let e = S.split("."), t = s;
   for (let r in e) {
     const i = e[r];
@@ -34,8 +34,8 @@ function pe(S, s) {
   }
   return !0;
 }
-function je(S, s, e) {
-  const t = Me(s, e);
+function Me(S, s, e) {
+  const t = je(s, e);
   S[s.replace(".", "_")] = t;
 }
 function Ve(S, s, e, t) {
@@ -59,11 +59,11 @@ function Ve(S, s, e, t) {
       break;
   }
 }
-function w(S, s, e, t, r, i = !1) {
+function m(S, s, e, t, r, i = !1) {
   const a = "CROSSAUTH_" + r;
   if (i && !pe(S, t) && !(a && a in process.env))
     throw new o(l.Configuration, S + " is required");
-  pe(S, t) ? je(e, S, t) : r && a in process.env && process.env[a] != null && Ve(e, S, s, a);
+  pe(S, t) ? Me(e, S, t) : r && a in process.env && process.env[a] != null && Ve(e, S, s, a);
 }
 class L {
   /**
@@ -75,7 +75,7 @@ class L {
     h(this, "adminEditableFields", []);
     h(this, "normalizeUsername", !0);
     h(this, "normalizeEmail", !0);
-    w("userEditableFields", g.JsonArray, this, s, "USER_EDITABLE_FIELDS"), w("adminEditableFields", g.JsonArray, this, s, "ADMIN_EDITABLE_FIELDS"), w("normalizeUsername", g.JsonArray, this, s, "NORMALIZE_USERNAME"), w("normalizeEmail", g.JsonArray, this, s, "NORMALIZE_EMAIL");
+    m("userEditableFields", g.JsonArray, this, s, "USER_EDITABLE_FIELDS"), m("adminEditableFields", g.JsonArray, this, s, "ADMIN_EDITABLE_FIELDS"), m("normalizeUsername", g.JsonArray, this, s, "NORMALIZE_USERNAME"), m("normalizeEmail", g.JsonArray, this, s, "NORMALIZE_EMAIL");
   }
   /**
    * Creates a user with the given details and secrets.
@@ -98,7 +98,7 @@ class L {
     return s.normalize("NFD").replace(new RegExp("\\p{Diacritic}", "gu"), "").toLowerCase();
   }
 }
-class D {
+class x {
   /**
    * Returns an object decoded from the data field as a JSON string
    * @param data the JSON string to decode
@@ -181,7 +181,7 @@ class G extends L {
     h(this, "includes", ["secrets"]);
     h(this, "includesObject", {});
     h(this, "forceIdToNumber", !0);
-    w("userTable", g.String, this, e, "USER_TABLE"), w("userSecretsTable", g.String, this, e, "USER_SECRETS_TABLE"), w("idColumn", g.String, this, e, "USER_ID_COLUMN"), w("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), w("includes", g.String, this, e, "USER_INCLUDES"), w("forceIdToNumber", g.String, this, e, "USER_FORCE_ID_TO_NUMBER"), this.includes.forEach((t) => {
+    m("userTable", g.String, this, e, "USER_TABLE"), m("userSecretsTable", g.String, this, e, "USER_SECRETS_TABLE"), m("idColumn", g.String, this, e, "USER_ID_COLUMN"), m("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), m("includes", g.String, this, e, "USER_INCLUDES"), m("forceIdToNumber", g.String, this, e, "USER_FORCE_ID_TO_NUMBER"), this.includes.forEach((t) => {
       this.includesObject[t] = !0;
     }), e && e.prismaClient ? this.prismaClient = e.prismaClient : this.prismaClient = new ce();
   }
@@ -288,7 +288,7 @@ class G extends L {
           });
         } catch {
         }
-        let { userid: m, ...y } = d ?? {};
+        let { userid: w, ...y } = d ?? {};
         n = { ...y, ...n }, await c[this.userTable].update({
           where: {
             [this.idColumn]: e.id
@@ -413,7 +413,7 @@ class G extends L {
     }
   }
 }
-class kt extends D {
+class kt extends x {
   /**
    * Constructor with user storage object to use plus optional parameters.
    * 
@@ -425,7 +425,7 @@ class kt extends D {
     h(this, "prismaClient");
     h(this, "transactionTimeout", 5e3);
     h(this, "useridForeignKeyColumn", "userid");
-    w("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), w("useridForeignKeyColumn", g.Number, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.keyTable && (this.keyTable = e.keyTable), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
+    m("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), m("useridForeignKeyColumn", g.Number, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.keyTable && (this.keyTable = e.keyTable), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
   }
   async getKey(e) {
     return await this.getKeyWithTransaction(e, this.prismaClient);
@@ -699,7 +699,7 @@ class Et extends me {
     h(this, "transactionTimeout", 5e3);
     h(this, "updateMode", "DeleteAndInsert");
     h(this, "useridForeignKeyColumn", "userid");
-    w("clientTable", g.String, this, e, "OAUTH_CLIENT_TABLE"), w("redirectUriTable", g.String, this, e, "OAUTH_REDIRECTURI_TABLE"), w("validFlowTable", g.String, this, e, "OAUTH_VALID_FLOW_TABLE"), w("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), w("updateMode", g.String, this, e, "OAUTHCLIENT_UPDATE_MODE"), w("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
+    m("clientTable", g.String, this, e, "OAUTH_CLIENT_TABLE"), m("redirectUriTable", g.String, this, e, "OAUTH_REDIRECTURI_TABLE"), m("validFlowTable", g.String, this, e, "OAUTH_VALID_FLOW_TABLE"), m("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), m("updateMode", g.String, this, e, "OAUTHCLIENT_UPDATE_MODE"), m("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
   }
   async getClientById(e) {
     return (await this.getClientWithTransaction("client_id", e, this.prismaClient, !0, void 0))[0];
@@ -717,14 +717,14 @@ class Et extends me {
             ...n
           },
           include: { redirect_uri: !0, valid_flow: !0 }
-        }), d = c.redirect_uri, m = c.valid_flow;
+        }), d = c.redirect_uri, w = c.valid_flow;
         let y = c[this.useridForeignKeyColumn];
         return y === null && (y = void 0), this.useridForeignKeyColumn != "userid" && delete c[this.useridForeignKeyColumn], [{
           ...c,
           userid: y,
           client_secret: c.client_secret ?? void 0,
           redirect_uri: d.map((p) => p.uri),
-          valid_flow: m.map((p) => p.flow)
+          valid_flow: w.map((p) => p.flow)
         }];
       } else {
         const c = await r[this.clientTable].findMany({
@@ -735,9 +735,9 @@ class Et extends me {
           include: { redirect_uri: !0, valid_flow: !0 }
         });
         for (let d of c) {
-          const m = d.redirect_uri, y = d.valid_flow;
+          const w = d.redirect_uri, y = d.valid_flow;
           let p = d[this.useridForeignKeyColumn];
-          p == null && (p = void 0), d.userid = p, this.useridForeignKeyColumn != "userid" && delete d[this.useridForeignKeyColumn], d.client_secret = d.client_secret ?? void 0, d.redirect_uri = m.map((_) => _.uri), d.valid_flow = y.map((_) => _.flow);
+          p == null && (p = void 0), d.userid = p, this.useridForeignKeyColumn != "userid" && delete d[this.useridForeignKeyColumn], d.client_secret = d.client_secret ?? void 0, d.redirect_uri = w.map((_) => _.uri), d.valid_flow = y.map((_) => _.flow);
         }
         return c;
       }
@@ -959,7 +959,7 @@ class bt extends we {
     // PrismaClient;
     h(this, "transactionTimeout", 5e3);
     h(this, "useridForeignKeyColumn", "userid");
-    w("authorizationTable", g.String, this, e, "OAUTH_CLIENT_TABLE"), w("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), w("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
+    m("authorizationTable", g.String, this, e, "OAUTH_CLIENT_TABLE"), m("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), m("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
   }
   async getAuthorizations(e, t) {
     try {
@@ -1157,7 +1157,7 @@ class Ut extends L {
     return i;
   }
 }
-class At extends D {
+class At extends x {
   /**
    * Constructor
    */
@@ -1452,7 +1452,7 @@ class oe extends L {
     h(this, "ldapUserSearchBase", "");
     h(this, "ldapUsernameAttribute", "cn");
     h(this, "createUserFn", $e);
-    this.localStorage = e, w("ldapUrls", g.JsonArray, this, t, "LDAP_URL", !0), w("ldapUserSearchBase", g.String, this, t, "LDAP_USER_SEARCH_BASE"), w("ldapUsernameAttribute", g.String, this, t, "LDAP_USENAME_ATTRIBUTE"), t.createUserFn && (this.createUserFn = t.createUserFn);
+    this.localStorage = e, m("ldapUrls", g.JsonArray, this, t, "LDAP_URL", !0), m("ldapUserSearchBase", g.String, this, t, "LDAP_USER_SEARCH_BASE"), m("ldapUsernameAttribute", g.String, this, t, "LDAP_USENAME_ATTRIBUTE"), t.createUserFn && (this.createUserFn = t.createUserFn);
   }
   /**
    * Authenticates the user in LDAP and, if valid, creates a user in local
@@ -1552,7 +1552,7 @@ class oe extends L {
     } catch (i) {
       u.logger.debug(f({ err: i }));
       const a = o.asCrossauthError(i);
-      throw console.log(i), i instanceof ye.InvalidCredentialsError ? new o(l.UsernameOrPasswordInvalid) : a.code != l.UnknownError ? a : new o(l.Connection, "LDAP error getting user");
+      throw i instanceof ye.InvalidCredentialsError ? new o(l.UsernameOrPasswordInvalid) : a.code != l.UnknownError ? a : new o(l.Connection, "LDAP error getting user");
     }
   }
   // bind and return the ldap client
@@ -1591,17 +1591,17 @@ class oe extends L {
         t,
         n,
         function(c, d) {
-          let m;
+          let w;
           if (c) {
             a(c), e.unbind();
             return;
           }
           d.on("searchEntry", function(y) {
-            m = oe.searchResultToUser(y.pojo);
+            w = oe.searchResultToUser(y.pojo);
           }), d.on("error", function(y) {
             a(y), e.unbind();
           }), d.on("end", function(y) {
-            y.status != 0 ? a(new o(l.Connection, "LDAP  onnection failed")) : m ? i(m) : a(new o(l.UsernameOrPasswordInvalid)), e.unbind();
+            y.status != 0 ? a(new o(l.Connection, "LDAP  onnection failed")) : w ? i(w) : a(new o(l.UsernameOrPasswordInvalid)), e.unbind();
           });
         }
       );
@@ -1644,7 +1644,7 @@ class Y extends L {
     h(this, "useridForeignKeyColumn", "userid");
     h(this, "forceIdToNumber", !0);
     h(this, "dbPool");
-    this.dbPool = e, w("userTable", g.String, this, t, "USER_TABLE"), w("userSecretsTable", g.String, this, t, "USER_SECRETS_TABLE"), w("idColumn", g.String, this, t, "USER_ID_COLUMN"), w("forceIdToNumber", g.String, this, t, "USER_FORCE_ID_TO_NUMBER"), w("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN");
+    this.dbPool = e, m("userTable", g.String, this, t, "USER_TABLE"), m("userSecretsTable", g.String, this, t, "USER_SECRETS_TABLE"), m("idColumn", g.String, this, t, "USER_ID_COLUMN"), m("forceIdToNumber", g.String, this, t, "USER_FORCE_ID_TO_NUMBER"), m("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN");
   }
   /**
    * Returns user matching the given id, or throws an exception.  
@@ -1696,25 +1696,25 @@ class Y extends L {
     let i = await this.dbPool.connect(), a, n, c = this.dbPool.parameters();
     try {
       await i.startTransaction();
-      let d = `select * from ${this.userTable} where ${e} = ` + c.nextParameter(), m = await i.execute(d, [t]);
-      if (m.length == 0)
+      let d = `select * from ${this.userTable} where ${e} = ` + c.nextParameter(), w = await i.execute(d, [t]);
+      if (w.length == 0)
         throw new o(l.UserNotExist);
       let y, p, _;
-      if (this.idColumn in m[0]) y = m[0][this.idColumn];
+      if (this.idColumn in w[0]) y = w[0][this.idColumn];
       else throw new o(l.Configuration, "ID column " + this.idColumn + " not present in user table");
-      if ("username" in m[0]) p = m[0].username;
+      if ("username" in w[0]) p = w[0].username;
       else throw new o(l.Configuration, "username column " + this.idColumn + " not present in user table");
-      if ("state" in m[0]) _ = m[0].state;
+      if ("state" in w[0]) _ = w[0].state;
       else throw new o(l.Configuration, "state column " + this.idColumn + " not present in user table");
       if (a = {
-        ...m[0],
+        ...w[0],
         id: y,
         username: p,
         state: _
       }, !a) throw new o(l.UserNotExist);
-      if (c = this.dbPool.parameters(), d = `select * from ${this.userSecretsTable} where ${this.useridForeignKeyColumn} = ` + c.nextParameter(), m = await i.execute(d, [a.id]), m.length == 0)
+      if (c = this.dbPool.parameters(), d = `select * from ${this.userSecretsTable} where ${this.useridForeignKeyColumn} = ` + c.nextParameter(), w = await i.execute(d, [a.id]), w.length == 0)
         throw new o(l.UserNotExist);
-      if (m.length > 0 ? n = { userid: a.id, ...m[0] } : n = { userid: a.id }, !n) throw new o(l.UserNotExist);
+      if (w.length > 0 ? n = { userid: a.id, ...w[0] } : n = { userid: a.id }, !n) throw new o(l.UserNotExist);
       if (this.useridForeignKeyColumn != "userid" && this.useridForeignKeyColumn in n && delete n[this.useridForeignKeyColumn], await i.commit(), (r == null ? void 0 : r.skipActiveCheck) != !0 && a.state == E.awaitingTwoFactorSetup)
         throw u.logger.debug(f({ msg: "2FA setup is not complete" })), new o(l.TwoFactorIncomplete);
       if ((r == null ? void 0 : r.skipActiveCheck) != !0 && a.state == E.disabled)
@@ -1745,28 +1745,28 @@ class Y extends L {
     let i = [], a = [], n = "", c = "", d = this.dbPool.parameters();
     e && (c = "OFFSET " + d.nextParameter()), t && (a.push(t), n = "LIMIT " + d.nextParameter());
     try {
-      let m = `select * from ${this.userTable} ${n} ${c} order by username_normalized asc`, y = await r.execute(m, a);
+      let w = `select * from ${this.userTable} ${n} ${c} order by username_normalized asc`, y = await r.execute(w, a);
       if (y.length == 0)
         throw new o(l.UserNotExist);
       for (let p of y) {
-        let _, C, v;
+        let _, C, T;
         if (this.idColumn in p) _ = p[this.idColumn];
         else throw new o(l.Configuration, "ID column " + this.idColumn + " not present in user table");
         if ("username" in p) C = p.username;
         else throw new o(l.Configuration, "username column " + this.idColumn + " not present in user table");
-        if ("state" in p) v = p.state;
+        if ("state" in p) T = p.state;
         else throw new o(l.Configuration, "state column " + this.idColumn + " not present in user table");
         let k = {
           ...p,
           id: _,
           username: C,
-          state: v
+          state: T
         };
         i.push(k);
       }
       return i;
-    } catch (m) {
-      throw m;
+    } catch (w) {
+      throw w;
     } finally {
       r.release();
     }
@@ -1791,21 +1791,21 @@ class Y extends L {
         throw new o(l.UserNotExist);
       let c = { ...e }, d = t ? { ...t } : void 0;
       "email" in c && c.email && (c = { email_normalized: this.normalizeEmail ? Y.normalize(c.email) : c.email, ...c }), "username" in c && c.username && (c = { username_normalized: this.normalizeUsername ? Y.normalize(c.username) : c.username, ...c }), i = this.dbPool.parameters();
-      let m = [], y = [];
+      let w = [], y = [];
       for (let p in c)
-        c[p] != null && p != "id" && (m.push(p + "= " + i.nextParameter()), y.push(c[p]));
-      if (m.length > 0) {
-        let p = m.join(", ");
+        c[p] != null && p != "id" && (w.push(p + "= " + i.nextParameter()), y.push(c[p]));
+      if (w.length > 0) {
+        let p = w.join(", ");
         y.push(e.id);
         let _ = `update ${this.userTable} set ${p} where ${this.idColumn} = ` + i.nextParameter();
         await r.execute(_, y);
       }
       if (t) {
-        m = [], y = [], i = this.dbPool.parameters();
+        w = [], y = [], i = this.dbPool.parameters();
         for (let p in d)
-          d[p] != null && p != "userid" && (m.push(p + "= " + i.nextParameter()), y.push(d[p]));
-        if (m.length > 0) {
-          let p = m.join(", ");
+          d[p] != null && p != "userid" && (w.push(p + "= " + i.nextParameter()), y.push(d[p]));
+        if (w.length > 0) {
+          let p = w.join(", ");
           y.push(e.id);
           let _ = `update ${this.userSecretsTable} set ${p} where userid = ` + i.nextParameter();
           await r.execute(_, y);
@@ -1836,27 +1836,27 @@ class Y extends L {
       await r.startTransaction();
       let a = { ...e }, n = t ? { ...t } : void 0;
       "email" in a && a.email && (a = { email_normalized: this.normalizeEmail ? Y.normalize(a.email) : a.email, ...a }), "username" in a && a.username && (a = { username_normalized: this.normalizeUsername ? Y.normalize(a.username) : a.username, ...a });
-      let c = [], d = [], m = [];
+      let c = [], d = [], w = [];
       const y = this.dbPool.parameters();
       for (let _ in a)
-        a[_] != null && _ != "id" && (c.push(_), d.push(y.nextParameter()), m.push(a[_]));
+        a[_] != null && _ != "id" && (c.push(_), d.push(y.nextParameter()), w.push(a[_]));
       if (c.length > 0) {
         let _ = c.join(", "), C = d.join(", ");
-        const v = `insert into ${this.userTable} (${_}) values (${C}) returning ${this.idColumn}`, k = await r.execute(v, m);
+        const T = `insert into ${this.userTable} (${_}) values (${C}) returning ${this.idColumn}`, k = await r.execute(T, w);
         if (k.length == 0 || !k[0][this.idColumn]) throw new o(l.Connection, "Couldn't create user");
         i = k[0][this.idColumn];
       }
       if (!i) throw new o(l.Connection, "Couldn't create user");
       if (t) {
-        c = [], d = [], m = [];
+        c = [], d = [], w = [];
         const _ = this.dbPool.parameters();
-        c.push("userid"), d.push(_.nextParameter()), m.push(i);
+        c.push("userid"), d.push(_.nextParameter()), w.push(i);
         for (let C in n)
-          n[C] != null && C != "userid" && (c.push(C), d.push(_.nextParameter()), m.push(n[C]));
+          n[C] != null && C != "userid" && (c.push(C), d.push(_.nextParameter()), w.push(n[C]));
         if (c.length > 0) {
-          let C = c.join(", "), v = d.join(", ");
-          const k = `insert into ${this.userSecretsTable} (${C}) values (${v})`;
-          u.logger.debug(f({ msg: "Executing query", query: k })), await r.execute(k, m);
+          let C = c.join(", "), T = d.join(", ");
+          const k = `insert into ${this.userSecretsTable} (${C}) values (${T})`;
+          u.logger.debug(f({ msg: "Executing query", query: k })), await r.execute(k, w);
         }
       }
       return await r.commit(), (await this.getUserById(i)).user;
@@ -1903,7 +1903,7 @@ class Y extends L {
     }
   }
 }
-class qe extends D {
+class qe extends x {
   /**
    * Constructor with user storage object to use plus optional parameters.
    * 
@@ -1915,7 +1915,7 @@ class qe extends D {
     h(this, "keyTable", "keys");
     h(this, "dbPool");
     h(this, "useridForeignKeyColumn", "userid");
-    w("transactionTimeout", g.Number, this, t, "TRANSACTION_TIMEOUT"), w("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), t.keyTable && (this.keyTable = t.keyTable), this.dbPool = e;
+    m("transactionTimeout", g.Number, this, t, "TRANSACTION_TIMEOUT"), m("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), t.keyTable && (this.keyTable = t.keyTable), this.dbPool = e;
   }
   async getKey(e) {
     const t = await this.dbPool.connect();
@@ -1962,21 +1962,21 @@ class qe extends D {
    * @throws {@link @crossauth/common!CrossauthError } if the key could not be stored.
    */
   async saveKey(e, t, r, i, a, n = {}) {
-    let c, d = [this.useridForeignKeyColumn, "value", "created", "expires", "data"], m = this.dbPool.parameters(), y = [];
+    let c, d = [this.useridForeignKeyColumn, "value", "created", "expires", "data"], w = this.dbPool.parameters(), y = [];
     for (let k = 0; k < 5; ++k)
-      y.push(m.nextParameter());
+      y.push(w.nextParameter());
     let p = [e ?? null, t, r, i ?? null, a ?? ""];
     for (let k in n)
-      d.push(k), y.push(m.nextParameter()), p.push(n[k]);
+      d.push(k), y.push(w.nextParameter()), p.push(n[k]);
     let _ = d.join(", "), C = y.join(", ");
-    const v = await this.dbPool.connect();
+    const T = await this.dbPool.connect();
     try {
       const k = `insert into ${this.keyTable} (${_}) values (${C})`;
-      await v.execute(k, p);
+      await T.execute(k, p);
     } catch (k) {
       o.asCrossauthError(k).code == l.ConstraintViolation ? (u.logger.warn(f({ msg: "Attempt to create key that already exists. Stack trace follows" })), u.logger.debug(f({ err: k })), c = new o(l.KeyExists)) : (u.logger.debug(f({ err: k })), c = new o(l.Connection, "Error saving key"));
     } finally {
-      v.release();
+      T.release();
     }
     if (c)
       throw c;
@@ -1995,11 +1995,11 @@ class qe extends D {
     try {
       let a, n = [], c = "", d = this.dbPool.parameters();
       if (e) {
-        const m = d.nextParameter(), y = d.nextParameter();
-        a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} = ${m} and value like ${y} `, n = [e];
+        const w = d.nextParameter(), y = d.nextParameter();
+        a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} = ${w} and value like ${y} `, n = [e];
       } else {
-        const m = d.nextParameter();
-        a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} is null and value like ${m}`;
+        const w = d.nextParameter();
+        a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} is null and value like ${w}`;
       }
       n.push(t + "%"), r && (c = "and value != " + d.nextParameter(), n.push(r)), a += " " + c, u.logger.debug(f({ msg: "Executing query", query: a })), await i.execute(a, n);
     } catch (a) {
@@ -2014,8 +2014,8 @@ class qe extends D {
       let r = [], i = [];
       const a = this.dbPool.parameters();
       for (let d in e) {
-        let m = d == "userid" ? this.useridForeignKeyColumn : d;
-        e[d] == null ? r.push(m + " is null") : (r.push(m + " = " + a.nextParameter()), i.push(e[d]));
+        let w = d == "userid" ? this.useridForeignKeyColumn : d;
+        e[d] == null ? r.push(w + " is null") : (r.push(w + " = " + a.nextParameter()), i.push(e[d]));
       }
       let n = r.join(" and "), c = `delete from ${this.keyTable} where ${n}`;
       await t.execute(c, i);
@@ -2054,8 +2054,8 @@ class qe extends D {
       if (c.length == 0)
         return [];
       for (let d of c) {
-        let m = this.makeKey(d);
-        this.useridForeignKeyColumn != "userid" && (m.userid = m[this.useridForeignKeyColumn], delete m[this.useridForeignKeyColumn]), r.push(m);
+        let w = this.makeKey(d);
+        this.useridForeignKeyColumn != "userid" && (w.userid = w[this.useridForeignKeyColumn], delete w[this.useridForeignKeyColumn]), r.push(w);
       }
       return r;
     } catch (r) {
@@ -2167,7 +2167,7 @@ class We extends me {
     h(this, "validFlowTable", "oauthclientvalidflow");
     h(this, "dbPool");
     h(this, "useridForeignKeyColumn", "userid");
-    w("clientTable", g.String, this, t, "OAUTH_CLIENT_TABLE"), w("redirectUriTable", g.String, this, t, "OAUTH_REDIRECTURI_TABLE"), w("validFlowTable", g.String, this, t, "OAUTH_VALID_FLOW_TABLE"), w("updateMode", g.String, this, t, "OAUTHCLIENT_UPDATE_MODE"), w("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), this.dbPool = e;
+    m("clientTable", g.String, this, t, "OAUTH_CLIENT_TABLE"), m("redirectUriTable", g.String, this, t, "OAUTH_REDIRECTURI_TABLE"), m("validFlowTable", g.String, this, t, "OAUTH_VALID_FLOW_TABLE"), m("updateMode", g.String, this, t, "OAUTHCLIENT_UPDATE_MODE"), m("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), this.dbPool = e;
   }
   async getClientById(e) {
     let t = await this.dbPool.connect();
@@ -2210,12 +2210,12 @@ class We extends me {
     };
   }
   async getClientWithTransaction(e, t, r, i, a, n) {
-    let c = [], d = this.dbPool.parameters(), m = [], y = `select c.*, r.uri as uri, null as flow from ${this.clientTable} as c left join ${this.redirectUriTable} r on c.client_id = r.client_id `, p = "";
-    t && r && (p = `where c.${t} = ` + d.nextParameter(), m.push(r)), i !== null && i == null || (p == "" ? p = "where " : p += " and ", i == null ? p += "userid is null" : (p += `${this.useridForeignKeyColumn} = ` + d.nextParameter(), m.push(i)));
+    let c = [], d = this.dbPool.parameters(), w = [], y = `select c.*, r.uri as uri, null as flow from ${this.clientTable} as c left join ${this.redirectUriTable} r on c.client_id = r.client_id `, p = "";
+    t && r && (p = `where c.${t} = ` + d.nextParameter(), w.push(r)), i !== null && i == null || (p == "" ? p = "where " : p += " and ", i == null ? p += "userid is null" : (p += `${this.useridForeignKeyColumn} = ` + d.nextParameter(), w.push(i)));
     let _ = `select c.*, null as uri, f.flow as flow from ${this.clientTable} as c left join ${this.validFlowTable} f on c.client_id = f.client_id `, C = "";
-    t && r && (C = `where c.${t} = ` + d.nextParameter(), m.push(r)), i !== null && i == null || (C == "" ? C = "where " : C += " and ", i == null ? C += "userid is null" : (C += `${this.useridForeignKeyColumn} = ` + d.nextParameter(), m.push(i))), n && (a || (a = 0), a = Number(a), n = Number(n), p == "" ? p = "where " : p += " and ", p += ` c.client_id in (select client_id from ${this.clientTable} limit ${n} offset ${a})`, C == "" ? C = "where " : C += " and ", C += ` c.client_id in (select client_id from ${this.clientTable} limit ${n} offset ${a})`), y += p, _ += C;
-    let v = y + " union " + _ + " order by client_id";
-    const k = await e.execute(v, m);
+    t && r && (C = `where c.${t} = ` + d.nextParameter(), w.push(r)), i !== null && i == null || (C == "" ? C = "where " : C += " and ", i == null ? C += "userid is null" : (C += `${this.useridForeignKeyColumn} = ` + d.nextParameter(), w.push(i))), n && (a || (a = 0), a = Number(a), n = Number(n), p == "" ? p = "where " : p += " and ", p += ` c.client_id in (select client_id from ${this.clientTable} limit ${n} offset ${a})`, C == "" ? C = "where " : C += " and ", C += ` c.client_id in (select client_id from ${this.clientTable} limit ${n} offset ${a})`), y += p, _ += C;
+    let T = y + " union " + _ + " order by client_id";
+    const k = await e.execute(T, w);
     let A;
     for (let z of k)
       (!A || z.client_id != A.client_id) && (A && c.push(A), A = this.makeClient(z), A.valid_flow = [], A.redirect_uri = []), z.uri && A.redirect_uri.push(z.uri), z.flow && A.valid_flow.push(z.flow);
@@ -2255,14 +2255,14 @@ class We extends me {
       for (let C = 0; C < i.length; ++C)
         if (!b.isValidFlow(i[C])) throw new o(l.InvalidOAuthFlow, "Invalid flow " + i[C]);
     }
-    let c = [], d = [], m = [], y = this.dbPool.parameters();
+    let c = [], d = [], w = [], y = this.dbPool.parameters();
     try {
       for (let C in n)
-        c.push(C), d.push(y.nextParameter()), m.push(n[C]);
+        c.push(C), d.push(y.nextParameter()), w.push(n[C]);
       if (c.length > 0) {
-        let C = c.join(", "), v = d.join(", ");
-        const k = `insert into ${this.clientTable} (${C}) values (${v})`;
-        await e.execute(k, m);
+        let C = c.join(", "), T = d.join(", ");
+        const k = `insert into ${this.clientTable} (${C}) values (${T})`;
+        await e.execute(k, w);
       }
     } catch (C) {
       throw typeof C == "object" && C != null && "code" in C && typeof C.code == "string" && (C.code.startsWith("22") || C.code.startsWith("23")) ? (u.logger.debug(f({ err: C })), new o(l.InvalidClientId, "Attempt to create an OAuth client with a client_id that already exists. Maximum attempts failed")) : (u.logger.debug(f({ err: C })), new o(l.Connection, "Error saving OAuth client"));
@@ -2273,15 +2273,15 @@ class We extends me {
     let _ = p[0];
     if (r)
       for (let C = 0; C < r.length; ++C) {
-        m = [], y = this.dbPool.parameters();
-        let v = `insert into ${this.redirectUriTable} (client_id, uri) values (` + y.nextParameter() + ", " + y.nextParameter() + ")";
-        m.push(_.client_id), m.push(r[C]), await e.execute(v, m);
+        w = [], y = this.dbPool.parameters();
+        let T = `insert into ${this.redirectUriTable} (client_id, uri) values (` + y.nextParameter() + ", " + y.nextParameter() + ")";
+        w.push(_.client_id), w.push(r[C]), await e.execute(T, w);
       }
     if (i)
       for (let C = 0; C < i.length; ++C) {
-        m = [], y = this.dbPool.parameters();
-        let v = `insert into ${this.validFlowTable} (client_id, flow) values (` + y.nextParameter() + ", " + y.nextParameter() + ")";
-        m.push(_.client_id), m.push(i[C]), await e.execute(v, m);
+        w = [], y = this.dbPool.parameters();
+        let T = `insert into ${this.validFlowTable} (client_id, flow) values (` + y.nextParameter() + ", " + y.nextParameter() + ")";
+        w.push(_.client_id), w.push(i[C]), await e.execute(T, w);
       }
     return { ..._, redirect_uri: r, valid_flow: i };
   }
@@ -2328,42 +2328,42 @@ class We extends me {
     if (!t.client_id) throw new o(l.InvalidClientId);
     const r = t.redirect_uri, i = t.valid_flow;
     if (r)
-      for (let v = 0; v < r.length; ++v) {
-        if (r[v].includes("#")) throw new o(l.InvalidRedirectUri, "Redirect Uri's may not contain page fragments");
+      for (let T = 0; T < r.length; ++T) {
+        if (r[T].includes("#")) throw new o(l.InvalidRedirectUri, "Redirect Uri's may not contain page fragments");
         try {
-          new URL(r[v]);
+          new URL(r[T]);
         } catch {
-          throw new o(l.InvalidRedirectUri, `Redriect uri ${r[v]} is not valid`);
+          throw new o(l.InvalidRedirectUri, `Redriect uri ${r[T]} is not valid`);
         }
       }
     if (i) {
-      for (let v = 0; v < i.length; ++v)
-        if (!b.isValidFlow(i[v])) throw new o(l.InvalidOAuthFlow, "Redirect Uri's may not contain page fragments");
+      for (let T = 0; T < i.length; ++T)
+        if (!b.isValidFlow(i[T])) throw new o(l.InvalidOAuthFlow, "Redirect Uri's may not contain page fragments");
     }
     if (!t.client_id) throw new o(l.InvalidClientId, "No client ig given");
     let { client_id: a, redirect_uri: n, valid_flow: c, ...d } = t;
     n || (n = []), c || (c = []);
-    let m = this.dbPool.parameters(), y = `delete from ${this.redirectUriTable} where client_id = ` + m.nextParameter();
-    await e.execute(y, [t.client_id]), m = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + m.nextParameter(), await e.execute(y, [t.client_id]);
+    let w = this.dbPool.parameters(), y = `delete from ${this.redirectUriTable} where client_id = ` + w.nextParameter();
+    await e.execute(y, [t.client_id]), w = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + w.nextParameter(), await e.execute(y, [t.client_id]);
     let p = [], _ = [], C = [];
-    m = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + m.nextParameter();
-    for (let v in d)
-      p.push(v), _.push(m.nextParameter()), C.push(d[v]);
+    w = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + w.nextParameter();
+    for (let T in d)
+      p.push(T), _.push(w.nextParameter()), C.push(d[T]);
     if (p.length > 0) {
-      let v = p.join(", "), k = _.join(", ");
-      y = `update ${this.clientTable} set (${v}) values (${k})`, await e.execute(y, C);
+      let T = p.join(", "), k = _.join(", ");
+      y = `update ${this.clientTable} set (${T}) values (${k})`, await e.execute(y, C);
     }
     if (n)
-      for (let v = 0; v < n.length; ++v) {
-        C = [], m = this.dbPool.parameters();
-        let k = `insert into ${this.redirectUriTable} (client_id, uri) values (` + m.nextParameter() + ", " + m.nextParameter() + ")";
-        C.push(t.client_id), C.push(n[v]), await e.execute(k, C);
+      for (let T = 0; T < n.length; ++T) {
+        C = [], w = this.dbPool.parameters();
+        let k = `insert into ${this.redirectUriTable} (client_id, uri) values (` + w.nextParameter() + ", " + w.nextParameter() + ")";
+        C.push(t.client_id), C.push(n[T]), await e.execute(k, C);
       }
     if (c)
-      for (let v = 0; v < c.length; ++v) {
-        C = [], m = this.dbPool.parameters();
-        let k = `insert into ${this.validFlowTable} (client_id, flow) values (` + m.nextParameter() + ", " + m.nextParameter() + ")";
-        C.push(t.client_id), C.push(c[v]), await e.execute(k, C);
+      for (let T = 0; T < c.length; ++T) {
+        C = [], w = this.dbPool.parameters();
+        let k = `insert into ${this.validFlowTable} (client_id, flow) values (` + w.nextParameter() + ", " + w.nextParameter() + ")";
+        C.push(t.client_id), C.push(c[T]), await e.execute(k, C);
       }
   }
   async getClients(e, t, r) {
@@ -2390,14 +2390,14 @@ class Je extends we {
     h(this, "authorizationTable", "oauthauthorization");
     h(this, "useridForeignKeyColumn", "userid");
     h(this, "dbPool");
-    w("authorizationTable", g.String, this, t, "OAUTH_CLIENT_TABLE"), w("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), this.dbPool = e;
+    m("authorizationTable", g.String, this, t, "OAUTH_CLIENT_TABLE"), m("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), this.dbPool = e;
   }
   async getAuthorizations(e, t) {
     let r = await this.dbPool.connect();
     try {
       const i = this.dbPool.parameters(), a = [];
       let n = `select scope from ${this.authorizationTable} where client_id = ` + i.nextParameter();
-      return a.push(e), t === null ? n += ` and ${this.useridForeignKeyColumn} is null` : t && (n += ` and ${this.useridForeignKeyColumn} = ` + i.nextParameter(), a.push(t)), (await r.execute(n, a)).map((m) => m.scope);
+      return a.push(e), t === null ? n += ` and ${this.useridForeignKeyColumn} is null` : t && (n += ` and ${this.useridForeignKeyColumn} = ` + i.nextParameter(), a.push(t)), (await r.execute(n, a)).map((w) => w.scope);
     } catch (i) {
       throw i;
     } finally {
@@ -2566,7 +2566,7 @@ class be extends re {
     return "none";
   }
 }
-const Ce = process.env.PBKDF2_DIGEST || "sha256", Se = Number(process.env.PBKDF2_ITERATIONS || 6e5), ve = Number(process.env.PBKDF2_KEYLENGTH || 32), et = Number(process.env.PBKDF2_KEYLENGTH || 16), ae = "sha256", q = class q {
+const Ce = process.env.PBKDF2_DIGEST || "sha256", Se = Number(process.env.PBKDF2_ITERATIONS || 6e5), Te = Number(process.env.PBKDF2_KEYLENGTH || 32), et = Number(process.env.PBKDF2_KEYLENGTH || 16), ae = "sha256", q = class q {
   /**
    * Returns true if the plaintext password, when hashed, equals the one in the hash, using
    * it's hasher settings
@@ -2713,21 +2713,21 @@ const Ce = process.env.PBKDF2_DIGEST || "sha256", Se = Number(process.env.PBKDF2
     t || (t = q.randomSalt());
     let a = r != null, n = a ? t + "!" + r : t;
     i == null && (i = !1);
-    let m = (await De(Ne)(
+    let w = (await xe(Ne)(
       s,
       n,
       e.iterations ?? Se,
-      e.keyLen ?? ve,
+      e.keyLen ?? Te,
       e.digest ?? Ce
     )).toString("base64url");
-    return i && (m = this.encodePasswordHash(
-      m,
+    return i && (w = this.encodePasswordHash(
+      w,
       t,
       a,
       e.iterations ?? Se,
-      e.keyLen ?? ve,
+      e.keyLen ?? Te,
       e.digest ?? Ce
-    )), m;
+    )), w;
   }
   /**
    * For creating non-JWT tokens (eg password reset tokens.)  The
@@ -2847,13 +2847,13 @@ const Ce = process.env.PBKDF2_DIGEST || "sha256", Se = Number(process.env.PBKDF2
     const r = s.split(".");
     if (r.length != 2) throw new o(l.InvalidHash, "Not AES-256-CBC ciphertext");
     let i = Buffer.from(r[0], "base64url"), a = Buffer.from(r[1], "base64url");
-    var n = xe("aes-256-cbc", t, i);
+    var n = De("aes-256-cbc", t, i);
     let c = n.update(a);
     return c = Buffer.concat([c, n.final()]), c.toString();
   }
 };
 h(q, "Base32", "ABCDEFGHJKLMNPQRSTUVWXYZ23456789".split(""));
-let T = q;
+let v = q;
 function tt(S) {
   let s = [];
   if (!S.password) s.push("Password not provided");
@@ -2887,7 +2887,7 @@ const le = class le extends be {
     h(this, "pbkdf2KeyLength", 32);
     /** See {@link LocalPasswordAuthenticatorOptions.validatePasswordFn}  */
     h(this, "validatePasswordFn", tt);
-    w("secret", g.String, this, t, "HASHER_SECRET"), w("enableSecretForPasswordHash", g.Boolean, this, t, "ENABLE_SECRET_FOR_PASSWORDS"), w("pbkdf2Digest", g.String, this, t, "PASSWORD_PBKDF2_DIGEST"), w("pbkdf2Iterations", g.String, this, t, "PASSWORD_PBKDF2_ITERATIONS"), w("pbkdf2SaltLength", g.String, this, t, "PASSWORD_PBKDF2_SALTLENGTH"), w("pbkdf2KeyLength", g.String, this, t, "PASSWORD_PBKDF2_KEYLENGTH"), t.validatePasswordFn && (this.validatePasswordFn = t.validatePasswordFn);
+    m("secret", g.String, this, t, "HASHER_SECRET"), m("enableSecretForPasswordHash", g.Boolean, this, t, "ENABLE_SECRET_FOR_PASSWORDS"), m("pbkdf2Digest", g.String, this, t, "PASSWORD_PBKDF2_DIGEST"), m("pbkdf2Iterations", g.String, this, t, "PASSWORD_PBKDF2_ITERATIONS"), m("pbkdf2SaltLength", g.String, this, t, "PASSWORD_PBKDF2_SALTLENGTH"), m("pbkdf2KeyLength", g.String, this, t, "PASSWORD_PBKDF2_KEYLENGTH"), t.validatePasswordFn && (this.validatePasswordFn = t.validatePasswordFn);
   }
   /**
    * Authenticates the user, returning a the user as a {@link User} object.
@@ -2907,7 +2907,7 @@ const le = class le extends be {
   async authenticateUser(e, t, r) {
     if (!r.password) throw new o(l.PasswordInvalid, "Password not provided");
     if (!t.password) throw new o(l.PasswordInvalid);
-    if (!await T.passwordsEqual(r.password, t.password, this.secret))
+    if (!await v.passwordsEqual(r.password, t.password, this.secret))
       throw u.logger.debug(f({ msg: "Invalid password hash", user: e.username })), new o(l.PasswordInvalid);
     if (e.state == "awaitingtwofactorsetup") throw new o(l.TwoFactorIncomplete);
     if (e.state == "awaitingemailverification") throw new o(l.EmailNotVerified);
@@ -2937,7 +2937,7 @@ const le = class le extends be {
    * @returns the encoded hash string.
    */
   async createPasswordHash(e, t) {
-    return await T.passwordHash(e, {
+    return await v.passwordHash(e, {
       salt: t,
       encode: !0,
       secret: this.enableSecretForPasswords ? this.secret : void 0,
@@ -2962,7 +2962,7 @@ const le = class le extends be {
    * @returns true if match, false otherwise
    */
   async passwordMatchesHash(e, t, r) {
-    return t == le.NoPassword ? !1 : await T.passwordsEqual(e, t, r);
+    return t == le.NoPassword ? !1 : await v.passwordsEqual(e, t, r);
   }
   /**
    * This will return p hash of the passed password.
@@ -3020,7 +3020,7 @@ const le = class le extends be {
   }
 };
 h(le, "NoPassword", "********");
-let Te = le;
+let ve = le;
 class Z extends re {
   /**
    * Constructor
@@ -3041,7 +3041,7 @@ class Z extends re {
     h(this, "smtpPassword");
     h(this, "emailAuthenticatorTokenExpires", 60 * 5);
     h(this, "render");
-    w("views", g.String, this, e, "VIEWS"), w("emailAuthenticatorTextBody", g.String, this, e, "EMAIL_AUTHENTICATOR_TEXT_BODY"), w("emailAuthenticatorHtmlBody", g.String, this, e, "EMAIL_AUTHENTICATOR_HTML_BODY"), w("emailAuthenticatorSubject", g.String, this, e, "EMAIL_AUTHENTICATOR_SUBJECT"), w("emailFrom", g.String, this, e, "EMAIL_FROM", !0), w("smtpHost", g.String, this, e, "SMTP_HOST", !0), w("smtpPort", g.Number, this, e, "SMTP_PORT"), w("smtpUsername", g.String, this, e, "SMTP_USERNAME"), w("smtpPassword", g.String, this, e, "SMTP_PASSWORD"), w("smtpUseTls", g.Boolean, this, e, "SMTP_USE_TLS"), w("emailAuthenticatorTokenExpires", g.Number, this, e, "EMAIL_AUTHENTICATOR_TOKEN_EXPIRES"), e.render ? this.render = e.render : W.configure(this.views, { autoescape: !0 });
+    m("views", g.String, this, e, "VIEWS"), m("emailAuthenticatorTextBody", g.String, this, e, "EMAIL_AUTHENTICATOR_TEXT_BODY"), m("emailAuthenticatorHtmlBody", g.String, this, e, "EMAIL_AUTHENTICATOR_HTML_BODY"), m("emailAuthenticatorSubject", g.String, this, e, "EMAIL_AUTHENTICATOR_SUBJECT"), m("emailFrom", g.String, this, e, "EMAIL_FROM", !0), m("smtpHost", g.String, this, e, "SMTP_HOST", !0), m("smtpPort", g.Number, this, e, "SMTP_PORT"), m("smtpUsername", g.String, this, e, "SMTP_USERNAME"), m("smtpPassword", g.String, this, e, "SMTP_PASSWORD"), m("smtpUseTls", g.Boolean, this, e, "SMTP_USE_TLS"), m("emailAuthenticatorTokenExpires", g.Number, this, e, "EMAIL_AUTHENTICATOR_TOKEN_EXPIRES"), e.render ? this.render = e.render : W.configure(this.views, { autoescape: !0 });
   }
   /**
    * Used by the OAuth password_mfa grant type.
@@ -3112,7 +3112,7 @@ class Z extends re {
    * @returns 
    */
   async reprepareConfiguration(e, t) {
-    const r = D.decodeData(t.data)["2fa"], i = Z.zeroPad(ee(999999), 6), a = /* @__PURE__ */ new Date(), n = new Date(a.getTime() + 1e3 * this.emailAuthenticatorTokenExpires).getTime(), c = this.sendToken(r.email, i);
+    const r = x.decodeData(t.data)["2fa"], i = Z.zeroPad(ee(999999), 6), a = /* @__PURE__ */ new Date(), n = new Date(a.getTime() + 1e3 * this.emailAuthenticatorTokenExpires).getTime(), c = this.sendToken(r.email, i);
     return u.logger.info(f({
       msg: "Sent factor otp email",
       emailMessageId: c,
@@ -3249,7 +3249,7 @@ class Q extends re {
     h(this, "smsAuthenticatorFrom", "");
     h(this, "smsAuthenticatorTokenExpires", 60 * 5);
     h(this, "render");
-    w("views", g.String, this, e, "VIEWS"), w("smsAuthenticatorBody", g.String, this, e, "SMS_AUTHENTICATOR_BODY"), w("smsAuthenticatorFrom", g.String, this, e, "SMS_AUTHENTICATOR_FROM", !0), w("smsAuthenticatorTokenExpires", g.Number, this, e, "SMS_AUTHENTICATOR_TOKEN_EXPIRES"), e.render ? this.render = e.render : W.configure(this.views, { autoescape: !0 });
+    m("views", g.String, this, e, "VIEWS"), m("smsAuthenticatorBody", g.String, this, e, "SMS_AUTHENTICATOR_BODY"), m("smsAuthenticatorFrom", g.String, this, e, "SMS_AUTHENTICATOR_FROM", !0), m("smsAuthenticatorTokenExpires", g.Number, this, e, "SMS_AUTHENTICATOR_TOKEN_EXPIRES"), e.render ? this.render = e.render : W.configure(this.views, { autoescape: !0 });
   }
   /**
    * Used by the OAuth password_mfa grant type.
@@ -3289,7 +3289,7 @@ class Q extends re {
       otp: t
     };
     let d = { otp: t };
-    const m = this.render ? this.render(this.smsAuthenticatorBody, d) : W.render(this.smsAuthenticatorBody, d), y = this.sendSms(r, m);
+    const w = this.render ? this.render(this.smsAuthenticatorBody, d) : W.render(this.smsAuthenticatorBody, d), y = this.sendSms(r, w);
     return u.logger.info(f({
       msg: "Sent factor otp sms",
       smsMessageId: y,
@@ -3303,7 +3303,7 @@ class Q extends re {
    * @returns 
    */
   async reprepareConfiguration(e, t) {
-    const r = D.decodeData(t.data)["2fa"], i = Q.zeroPad(ee(999999), 6), a = /* @__PURE__ */ new Date(), n = new Date(a.getTime() + 1e3 * this.smsAuthenticatorTokenExpires).getTime(), c = this.sendSms(r.phone, i);
+    const r = x.decodeData(t.data)["2fa"], i = Q.zeroPad(ee(999999), 6), a = /* @__PURE__ */ new Date(), n = new Date(a.getTime() + 1e3 * this.smsAuthenticatorTokenExpires).getTime(), c = this.sendSms(r.phone, i);
     return u.logger.info(f({
       msg: "Sent factor otp sms",
       smsMessageId: c,
@@ -3522,7 +3522,7 @@ class Rt extends re {
    * @returns 
    */
   async reprepareConfiguration(e, t) {
-    const r = D.decodeData(t.data)["2fa"], i = this.code, a = /* @__PURE__ */ new Date(), n = new Date(a.getTime() + 1e3 * 60).getTime();
+    const r = x.decodeData(t.data)["2fa"], i = this.code, a = /* @__PURE__ */ new Date(), n = new Date(a.getTime() + 1e3 * 60).getTime();
     return {
       userData: { factor2: r.factor2, otp: i },
       secrets: {},
@@ -3628,7 +3628,7 @@ class Rt extends re {
     return Array(+(r > 0 && r)).join("0") + e;
   }
 }
-class xt extends be {
+class Dt extends be {
   /**
    * Create a new authenticator.
    * 
@@ -3639,7 +3639,7 @@ class xt extends be {
     super({ friendlyName: "LDAP", ...t });
     h(this, "ldapAutoCreateAccount", !1);
     h(this, "ldapStorage");
-    w("ldapAutoCreateAccount", g.Boolean, this, t, "LDAP_AUTO_CREATE_ACCOUNT"), this.ldapStorage = e;
+    m("ldapAutoCreateAccount", g.Boolean, this, t, "LDAP_AUTO_CREATE_ACCOUNT"), this.ldapStorage = e;
   }
   /**
    * Authenticates the user, returning a the user as a {@link User} object.
@@ -3721,7 +3721,7 @@ class xt extends be {
   async reprepareConfiguration(e, t) {
   }
 }
-class Dt extends re {
+class xt extends re {
   /**
    * Constructor
    * @param appName this forms part of the QR code that users scan into 
@@ -3758,7 +3758,7 @@ class Dt extends re {
     }), { qrUrl: r, secret: t };
   }
   async getSecretFromSession(e, t) {
-    const r = D.decodeData(t.data);
+    const r = x.decodeData(t.data);
     if (!("totpsecret" in r))
       throw new o(
         l.Unauthorized,
@@ -3933,7 +3933,7 @@ class R {
     h(this, "verifyEmailExpires", 60 * 60 * 24);
     h(this, "passwordResetExpires", 60 * 60 * 24);
     h(this, "render");
-    this.userStorage = s, this.keyStorage = e, w("siteUrl", g.String, this, t, "SITE_URL", !0), w("prefix", g.String, this, t, "PREFIX"), w("views", g.String, this, t, "VIEWS"), w("emailVerificationTextBody", g.String, this, t, "EMAIL_VERIFICATION_TEXT_BODY"), w("emailVerificationHtmlBody", g.String, this, t, "EMAIL_VERIFICATION_HTML_BODY"), w("emailVerificationSubject", g.String, this, t, "EMAIL_VERIFICATION_SUBJECT"), w("passwordResetTextBody", g.String, this, t, "PASSWORD_RESET_TEXT_BODY"), w("passwordResetHtmlBody", g.String, this, t, "PASSWORD_RESET_HTML_BODY"), w("passwordResetSubject", g.String, this, t, "PASSWORD_RESET_SUBJECT"), w("emailFrom", g.String, this, t, "EMAIL_FROM", !0), w("smtpHost", g.String, this, t, "SMTP_HOST", !0), w("smtpPort", g.Number, this, t, "SMTP_PORT"), w("smtpUsername", g.String, this, t, "SMTP_USERNAME"), w("smtpPassword", g.String, this, t, "SMTP_PASSWORD"), w("smtpUseTls", g.Boolean, this, t, "SMTP_USE_TLS"), w("verifyEmailExpires", g.Boolean, this, t, "VERIFY_EMAIL_EXPIRES"), w("passwordResetExpires", g.String, this, t, "PASSWORD_RESET_EXPIRES"), t.render ? this.render = t.render : W.configure(this.views, { autoescape: !0 });
+    this.userStorage = s, this.keyStorage = e, m("siteUrl", g.String, this, t, "SITE_URL", !0), m("prefix", g.String, this, t, "PREFIX"), m("views", g.String, this, t, "VIEWS"), m("emailVerificationTextBody", g.String, this, t, "EMAIL_VERIFICATION_TEXT_BODY"), m("emailVerificationHtmlBody", g.String, this, t, "EMAIL_VERIFICATION_HTML_BODY"), m("emailVerificationSubject", g.String, this, t, "EMAIL_VERIFICATION_SUBJECT"), m("passwordResetTextBody", g.String, this, t, "PASSWORD_RESET_TEXT_BODY"), m("passwordResetHtmlBody", g.String, this, t, "PASSWORD_RESET_HTML_BODY"), m("passwordResetSubject", g.String, this, t, "PASSWORD_RESET_SUBJECT"), m("emailFrom", g.String, this, t, "EMAIL_FROM", !0), m("smtpHost", g.String, this, t, "SMTP_HOST", !0), m("smtpPort", g.Number, this, t, "SMTP_PORT"), m("smtpUsername", g.String, this, t, "SMTP_USERNAME"), m("smtpPassword", g.String, this, t, "SMTP_PASSWORD"), m("smtpUseTls", g.Boolean, this, t, "SMTP_USE_TLS"), m("verifyEmailExpires", g.Boolean, this, t, "VERIFY_EMAIL_EXPIRES"), m("passwordResetExpires", g.String, this, t, "PASSWORD_RESET_EXPIRES"), t.render ? this.render = t.render : W.configure(this.views, { autoescape: !0 });
   }
   createEmailer() {
     let s = {};
@@ -3949,24 +3949,24 @@ class R {
    * correct prefix for inserting into storage.
    */
   static hashEmailVerificationToken(s) {
-    return U.emailVerificationToken + T.hash(s);
+    return U.emailVerificationToken + v.hash(s);
   }
   /**
    * Produces a hash of the given password reset token with the
    * correct prefix for inserting into storage.
    */
   static hashPasswordResetToken(s) {
-    return U.passwordResetToken + T.hash(s);
+    return U.passwordResetToken + v.hash(s);
   }
   async createAndSaveEmailVerificationToken(s, e = "") {
     let r = 0;
     const i = /* @__PURE__ */ new Date(), a = new Date(i.getTime() + 1e3 * this.verifyEmailExpires);
     for (; r < 10; ) {
-      let n = T.randomValue(ne), c = R.hashEmailVerificationToken(n);
+      let n = v.randomValue(ne), c = R.hashEmailVerificationToken(n);
       try {
         return await this.keyStorage.saveKey(s, c, i, a, e), n;
       } catch {
-        n = T.randomValue(ne), c = R.hashEmailVerificationToken(n), r++;
+        n = v.randomValue(ne), c = R.hashEmailVerificationToken(n), r++;
       }
     }
     throw new o(l.Connection, "failed creating a unique key");
@@ -4051,11 +4051,11 @@ class R {
     let t = 0;
     const r = /* @__PURE__ */ new Date(), i = new Date(r.getTime() + 1e3 * this.passwordResetExpires);
     for (; t < 10; ) {
-      let a = T.randomValue(ne), n = R.hashPasswordResetToken(a);
+      let a = v.randomValue(ne), n = R.hashPasswordResetToken(a);
       try {
         return await this.keyStorage.saveKey(s, n, r, i), a;
       } catch {
-        a = T.randomValue(ne), n = R.hashPasswordResetToken(a), t++;
+        a = v.randomValue(ne), n = R.hashPasswordResetToken(a), t++;
       }
     }
     throw new o(l.Connection, "failed creating a unique key");
@@ -4177,7 +4177,7 @@ class rt {
     h(this, "sameSite", "lax");
     // hasher settings
     h(this, "secret", "");
-    w("headerName", g.String, this, s, "CSRF_HEADER_NAME"), w("cookieName", g.String, this, s, "CSRF_COOKIE_NAME"), w("domain", g.String, this, s, "CSRF_COOKIE_DOMAIN"), w("httpOnly", g.Boolean, this, s, "CSRF_COOKIE_HTTPONLY"), w("path", g.String, this, s, "CSRF_COOKIE_PATH"), w("secure", g.Boolean, this, s, "CSRF_COOKIE_SECURE"), w("sameSite", g.String, this, s, "CSRF_COOKIE_SAMESITE"), w("secret", g.String, this, s, "SECRET", !0);
+    m("headerName", g.String, this, s, "CSRF_HEADER_NAME"), m("cookieName", g.String, this, s, "CSRF_COOKIE_NAME"), m("domain", g.String, this, s, "CSRF_COOKIE_DOMAIN"), m("httpOnly", g.Boolean, this, s, "CSRF_COOKIE_HTTPONLY"), m("path", g.String, this, s, "CSRF_COOKIE_PATH"), m("secure", g.Boolean, this, s, "CSRF_COOKIE_SECURE"), m("sameSite", g.String, this, s, "CSRF_COOKIE_SAMESITE"), m("secret", g.String, this, s, "SECRET", !0);
   }
   /**
    * Creates a session key and saves in storage
@@ -4187,7 +4187,7 @@ class rt {
    * @returns a random CSRF token.
    */
   createCsrfToken() {
-    return T.randomValue(_e);
+    return v.randomValue(_e);
   }
   /**
    * Returns a {@link Cookie } object with the given session key.
@@ -4196,7 +4196,7 @@ class rt {
    * @returns a {@link Cookie } object,
    */
   makeCsrfCookie(s) {
-    const e = T.signSecureToken(s, this.secret);
+    const e = v.signSecureToken(s, this.secret);
     let t = {};
     return this.domain && (t.domain = this.domain), this.path && (t.path = this.path), t.sameSite = this.sameSite, this.httpOnly && (t.httpOnly = this.httpOnly), this.secure && (t.secure = this.secure), {
       name: this.cookieName,
@@ -4208,7 +4208,7 @@ class rt {
     return this.maskCsrfToken(s);
   }
   unsignCookie(s) {
-    return T.unsignSecureToken(s, this.secret);
+    return v.unsignSecureToken(s, this.secret);
   }
   /**
    * Takes a session ID and creates a string representation of the cookie (value of the HTTP `Cookie` header).
@@ -4221,14 +4221,14 @@ class rt {
     return this.domain && (e += "; " + this.domain), this.path && (e += "; " + this.path), this.httpOnly && (e += "; httpOnly"), this.secure && (e += "; secure"), e;
   }
   maskCsrfToken(s) {
-    const e = T.randomValue(_e), t = T.xor(s, e);
+    const e = v.randomValue(_e), t = v.xor(s, e);
     return e + "." + t;
   }
   unmaskCsrfToken(s) {
     const e = s.split(".");
     if (e.length != 2) throw new o(l.InvalidCsrf, "CSRF token in header or form not in correct format");
     const t = e[0], r = e[1];
-    return T.xor(r, t);
+    return v.xor(r, t);
   }
   /**
    * Validates the passed CSRF token.  
@@ -4245,12 +4245,12 @@ class rt {
     const t = this.unmaskCsrfToken(e);
     let r;
     try {
-      r = T.unsignSecureToken(s, this.secret);
+      r = v.unsignSecureToken(s, this.secret);
     } catch (i) {
       throw u.logger.error(f({ err: i })), new o(l.InvalidCsrf, "Invalid CSRF cookie");
     }
     if (r != t)
-      throw u.logger.warn(f({ msg: "Invalid CSRF token received - form/header value does not match", csrfCookieHash: T.hash(s) })), new o(l.InvalidCsrf);
+      throw u.logger.warn(f({ msg: "Invalid CSRF token received - form/header value does not match", csrfCookieHash: v.hash(s) })), new o(l.InvalidCsrf);
   }
   /**
    * Validates the passed CSRF cookie (doesn't check it matches the token, just that the cookie is valid).  
@@ -4264,13 +4264,13 @@ class rt {
    */
   validateCsrfCookie(s) {
     try {
-      return T.unsignSecureToken(s, this.secret);
+      return v.unsignSecureToken(s, this.secret);
     } catch (e) {
       throw u.logger.error(f({ err: e })), new o(l.InvalidCsrf, "Invalid CSRF cookie");
     }
   }
 }
-class x {
+class D {
   /**
    * Constructor.
    * 
@@ -4299,7 +4299,7 @@ class x {
     h(this, "sameSite", "lax");
     // hasher settings
     h(this, "secret", "");
-    e.userStorage && (this.userStorage = e.userStorage), this.keyStorage = s, w("idleTimeout", g.Number, this, e, "SESSION_IDLE_TIMEOUT"), w("persist", g.Boolean, this, e, "PERSIST_SESSION_ID"), this.filterFunction = e.filterFunction, w("cookieName", g.String, this, e, "SESSION_COOKIE_NAME"), w("maxAge", g.String, this, e, "SESSION_COOKIE_MAX_AGE"), w("domain", g.String, this, e, "SESSION_COOKIE_DOMAIN"), w("httpOnly", g.Boolean, this, e, "SESSIONCOOKIE_HTTPONLY"), w("path", g.String, this, e, "SESSION_COOKIE_PATH"), w("secure", g.Boolean, this, e, "SESSION_COOKIE_SECURE"), w("sameSite", g.String, this, e, "SESSION_COOKIE_SAMESITE"), w("secret", g.String, this, e, "SECRET", !0);
+    e.userStorage && (this.userStorage = e.userStorage), this.keyStorage = s, m("idleTimeout", g.Number, this, e, "SESSION_IDLE_TIMEOUT"), m("persist", g.Boolean, this, e, "PERSIST_SESSION_ID"), this.filterFunction = e.filterFunction, m("cookieName", g.String, this, e, "SESSION_COOKIE_NAME"), m("maxAge", g.String, this, e, "SESSION_COOKIE_MAX_AGE"), m("domain", g.String, this, e, "SESSION_COOKIE_DOMAIN"), m("httpOnly", g.Boolean, this, e, "SESSIONCOOKIE_HTTPONLY"), m("path", g.String, this, e, "SESSION_COOKIE_PATH"), m("secure", g.Boolean, this, e, "SESSION_COOKIE_SECURE"), m("sameSite", g.String, this, e, "SESSION_COOKIE_SAMESITE"), m("secret", g.String, this, e, "SECRET", !0);
   }
   expiry(s) {
     let e;
@@ -4313,7 +4313,7 @@ class x {
    * @returns a base64-url-encoded string that can go into the storage
    */
   static hashSessionId(s) {
-    return U.session + T.hash(s);
+    return U.session + v.hash(s);
   }
   /**
    * Creates a session key and saves in storage
@@ -4332,20 +4332,20 @@ class x {
    *          attempts exceeded trying to create a unique session id
    */
   async createSessionKey(s, e = {}) {
-    let r = 0, i = T.randomValue(ke);
+    let r = 0, i = v.randomValue(ke);
     const a = /* @__PURE__ */ new Date();
     let n = this.expiry(a), c = !1;
     for (; r < 10 && !c; ) {
-      const d = x.hashSessionId(i);
+      const d = D.hashSessionId(i);
       try {
         this.idleTimeout > 0 && s && (e = { ...e, lastActivity: /* @__PURE__ */ new Date() }), await this.keyStorage.saveKey(s, d, a, n, void 0, e), c = !0;
-      } catch (m) {
-        let y = o.asCrossauthError(m);
+      } catch (w) {
+        let y = o.asCrossauthError(w);
         if (y.code == l.KeyExists || y.code == l.InvalidKey) {
-          if (r++, i = T.randomValue(ke), r > 10)
+          if (r++, i = v.randomValue(ke), r > 10)
             throw u.logger.error(f({ msg: "Max attempts exceeded trying to create session ID" })), new o(l.KeyExists);
         } else
-          throw u.logger.debug(f({ err: m })), m;
+          throw u.logger.debug(f({ err: w })), w;
       }
     }
     return {
@@ -4365,7 +4365,7 @@ class x {
    * @returns a {@link Cookie } object,
    */
   makeCookie(s, e) {
-    let t = T.signSecureToken(s.value, this.secret), r = {};
+    let t = v.signSecureToken(s.value, this.secret), r = {};
     return e == null && (e = this.persist), this.domain && (r.domain = this.domain), s.expires && e && (r.expires = s.expires), this.path && (r.path = this.path), r.sameSite = this.sameSite, this.httpOnly && (r.httpOnly = this.httpOnly), this.secure && (r.secure = this.secure), {
       name: this.cookieName,
       value: t,
@@ -4392,7 +4392,7 @@ class x {
    */
   async updateSessionKey(s) {
     if (!s.value) throw new o(l.InvalidKey, "No session when updating activity");
-    s.value = x.hashSessionId(s.value), await this.keyStorage.updateKey(s);
+    s.value = D.hashSessionId(s.value), await this.keyStorage.updateKey(s);
   }
   /**
    * Unsigns a cookie and returns the original value.
@@ -4402,7 +4402,7 @@ class x {
    *         is invalid. 
    */
   unsignCookie(s) {
-    return T.unsignSecureToken(s, this.secret);
+    return v.unsignSecureToken(s, this.secret);
   }
   /**
    * Returns the user matching the given session key in session storage, or throws an exception.
@@ -4440,13 +4440,13 @@ class x {
    *         `Expired` or `UserNotExist`.
    */
   async getSessionKey(s) {
-    const e = Date.now(), t = x.hashSessionId(s), r = await this.keyStorage.getKey(t);
+    const e = Date.now(), t = D.hashSessionId(s), r = await this.keyStorage.getKey(t);
     if (r.value = s, r.expires && e > r.expires.getTime())
-      throw u.logger.warn(f({ msg: "Session id in cookie expired in key storage", hashedSessionCookie: T.hash(s) })), new o(l.Expired);
+      throw u.logger.warn(f({ msg: "Session id in cookie expired in key storage", hashedSessionCookie: v.hash(s) })), new o(l.Expired);
     if (r.userid && this.idleTimeout > 0 && r.lastactive && e > r.lastactive.getTime() + this.idleTimeout * 1e3)
-      throw u.logger.warn(f({ msg: "Session cookie with expired idle time received", hashedSessionCookie: T.hash(s) })), new o(l.Expired);
+      throw u.logger.warn(f({ msg: "Session cookie with expired idle time received", hashedSessionCookie: v.hash(s) })), new o(l.Expired);
     if (this.filterFunction && !this.filterFunction(r))
-      throw u.logger.warn(f({ msg: "Filter function on session id in cookie failed", hashedSessionCookie: T.hash(s) })), new o(l.InvalidKey);
+      throw u.logger.warn(f({ msg: "Filter function on session id in cookie failed", hashedSessionCookie: v.hash(s) })), new o(l.InvalidKey);
     return r;
   }
   /**
@@ -4455,7 +4455,7 @@ class x {
    * @param except if defined, don't delete this key
    */
   async deleteAllForUser(s, e) {
-    e && (e = x.hashSessionId(e)), await this.keyStorage.deleteAllForUser(s, U.session, e);
+    e && (e = D.hashSessionId(e)), await this.keyStorage.deleteAllForUser(s, U.session, e);
   }
 }
 class Lt {
@@ -4480,7 +4480,7 @@ class Lt {
     t.userStorage && (this.userStorage = t.userStorage), this.keyStorage = s, this.authenticators = e;
     for (let r in this.authenticators)
       this.authenticators[r].factorName = r;
-    if (this.session = new x(this.keyStorage, { ...t == null ? void 0 : t.sessionCookieOptions, ...t ?? {} }), this.csrfTokens = new rt({ ...t == null ? void 0 : t.doubleSubmitCookieOptions, ...t ?? {} }), w("allowedFactor2", g.JsonArray, this, t, "ALLOWED_FACTOR2"), w("enableEmailVerification", g.Boolean, this, t, "ENABLE_EMAIL_VERIFICATION"), w("enablePasswordReset", g.Boolean, this, t, "ENABLE_PASSWORD_RESET"), this.emailTokenStorage = this.keyStorage, this.userStorage && (this.enableEmailVerification || this.enablePasswordReset)) {
+    if (this.session = new D(this.keyStorage, { ...t == null ? void 0 : t.sessionCookieOptions, ...t ?? {} }), this.csrfTokens = new rt({ ...t == null ? void 0 : t.doubleSubmitCookieOptions, ...t ?? {} }), m("allowedFactor2", g.JsonArray, this, t, "ALLOWED_FACTOR2"), m("enableEmailVerification", g.Boolean, this, t, "ENABLE_EMAIL_VERIFICATION"), m("enablePasswordReset", g.Boolean, this, t, "ENABLE_PASSWORD_RESET"), this.emailTokenStorage = this.keyStorage, this.userStorage && (this.enableEmailVerification || this.enablePasswordReset)) {
       let r = this.keyStorage;
       t.emailTokenStorage && (this.emailTokenStorage = t.emailTokenStorage), this.tokenEmailer = new R(this.userStorage, r, t);
     }
@@ -4558,7 +4558,7 @@ class Lt {
       const p = await this.session.createSessionKey(i.id, t);
       c = this.session.makeCookie(p, r);
     }
-    const d = this.csrfTokens.createCsrfToken(), m = this.csrfTokens.makeCsrfCookie(d), y = this.csrfTokens.makeCsrfFormOrHeaderToken(d);
+    const d = this.csrfTokens.createCsrfToken(), w = this.csrfTokens.makeCsrfCookie(d), y = this.csrfTokens.makeCsrfFormOrHeaderToken(d);
     try {
       this.emailTokenStorage.deleteAllForUser(
         i.id,
@@ -4569,7 +4569,7 @@ class Lt {
     }
     return {
       sessionCookie: c,
-      csrfCookie: m,
+      csrfCookie: w,
       csrfFormOrHeaderValue: y,
       user: i,
       secrets: n
@@ -4602,7 +4602,7 @@ class Lt {
    */
   async logout(s) {
     const e = await this.session.getSessionKey(s);
-    return await this.keyStorage.deleteKey(x.hashSessionId(e.value));
+    return await this.keyStorage.deleteKey(D.hashSessionId(e.value));
   }
   /**
    * Logs a user out from all sessions.
@@ -4750,8 +4750,8 @@ class Lt {
    * @param value new value to store
    */
   async updateSessionData(s, e, t) {
-    const r = x.hashSessionId(s);
-    u.logger.debug(f({ msg: `Updating session data value${e}`, hashedSessionCookie: T.hash(s) })), await this.keyStorage.updateData(r, e, t);
+    const r = D.hashSessionId(s);
+    u.logger.debug(f({ msg: `Updating session data value${e}`, hashedSessionCookie: v.hash(s) })), await this.keyStorage.updateData(r, e, t);
   }
   /**
    * Update field sin the session data.
@@ -4762,8 +4762,8 @@ class Lt {
    * @param dataArray names and values.
    */
   async updateManySessionData(s, e) {
-    const t = x.hashSessionId(s);
-    u.logger.debug(f({ msg: "Updating session data", hashedSessionCookie: T.hash(s) })), await this.keyStorage.updateManyData(t, e);
+    const t = D.hashSessionId(s);
+    u.logger.debug(f({ msg: "Updating session data", hashedSessionCookie: v.hash(s) })), await this.keyStorage.updateManyData(t, e);
   }
   /**
   * Deletes a field from the session data.
@@ -4774,8 +4774,8 @@ class Lt {
   * @param name of the field.
   */
   async deleteSessionData(s, e) {
-    const t = x.hashSessionId(s);
-    u.logger.debug(f({ msg: `Updating session data value${e}`, hashedSessionCookie: T.hash(s) })), await this.keyStorage.deleteData(t, e);
+    const t = D.hashSessionId(s);
+    u.logger.debug(f({ msg: `Updating session data value${e}`, hashedSessionCookie: v.hash(s) })), await this.keyStorage.deleteData(t, e);
   }
   /**
    * Deletes the given session ID from the key storage (not the cookie)
@@ -4783,7 +4783,7 @@ class Lt {
    * @param sessionId the session Id to delete
    */
   async deleteSession(s) {
-    return await this.keyStorage.deleteKey(x.hashSessionId(s));
+    return await this.keyStorage.deleteKey(D.hashSessionId(s));
   }
   /**
    * Creates a new user, sending an email verification message if necessary.
@@ -4838,7 +4838,7 @@ class Lt {
     if (!this.authenticators[s.factor2]) throw new o(l.Configuration, "Two factor authentication not enabled for user");
     const a = await this.authenticators[s.factor2].prepareConfiguration(s), n = a == null ? {} : a.userData, c = a == null ? {} : a.sessionData, d = await this.authenticators[s.factor1].createPersistentSecrets(s.username, e, r);
     return s.state = "awaitingtwofactorsetup", await this.keyStorage.updateData(
-      x.hashSessionId(t),
+      D.hashSessionId(t),
       "2fa",
       c
     ), { userid: (await this.userStorage.createUser(s, d)).id, userData: n };
@@ -4858,13 +4858,13 @@ class Lt {
       if (!this.authenticators[e]) throw new o(l.Configuration, "Two factor authentication not enabled for user");
       const i = await this.authenticators[e].prepareConfiguration(s), a = i == null ? {} : i.userData, n = i == null ? {} : i.sessionData;
       return await this.keyStorage.updateData(
-        x.hashSessionId(t),
+        D.hashSessionId(t),
         "2fa",
         n
       ), a;
     }
     return await this.userStorage.updateUser({ id: s.id, factor2: e ?? "" }), await this.keyStorage.updateData(
-      x.hashSessionId(t),
+      D.hashSessionId(t),
       "2fa",
       void 0
     ), {};
@@ -4884,10 +4884,10 @@ class Lt {
    */
   async repeatTwoFactorSignup(s) {
     if (!this.userStorage) throw new o(l.Configuration, "Cannot call repeatTwoFactorSignup if no user storage provided");
-    const e = (await this.dataForSessionId(s))["2fa"], t = e.username, r = e.factor2, i = x.hashSessionId(s), a = await this.keyStorage.getKey(i), c = await this.authenticators[r].reprepareConfiguration(t, a), d = c == null ? {} : c.userData, m = c == null ? {} : c.secrets, y = c == null ? {} : c.newSessionData;
+    const e = (await this.dataForSessionId(s))["2fa"], t = e.username, r = e.factor2, i = D.hashSessionId(s), a = await this.keyStorage.getKey(i), c = await this.authenticators[r].reprepareConfiguration(t, a), d = c == null ? {} : c.userData, w = c == null ? {} : c.secrets, y = c == null ? {} : c.newSessionData;
     y && await this.keyStorage.updateData(i, "2fa", y);
     const { user: p } = await this.userStorage.getUserByUsername(t, { skipActiveCheck: !0, skipEmailVerifiedCheck: !0 });
-    return { userid: p.id, userData: d, secrets: m };
+    return { userid: p.id, userData: d, secrets: w };
   }
   /**
    * Authenticates with the second factor.  
@@ -4908,14 +4908,14 @@ class Lt {
     if (r && r.state != E.active && r.state != E.factor2ResetNeeded)
       throw new o(l.UserNotActive);
     if (!i) throw new o(l.InvalidKey, "Session key not found");
-    let a = D.decodeData(i.data)["2fa"];
+    let a = x.decodeData(i.data)["2fa"];
     if (!(a != null && a.factor2) || !(a != null && a.username)) throw new o(l.Unauthorized, "Two factor authentication not initiated");
     let n = a.username;
     const c = this.authenticators[a.factor2];
     if (!c) throw new o(l.Configuration, "Unrecognised second factor authentication");
-    const d = {}, m = c.secretNames();
+    const d = {}, w = c.secretNames();
     for (let C in a)
-      m.includes(C) && (d[C] = a[C]);
+      w.includes(C) && (d[C] = a[C]);
     await c.authenticateUser(void 0, a, s), r || (t = !0, r = (await this.userStorage.getUserByUsername(n, { skipActiveCheck: !0, skipEmailVerifiedCheck: !0 })).user);
     const y = c.skipEmailVerificationOnSignup() == !0;
     if (!r) throw new o(l.UserNotExist, "Couldn't fetch user");
@@ -4924,7 +4924,7 @@ class Lt {
       state: !y && this.enableEmailVerification ? "awaitingemailverification" : "active",
       factor2: a.factor2
     };
-    return c.secretNames().length > 0 ? await this.userStorage.updateUser(p, d) : await this.userStorage.updateUser(p), !y && t && this.enableEmailVerification && this.tokenEmailer && await ((_ = this.tokenEmailer) == null ? void 0 : _.sendEmailVerificationToken(r.id, void 0)), await this.keyStorage.updateData(x.hashSessionId(i.value), "2fa", void 0), { ...r, ...p };
+    return c.secretNames().length > 0 ? await this.userStorage.updateUser(p, d) : await this.userStorage.updateUser(p), !y && t && this.enableEmailVerification && this.tokenEmailer && await ((_ = this.tokenEmailer) == null ? void 0 : _.sendEmailVerificationToken(r.id, void 0)), await this.keyStorage.updateData(D.hashSessionId(i.value), "2fa", void 0), { ...r, ...p };
   }
   /**
    * Initiates the two factor login process.
@@ -4954,14 +4954,14 @@ class Lt {
    */
   async initiateTwoFactorPageVisit(s, e, t, r, i) {
     const n = await this.authenticators[s.factor2].createOneTimeSecrets(s);
-    let c, d, m;
-    const y = x.hashSessionId(e);
+    let c, d, w;
+    const y = D.hashSessionId(e);
     u.logger.debug("initiateTwoFactorPageVisit " + s.username + " " + e + " " + y);
     let p = { username: s.username, factor2: s.factor2, secrets: n, body: t, url: r };
     return i && (p["content-type"] = i), await this.keyStorage.updateData(y, "pre2fa", p), {
       sessionCookie: c,
       csrfCookie: d,
-      csrfFormOrHeaderValue: m
+      csrfFormOrHeaderValue: w
     };
   }
   /**
@@ -4977,14 +4977,14 @@ class Lt {
     if (!this.userStorage) throw new o(l.Configuration, "Cannot call completeTwoFactorPageVisit if no user storage provided");
     let { key: t } = await this.session.getUserForSessionId(e);
     if (!t) throw new o(l.InvalidKey, "Session key not found");
-    let r = D.decodeData(t.data);
+    let r = x.decodeData(t.data);
     if (!("pre2fa" in r)) throw new o(l.Unauthorized, "Two factor authentication not initiated");
     const { secrets: i } = await this.userStorage.getUserByUsername(r.pre2fa.username), a = this.authenticators[r.pre2fa.factor2];
     if (!a) throw new o(l.Configuration, "Unrecognised second factor authentication");
     const n = {}, c = a.secretNames();
     for (let d in i)
       c.includes(d) && d in i && (n[d] = i[d]);
-    await a.authenticateUser(void 0, { ...n, ...r.pre2fa.secrets }, s), await this.keyStorage.updateData(x.hashSessionId(t.value), "pre2fa", void 0);
+    await a.authenticateUser(void 0, { ...n, ...r.pre2fa.secrets }, s), await this.keyStorage.updateData(D.hashSessionId(t.value), "pre2fa", void 0);
   }
   /**
    * Cancels the 2FA that was previously initiated but not completed..  
@@ -4998,9 +4998,9 @@ class Lt {
   async cancelTwoFactorPageVisit(s) {
     let { key: e } = await this.session.getUserForSessionId(s);
     if (!e) throw new o(l.InvalidKey, "Session key not found");
-    let t = D.decodeData(e.data);
+    let t = x.decodeData(e.data);
     if (!("pre2fa" in t)) throw new o(l.Unauthorized, "Two factor authentication not initiated");
-    return await this.keyStorage.updateData(x.hashSessionId(e.value), "pre2fa", void 0), t.pre2fa;
+    return await this.keyStorage.updateData(D.hashSessionId(e.value), "pre2fa", void 0), t.pre2fa;
   }
   /**
    * Performs the second factor authentication as the second step of the login
@@ -5023,13 +5023,13 @@ class Lt {
     if (!this.userStorage) throw new o(l.Configuration, "Cannot call completeTwoFactorLogin if no user storage provided");
     let { key: i } = await this.session.getUserForSessionId(e);
     if (!i || !i.data || i.data == "") throw new o(l.Unauthorized);
-    let a = D.decodeData(i.data)["2fa"], n = a.username, c = a.factor2;
-    const { user: d, secrets: m } = await this.userStorage.getUserByUsername(n), y = this.authenticators[c];
+    let a = x.decodeData(i.data)["2fa"], n = a.username, c = a.factor2;
+    const { user: d, secrets: w } = await this.userStorage.getUserByUsername(n), y = this.authenticators[c];
     if (!y) throw new o(l.Configuration, "Second factor " + c + " not enabled");
-    await y.authenticateUser(d, { ...m, ...a }, s);
+    await y.authenticateUser(d, { ...w, ...a }, s);
     const p = await this.session.createSessionKey(d.id, t);
-    await this.keyStorage.deleteKey(x.hashSessionId(i.value));
-    const _ = this.session.makeCookie(p, r), C = this.csrfTokens.createCsrfToken(), v = this.csrfTokens.makeCsrfCookie(C), k = this.csrfTokens.makeCsrfFormOrHeaderToken(C);
+    await this.keyStorage.deleteKey(D.hashSessionId(i.value));
+    const _ = this.session.makeCookie(p, r), C = this.csrfTokens.createCsrfToken(), T = this.csrfTokens.makeCsrfCookie(C), k = this.csrfTokens.makeCsrfFormOrHeaderToken(C);
     try {
       this.emailTokenStorage.deleteAllForUser(
         d.id,
@@ -5040,7 +5040,7 @@ class Lt {
     }
     return {
       sessionCookie: _,
-      csrfCookie: v,
+      csrfCookie: T,
       csrfFormOrHeaderValue: k,
       user: d
     };
@@ -5106,8 +5106,8 @@ class Lt {
         a.id,
         U.passwordResetToken
       );
-    } catch (m) {
-      u.logger.warn(f({ msg: "Couldn't delete password reset tokens while logging in", user: s })), u.logger.debug(f({ err: m }));
+    } catch (w) {
+      u.logger.warn(f({ msg: "Couldn't delete password reset tokens while logging in", user: s })), u.logger.debug(f({ err: w }));
     }
     return a;
   }
@@ -5127,19 +5127,19 @@ class Lt {
       throw new o(l.UserNotExist, "Please specify a userername");
     let { email: a, username: n, password: c, ...d } = e;
     d.userid = s.userid;
-    let m = !1;
+    let w = !1;
     if (a)
-      i = a, R.validateEmail(i), m = !0;
+      i = a, R.validateEmail(i), w = !0;
     else if (n) {
       i = n;
       try {
-        R.validateEmail(s.username), m = !0;
+        R.validateEmail(s.username), w = !0;
       } catch {
       }
-      m && R.validateEmail(i);
+      w && R.validateEmail(i);
     }
-    return !t && this.enableEmailVerification && m ? await ((y = this.tokenEmailer) == null ? void 0 : y.sendEmailVerificationToken(s.id, i)) : (a && (d.email = a), n && (d.username = n)), (e.state == E.passwordResetNeeded || e.state == E.passwordAndFactor2ResetNeeded) && await ((p = this.tokenEmailer) == null ? void 0 : p.sendPasswordResetToken(s.id, {}, r)), await this.userStorage.updateUser(d), {
-      emailVerificationTokenSent: !t && this.enableEmailVerification && m,
+    return !t && this.enableEmailVerification && w ? await ((y = this.tokenEmailer) == null ? void 0 : y.sendEmailVerificationToken(s.id, i)) : (a && (d.email = a), n && (d.username = n)), (e.state == E.passwordResetNeeded || e.state == E.passwordAndFactor2ResetNeeded) && await ((p = this.tokenEmailer) == null ? void 0 : p.sendPasswordResetToken(s.id, {}, r)), await this.userStorage.updateUser(d), {
+      emailVerificationTokenSent: !t && this.enableEmailVerification && w,
       passwordResetTokenSent: e.state == E.passwordResetNeeded || e.state == E.passwordAndFactor2ResetNeeded
     };
   }
@@ -5192,7 +5192,7 @@ class ge {
     h(this, "prefix", U.apiKey);
     /** The name of the speak in the Authorization header.  Defaults to "ApiKey" */
     h(this, "authScheme", "ApiKey");
-    this.apiKeyStorage = s, w("secret", g.String, this, e, "SECRET", !0), w("keyLength", g.String, this, e, "APIKEY_LENGTH"), w("prefix", g.String, this, e, "APIKEY_PREFIX"), w("authScheme", g.String, this, e, "APIKEY_AUTHSCHEME");
+    this.apiKeyStorage = s, m("secret", g.String, this, e, "SECRET", !0), m("keyLength", g.String, this, e, "APIKEY_LENGTH"), m("prefix", g.String, this, e, "APIKEY_PREFIX"), m("authScheme", g.String, this, e, "APIKEY_AUTHSCHEME");
   }
   /**
    * Creates a new random key and returns it, unsigned.  It is also persisted in the key storage as a 
@@ -5213,11 +5213,11 @@ class ge {
    *          Authorization header (with the signature appended.)
    */
   async createKey(s, e, t, r, i) {
-    const a = T.randomValue(this.keyLength), n = /* @__PURE__ */ new Date(), c = r ? new Date(n.getTime() + r * 1e3) : void 0, d = ge.hashApiKeyValue(a), m = {
+    const a = v.randomValue(this.keyLength), n = /* @__PURE__ */ new Date(), c = r ? new Date(n.getTime() + r * 1e3) : void 0, d = ge.hashApiKeyValue(a), w = {
       name: s,
       value: a,
       userid: e,
-      data: D.encodeData(t),
+      data: x.encodeData(t),
       expires: c,
       created: n,
       ...i
@@ -5227,14 +5227,14 @@ class ge {
       this.prefix + d,
       n,
       c,
-      m.data,
+      w.data,
       { name: s, ...i }
     );
     const y = this.signApiKeyValue(a);
-    return { key: m, token: y };
+    return { key: w, token: y };
   }
   static hashApiKeyValue(s) {
-    return T.hash(s);
+    return v.hash(s);
   }
   /**
    * Returns the hash of the bearer value from the Authorization header.
@@ -5245,13 +5245,13 @@ class ge {
    * @returns a hash of the value (without the prefix).
    */
   static hashSignedApiKeyValue(s) {
-    return T.hash(s.split(".")[0]);
+    return v.hash(s.split(".")[0]);
   }
   unsignApiKeyValue(s) {
-    return T.unsign(s, this.secret).v;
+    return v.unsign(s, this.secret).v;
   }
   signApiKeyValue(s) {
-    return T.sign({ v: s }, this.secret);
+    return v.sign({ v: s }, this.secret);
   }
   async getKey(s) {
     if (this.authScheme != "" && s.startsWith(this.authScheme + " ")) {
@@ -5290,7 +5290,7 @@ class J {
       l.Configuration,
       "Must specify clientStorage when adding a client manager"
     );
-    this.clientStorage = s.clientStorage, w("oauthPbkdf2Digest", g.String, this, s, "OAUTH_PBKDF2_DIGEST"), w("oauthPbkdf2KeyLength", g.String, this, s, "OAUTH_PBKDF2_KEYLENGTH"), w("requireRedirectUriRegistration", g.Boolean, this, s, "OAUTH_REQUIRE_REDIRECT_URI_REGISTRATION");
+    this.clientStorage = s.clientStorage, m("oauthPbkdf2Digest", g.String, this, s, "OAUTH_PBKDF2_DIGEST"), m("oauthPbkdf2KeyLength", g.String, this, s, "OAUTH_PBKDF2_KEYLENGTH"), m("requireRedirectUriRegistration", g.Boolean, this, s, "OAUTH_REQUIRE_REDIRECT_URI_REGISTRATION");
   }
   /**
    * Creates a client and puts it in the storage
@@ -5307,7 +5307,7 @@ class J {
   async createClient(s, e, t, r = !0, i) {
     const a = J.randomClientId();
     let n, c;
-    r && (c = J.randomClientSecret(), n = await T.passwordHash(c, {
+    r && (c = J.randomClientSecret(), n = await v.passwordHash(c, {
       encode: !0,
       iterations: this.oauthPbkdf2Iterations,
       keyLen: this.oauthPbkdf2KeyLength,
@@ -5324,10 +5324,10 @@ class J {
       valid_flow: t,
       userid: i
     };
-    let m;
+    let w;
     for (let y = 0; y < 5; ++y)
       try {
-        m = await this.clientStorage.createClient(d);
+        w = await this.clientStorage.createClient(d);
         break;
       } catch (p) {
         if (y == 4) {
@@ -5335,8 +5335,8 @@ class J {
         } else
           d.client_id = J.randomClientId();
       }
-    if (!m) throw new o(l.ClientExists);
-    return m.client_secret && c && (m.client_secret = c), m;
+    if (!w) throw new o(l.ClientExists);
+    return w.client_secret && c && (w.client_secret = c), w;
   }
   /**
    * Updates a client
@@ -5350,7 +5350,7 @@ class J {
   async updateClient(s, e, t = !1) {
     const r = await this.clientStorage.getClientById(s);
     let i = !1, a;
-    e.confidential === !0 && !r.confidential || e.confidential === !0 && t ? (a = J.randomClientSecret(), e.client_secret = await T.passwordHash(a, {
+    e.confidential === !0 && !r.confidential || e.confidential === !0 && t ? (a = J.randomClientSecret(), e.client_secret = await v.passwordHash(a, {
       encode: !0,
       iterations: this.oauthPbkdf2Iterations,
       keyLen: this.oauthPbkdf2KeyLength,
@@ -5365,13 +5365,13 @@ class J {
    * Create a random OAuth client id
    */
   static randomClientId() {
-    return T.randomValue(it);
+    return v.randomValue(it);
   }
   /**
   * Create a random OAuth client secret
   */
   static randomClientSecret() {
-    return T.randomValue(st);
+    return v.randomValue(st);
   }
   /** If the passed redirect URI is not in the set of valid ones,
    * throw {@link @crossauth/common!CrossauthError} with
@@ -5483,9 +5483,9 @@ class zt {
     h(this, "validFlows", ["all"]);
     /** Set from options.  See {@link OAuthAuthorizationServerOptions.allowedFactor2} */
     h(this, "allowedFactor2", []);
-    this.clientStorage = s, this.keyStorage = e, this.userStorage = r.userStorage, this.authStorage = r.authStorage, t && (this.authenticators = t), this.clientManager = new J({ clientStorage: s, ...r }), w("oauthIssuer", g.String, this, r, "AUTH_SERVER_BASE_URL", !0), w("audience", g.String, this, r, "OAUTH_AUDIENCE"), w("oauthPbkdf2Iterations", g.String, this, r, "OAUTH_PBKDF2_ITERATIONS"), w("requireClientSecretOrChallenge", g.Boolean, this, r, "OAUTH_REQUIRE_CLIENT_SECRET_OR_CHALLENGE"), w("jwtAlgorithm", g.String, this, r, "JWT_ALGORITHM"), w("codeLength", g.Number, this, r, "OAUTH_CODE_LENGTH"), w("jwtKeyType", g.String, this, r, "JWT_KEY_TYPE"), w("jwtSecretKeyFile", g.String, this, r, "JWT_SECRET_KEY_FILE"), w("jwtPublicKeyFile", g.String, this, r, "JWT_PUBLIC_KEY_FILE"), w("jwtPrivateKeyFile", g.String, this, r, "JWT_PRIVATE_KEY_FILE"), w("jwtSecretKey", g.String, this, r, "JWT_SECRET_KEY"), w("jwtPublicKey", g.String, this, r, "JWT_PUBLIC_KEY"), w("jwtPrivateKey", g.String, this, r, "JWT_PRIVATE_KEY"), w("jwtKid", g.String, this, r, "JWT_KID"), w("persistAccessToken", g.String, this, r, "OAUTH_PERSIST_ACCESS_TOKEN"), w("issueRefreshToken", g.String, this, r, "OAUTH_ISSUE_REFRESH_TOKEN"), w("opaqueAccessToken", g.String, this, r, "OAUTH_OPAQUE_ACCESS_TOKEN"), w("accessTokenExpiry", g.Number, this, r, "OAUTH_ACCESS_TOKEN_EXPIRY"), w("refreshTokenExpiry", g.Number, this, r, "OAUTH_REFRESH_TOKEN_EXPIRY"), w("rollingRefreshToken", g.Boolean, this, r, "OAUTH_ROLLING_REFRESH_TOKEN"), w("authorizationCodeExpiry", g.Number, this, r, "OAUTH_AUTHORIZATION_CODE_EXPIRY"), w("mfaTokenExpiry", g.Number, this, r, "OAUTH_MFA_TOKEN_EXPIRY"), w("clockTolerance", g.Number, this, r, "OAUTH_CLOCK_TOLERANCE"), w("validateScopes", g.Boolean, this, r, "OAUTH_VALIDATE_SCOPES"), w("emptyScopeIsValid", g.Boolean, this, r, "OAUTH_EMPTY_SCOPE_VALID"), w("validScopes", g.JsonArray, this, r, "OAUTH_VALID_SCOPES"), w("validFlows", g.JsonArray, this, r, "OAUTH_validFlows"), w("idTokenClaims", g.Json, this, r, "OAUTH_ID_TOKEN_CLAIMS"), w("accessTokenClaims", g.Json, this, r, "OAUTH_ACCESS_TOKEN_CLAIMS"), w("allowedFactor2", g.JsonArray, this, r, "ALLOWED_FACTOR2"), w("userCodeExpiry", g.Number, this, r, "DEVICECODE_USERCODE_EXPIRY"), w("userCodeThrottle", g.Number, this, r, "DEVICECODE_USERCODE_THROTTLE"), w("deviceCodePollInterval", g.Number, this, r, "DEVICECODE_POLL_INTERVAL"), w("deviceCodeLength", g.Number, this, r, "DEVICECODE_LENGTH"), w("userCodeLength", g.Number, this, r, "DEVICECODE_USERCODE_LENGTH");
+    this.clientStorage = s, this.keyStorage = e, this.userStorage = r.userStorage, this.authStorage = r.authStorage, t && (this.authenticators = t), this.clientManager = new J({ clientStorage: s, ...r }), m("oauthIssuer", g.String, this, r, "AUTH_SERVER_BASE_URL", !0), m("audience", g.String, this, r, "OAUTH_AUDIENCE"), m("oauthPbkdf2Iterations", g.String, this, r, "OAUTH_PBKDF2_ITERATIONS"), m("requireClientSecretOrChallenge", g.Boolean, this, r, "OAUTH_REQUIRE_CLIENT_SECRET_OR_CHALLENGE"), m("jwtAlgorithm", g.String, this, r, "JWT_ALGORITHM"), m("codeLength", g.Number, this, r, "OAUTH_CODE_LENGTH"), m("jwtKeyType", g.String, this, r, "JWT_KEY_TYPE"), m("jwtSecretKeyFile", g.String, this, r, "JWT_SECRET_KEY_FILE"), m("jwtPublicKeyFile", g.String, this, r, "JWT_PUBLIC_KEY_FILE"), m("jwtPrivateKeyFile", g.String, this, r, "JWT_PRIVATE_KEY_FILE"), m("jwtSecretKey", g.String, this, r, "JWT_SECRET_KEY"), m("jwtPublicKey", g.String, this, r, "JWT_PUBLIC_KEY"), m("jwtPrivateKey", g.String, this, r, "JWT_PRIVATE_KEY"), m("jwtKid", g.String, this, r, "JWT_KID"), m("persistAccessToken", g.String, this, r, "OAUTH_PERSIST_ACCESS_TOKEN"), m("issueRefreshToken", g.String, this, r, "OAUTH_ISSUE_REFRESH_TOKEN"), m("opaqueAccessToken", g.String, this, r, "OAUTH_OPAQUE_ACCESS_TOKEN"), m("accessTokenExpiry", g.Number, this, r, "OAUTH_ACCESS_TOKEN_EXPIRY"), m("refreshTokenExpiry", g.Number, this, r, "OAUTH_REFRESH_TOKEN_EXPIRY"), m("rollingRefreshToken", g.Boolean, this, r, "OAUTH_ROLLING_REFRESH_TOKEN"), m("authorizationCodeExpiry", g.Number, this, r, "OAUTH_AUTHORIZATION_CODE_EXPIRY"), m("mfaTokenExpiry", g.Number, this, r, "OAUTH_MFA_TOKEN_EXPIRY"), m("clockTolerance", g.Number, this, r, "OAUTH_CLOCK_TOLERANCE"), m("validateScopes", g.Boolean, this, r, "OAUTH_VALIDATE_SCOPES"), m("emptyScopeIsValid", g.Boolean, this, r, "OAUTH_EMPTY_SCOPE_VALID"), m("validScopes", g.JsonArray, this, r, "OAUTH_VALID_SCOPES"), m("validFlows", g.JsonArray, this, r, "OAUTH_validFlows"), m("idTokenClaims", g.Json, this, r, "OAUTH_ID_TOKEN_CLAIMS"), m("accessTokenClaims", g.Json, this, r, "OAUTH_ACCESS_TOKEN_CLAIMS"), m("allowedFactor2", g.JsonArray, this, r, "ALLOWED_FACTOR2"), m("userCodeExpiry", g.Number, this, r, "DEVICECODE_USERCODE_EXPIRY"), m("userCodeThrottle", g.Number, this, r, "DEVICECODE_USERCODE_THROTTLE"), m("deviceCodePollInterval", g.Number, this, r, "DEVICECODE_POLL_INTERVAL"), m("deviceCodeLength", g.Number, this, r, "DEVICECODE_LENGTH"), m("userCodeLength", g.Number, this, r, "DEVICECODE_USERCODE_LENGTH");
     let i = {};
-    if (w("userCodeDashEvery", g.String, i, r, "DEVICECODE_USERCODE_DASH_EVERY"), i.userCodeDashEvery)
+    if (m("userCodeDashEvery", g.String, i, r, "DEVICECODE_USERCODE_DASH_EVERY"), i.userCodeDashEvery)
       if (i.userCodeDashEvery == "" || i.userCodeDashEvery.toLowerCase() == "null") this.userCodeDashEvery = null;
       else
         try {
@@ -5496,7 +5496,7 @@ class zt {
             "userCodeDashEvery must be a number or null"
           );
         }
-    if (w("deviceCodeVerificationUri", g.String, this, r, "DEVICECODE_VERIFICATION_URI"), this.validFlows.length == 1 && this.validFlows[0] == b.All && (this.validFlows = b.allFlows()), this.jwtAlgorithmChecked = at(this.jwtAlgorithm), this.jwtSecretKey || this.jwtSecretKeyFile) {
+    if (m("deviceCodeVerificationUri", g.String, this, r, "DEVICECODE_VERIFICATION_URI"), this.validFlows.length == 1 && this.validFlows[0] == b.All && (this.validFlows = b.allFlows()), this.jwtAlgorithmChecked = at(this.jwtAlgorithm), this.jwtSecretKey || this.jwtSecretKeyFile) {
       if (this.jwtPublicKey || this.jwtPublicKeyFile || this.jwtPrivateKey || this.jwtPrivateKeyFile)
         throw new o(
           l.Configuration,
@@ -5573,11 +5573,11 @@ class zt {
         error: "unsupported_response_type",
         error_description: "Unsupported response type " + s
       };
-    let m;
+    let w;
     try {
-      m = await this.clientStorage.getClientById(e);
-    } catch (v) {
-      return u.logger.debug(f({ err: v })), {
+      w = await this.clientStorage.getClientById(e);
+    } catch (T) {
+      return u.logger.debug(f({ err: T })), {
         error: "unauthorized_client",
         error_description: "Client is not authorized"
       };
@@ -5597,7 +5597,7 @@ class zt {
         error: "access_denied",
         error_description: "Unsupported flow type " + C
       };
-    if (!m.valid_flow.includes(C))
+    if (!w.valid_flow.includes(C))
       return {
         error: "unauthorized_client",
         error_description: "Client does not support " + C
@@ -5611,7 +5611,7 @@ class zt {
       };
     }
     return s == "code" ? await this.getAuthorizationCode(
-      m,
+      w,
       t,
       y,
       i,
@@ -5710,7 +5710,7 @@ class zt {
     } : r && (!t || !e.client_secret) ? {
       error: "access_denied",
       error_description: "Client is confidential but either secret not passed or is missing in database"
-    } : r && !await T.passwordsEqual(
+    } : r && !await v.passwordsEqual(
       t ?? "",
       e.client_secret ?? ""
     ) ? {
@@ -5754,39 +5754,39 @@ class zt {
     refreshToken: n,
     username: c,
     password: d,
-    mfaToken: m,
+    mfaToken: w,
     oobCode: y,
     bindingCode: p,
     otp: _,
     deviceCode: C
   }) {
-    var O, V, M;
-    const v = this.inferFlowFromPost(s, a);
-    if (!v) return {
+    var O, V, j;
+    const T = this.inferFlowFromPost(s, a);
+    if (!T) return {
       error: "server_error",
       error_description: "Unable to determine OAuth flow type"
     };
     const k = await this.getClientById(e);
     if (!k.client) return k;
-    const A = k.client, z = await this.authenticateClient(v, A, i);
+    const A = k.client, z = await this.authenticateClient(T, A, i);
     if (z.error) return z;
-    if (v == b.Password && !this.validFlows.includes(v) && !this.validFlows.includes(b.PasswordMfa))
+    if (T == b.Password && !this.validFlows.includes(T) && !this.validFlows.includes(b.PasswordMfa))
       return {
         error: "access_denied",
-        error_description: "Unsupported flow type " + v
+        error_description: "Unsupported flow type " + T
       };
-    if (!v || !this.validFlows.includes(v))
+    if (!T || !this.validFlows.includes(T))
       return {
         error: "access_denied",
-        error_description: "Unsupported flow type " + v
+        error_description: "Unsupported flow type " + T
       };
-    if (A && !A.valid_flow.includes(v))
+    if (A && !A.valid_flow.includes(T))
       return {
         error: "unauthorized_client",
-        error_description: "Client does not support " + v
+        error_description: "Client does not support " + T
       };
     let H = !1;
-    this.issueRefreshToken && v != b.RefreshToken && (H = !0), this.issueRefreshToken && v == b.RefreshToken && this.rollingRefreshToken && (H = !0);
+    this.issueRefreshToken && T != b.RefreshToken && (H = !0), this.issueRefreshToken && T == b.RefreshToken && this.rollingRefreshToken && (H = !0);
     let K;
     if (s == "authorization_code")
       return this.requireClientSecretOrChallenge && A && A.client_secret && !i && !a ? {
@@ -5828,7 +5828,7 @@ class zt {
           };
         }
       try {
-        const F = U.refreshToken + T.hash(n);
+        const F = U.refreshToken + v.hash(n);
         await this.keyStorage.deleteKey(F);
       } catch (F) {
         const I = o.asCrossauthError(F);
@@ -5922,12 +5922,12 @@ class zt {
           error: "access_denied",
           error_description: "OTP not provided"
         };
-      if (!m)
+      if (!w)
         return {
           error: "access_denied",
           error_description: "MFA token not provided"
         };
-      const I = await this.validateMfaToken(m), $ = U.mfaToken + T.hash(m);
+      const I = await this.validateMfaToken(w), $ = U.mfaToken + v.hash(w);
       if (!I.user || !I.key)
         return {
           error: "access_denied",
@@ -5940,23 +5940,23 @@ class zt {
           error_description: "MFA type is not supported for OAuth"
         };
       try {
-        const { secrets: j } = await this.userStorage.getUserById(I.user.id);
+        const { secrets: M } = await this.userStorage.getUserById(I.user.id);
         await B.authenticateUser(
           I.user,
-          j,
+          M,
           { otp: _ }
         );
-      } catch (j) {
-        return u.logger.debug(f({ err: j })), {
+      } catch (M) {
+        return u.logger.debug(f({ err: M })), {
           error: "access_denied",
           error_description: "Invalid OTP"
         };
       }
       try {
         await this.keyStorage.deleteKey($);
-      } catch (j) {
-        u.logger.debug(f({ err: j })), u.logger.warn(f({
-          cerr: j,
+      } catch (M) {
+        u.logger.debug(f({ err: M })), u.logger.warn(f({
+          cerr: M,
           msg: "Couldn't delete mfa token",
           hashedMfaToken: I.key.value
         }));
@@ -5985,12 +5985,12 @@ class zt {
           error: "access_denied",
           error_description: "OOB code or binding code not provided"
         };
-      if (!m)
+      if (!w)
         return {
           error: "access_denied",
           error_description: "MFA token not provided"
         };
-      const I = await this.validateMfaToken(m);
+      const I = await this.validateMfaToken(w);
       if (!I.user || !I.key)
         return {
           error: "access_denied",
@@ -6003,20 +6003,20 @@ class zt {
           error_description: "MFA type is not supported for OAuth"
         };
       try {
-        const { secrets: B } = await this.userStorage.getUserById(I.user.id), j = D.decodeData(I.key.data).omfa;
-        if (!j || !j.otp || !j.oobCode)
+        const { secrets: B } = await this.userStorage.getUserById(I.user.id), M = x.decodeData(I.key.data).omfa;
+        if (!M || !M.otp || !M.oobCode)
           return {
             error: "server_error",
             error_description: "Cannot retrieve email OTP"
           };
-        if (j.oobCode != y)
+        if (M.oobCode != y)
           return {
             error: "access_denied",
             error_description: "Invalid OOB code"
           };
         await $.authenticateUser(
           I.user,
-          { ...B, otp: j.otp, expiry: (V = I.key.expires) == null ? void 0 : V.getTime() },
+          { ...B, otp: M.otp, expiry: (V = I.key.expires) == null ? void 0 : V.getTime() },
           { otp: p }
         );
       } catch (B) {
@@ -6071,7 +6071,7 @@ class zt {
             error_description: "Waiting for user code to be entered"
           };
         {
-          let I = P.scope ? P.scope.split(" ") : void 0, $ = P.userid ? await ((M = this.userStorage) == null ? void 0 : M.getUserById(P.userid)) : void 0;
+          let I = P.scope ? P.scope.split(" ") : void 0, $ = P.userid ? await ((j = this.userStorage) == null ? void 0 : j.getUserById(P.userid)) : void 0;
           return await this.deleteDeviceCode(C), await this.makeAccessToken({
             client: A,
             client_secret: i,
@@ -6150,25 +6150,25 @@ class zt {
         error_description: "Unsupported flow type " + r
       };
     if (e) {
-      const { error: v, errorDescription: k } = this.validateScope(e);
-      if (v) return {
-        error: v,
+      const { error: T, errorDescription: k } = this.validateScope(e);
+      if (T) return {
+        error: T,
         error_description: k
       };
     }
     let c, d = !1;
-    const m = /* @__PURE__ */ new Date(), y = this.userCodeExpiry, p = new Date(m.getTime() + this.userCodeExpiry * 1e3 + this.clockTolerance * 1e3);
-    for (let v = 0; v < 10 && !d; ++v)
+    const w = /* @__PURE__ */ new Date(), y = this.userCodeExpiry, p = new Date(w.getTime() + this.userCodeExpiry * 1e3 + this.clockTolerance * 1e3);
+    for (let T = 0; T < 10 && !d; ++T)
       try {
-        c = T.randomValue(this.deviceCodeLength), await this.keyStorage.saveKey(
+        c = v.randomValue(this.deviceCodeLength), await this.keyStorage.saveKey(
           void 0,
           U.deviceCode + c,
-          m,
+          w,
           p,
           JSON.stringify({ scope: e, client_id: s })
         ), d = !0;
       } catch {
-        u.logger.debug(f({ msg: `Attempt number${v} at creating a unique authozation code failed` }));
+        u.logger.debug(f({ msg: `Attempt number${T} at creating a unique authozation code failed` }));
       }
     if (!d || !c)
       return {
@@ -6177,17 +6177,17 @@ class zt {
       };
     let _;
     d = !1;
-    for (let v = 0; v < 10 && !d; ++v)
+    for (let T = 0; T < 10 && !d; ++T)
       try {
-        _ = T.randomBase32(this.userCodeLength), await this.keyStorage.saveKey(
+        _ = v.randomBase32(this.userCodeLength), await this.keyStorage.saveKey(
           void 0,
           U.userCode + _,
-          m,
+          w,
           p,
           JSON.stringify({ deviceCode: c })
         ), d = !0;
       } catch {
-        u.logger.debug(f({ msg: `Attempt number${v} at creating a unique authozation code failed` }));
+        u.logger.debug(f({ msg: `Attempt number${T} at creating a unique authozation code failed` }));
       }
     if (!d || !_)
       return await this.deleteDeviceCode(c), {
@@ -6195,8 +6195,8 @@ class zt {
         error_description: "Couldn't create device code"
       };
     if (_ && this.userCodeDashEvery) {
-      const v = new RegExp(String.raw`(.{1,${this.userCodeDashEvery}})`, "g");
-      _ = (C = _.match(v)) == null ? void 0 : C.join("-");
+      const T = new RegExp(String.raw`(.{1,${this.userCodeDashEvery}})`, "g");
+      _ = (C = _.match(T)) == null ? void 0 : C.join("-");
     }
     return {
       device_code: c,
@@ -6222,7 +6222,7 @@ class zt {
     userCode: s,
     user: e
   }) {
-    var m;
+    var w;
     s = s.replace(/[ -]*/g, "");
     let t, r = {};
     try {
@@ -6235,7 +6235,7 @@ class zt {
       };
     }
     if (!r.deviceCode)
-      return u.logger.error(f({ msg: "No device code for user code", userCodeHash: T.hash(s) })), await this.deleteUserCode(s), {
+      return u.logger.error(f({ msg: "No device code for user code", userCodeHash: v.hash(s) })), await this.deleteUserCode(s), {
         ok: !1,
         error: "server_error",
         error_description: "No device code for user code"
@@ -6247,8 +6247,8 @@ class zt {
       const p = o.asCrossauthError(y);
       return u.logger.debug(f({ err: p })), u.logger.error(f({
         msg: "Invalid device code for user code",
-        userCodeHash: T.hash(s),
-        deviceCodeHash: T.hash(r.deviceCode),
+        userCodeHash: v.hash(s),
+        deviceCodeHash: v.hash(r.deviceCode),
         cerr: p
       })), await this.deleteUserCode(s), {
         ok: !1,
@@ -6268,7 +6268,7 @@ class zt {
         error_description: "Unexpected or incomplete data in device code key"
       };
     }
-    if ((/* @__PURE__ */ new Date()).getTime() > ((m = r.expires) == null ? void 0 : m.getTime()))
+    if ((/* @__PURE__ */ new Date()).getTime() > ((w = r.expires) == null ? void 0 : w.getTime()))
       return await this.deleteUserCode(s), {
         ok: !1,
         error: "expired_token",
@@ -6343,7 +6343,7 @@ class zt {
       };
     }
     if (!t.deviceCode)
-      return u.logger.error(f({ msg: "No device code for user code", userCodeHash: T.hash(s) })), await this.deleteUserCode(s), {
+      return u.logger.error(f({ msg: "No device code for user code", userCodeHash: v.hash(s) })), await this.deleteUserCode(s), {
         ok: !1,
         error: "server_error",
         error_description: "No device code for user code"
@@ -6355,8 +6355,8 @@ class zt {
       const c = o.asCrossauthError(n);
       return u.logger.debug(f({ err: c })), u.logger.error(f({
         msg: "Invalid device code for user code",
-        userCodeHash: T.hash(s),
-        deviceCodeHash: T.hash(t.deviceCode),
+        userCodeHash: v.hash(s),
+        deviceCodeHash: v.hash(t.deviceCode),
         cerr: c
       })), await this.deleteUserCode(s), {
         ok: !1,
@@ -6394,7 +6394,7 @@ class zt {
     };
   }
   async createMfaRequest(s) {
-    const e = T.randomValue(this.codeLength), t = U.mfaToken + T.hash(e), r = /* @__PURE__ */ new Date();
+    const e = v.randomValue(this.codeLength), t = U.mfaToken + v.hash(e), r = /* @__PURE__ */ new Date();
     try {
       await this.keyStorage.saveKey(
         s.id,
@@ -6420,7 +6420,7 @@ class zt {
     var r;
     let e, t;
     try {
-      const i = U.mfaToken + T.hash(s);
+      const i = U.mfaToken + v.hash(s);
       if (t = await this.keyStorage.getKey(i), !t.userid)
         return {
           error: "access_denied",
@@ -6448,7 +6448,7 @@ class zt {
         error_description: "Invalid MFA token"
       };
     try {
-      if (D.decodeData(t.data).omfaaid != e.factor2)
+      if (x.decodeData(t.data).omfaaid != e.factor2)
         return {
           error: "access_denied",
           error_description: "authenticatorId not valid for user"
@@ -6509,9 +6509,9 @@ class zt {
     if (!n.client) return n;
     const c = n.client, d = await this.authenticateClient(a, c, t);
     if (d.error) return d;
-    const m = await this.validateMfaToken(s);
-    if (!m.user || !m.key) return m;
-    if (m.user.factor2 != i)
+    const w = await this.validateMfaToken(s);
+    if (!w.user || !w.key) return w;
+    if (w.user.factor2 != i)
       return {
         error: "access_denied",
         error_description: "Invalid MFA authenticator"
@@ -6523,18 +6523,18 @@ class zt {
       };
     let y = {};
     r == "oob" && (y = {
-      oobCode: T.randomValue(this.codeLength)
+      oobCode: v.randomValue(this.codeLength)
     });
     try {
-      const p = this.authenticators[m.user.factor2];
+      const p = this.authenticators[w.user.factor2];
       if (!p)
         throw new o(
           l.Configuration,
           "User's authenticator has not been loaded"
         );
-      const _ = await p.createOneTimeSecrets(m.user);
+      const _ = await p.createOneTimeSecrets(w.user);
       await this.keyStorage.updateData(
-        m.key.value,
+        w.key.value,
         "omfa",
         { ...y, ..._ }
       );
@@ -6601,21 +6601,21 @@ class zt {
         error: "invalid_request",
         error_description: `The redirect uri ${e} is invalid`
       };
-    const d = /* @__PURE__ */ new Date(), m = this.authorizationCodeExpiry ? new Date(d.getTime() + this.authorizationCodeExpiry * 1e3 + this.clockTolerance * 1e3) : void 0, y = {};
-    t && (y.scope = t), i && (y.challengeMethod = a, y.challenge = T.hash(i)), n && (y.username = n.username, y.id = n.id);
+    const d = /* @__PURE__ */ new Date(), w = this.authorizationCodeExpiry ? new Date(d.getTime() + this.authorizationCodeExpiry * 1e3 + this.clockTolerance * 1e3) : void 0, y = {};
+    t && (y.scope = t), i && (y.challengeMethod = a, y.challenge = v.hash(i)), n && (y.username = n.username, y.id = n.id);
     const p = JSON.stringify(y);
     let _ = !1, C = "";
-    for (let v = 0; v < 10 && !_; ++v)
+    for (let T = 0; T < 10 && !_; ++T)
       try {
-        C = T.randomValue(this.codeLength), await this.keyStorage.saveKey(
+        C = v.randomValue(this.codeLength), await this.keyStorage.saveKey(
           void 0,
-          U.authorizationCode + T.hash(C),
+          U.authorizationCode + v.hash(C),
           d,
-          m,
+          w,
           p
         ), _ = !0;
       } catch {
-        u.logger.debug(f({ msg: `Attempt number${v} at creating a unique authozation code failed` }));
+        u.logger.debug(f({ msg: `Attempt number${T} at creating a unique authozation code failed` }));
       }
     if (!_)
       throw new o(
@@ -6639,7 +6639,7 @@ class zt {
     var z, H;
     let c = !0;
     try {
-      s.client_secret != null && (c = await T.passwordsEqual(
+      s.client_secret != null && (c = await v.passwordsEqual(
         t ?? "",
         s.client_secret ?? ""
       ));
@@ -6654,7 +6654,7 @@ class zt {
     if (e) {
       let K;
       try {
-        K = await this.keyStorage.getKey(U.authorizationCode + T.hash(e)), d = D.decodeData(K.data);
+        K = await this.keyStorage.getKey(U.authorizationCode + v.hash(e)), d = x.decodeData(K.data);
       } catch (O) {
         return u.logger.debug(f({ err: O })), {
           error: "access_denied",
@@ -6678,14 +6678,14 @@ class zt {
         error_description: "Invalid code challenge/code challenge method method for authorization code"
       };
     if (d.challenge) {
-      const K = d.challengeMethod == "plain" ? r ?? "" : T.sha256(r ?? "");
-      if (T.hash(K) != d.challenge)
+      const K = d.challengeMethod == "plain" ? r ?? "" : v.sha256(r ?? "");
+      if (v.hash(K) != d.challenge)
         return {
           error: "access_denied",
           error_description: "Code verifier is incorrect"
         };
     }
-    const m = /* @__PURE__ */ new Date(), y = Math.ceil(m.getTime() / 1e3);
+    const w = /* @__PURE__ */ new Date(), y = Math.ceil(w.getTime() / 1e3);
     let p;
     if ((i && i.includes("openid") || Object.keys(this.accessTokenClaims).length > 0) && this.userStorage && d.username)
       try {
@@ -6697,7 +6697,7 @@ class zt {
           error_description: "Couldn't load user data"
         };
       }
-    const _ = T.uuid();
+    const _ = v.uuid();
     let C = {
       jti: _,
       iat: y,
@@ -6705,14 +6705,14 @@ class zt {
       sub: d.username,
       type: "access"
     };
-    C = this.addClaims(C, this.accessTokenClaims, i, n), i && (C.scope = i), this.accessTokenExpiry != null && (C.exp = y + this.accessTokenExpiry, p = new Date(m.getTime() + this.accessTokenExpiry * 1e3 + this.clockTolerance * 1e3)), this.audience && (C.aud = this.audience);
-    const v = await new Promise((K, O) => {
+    C = this.addClaims(C, this.accessTokenClaims, i, n), i && (C.scope = i), this.accessTokenExpiry != null && (C.exp = y + this.accessTokenExpiry, p = new Date(w.getTime() + this.accessTokenExpiry * 1e3 + this.clockTolerance * 1e3)), this.audience && (C.aud = this.audience);
+    const T = await new Promise((K, O) => {
       se.sign(
         C,
         this.secretOrPrivateKey,
         { algorithm: this.jwtAlgorithmChecked, keyid: "1" },
-        (V, M) => {
-          M ? K(M) : O(V || new o(
+        (V, j) => {
+          j ? K(j) : O(V || new o(
             l.Unauthorized,
             "Couldn't create jwt"
           ));
@@ -6722,13 +6722,13 @@ class zt {
     this.persistAccessToken && this.keyStorage && await ((z = this.keyStorage) == null ? void 0 : z.saveKey(
       void 0,
       // to avoid user storage dependency, we don't set this
-      U.accessToken + T.hash(_),
-      m,
+      U.accessToken + v.hash(_),
+      w,
       p
     ));
     let k;
     if (i && i.includes("openid")) {
-      const K = T.uuid();
+      const K = v.uuid();
       let O = {
         aud: s.client_id,
         jti: K,
@@ -6755,7 +6755,7 @@ class zt {
           "updated_at"
         ])
           O[V] = n[V];
-      O = this.addClaims(O, this.idTokenClaims, i, n), O.scope = i, this.accessTokenExpiry != null && (O.exp = y + this.accessTokenExpiry), k = await new Promise((V, M) => {
+      O = this.addClaims(O, this.idTokenClaims, i, n), O.scope = i, this.accessTokenExpiry != null && (O.exp = y + this.accessTokenExpiry), k = await new Promise((V, j) => {
         se.sign(
           O,
           this.secretOrPrivateKey,
@@ -6764,7 +6764,7 @@ class zt {
             keyid: this.jwtKid
           },
           (N, P) => {
-            P ? V(P) : M(N || new o(
+            P ? V(P) : j(N || new o(
               l.Unauthorized,
               "Couldn't create jwt"
             ));
@@ -6780,16 +6780,16 @@ class zt {
       };
       i && (K.scope = i);
       let O;
-      const M = {
-        jti: T.uuid(),
+      const j = {
+        jti: v.uuid(),
         iat: y,
         iss: this.oauthIssuer,
         sub: d.username,
         type: "refresh"
       };
-      this.refreshTokenExpiry != null && (M.exp = y + this.refreshTokenExpiry, O = this.refreshTokenExpiry ? new Date(y + this.refreshTokenExpiry * 1e3 + this.clockTolerance * 1e3) : void 0), this.oauthIssuer && (M.aud = this.oauthIssuer), A = await new Promise((N, P) => {
+      this.refreshTokenExpiry != null && (j.exp = y + this.refreshTokenExpiry, O = this.refreshTokenExpiry ? new Date(y + this.refreshTokenExpiry * 1e3 + this.clockTolerance * 1e3) : void 0), this.oauthIssuer && (j.aud = this.oauthIssuer), A = await new Promise((N, P) => {
         se.sign(
-          M,
+          j,
           this.secretOrPrivateKey,
           { algorithm: this.jwtAlgorithmChecked, keyid: "1" },
           (F, I) => {
@@ -6802,14 +6802,14 @@ class zt {
       }), A && await ((H = this.keyStorage) == null ? void 0 : H.saveKey(
         void 0,
         // to avoid user storage dependency
-        U.refreshToken + T.hash(A),
-        m,
+        U.refreshToken + v.hash(A),
+        w,
         O,
         JSON.stringify(K)
       ));
     }
     return {
-      access_token: v,
+      access_token: T,
       id_token: k,
       refresh_token: A,
       expires_in: this.accessTokenExpiry == null ? void 0 : this.accessTokenExpiry,
@@ -6830,8 +6830,8 @@ class zt {
             else {
               let a = e[i];
               typeof a == "string" && (a = [a]);
-              for (let n of a)
-                s[n] = r[n];
+              for (let n in a)
+                s[n] = r[a[n]];
             }
       }
       if ("all" in e) {
@@ -6841,9 +6841,11 @@ class zt {
             ...s,
             ...r
           };
-        else
-          for (let a of i)
-            s[a] = r[a];
+        else {
+          console.log(i);
+          for (let a in i)
+            s[a] = r[i[a]];
+        }
       }
     }
     return s;
@@ -6856,7 +6858,7 @@ class zt {
    */
   async validAuthorizationCode(s) {
     try {
-      const e = U.authorizationCode + T.hash(s);
+      const e = U.authorizationCode + v.hash(s);
       return await this.keyStorage.getKey(e), !0;
     } catch (e) {
       return u.logger.debug(f({ err: e })), !1;
@@ -6870,7 +6872,7 @@ class zt {
    */
   async validRefreshToken(s) {
     try {
-      const e = U.refreshToken + T.hash(s);
+      const e = U.refreshToken + v.hash(s);
       return await this.keyStorage.getKey(e), !0;
     } catch (e) {
       return u.logger.debug(f({ err: e })), !1;
@@ -6885,7 +6887,7 @@ class zt {
   async getRefreshTokenData(s) {
     if (s)
       try {
-        const e = U.refreshToken + T.hash(s), t = await this.keyStorage.getKey(e);
+        const e = U.refreshToken + v.hash(s), t = await this.keyStorage.getKey(e);
         return JSON.parse(t.data || "{}");
       } catch (e) {
         u.logger.debug(f({ err: e }));
@@ -6919,7 +6921,7 @@ class zt {
     try {
       const e = await this.validateJwt(s, "access");
       if (this.persistAccessToken) {
-        const t = U.accessToken + T.hash(e.payload.jti);
+        const t = U.accessToken + v.hash(e.payload.jti);
         await this.keyStorage.getKey(t);
       }
       return e;
@@ -7120,7 +7122,7 @@ class nt extends Pe {
    */
   constructor(e, t = {}) {
     const r = {};
-    w("jwtKeyType", g.String, r, t, "JWT_KEY_TYPE");
+    m("jwtKeyType", g.String, r, t, "JWT_KEY_TYPE");
     super(e, { ...t, ...r });
     /**
      * Value passed to the constructor.  The `aud` claim must match it
@@ -7134,7 +7136,7 @@ class nt extends Pe {
     h(this, "keyStorage");
     h(this, "jwtSecretKeyFile", "");
     h(this, "jwtPublicKeyFile", "");
-    if (this.audience = e, w("authServerBaseUrl", g.String, this, t, "AUTH_SERVER_BASE_URL", !0), w("jwtSecretKeyFile", g.String, this, t, "JWT_SECRET_KEY_FILE"), w("jwtPublicKeyFile", g.String, this, t, "JWT_PUBLIC_KEY_FILE"), w("jwtSecretKey", g.String, this, t, "JWT_SECRET_KEY"), w("jwtPublicKey", g.String, this, t, "JWT_PUBLIC_KEY"), w("clockTolerance", g.Number, this, t, "OAUTH_CLOCK_TOLERANCE"), w("persistAccessToken", g.Boolean, this, t, "OAUTH_PERSIST_ACCESS_TOKEN"), this.keyStorage = t.keyStorage, this.jwtSecretKey || this.jwtSecretKeyFile) {
+    if (this.audience = e, m("authServerBaseUrl", g.String, this, t, "AUTH_SERVER_BASE_URL", !0), m("jwtSecretKeyFile", g.String, this, t, "JWT_SECRET_KEY_FILE"), m("jwtPublicKeyFile", g.String, this, t, "JWT_PUBLIC_KEY_FILE"), m("jwtSecretKey", g.String, this, t, "JWT_SECRET_KEY"), m("jwtPublicKey", g.String, this, t, "JWT_PUBLIC_KEY"), m("clockTolerance", g.Number, this, t, "OAUTH_CLOCK_TOLERANCE"), m("persistAccessToken", g.Boolean, this, t, "OAUTH_PERSIST_ACCESS_TOKEN"), this.keyStorage = t.keyStorage, this.jwtSecretKey || this.jwtSecretKeyFile) {
       if (this.jwtPublicKey || this.jwtPublicKeyFile)
         throw new o(
           l.Configuration,
@@ -7162,7 +7164,7 @@ class nt extends Pe {
    * @returns Base64-url-encoded hash
    */
   async hash(e) {
-    return T.hash(e);
+    return v.hash(e);
   }
   /**
    * If the given token is valid, the paylaod is returned.  Otherwise
@@ -7183,7 +7185,7 @@ class nt extends Pe {
     const r = await super.tokenAuthorized(e, t);
     if (r && t == "access" && this.persistAccessToken && this.keyStorage)
       try {
-        const a = U.accessToken + T.hash(r.jti), n = await this.keyStorage.getKey(a), c = /* @__PURE__ */ new Date();
+        const a = U.accessToken + v.hash(r.jti ? r.jti : r.sid ? r.sid : ""), n = await this.keyStorage.getKey(a), c = /* @__PURE__ */ new Date();
         if (n.expires && ((i = n.expires) == null ? void 0 : i.getTime()) < c.getTime()) {
           u.logger.error(f({ msg: "Access token expired in storage but not in JWT" }));
           return;
@@ -7191,7 +7193,7 @@ class nt extends Pe {
       } catch (a) {
         u.logger.warn(f({
           msg: "Couldn't get token from database - is it valid?",
-          hashedAccessToken: T.hash(r.jti)
+          hashedAccessToken: v.hash(r.jti ? r.jti : r.sid ? r.sid : "")
         })), u.logger.debug(f({ err: a }));
         return;
       }
@@ -7210,7 +7212,7 @@ class Ht extends Ke {
     const r = {
       client_id: ""
     };
-    w("client_id", g.String, r, t, "OAUTH_CLIENT_ID", !0);
+    m("client_id", g.String, r, t, "OAUTH_CLIENT_ID", !0);
     super({
       authServerBaseUrl: e,
       tokenConsumer: new nt(
@@ -7231,7 +7233,8 @@ class Ht extends Ke {
     h(this, "userStorage");
     this.client_id = r.client_id;
     let i = {};
-    w("stateLength", g.String, this, t, "OAUTH_STATE_LENGTH"), w("verifierLength", g.String, this, t, "OAUTH_VERIFIER_LENGTH"), w("client_secret", g.String, i, t, "OAUTH_CLIENT_SECRET"), w("codeChallengeMethod", g.String, this, t, "OAUTH_CODE_CHALLENGE_METHOD"), w("deviceAuthorizationUrl", g.String, this, t, "OAUTH_DEVICE_AUTHORIZATION_URL"), this.deviceAuthorizationUrl.startsWith("/") && (this.deviceAuthorizationUrl = this.deviceAuthorizationUrl.substring(1)), i.client_secret && (this.client_secret = i.client_secret), w("userCreationType", g.String, this, t, "OAUTH_USER_CREATION_TYPE"), w("userMatchField", g.String, this, t, "OAUTH_USER_MATCH_FIELD"), w("idTokenMatchField", g.String, this, t, "OAUTH_IDTOKEN_MaTCH_FIELD"), this.userCreationType == "merge" ? this.userCreationFn = ot : this.userCreationType == "embed" ? this.userCreationFn = lt : t.userCreationFn && this.userCreationType == "custom" ? this.userCreationFn = t.userCreationFn : this.userCreationFn = ct, t.userStorage && (this.userStorage = t.userStorage);
+    if (m("stateLength", g.String, this, t, "OAUTH_STATE_LENGTH"), m("verifierLength", g.String, this, t, "OAUTH_VERIFIER_LENGTH"), m("client_secret", g.String, i, t, "OAUTH_CLIENT_SECRET"), m("codeChallengeMethod", g.String, this, t, "OAUTH_CODE_CHALLENGE_METHOD"), m("deviceAuthorizationUrl", g.String, this, t, "OAUTH_DEVICE_AUTHORIZATION_URL"), m("oauthLogFetch", g.Boolean, this, t, "OAUTH_LOG_FETCH"), this.deviceAuthorizationUrl.startsWith("/") && (this.deviceAuthorizationUrl = this.deviceAuthorizationUrl.substring(1)), i.client_secret && (this.client_secret = i.client_secret), m("userCreationType", g.String, this, t, "OAUTH_USER_CREATION_TYPE"), m("userMatchField", g.String, this, t, "OAUTH_USER_MATCH_FIELD"), m("idTokenMatchField", g.String, this, t, "OAUTH_IDTOKEN_MaTCH_FIELD"), this.userCreationType == "merge" ? this.userCreationFn = ot : this.userCreationType == "embed" ? this.userCreationFn = lt : t.userCreationFn && this.userCreationType == "custom" ? this.userCreationFn = t.userCreationFn : this.userCreationFn = ct, t.userStorage && (this.userStorage = t.userStorage), m("oauthPostType", g.String, this, t, "OAUTH_POST_TYPE"), m("oauthUseUserInfoEndpoint", g.Boolean, this, t, "OAUTH_USE_USER_INFO_ENDPOINT"), this.oauthPostType != "json" && this.oauthPostType != "form")
+      throw new o(l.Configuration, "oauthPostType must be json or form");
   }
   /**
    * Uses {@link @crossauth/backend!Crypto.randomValue} to create a random string
@@ -7240,7 +7243,7 @@ class Ht extends Ke {
    * @returns the Base64-URL-encoded random string
    */
   randomValue(e) {
-    return T.randomValue(e);
+    return v.randomValue(e);
   }
   /**
    * Uses {@link @crossauth/backend!Crypto.sha256} to create hash a string using SHA256
@@ -7248,7 +7251,7 @@ class Ht extends Ke {
    * @returns the Base64-URL-encoded hash
    */
   async sha256(e) {
-    return T.sha256(e);
+    return v.sha256(e);
   }
 }
 async function ot(S, s, e, t) {
@@ -7282,7 +7285,7 @@ async function ct(S, s, e, t) {
     state: S.state ?? "active"
   };
 }
-class Mt {
+class jt {
   /**
    * Constructor
    * @param tokenConsumers one or more consumers that will process
@@ -7327,7 +7330,7 @@ class Mt {
 export {
   ge as ApiKeyManager,
   re as Authenticator,
-  T as Crypto,
+  v as Crypto,
   rt as DoubleSubmitCsrfToken,
   Rt as DummyFactor2Authenticator,
   Z as EmailAuthenticator,
@@ -7335,16 +7338,16 @@ export {
   Pt as InMemoryOAuthAuthorizationStorage,
   It as InMemoryOAuthClientStorage,
   Ut as InMemoryUserStorage,
-  D as KeyStorage,
-  xt as LdapAuthenticator,
+  x as KeyStorage,
+  Dt as LdapAuthenticator,
   oe as LdapUserStorage,
-  Te as LocalPasswordAuthenticator,
+  ve as LocalPasswordAuthenticator,
   zt as OAuthAuthorizationServer,
   we as OAuthAuthorizationStorage,
   Ht as OAuthClientBackend,
   J as OAuthClientManager,
   me as OAuthClientStorage,
-  Mt as OAuthResourceServer,
+  jt as OAuthResourceServer,
   nt as OAuthTokenConsumer,
   g as ParamType,
   be as PasswordAuthenticator,
@@ -7356,13 +7359,13 @@ export {
   bt as PrismaOAuthAuthorizationStorage,
   Et as PrismaOAuthClientStorage,
   G as PrismaUserStorage,
-  x as SessionCookie,
+  D as SessionCookie,
   Lt as SessionManager,
   Q as SmsAuthenticator,
   R as TokenEmailer,
-  Dt as TotpAuthenticator,
+  xt as TotpAuthenticator,
   Ue as TwilioAuthenticator,
   L as UserStorage,
-  w as setParameter,
+  m as setParameter,
   Bt as toCookieSerializeOptions
 };