@crossauth/backend 0.0.28 → 0.0.30

package/dist/index.js

@@ -15,7 +15,7 @@ import se from "jsonwebtoken";
 import { createPublicKey as ze } from "crypto";
 import te from "node:fs";
 import * as He from "jose";
-var m = /* @__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))(m || {});
+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) {
   let e = S.split("."), t = s;
   for (let r in e) {
@@ -65,7 +65,7 @@ function w(S, s, e, t, r, i = !1) {
     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);
 }
-class H {
+class L {
   /**
    * Constructor
    * @param options See {@link UserStorageOptions}
@@ -75,7 +75,7 @@ class H {
     h(this, "adminEditableFields", []);
     h(this, "normalizeUsername", !0);
     h(this, "normalizeEmail", !0);
-    w("userEditableFields", m.JsonArray, this, s, "USER_EDITABLE_FIELDS"), w("adminEditableFields", m.JsonArray, this, s, "ADMIN_EDITABLE_FIELDS"), w("normalizeUsername", m.JsonArray, this, s, "NORMALIZE_USERNAME"), w("normalizeEmail", m.JsonArray, this, s, "NORMALIZE_EMAIL");
+    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");
   }
   /**
    * Creates a user with the given details and secrets.
@@ -98,7 +98,7 @@ class H {
     return s.normalize("NFD").replace(new RegExp("\\p{Diacritic}", "gu"), "").toLowerCase();
   }
 }
-class L {
+class D {
   /**
    * Returns an object decoded from the data field as a JSON string
    * @param data the JSON string to decode
@@ -166,7 +166,7 @@ class we {
   constructor(s = {}) {
   }
 }
-class G extends H {
+class G extends L {
   /**
    * Creates a PrismaUserStorage object, optionally overriding defaults.
    * @param options see {@link PrismaUserStorageOptions}
@@ -181,7 +181,7 @@ class G extends H {
     h(this, "includes", ["secrets"]);
     h(this, "includesObject", {});
     h(this, "forceIdToNumber", !0);
-    w("userTable", m.String, this, e, "USER_TABLE"), w("userSecretsTable", m.String, this, e, "USER_SECRETS_TABLE"), w("idColumn", m.String, this, e, "USER_ID_COLUMN"), w("useridForeignKeyColumn", m.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), w("includes", m.String, this, e, "USER_INCLUDES"), w("forceIdToNumber", m.String, this, e, "USER_FORCE_ID_TO_NUMBER"), this.includes.forEach((t) => {
+    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) => {
       this.includesObject[t] = !0;
     }), e && e.prismaClient ? this.prismaClient = e.prismaClient : this.prismaClient = new ce();
   }
@@ -288,7 +288,7 @@ class G extends H {
           });
         } catch {
         }
-        let { userid: g, ...y } = d ?? {};
+        let { userid: m, ...y } = d ?? {};
         n = { ...y, ...n }, await c[this.userTable].update({
           where: {
             [this.idColumn]: e.id
@@ -413,7 +413,7 @@ class G extends H {
     }
   }
 }
-class kt extends L {
+class kt extends D {
   /**
    * Constructor with user storage object to use plus optional parameters.
    * 
@@ -425,7 +425,7 @@ class kt extends L {
     h(this, "prismaClient");
     h(this, "transactionTimeout", 5e3);
     h(this, "useridForeignKeyColumn", "userid");
-    w("transactionTimeout", m.Number, this, e, "TRANSACTION_TIMEOUT"), w("useridForeignKeyColumn", m.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;
+    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;
   }
   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", m.String, this, e, "OAUTH_CLIENT_TABLE"), w("redirectUriTable", m.String, this, e, "OAUTH_REDIRECTURI_TABLE"), w("validFlowTable", m.String, this, e, "OAUTH_VALID_FLOW_TABLE"), w("transactionTimeout", m.Number, this, e, "TRANSACTION_TIMEOUT"), w("updateMode", m.String, this, e, "OAUTHCLIENT_UPDATE_MODE"), w("useridForeignKeyColumn", m.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
+    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;
   }
   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, g = c.valid_flow;
+        }), d = c.redirect_uri, m = 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: g.map((p) => p.flow)
+          valid_flow: m.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 g = d.redirect_uri, y = d.valid_flow;
+          const m = 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 = g.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 = m.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", m.String, this, e, "OAUTH_CLIENT_TABLE"), w("transactionTimeout", m.Number, this, e, "TRANSACTION_TIMEOUT"), w("useridForeignKeyColumn", m.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
+    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;
   }
   async getAuthorizations(e, t) {
     try {
@@ -1011,7 +1011,7 @@ class bt extends we {
     }
   }
 }
-class Ut extends H {
+class Ut extends L {
   /**
    * Creates a InMemoryUserStorage object, optionally overriding defaults.
    * @param options see {@link InMemoryUserStorageOptions}
@@ -1029,9 +1029,9 @@ class Ut extends H {
    * @param secrets optionally, secrets to save
    */
   async createUser(e, t) {
-    if (e.username_normalized = H.normalize(e.username), e.username_normalized in this.usersByUsername)
+    if (e.username_normalized = L.normalize(e.username), e.username_normalized in this.usersByUsername)
       throw new o(l.UserExists);
-    if ("email" in e && e.email && (e.email_normalized = H.normalize(e.email), e.email_normalized in this.getUserByEmail))
+    if ("email" in e && e.email && (e.email_normalized = L.normalize(e.email), e.email_normalized in this.getUserByEmail))
       throw new o(l.UserExists);
     const r = { id: e.username, ...e };
     return this.usersByUsername[e.username_normalized] = r, this.secretsByUsername[e.username_normalized] = t ?? {}, "email" in e && e.email && (this.usersByEmail[e.email_normalized] = r), "email" in e && e.email && (this.secretsByEmail[e.email_normalized] = t ?? {}), { id: e.username, ...e };
@@ -1044,7 +1044,7 @@ class Ut extends H {
    * @throws {@link @crossauth/common!CrossauthError } with {@link @crossauth/common!ErrorCode } set to either `UserNotExist`.
    */
   async getUserByUsername(e, t) {
-    const r = H.normalize(e);
+    const r = L.normalize(e);
     if (r in this.usersByUsername) {
       const i = this.usersByUsername[r];
       if (!i) throw new o(l.UserNotExist);
@@ -1073,7 +1073,7 @@ class Ut extends H {
    * @throws {@link @crossauth/common!CrossauthError } with {@link @crossauth/common!ErrorCode } set to either `UserNotExist`.
    */
   async getUserByEmail(e, t) {
-    const r = H.normalize(e);
+    const r = L.normalize(e);
     if (r in this.usersByEmail) {
       const i = this.usersByEmail[r];
       if (!i) throw new o(l.UserNotExist);
@@ -1117,7 +1117,7 @@ class Ut extends H {
    */
   async updateUser(e, t) {
     let r = { ...e };
-    if ("username" in r && r.username ? r.username_normalized = H.normalize(r.username) : "id" in r && r.id && (r.username_normalized = H.normalize(String(r.id))), "email" in r && r.email && (r.email_normalized = H.normalize(r.email)), r.username_normalized && r.username_normalized in this.usersByUsername) {
+    if ("username" in r && r.username ? r.username_normalized = L.normalize(r.username) : "id" in r && r.id && (r.username_normalized = L.normalize(String(r.id))), "email" in r && r.email && (r.email_normalized = L.normalize(r.email)), r.username_normalized && r.username_normalized in this.usersByUsername) {
       for (let i in r)
         this.usersByUsername[r.username_normalized][i] = r[i];
       t && (this.secretsByUsername[r.username_normalized] = {
@@ -1131,11 +1131,11 @@ class Ut extends H {
    * @param username username of user to delete
    */
   async deleteUserByUsername(e) {
-    const t = H.normalize(String(e));
+    const t = L.normalize(String(e));
     if (t in this.usersByUsername) {
       const r = this.usersByUsername[t];
       delete this.usersByUsername[t], delete this.secretsByUsername[t];
-      const i = H.normalize(String(r.email));
+      const i = L.normalize(String(r.email));
       i in this.usersByEmail && (delete this.usersByEmail[i], delete this.secretsByEmail[i]);
     }
   }
@@ -1157,7 +1157,7 @@ class Ut extends H {
     return i;
   }
 }
-class At extends L {
+class At extends D {
   /**
    * Constructor
    */
@@ -1439,7 +1439,7 @@ class Pt extends we {
 function $e(S, s) {
   return { username: Array.isArray(s.uid) ? s.uid[0] : s.uid, state: "active", ...S };
 }
-class oe extends H {
+class oe extends L {
   /**
    * Constructor.
    * @param localStorage the underlying storage where users are kept (without passwords)
@@ -1452,7 +1452,7 @@ class oe extends H {
     h(this, "ldapUserSearchBase", "");
     h(this, "ldapUsernameAttribute", "cn");
     h(this, "createUserFn", $e);
-    this.localStorage = e, w("ldapUrls", m.JsonArray, this, t, "LDAP_URL", !0), w("ldapUserSearchBase", m.String, this, t, "LDAP_USER_SEARCH_BASE"), w("ldapUsernameAttribute", m.String, this, t, "LDAP_USENAME_ATTRIBUTE"), t.createUserFn && (this.createUserFn = t.createUserFn);
+    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);
   }
   /**
    * Authenticates the user in LDAP and, if valid, creates a user in local
@@ -1591,17 +1591,17 @@ class oe extends H {
         t,
         n,
         function(c, d) {
-          let g;
+          let m;
           if (c) {
             a(c), e.unbind();
             return;
           }
           d.on("searchEntry", function(y) {
-            g = oe.searchResultToUser(y.pojo);
+            m = 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")) : g ? i(g) : a(new o(l.UsernameOrPasswordInvalid)), e.unbind();
+            y.status != 0 ? a(new o(l.Connection, "LDAP  onnection failed")) : m ? i(m) : a(new o(l.UsernameOrPasswordInvalid)), e.unbind();
           });
         }
       );
@@ -1630,7 +1630,7 @@ class oe extends H {
     return oe.sanitizeLdapDn(e).replace("*", "*").replace("(", "(").replace(")", ")");
   }
 }
-class Y extends H {
+class Y extends L {
   /**
    * Creates a DbUserStorage object, optionally overriding defaults.
    * @param dbPool the instance of the Posrgres client. 
@@ -1644,7 +1644,7 @@ class Y extends H {
     h(this, "useridForeignKeyColumn", "userid");
     h(this, "forceIdToNumber", !0);
     h(this, "dbPool");
-    this.dbPool = e, w("userTable", m.String, this, t, "USER_TABLE"), w("userSecretsTable", m.String, this, t, "USER_SECRETS_TABLE"), w("idColumn", m.String, this, t, "USER_ID_COLUMN"), w("forceIdToNumber", m.String, this, t, "USER_FORCE_ID_TO_NUMBER"), w("useridForeignKeyColumn", m.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN");
+    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");
   }
   /**
    * Returns user matching the given id, or throws an exception.  
@@ -1696,25 +1696,25 @@ class Y extends H {
     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(), g = await i.execute(d, [t]);
-      if (g.length == 0)
+      let d = `select * from ${this.userTable} where ${e} = ` + c.nextParameter(), m = await i.execute(d, [t]);
+      if (m.length == 0)
         throw new o(l.UserNotExist);
       let y, p, _;
-      if (this.idColumn in g[0]) y = g[0][this.idColumn];
+      if (this.idColumn in m[0]) y = m[0][this.idColumn];
       else throw new o(l.Configuration, "ID column " + this.idColumn + " not present in user table");
-      if ("username" in g[0]) p = g[0].username;
+      if ("username" in m[0]) p = m[0].username;
       else throw new o(l.Configuration, "username column " + this.idColumn + " not present in user table");
-      if ("state" in g[0]) _ = g[0].state;
+      if ("state" in m[0]) _ = m[0].state;
       else throw new o(l.Configuration, "state column " + this.idColumn + " not present in user table");
       if (a = {
-        ...g[0],
+        ...m[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(), g = await i.execute(d, [a.id]), g.length == 0)
+      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)
         throw new o(l.UserNotExist);
-      if (g.length > 0 ? n = { userid: a.id, ...g[0] } : n = { userid: a.id }, !n) 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 (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,7 +1745,7 @@ class Y extends H {
     let i = [], a = [], n = "", c = "", d = this.dbPool.parameters();
     e && (c = "OFFSET " + d.nextParameter()), t && (a.push(t), n = "LIMIT " + d.nextParameter());
     try {
-      let g = `select * from ${this.userTable} ${n} ${c} order by username_normalized asc`, y = await r.execute(g, a);
+      let m = `select * from ${this.userTable} ${n} ${c} order by username_normalized asc`, y = await r.execute(m, a);
       if (y.length == 0)
         throw new o(l.UserNotExist);
       for (let p of y) {
@@ -1765,8 +1765,8 @@ class Y extends H {
         i.push(k);
       }
       return i;
-    } catch (g) {
-      throw g;
+    } catch (m) {
+      throw m;
     } finally {
       r.release();
     }
@@ -1791,21 +1791,21 @@ class Y extends H {
         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 g = [], y = [];
+      let m = [], y = [];
       for (let p in c)
-        c[p] != null && p != "id" && (g.push(p + "= " + i.nextParameter()), y.push(c[p]));
-      if (g.length > 0) {
-        let p = g.join(", ");
+        c[p] != null && p != "id" && (m.push(p + "= " + i.nextParameter()), y.push(c[p]));
+      if (m.length > 0) {
+        let p = m.join(", ");
         y.push(e.id);
         let _ = `update ${this.userTable} set ${p} where ${this.idColumn} = ` + i.nextParameter();
         await r.execute(_, y);
       }
       if (t) {
-        g = [], y = [], i = this.dbPool.parameters();
+        m = [], y = [], i = this.dbPool.parameters();
         for (let p in d)
-          d[p] != null && p != "userid" && (g.push(p + "= " + i.nextParameter()), y.push(d[p]));
-        if (g.length > 0) {
-          let p = g.join(", ");
+          d[p] != null && p != "userid" && (m.push(p + "= " + i.nextParameter()), y.push(d[p]));
+        if (m.length > 0) {
+          let p = m.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 H {
       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 = [], g = [];
+      let c = [], d = [], m = [];
       const y = this.dbPool.parameters();
       for (let _ in a)
-        a[_] != null && _ != "id" && (c.push(_), d.push(y.nextParameter()), g.push(a[_]));
+        a[_] != null && _ != "id" && (c.push(_), d.push(y.nextParameter()), m.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, g);
+        const v = `insert into ${this.userTable} (${_}) values (${C}) returning ${this.idColumn}`, k = await r.execute(v, m);
         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 = [], g = [];
+        c = [], d = [], m = [];
         const _ = this.dbPool.parameters();
-        c.push("userid"), d.push(_.nextParameter()), g.push(i);
+        c.push("userid"), d.push(_.nextParameter()), m.push(i);
         for (let C in n)
-          n[C] != null && C != "userid" && (c.push(C), d.push(_.nextParameter()), g.push(n[C]));
+          n[C] != null && C != "userid" && (c.push(C), d.push(_.nextParameter()), m.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, g);
+          u.logger.debug(f({ msg: "Executing query", query: k })), await r.execute(k, m);
         }
       }
       return await r.commit(), (await this.getUserById(i)).user;
@@ -1903,7 +1903,7 @@ class Y extends H {
     }
   }
 }
-class qe extends L {
+class qe extends D {
   /**
    * Constructor with user storage object to use plus optional parameters.
    * 
@@ -1915,7 +1915,7 @@ class qe extends L {
     h(this, "keyTable", "keys");
     h(this, "dbPool");
     h(this, "useridForeignKeyColumn", "userid");
-    w("transactionTimeout", m.Number, this, t, "TRANSACTION_TIMEOUT"), w("useridForeignKeyColumn", m.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), t.keyTable && (this.keyTable = t.keyTable), this.dbPool = e;
+    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;
   }
   async getKey(e) {
     const t = await this.dbPool.connect();
@@ -1962,12 +1962,12 @@ class qe extends L {
    * @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"], g = this.dbPool.parameters(), y = [];
+    let c, d = [this.useridForeignKeyColumn, "value", "created", "expires", "data"], m = this.dbPool.parameters(), y = [];
     for (let k = 0; k < 5; ++k)
-      y.push(g.nextParameter());
+      y.push(m.nextParameter());
     let p = [e ?? null, t, r, i ?? null, a ?? ""];
     for (let k in n)
-      d.push(k), y.push(g.nextParameter()), p.push(n[k]);
+      d.push(k), y.push(m.nextParameter()), p.push(n[k]);
     let _ = d.join(", "), C = y.join(", ");
     const v = await this.dbPool.connect();
     try {
@@ -1995,11 +1995,11 @@ class qe extends L {
     try {
       let a, n = [], c = "", d = this.dbPool.parameters();
       if (e) {
-        const g = d.nextParameter(), y = d.nextParameter();
-        a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} = ${g} and value like ${y} `, n = [e];
+        const m = d.nextParameter(), y = d.nextParameter();
+        a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} = ${m} and value like ${y} `, n = [e];
       } else {
-        const g = d.nextParameter();
-        a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} is null and value like ${g}`;
+        const m = d.nextParameter();
+        a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} is null and value like ${m}`;
       }
       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 L {
       let r = [], i = [];
       const a = this.dbPool.parameters();
       for (let d in e) {
-        let g = d == "userid" ? this.useridForeignKeyColumn : d;
-        e[d] == null ? r.push(g + " is null") : (r.push(g + " = " + a.nextParameter()), i.push(e[d]));
+        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 n = r.join(" and "), c = `delete from ${this.keyTable} where ${n}`;
       await t.execute(c, i);
@@ -2054,8 +2054,8 @@ class qe extends L {
       if (c.length == 0)
         return [];
       for (let d of c) {
-        let g = this.makeKey(d);
-        this.useridForeignKeyColumn != "userid" && (g.userid = g[this.useridForeignKeyColumn], delete g[this.useridForeignKeyColumn]), r.push(g);
+        let m = this.makeKey(d);
+        this.useridForeignKeyColumn != "userid" && (m.userid = m[this.useridForeignKeyColumn], delete m[this.useridForeignKeyColumn]), r.push(m);
       }
       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", m.String, this, t, "OAUTH_CLIENT_TABLE"), w("redirectUriTable", m.String, this, t, "OAUTH_REDIRECTURI_TABLE"), w("validFlowTable", m.String, this, t, "OAUTH_VALID_FLOW_TABLE"), w("updateMode", m.String, this, t, "OAUTHCLIENT_UPDATE_MODE"), w("useridForeignKeyColumn", m.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), this.dbPool = e;
+    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;
   }
   async getClientById(e) {
     let t = await this.dbPool.connect();
@@ -2210,15 +2210,15 @@ class We extends me {
     };
   }
   async getClientWithTransaction(e, t, r, i, a, n) {
-    let c = [], d = this.dbPool.parameters(), g = [], 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(), g.push(r)), i !== null && i == null || (p == "" ? p = "where " : p += " and ", i == null ? p += "userid is null" : (p += `${this.useridForeignKeyColumn} = ` + d.nextParameter(), g.push(i)));
+    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 _ = `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(), g.push(r)), i !== null && i == null || (C == "" ? C = "where " : C += " and ", i == null ? C += "userid is null" : (C += `${this.useridForeignKeyColumn} = ` + d.nextParameter(), g.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;
+    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, g);
+    const k = await e.execute(v, m);
     let A;
-    for (let M of k)
-      (!A || M.client_id != A.client_id) && (A && c.push(A), A = this.makeClient(M), A.valid_flow = [], A.redirect_uri = []), M.uri && A.redirect_uri.push(M.uri), M.flow && A.valid_flow.push(M.flow);
+    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);
     return A && c.push(A), c;
   }
   /**
@@ -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 = [], g = [], y = this.dbPool.parameters();
+    let c = [], d = [], m = [], y = this.dbPool.parameters();
     try {
       for (let C in n)
-        c.push(C), d.push(y.nextParameter()), g.push(n[C]);
+        c.push(C), d.push(y.nextParameter()), m.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, g);
+        await e.execute(k, m);
       }
     } 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) {
-        g = [], y = this.dbPool.parameters();
+        m = [], y = this.dbPool.parameters();
         let v = `insert into ${this.redirectUriTable} (client_id, uri) values (` + y.nextParameter() + ", " + y.nextParameter() + ")";
-        g.push(_.client_id), g.push(r[C]), await e.execute(v, g);
+        m.push(_.client_id), m.push(r[C]), await e.execute(v, m);
       }
     if (i)
       for (let C = 0; C < i.length; ++C) {
-        g = [], y = this.dbPool.parameters();
+        m = [], y = this.dbPool.parameters();
         let v = `insert into ${this.validFlowTable} (client_id, flow) values (` + y.nextParameter() + ", " + y.nextParameter() + ")";
-        g.push(_.client_id), g.push(i[C]), await e.execute(v, g);
+        m.push(_.client_id), m.push(i[C]), await e.execute(v, m);
       }
     return { ..._, redirect_uri: r, valid_flow: i };
   }
@@ -2343,26 +2343,26 @@ class We extends me {
     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 g = this.dbPool.parameters(), y = `delete from ${this.redirectUriTable} where client_id = ` + g.nextParameter();
-    await e.execute(y, [t.client_id]), g = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + g.nextParameter(), await e.execute(y, [t.client_id]);
+    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 p = [], _ = [], C = [];
-    g = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + g.nextParameter();
+    m = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + m.nextParameter();
     for (let v in d)
-      p.push(v), _.push(g.nextParameter()), C.push(d[v]);
+      p.push(v), _.push(m.nextParameter()), C.push(d[v]);
     if (p.length > 0) {
       let v = p.join(", "), k = _.join(", ");
       y = `update ${this.clientTable} set (${v}) values (${k})`, await e.execute(y, C);
     }
     if (n)
       for (let v = 0; v < n.length; ++v) {
-        C = [], g = this.dbPool.parameters();
-        let k = `insert into ${this.redirectUriTable} (client_id, uri) values (` + g.nextParameter() + ", " + g.nextParameter() + ")";
+        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);
       }
     if (c)
       for (let v = 0; v < c.length; ++v) {
-        C = [], g = this.dbPool.parameters();
-        let k = `insert into ${this.validFlowTable} (client_id, flow) values (` + g.nextParameter() + ", " + g.nextParameter() + ")";
+        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);
       }
   }
@@ -2390,14 +2390,14 @@ class Je extends we {
     h(this, "authorizationTable", "oauthauthorization");
     h(this, "useridForeignKeyColumn", "userid");
     h(this, "dbPool");
-    w("authorizationTable", m.String, this, t, "OAUTH_CLIENT_TABLE"), w("useridForeignKeyColumn", m.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), this.dbPool = e;
+    w("authorizationTable", g.String, this, t, "OAUTH_CLIENT_TABLE"), w("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((g) => g.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((m) => m.scope);
     } catch (i) {
       throw i;
     } finally {
@@ -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 g = (await De(Ne)(
+    let m = (await De(Ne)(
       s,
       n,
       e.iterations ?? Se,
       e.keyLen ?? ve,
       e.digest ?? Ce
     )).toString("base64url");
-    return i && (g = this.encodePasswordHash(
-      g,
+    return i && (m = this.encodePasswordHash(
+      m,
       t,
       a,
       e.iterations ?? Se,
       e.keyLen ?? ve,
       e.digest ?? Ce
-    )), g;
+    )), m;
   }
   /**
    * For creating non-JWT tokens (eg password reset tokens.)  The
@@ -2887,7 +2887,7 @@ const le = class le extends be {
     h(this, "pbkdf2KeyLength", 32);
     /** See {@link LocalPasswordAuthenticatorOptions.validatePasswordFn}  */
     h(this, "validatePasswordFn", tt);
-    w("secret", m.String, this, t, "HASHER_SECRET"), w("enableSecretForPasswordHash", m.Boolean, this, t, "ENABLE_SECRET_FOR_PASSWORDS"), w("pbkdf2Digest", m.String, this, t, "PASSWORD_PBKDF2_DIGEST"), w("pbkdf2Iterations", m.String, this, t, "PASSWORD_PBKDF2_ITERATIONS"), w("pbkdf2SaltLength", m.String, this, t, "PASSWORD_PBKDF2_SALTLENGTH"), w("pbkdf2KeyLength", m.String, this, t, "PASSWORD_PBKDF2_KEYLENGTH"), t.validatePasswordFn && (this.validatePasswordFn = t.validatePasswordFn);
+    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);
   }
   /**
    * Authenticates the user, returning a the user as a {@link User} object.
@@ -3041,7 +3041,7 @@ class Z extends re {
     h(this, "smtpPassword");
     h(this, "emailAuthenticatorTokenExpires", 60 * 5);
     h(this, "render");
-    w("views", m.String, this, e, "VIEWS"), w("emailAuthenticatorTextBody", m.String, this, e, "EMAIL_AUTHENTICATOR_TEXT_BODY"), w("emailAuthenticatorHtmlBody", m.String, this, e, "EMAIL_AUTHENTICATOR_HTML_BODY"), w("emailAuthenticatorSubject", m.String, this, e, "EMAIL_AUTHENTICATOR_SUBJECT"), w("emailFrom", m.String, this, e, "EMAIL_FROM", !0), w("smtpHost", m.String, this, e, "SMTP_HOST", !0), w("smtpPort", m.Number, this, e, "SMTP_PORT"), w("smtpUsername", m.String, this, e, "SMTP_USERNAME"), w("smtpPassword", m.String, this, e, "SMTP_PASSWORD"), w("smtpUseTls", m.Boolean, this, e, "SMTP_USE_TLS"), w("emailAuthenticatorTokenExpires", m.Number, this, e, "EMAIL_AUTHENTICATOR_TOKEN_EXPIRES"), e.render ? this.render = e.render : W.configure(this.views, { autoescape: !0 });
+    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 });
   }
   /**
    * Used by the OAuth password_mfa grant type.
@@ -3112,7 +3112,7 @@ class Z extends re {
    * @returns 
    */
   async reprepareConfiguration(e, t) {
-    const r = L.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 = 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);
     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", m.String, this, e, "VIEWS"), w("smsAuthenticatorBody", m.String, this, e, "SMS_AUTHENTICATOR_BODY"), w("smsAuthenticatorFrom", m.String, this, e, "SMS_AUTHENTICATOR_FROM", !0), w("smsAuthenticatorTokenExpires", m.Number, this, e, "SMS_AUTHENTICATOR_TOKEN_EXPIRES"), e.render ? this.render = e.render : W.configure(this.views, { autoescape: !0 });
+    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 });
   }
   /**
    * Used by the OAuth password_mfa grant type.
@@ -3289,7 +3289,7 @@ class Q extends re {
       otp: t
     };
     let d = { otp: t };
-    const g = this.render ? this.render(this.smsAuthenticatorBody, d) : W.render(this.smsAuthenticatorBody, d), y = this.sendSms(r, g);
+    const m = this.render ? this.render(this.smsAuthenticatorBody, d) : W.render(this.smsAuthenticatorBody, d), y = this.sendSms(r, m);
     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 = L.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 = 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);
     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 = L.decodeData(t.data)["2fa"], i = this.code, a = /* @__PURE__ */ new Date(), n = new Date(a.getTime() + 1e3 * 60).getTime();
+    const r = D.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: {},
@@ -3639,7 +3639,7 @@ class xt extends be {
     super({ friendlyName: "LDAP", ...t });
     h(this, "ldapAutoCreateAccount", !1);
     h(this, "ldapStorage");
-    w("ldapAutoCreateAccount", m.Boolean, this, t, "LDAP_AUTO_CREATE_ACCOUNT"), this.ldapStorage = e;
+    w("ldapAutoCreateAccount", g.Boolean, this, t, "LDAP_AUTO_CREATE_ACCOUNT"), this.ldapStorage = e;
   }
   /**
    * Authenticates the user, returning a the user as a {@link User} object.
@@ -3758,7 +3758,7 @@ class Dt extends re {
     }), { qrUrl: r, secret: t };
   }
   async getSecretFromSession(e, t) {
-    const r = L.decodeData(t.data);
+    const r = D.decodeData(t.data);
     if (!("totpsecret" in r))
       throw new o(
         l.Unauthorized,
@@ -3902,7 +3902,7 @@ class Dt extends re {
   }
 }
 const ne = 16;
-class x {
+class R {
   /**
    * Construct a new EmailVerifier.
    * 
@@ -3933,7 +3933,7 @@ class x {
     h(this, "verifyEmailExpires", 60 * 60 * 24);
     h(this, "passwordResetExpires", 60 * 60 * 24);
     h(this, "render");
-    this.userStorage = s, this.keyStorage = e, w("siteUrl", m.String, this, t, "SITE_URL", !0), w("prefix", m.String, this, t, "PREFIX"), w("views", m.String, this, t, "VIEWS"), w("emailVerificationTextBody", m.String, this, t, "EMAIL_VERIFICATION_TEXT_BODY"), w("emailVerificationHtmlBody", m.String, this, t, "EMAIL_VERIFICATION_HTML_BODY"), w("emailVerificationSubject", m.String, this, t, "EMAIL_VERIFICATION_SUBJECT"), w("passwordResetTextBody", m.String, this, t, "PASSWORD_RESET_TEXT_BODY"), w("passwordResetHtmlBody", m.String, this, t, "PASSWORD_RESET_HTML_BODY"), w("passwordResetSubject", m.String, this, t, "PASSWORD_RESET_SUBJECT"), w("emailFrom", m.String, this, t, "EMAIL_FROM", !0), w("smtpHost", m.String, this, t, "SMTP_HOST", !0), w("smtpPort", m.Number, this, t, "SMTP_PORT"), w("smtpUsername", m.String, this, t, "SMTP_USERNAME"), w("smtpPassword", m.String, this, t, "SMTP_PASSWORD"), w("smtpUseTls", m.Boolean, this, t, "SMTP_USE_TLS"), w("verifyEmailExpires", m.Boolean, this, t, "VERIFY_EMAIL_EXPIRES"), w("passwordResetExpires", m.String, this, t, "PASSWORD_RESET_EXPIRES"), t.render ? this.render = t.render : W.configure(this.views, { autoescape: !0 });
+    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 });
   }
   createEmailer() {
     let s = {};
@@ -3962,11 +3962,11 @@ class x {
     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 = x.hashEmailVerificationToken(n);
+      let n = T.randomValue(ne), c = R.hashEmailVerificationToken(n);
       try {
         return await this.keyStorage.saveKey(s, c, i, a, e), n;
       } catch {
-        n = T.randomValue(ne), c = x.hashEmailVerificationToken(n), r++;
+        n = T.randomValue(ne), c = R.hashEmailVerificationToken(n), r++;
       }
     }
     throw new o(l.Connection, "failed creating a unique key");
@@ -4007,7 +4007,7 @@ class x {
         "Either emailVerificationTextBody or emailVerificationHtmlBody must be set to send email verification emails"
       );
     let { user: r } = await this.userStorage.getUserById(s, { skipEmailVerifiedCheck: !0 }), i = e;
-    i != "" ? x.validateEmail(i) : (i = r.email ?? r.username, i || (i = r.username), x.validateEmail(i)), x.validateEmail(i);
+    i != "" ? R.validateEmail(i) : (i = r.email ?? r.username, i || (i = r.username), R.validateEmail(i)), R.validateEmail(i);
     const a = await this.createAndSaveEmailVerificationToken(s, e), n = await this._sendEmailVerificationToken(a, i, t);
     u.logger.info(f({ msg: "Sent email verification email", emailMessageId: n, email: i }));
   }
@@ -4027,20 +4027,20 @@ class x {
    *          address the user is validating
    */
   async verifyEmailVerificationToken(s) {
-    const e = x.hashEmailVerificationToken(s);
+    const e = R.hashEmailVerificationToken(s);
     let t = await this.keyStorage.getKey(e);
     try {
       if (!t.userid || !t.expires) throw new o(l.InvalidKey);
       const { user: r } = await this.userStorage.getUserById(t.userid, { skipEmailVerifiedCheck: !0 });
       let i = (r.email ?? r.username).toLowerCase();
-      if (i || (i = r.username.toLowerCase()), x.validateEmail(i), (/* @__PURE__ */ new Date()).getTime() > t.expires.getTime()) throw new o(l.Expired);
+      if (i || (i = r.username.toLowerCase()), R.validateEmail(i), (/* @__PURE__ */ new Date()).getTime() > t.expires.getTime()) throw new o(l.Expired);
       return { userid: t.userid, newEmail: t.data ?? "" };
     } finally {
     }
   }
   async deleteEmailVerificationToken(s) {
     try {
-      const e = x.hashEmailVerificationToken(s);
+      const e = R.hashEmailVerificationToken(s);
       await this.keyStorage.deleteKey(e);
     } catch (e) {
       const t = o.asCrossauthError(e);
@@ -4051,11 +4051,11 @@ class x {
     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 = x.hashPasswordResetToken(a);
+      let a = T.randomValue(ne), n = R.hashPasswordResetToken(a);
       try {
         return await this.keyStorage.saveKey(s, n, r, i), a;
       } catch {
-        a = T.randomValue(ne), n = x.hashPasswordResetToken(a), t++;
+        a = T.randomValue(ne), n = R.hashPasswordResetToken(a), t++;
       }
     }
     throw new o(l.Connection, "failed creating a unique key");
@@ -4075,7 +4075,7 @@ class x {
    * @returns the user that the token is for
    */
   async verifyPasswordResetToken(s) {
-    const e = x.hashPasswordResetToken(s);
+    const e = R.hashPasswordResetToken(s);
     u.logger.debug("verifyPasswordResetToken " + s + " " + e);
     let t = await this.keyStorage.getKey(e);
     if (!t.userid) throw new o(l.InvalidKey);
@@ -4124,7 +4124,7 @@ class x {
     if (!t && r.state != E.active && r.state != E.passwordResetNeeded && r.state != E.passwordAndFactor2ResetNeeded)
       throw new o(l.UserNotActive);
     let i = (r.email ?? r.username).toLowerCase();
-    i || (i = r.username.toLowerCase()), x.validateEmail(i);
+    i || (i = r.username.toLowerCase()), R.validateEmail(i);
     const a = await this.createAndSavePasswordResetToken(s), n = await this._sendPasswordResetToken(a, i, e);
     u.logger.info(f({ msg: "Sent password reset email", emailMessageId: n, email: i }));
   }
@@ -4146,7 +4146,7 @@ class x {
    * @param email the email to validate
    */
   static validateEmail(s) {
-    if (s == null || !x.isEmailValid(s)) throw new o(l.InvalidEmail);
+    if (s == null || !R.isEmailValid(s)) throw new o(l.InvalidEmail);
   }
 }
 const _e = 16, ke = 16;
@@ -4177,7 +4177,7 @@ class rt {
     h(this, "sameSite", "lax");
     // hasher settings
     h(this, "secret", "");
-    w("headerName", m.String, this, s, "CSRF_HEADER_NAME"), w("cookieName", m.String, this, s, "CSRF_COOKIE_NAME"), w("domain", m.String, this, s, "CSRF_COOKIE_DOMAIN"), w("httpOnly", m.Boolean, this, s, "CSRF_COOKIE_HTTPONLY"), w("path", m.String, this, s, "CSRF_COOKIE_PATH"), w("secure", m.Boolean, this, s, "CSRF_COOKIE_SECURE"), w("sameSite", m.String, this, s, "CSRF_COOKIE_SAMESITE"), w("secret", m.String, this, s, "SECRET", !0);
+    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);
   }
   /**
    * Creates a session key and saves in storage
@@ -4270,7 +4270,7 @@ class rt {
     }
   }
 }
-class D {
+class x {
   /**
    * Constructor.
    * 
@@ -4299,7 +4299,7 @@ class D {
     h(this, "sameSite", "lax");
     // hasher settings
     h(this, "secret", "");
-    e.userStorage && (this.userStorage = e.userStorage), this.keyStorage = s, w("idleTimeout", m.Number, this, e, "SESSION_IDLE_TIMEOUT"), w("persist", m.Boolean, this, e, "PERSIST_SESSION_ID"), this.filterFunction = e.filterFunction, w("cookieName", m.String, this, e, "SESSION_COOKIE_NAME"), w("maxAge", m.String, this, e, "SESSION_COOKIE_MAX_AGE"), w("domain", m.String, this, e, "SESSION_COOKIE_DOMAIN"), w("httpOnly", m.Boolean, this, e, "SESSIONCOOKIE_HTTPONLY"), w("path", m.String, this, e, "SESSION_COOKIE_PATH"), w("secure", m.Boolean, this, e, "SESSION_COOKIE_SECURE"), w("sameSite", m.String, this, e, "SESSION_COOKIE_SAMESITE"), w("secret", m.String, this, e, "SECRET", !0);
+    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);
   }
   expiry(s) {
     let e;
@@ -4336,16 +4336,16 @@ class D {
     const a = /* @__PURE__ */ new Date();
     let n = this.expiry(a), c = !1;
     for (; r < 10 && !c; ) {
-      const d = D.hashSessionId(i);
+      const d = x.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 (g) {
-        let y = o.asCrossauthError(g);
+      } catch (m) {
+        let y = o.asCrossauthError(m);
         if (y.code == l.KeyExists || y.code == l.InvalidKey) {
           if (r++, i = T.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: g })), g;
+          throw u.logger.debug(f({ err: m })), m;
       }
     }
     return {
@@ -4392,7 +4392,7 @@ class D {
    */
   async updateSessionKey(s) {
     if (!s.value) throw new o(l.InvalidKey, "No session when updating activity");
-    s.value = D.hashSessionId(s.value), await this.keyStorage.updateKey(s);
+    s.value = x.hashSessionId(s.value), await this.keyStorage.updateKey(s);
   }
   /**
    * Unsigns a cookie and returns the original value.
@@ -4440,7 +4440,7 @@ class D {
    *         `Expired` or `UserNotExist`.
    */
   async getSessionKey(s) {
-    const e = Date.now(), t = D.hashSessionId(s), r = await this.keyStorage.getKey(t);
+    const e = Date.now(), t = x.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);
     if (r.userid && this.idleTimeout > 0 && r.lastactive && e > r.lastactive.getTime() + this.idleTimeout * 1e3)
@@ -4455,7 +4455,7 @@ class D {
    * @param except if defined, don't delete this key
    */
   async deleteAllForUser(s, e) {
-    e && (e = D.hashSessionId(e)), await this.keyStorage.deleteAllForUser(s, U.session, e);
+    e && (e = x.hashSessionId(e)), await this.keyStorage.deleteAllForUser(s, U.session, e);
   }
 }
 class Lt {
@@ -4480,9 +4480,9 @@ 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 D(this.keyStorage, { ...t == null ? void 0 : t.sessionCookieOptions, ...t ?? {} }), this.csrfTokens = new rt({ ...t == null ? void 0 : t.doubleSubmitCookieOptions, ...t ?? {} }), w("allowedFactor2", m.JsonArray, this, t, "ALLOWED_FACTOR2"), w("enableEmailVerification", m.Boolean, this, t, "ENABLE_EMAIL_VERIFICATION"), w("enablePasswordReset", m.Boolean, this, t, "ENABLE_PASSWORD_RESET"), this.emailTokenStorage = this.keyStorage, this.userStorage && (this.enableEmailVerification || this.enablePasswordReset)) {
+    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)) {
       let r = this.keyStorage;
-      t.emailTokenStorage && (this.emailTokenStorage = t.emailTokenStorage), this.tokenEmailer = new x(this.userStorage, r, t);
+      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(), g = this.csrfTokens.makeCsrfCookie(d), y = this.csrfTokens.makeCsrfFormOrHeaderToken(d);
+    const d = this.csrfTokens.createCsrfToken(), m = 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: g,
+      csrfCookie: m,
       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(D.hashSessionId(e.value));
+    return await this.keyStorage.deleteKey(x.hashSessionId(e.value));
   }
   /**
    * Logs a user out from all sessions.
@@ -4750,7 +4750,7 @@ class Lt {
    * @param value new value to store
    */
   async updateSessionData(s, e, t) {
-    const r = D.hashSessionId(s);
+    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);
   }
   /**
@@ -4762,7 +4762,7 @@ class Lt {
    * @param dataArray names and values.
    */
   async updateManySessionData(s, e) {
-    const t = D.hashSessionId(s);
+    const t = x.hashSessionId(s);
     u.logger.debug(f({ msg: "Updating session data", hashedSessionCookie: T.hash(s) })), await this.keyStorage.updateManyData(t, e);
   }
   /**
@@ -4774,7 +4774,7 @@ class Lt {
   * @param name of the field.
   */
   async deleteSessionData(s, e) {
-    const t = D.hashSessionId(s);
+    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);
   }
   /**
@@ -4783,7 +4783,7 @@ class Lt {
    * @param sessionId the session Id to delete
    */
   async deleteSession(s) {
-    return await this.keyStorage.deleteKey(D.hashSessionId(s));
+    return await this.keyStorage.deleteKey(x.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(
-      D.hashSessionId(t),
+      x.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(
-        D.hashSessionId(t),
+        x.hashSessionId(t),
         "2fa",
         n
       ), a;
     }
     return await this.userStorage.updateUser({ id: s.id, factor2: e ?? "" }), await this.keyStorage.updateData(
-      D.hashSessionId(t),
+      x.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 = D.hashSessionId(s), a = await this.keyStorage.getKey(i), c = await this.authenticators[r].reprepareConfiguration(t, a), d = c == null ? {} : c.userData, g = c == null ? {} : c.secrets, y = c == null ? {} : c.newSessionData;
+    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;
     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: g };
+    return { userid: p.id, userData: d, secrets: m };
   }
   /**
    * 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 = L.decodeData(i.data)["2fa"];
+    let a = D.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 = {}, g = c.secretNames();
+    const d = {}, m = c.secretNames();
     for (let C in a)
-      g.includes(C) && (d[C] = a[C]);
+      m.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(D.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(x.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, g;
-    const y = D.hashSessionId(e);
+    let c, d, m;
+    const y = x.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: g
+      csrfFormOrHeaderValue: m
     };
   }
   /**
@@ -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 = L.decodeData(t.data);
+    let r = D.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(D.hashSessionId(t.value), "pre2fa", void 0);
+    await a.authenticateUser(void 0, { ...n, ...r.pre2fa.secrets }, s), await this.keyStorage.updateData(x.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 = L.decodeData(e.data);
+    let t = D.decodeData(e.data);
     if (!("pre2fa" in t)) throw new o(l.Unauthorized, "Two factor authentication not initiated");
-    return await this.keyStorage.updateData(D.hashSessionId(e.value), "pre2fa", void 0), t.pre2fa;
+    return await this.keyStorage.updateData(x.hashSessionId(e.value), "pre2fa", void 0), t.pre2fa;
   }
   /**
    * Performs the second factor authentication as the second step of the login
@@ -5023,12 +5023,12 @@ 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 = L.decodeData(i.data)["2fa"], n = a.username, c = a.factor2;
-    const { user: d, secrets: g } = await this.userStorage.getUserByUsername(n), y = this.authenticators[c];
+    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];
     if (!y) throw new o(l.Configuration, "Second factor " + c + " not enabled");
-    await y.authenticateUser(d, { ...g, ...a }, s);
+    await y.authenticateUser(d, { ...m, ...a }, s);
     const p = await this.session.createSessionKey(d.id, t);
-    await this.keyStorage.deleteKey(D.hashSessionId(i.value));
+    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);
     try {
       this.emailTokenStorage.deleteAllForUser(
@@ -5106,8 +5106,8 @@ class Lt {
         a.id,
         U.passwordResetToken
       );
-    } catch (g) {
-      u.logger.warn(f({ msg: "Couldn't delete password reset tokens while logging in", user: s })), u.logger.debug(f({ err: g }));
+    } catch (m) {
+      u.logger.warn(f({ msg: "Couldn't delete password reset tokens while logging in", user: s })), u.logger.debug(f({ err: m }));
     }
     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 g = !1;
+    let m = !1;
     if (a)
-      i = a, x.validateEmail(i), g = !0;
+      i = a, R.validateEmail(i), m = !0;
     else if (n) {
       i = n;
       try {
-        x.validateEmail(s.username), g = !0;
+        R.validateEmail(s.username), m = !0;
       } catch {
       }
-      g && x.validateEmail(i);
+      m && R.validateEmail(i);
     }
-    return !t && this.enableEmailVerification && g ? 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 && g,
+    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,
       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", m.String, this, e, "SECRET", !0), w("keyLength", m.String, this, e, "APIKEY_LENGTH"), w("prefix", m.String, this, e, "APIKEY_PREFIX"), w("authScheme", m.String, this, e, "APIKEY_AUTHSCHEME");
+    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");
   }
   /**
    * 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), g = {
+    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 = {
       name: s,
       value: a,
       userid: e,
-      data: L.encodeData(t),
+      data: D.encodeData(t),
       expires: c,
       created: n,
       ...i
@@ -5227,11 +5227,11 @@ class ge {
       this.prefix + d,
       n,
       c,
-      g.data,
+      m.data,
       { name: s, ...i }
     );
     const y = this.signApiKeyValue(a);
-    return { key: g, token: y };
+    return { key: m, token: y };
   }
   static hashApiKeyValue(s) {
     return T.hash(s);
@@ -5290,7 +5290,7 @@ class J {
       l.Configuration,
       "Must specify clientStorage when adding a client manager"
     );
-    this.clientStorage = s.clientStorage, w("oauthPbkdf2Digest", m.String, this, s, "OAUTH_PBKDF2_DIGEST"), w("oauthPbkdf2KeyLength", m.String, this, s, "OAUTH_PBKDF2_KEYLENGTH"), w("requireRedirectUriRegistration", m.Boolean, this, s, "OAUTH_REQUIRE_REDIRECT_URI_REGISTRATION");
+    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");
   }
   /**
    * Creates a client and puts it in the storage
@@ -5324,10 +5324,10 @@ class J {
       valid_flow: t,
       userid: i
     };
-    let g;
+    let m;
     for (let y = 0; y < 5; ++y)
       try {
-        g = await this.clientStorage.createClient(d);
+        m = await this.clientStorage.createClient(d);
         break;
       } catch (p) {
         if (y == 4) {
@@ -5335,8 +5335,8 @@ class J {
         } else
           d.client_id = J.randomClientId();
       }
-    if (!g) throw new o(l.ClientExists);
-    return g.client_secret && c && (g.client_secret = c), g;
+    if (!m) throw new o(l.ClientExists);
+    return m.client_secret && c && (m.client_secret = c), m;
   }
   /**
    * Updates a client
@@ -5470,6 +5470,7 @@ class zt {
     h(this, "validateScopes", !1);
     h(this, "validScopes", []);
     h(this, "idTokenClaims", {});
+    h(this, "accessTokenClaims", {});
     // device code
     h(this, "userCodeExpiry", 60 * 5);
     h(this, "userCodeThrottle", 1500);
@@ -5482,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", m.String, this, r, "AUTH_SERVER_BASE_URL", !0), w("audience", m.String, this, r, "OAUTH_AUDIENCE"), w("oauthPbkdf2Iterations", m.String, this, r, "OAUTH_PBKDF2_ITERATIONS"), w("requireClientSecretOrChallenge", m.Boolean, this, r, "OAUTH_REQUIRE_CLIENT_SECRET_OR_CHALLENGE"), w("jwtAlgorithm", m.String, this, r, "JWT_ALGORITHM"), w("codeLength", m.Number, this, r, "OAUTH_CODE_LENGTH"), w("jwtKeyType", m.String, this, r, "JWT_KEY_TYPE"), w("jwtSecretKeyFile", m.String, this, r, "JWT_SECRET_KEY_FILE"), w("jwtPublicKeyFile", m.String, this, r, "JWT_PUBLIC_KEY_FILE"), w("jwtPrivateKeyFile", m.String, this, r, "JWT_PRIVATE_KEY_FILE"), w("jwtSecretKey", m.String, this, r, "JWT_SECRET_KEY"), w("jwtPublicKey", m.String, this, r, "JWT_PUBLIC_KEY"), w("jwtPrivateKey", m.String, this, r, "JWT_PRIVATE_KEY"), w("jwtKid", m.String, this, r, "JWT_KID"), w("persistAccessToken", m.String, this, r, "OAUTH_PERSIST_ACCESS_TOKEN"), w("issueRefreshToken", m.String, this, r, "OAUTH_ISSUE_REFRESH_TOKEN"), w("opaqueAccessToken", m.String, this, r, "OAUTH_OPAQUE_ACCESS_TOKEN"), w("accessTokenExpiry", m.Number, this, r, "OAUTH_ACCESS_TOKEN_EXPIRY"), w("refreshTokenExpiry", m.Number, this, r, "OAUTH_REFRESH_TOKEN_EXPIRY"), w("rollingRefreshToken", m.Boolean, this, r, "OAUTH_ROLLING_REFRESH_TOKEN"), w("authorizationCodeExpiry", m.Number, this, r, "OAUTH_AUTHORIZATION_CODE_EXPIRY"), w("mfaTokenExpiry", m.Number, this, r, "OAUTH_MFA_TOKEN_EXPIRY"), w("clockTolerance", m.Number, this, r, "OAUTH_CLOCK_TOLERANCE"), w("validateScopes", m.Boolean, this, r, "OAUTH_VALIDATE_SCOPES"), w("emptyScopeIsValid", m.Boolean, this, r, "OAUTH_EMPTY_SCOPE_VALID"), w("validScopes", m.JsonArray, this, r, "OAUTH_VALID_SCOPES"), w("validFlows", m.JsonArray, this, r, "OAUTH_validFlows"), w("idTokenClaims", m.Json, this, r, "OAUTH_ID_TOKEN_CLAIMS"), w("allowedFactor2", m.JsonArray, this, r, "ALLOWED_FACTOR2"), w("userCodeExpiry", m.Number, this, r, "DEVICECODE_USERCODE_EXPIRY"), w("userCodeThrottle", m.Number, this, r, "DEVICECODE_USERCODE_THROTTLE"), w("deviceCodePollInterval", m.Number, this, r, "DEVICECODE_POLL_INTERVAL"), w("deviceCodeLength", m.Number, this, r, "DEVICECODE_LENGTH"), w("userCodeLength", m.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 }), 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");
     let i = {};
-    if (w("userCodeDashEvery", m.String, i, r, "DEVICECODE_USERCODE_DASH_EVERY"), i.userCodeDashEvery)
+    if (w("userCodeDashEvery", g.String, i, r, "DEVICECODE_USERCODE_DASH_EVERY"), i.userCodeDashEvery)
       if (i.userCodeDashEvery == "" || i.userCodeDashEvery.toLowerCase() == "null") this.userCodeDashEvery = null;
       else
         try {
@@ -5495,7 +5496,7 @@ class zt {
             "userCodeDashEvery must be a number or null"
           );
         }
-    if (w("deviceCodeVerificationUri", m.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 (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 (this.jwtPublicKey || this.jwtPublicKeyFile || this.jwtPrivateKey || this.jwtPrivateKeyFile)
         throw new o(
           l.Configuration,
@@ -5572,9 +5573,9 @@ class zt {
         error: "unsupported_response_type",
         error_description: "Unsupported response type " + s
       };
-    let g;
+    let m;
     try {
-      g = await this.clientStorage.getClientById(e);
+      m = await this.clientStorage.getClientById(e);
     } catch (v) {
       return u.logger.debug(f({ err: v })), {
         error: "unauthorized_client",
@@ -5596,7 +5597,7 @@ class zt {
         error: "access_denied",
         error_description: "Unsupported flow type " + C
       };
-    if (!g.valid_flow.includes(C))
+    if (!m.valid_flow.includes(C))
       return {
         error: "unauthorized_client",
         error_description: "Client does not support " + C
@@ -5610,7 +5611,7 @@ class zt {
       };
     }
     return s == "code" ? await this.getAuthorizationCode(
-      g,
+      m,
       t,
       y,
       i,
@@ -5753,13 +5754,13 @@ class zt {
     refreshToken: n,
     username: c,
     password: d,
-    mfaToken: g,
+    mfaToken: m,
     oobCode: y,
     bindingCode: p,
     otp: _,
     deviceCode: C
   }) {
-    var K, O, B;
+    var O, V, M;
     const v = this.inferFlowFromPost(s, a);
     if (!v) return {
       error: "server_error",
@@ -5767,8 +5768,8 @@ class zt {
     };
     const k = await this.getClientById(e);
     if (!k.client) return k;
-    const A = k.client, M = await this.authenticateClient(v, A, i);
-    if (M.error) return M;
+    const A = k.client, z = await this.authenticateClient(v, A, i);
+    if (z.error) return z;
     if (v == b.Password && !this.validFlows.includes(v) && !this.validFlows.includes(b.PasswordMfa))
       return {
         error: "access_denied",
@@ -5784,9 +5785,9 @@ class zt {
         error: "unauthorized_client",
         error_description: "Client does not support " + v
       };
-    let j = !1;
-    this.issueRefreshToken && v != b.RefreshToken && (j = !0), this.issueRefreshToken && v == b.RefreshToken && this.rollingRefreshToken && (j = !0);
-    let N;
+    let H = !1;
+    this.issueRefreshToken && v != b.RefreshToken && (H = !0), this.issueRefreshToken && v == b.RefreshToken && this.rollingRefreshToken && (H = !0);
+    let K;
     if (s == "authorization_code")
       return this.requireClientSecretOrChallenge && A && A.client_secret && !i && !a ? {
         error: "access_denied",
@@ -5799,28 +5800,28 @@ class zt {
         code: r,
         client_secret: i,
         codeVerifier: a,
-        issueRefreshToken: j
+        issueRefreshToken: H
       }) : {
         error: "access_denied",
         error_description: "No authorization code provided for authorization code flow"
       };
     if (s == "refresh_token") {
-      const R = await this.getRefreshTokenData(n);
-      if (!n || !R || !this.userStorage)
+      const N = await this.getRefreshTokenData(n);
+      if (!n || !N || !this.userStorage)
         return {
           error: "access_denied",
           error_description: "Refresh token is invalid"
         };
       let P;
-      if (R.username)
+      if (N.username)
         try {
-          const { user: F } = await ((K = this.userStorage) == null ? void 0 : K.getUserByUsername(R.username));
+          const { user: F } = await ((O = this.userStorage) == null ? void 0 : O.getUserByUsername(N.username));
           P = F;
         } catch (F) {
           return u.logger.error(f({
             err: F,
             msg: "Couldn't get user for refresh token.  Doesn't exist?",
-            username: R.username
+            username: N.username
           })), {
             error: "access_denied",
             error_description: "Refresh token is invalid"
@@ -5837,13 +5838,13 @@ class zt {
         client: A,
         client_secret: i,
         codeVerifier: a,
-        issueRefreshToken: j,
-        scopes: R.scope,
+        issueRefreshToken: H,
+        scopes: N.scope,
         user: P
       });
     } else if (s == "client_credentials") {
       const {
-        scopes: R,
+        scopes: N,
         error: P,
         error_description: F
       } = await this.validateAndPersistScope(e, t, void 0);
@@ -5854,8 +5855,8 @@ class zt {
         client: A,
         client_secret: i,
         codeVerifier: a,
-        scopes: R,
-        issueRefreshToken: j
+        scopes: N,
+        issueRefreshToken: H
       });
     } else if (s == "password") {
       if (!c || !d)
@@ -5869,17 +5870,17 @@ class zt {
             error: "server_error",
             error_description: "Password authentication not configured"
           };
-        const { user: I, secrets: $ } = await this.userStorage.getUserByUsername(c), z = this.authenticators[I.factor1];
-        if (!z || !z.secretNames().includes("password"))
+        const { user: I, secrets: $ } = await this.userStorage.getUserByUsername(c), B = this.authenticators[I.factor1];
+        if (!B || !B.secretNames().includes("password"))
           return {
             error: "access_denied",
             error_description: "Password flow used but factor 1 authenticator does not accept passwords"
           };
-        await z.authenticateUser(
+        await B.authenticateUser(
           I,
           $,
           { password: d }
-        ), N = I;
+        ), K = I;
       } catch (I) {
         return u.logger.debug(f({ err: I })), {
           error: "access_denied",
@@ -5887,27 +5888,27 @@ class zt {
         };
       }
       const {
-        scopes: R,
+        scopes: N,
         error: P,
         error_description: F
-      } = await this.validateAndPersistScope(e, t, N);
+      } = await this.validateAndPersistScope(e, t, K);
       return P ? {
         error: P,
         error_description: F
-      } : N.factor2 ? this.allowedFactor2.length > 0 && (N.state == E.factor2ResetNeeded || !this.allowedFactor2.includes(N.factor2 ? N.factor2 : "none")) ? {
+      } : K.factor2 ? this.allowedFactor2.length > 0 && (K.state == E.factor2ResetNeeded || !this.allowedFactor2.includes(K.factor2 ? K.factor2 : "none")) ? {
         error: "access_denied",
         error_description: "2FA method not allowed or needs to be reconfigured"
-      } : await this.createMfaRequest(N) : await this.makeAccessToken({
+      } : await this.createMfaRequest(K) : await this.makeAccessToken({
         client: A,
         client_secret: i,
         codeVerifier: a,
-        scopes: R,
-        issueRefreshToken: j,
-        user: N
+        scopes: N,
+        issueRefreshToken: H,
+        user: K
       });
     } else if (s == "http://auth0.com/oauth/grant-type/mfa-otp") {
       const {
-        scopes: R,
+        scopes: N,
         error: P,
         error_description: F
       } = await this.validateAndPersistScope(e, t, void 0);
@@ -5921,41 +5922,41 @@ class zt {
           error: "access_denied",
           error_description: "OTP not provided"
         };
-      if (!g)
+      if (!m)
         return {
           error: "access_denied",
           error_description: "MFA token not provided"
         };
-      const I = await this.validateMfaToken(g), $ = U.mfaToken + T.hash(g);
+      const I = await this.validateMfaToken(m), $ = U.mfaToken + T.hash(m);
       if (!I.user || !I.key)
         return {
           error: "access_denied",
           error_description: "Invalid MFA token"
         };
-      const z = this.authenticators[I.user.factor2];
-      if (!z || !this.userStorage)
+      const B = this.authenticators[I.user.factor2];
+      if (!B || !this.userStorage)
         return {
           error: "access_denied",
           error_description: "MFA type is not supported for OAuth"
         };
       try {
-        const { secrets: V } = await this.userStorage.getUserById(I.user.id);
-        await z.authenticateUser(
+        const { secrets: j } = await this.userStorage.getUserById(I.user.id);
+        await B.authenticateUser(
           I.user,
-          V,
+          j,
           { otp: _ }
         );
-      } catch (V) {
-        return u.logger.debug(f({ err: V })), {
+      } catch (j) {
+        return u.logger.debug(f({ err: j })), {
           error: "access_denied",
           error_description: "Invalid OTP"
         };
       }
       try {
         await this.keyStorage.deleteKey($);
-      } catch (V) {
-        u.logger.debug(f({ err: V })), u.logger.warn(f({
-          cerr: V,
+      } catch (j) {
+        u.logger.debug(f({ err: j })), u.logger.warn(f({
+          cerr: j,
           msg: "Couldn't delete mfa token",
           hashedMfaToken: I.key.value
         }));
@@ -5964,13 +5965,13 @@ class zt {
         client: A,
         client_secret: i,
         codeVerifier: a,
-        scopes: R,
-        issueRefreshToken: j,
+        scopes: N,
+        issueRefreshToken: H,
         user: I.user
       });
     } else if (s == "http://auth0.com/oauth/grant-type/mfa-oob") {
       const {
-        scopes: R,
+        scopes: N,
         error: P,
         error_description: F
       } = await this.validateAndPersistScope(e, t, void 0);
@@ -5984,12 +5985,12 @@ class zt {
           error: "access_denied",
           error_description: "OOB code or binding code not provided"
         };
-      if (!g)
+      if (!m)
         return {
           error: "access_denied",
           error_description: "MFA token not provided"
         };
-      const I = await this.validateMfaToken(g);
+      const I = await this.validateMfaToken(m);
       if (!I.user || !I.key)
         return {
           error: "access_denied",
@@ -6002,33 +6003,33 @@ class zt {
           error_description: "MFA type is not supported for OAuth"
         };
       try {
-        const { secrets: z } = await this.userStorage.getUserById(I.user.id), V = L.decodeData(I.key.data).omfa;
-        if (!V || !V.otp || !V.oobCode)
+        const { secrets: B } = await this.userStorage.getUserById(I.user.id), j = D.decodeData(I.key.data).omfa;
+        if (!j || !j.otp || !j.oobCode)
           return {
             error: "server_error",
             error_description: "Cannot retrieve email OTP"
           };
-        if (V.oobCode != y)
+        if (j.oobCode != y)
           return {
             error: "access_denied",
             error_description: "Invalid OOB code"
           };
         await $.authenticateUser(
           I.user,
-          { ...z, otp: V.otp, expiry: (O = I.key.expires) == null ? void 0 : O.getTime() },
+          { ...B, otp: j.otp, expiry: (V = I.key.expires) == null ? void 0 : V.getTime() },
           { otp: p }
         );
-      } catch (z) {
-        return u.logger.debug(f({ err: z })), {
+      } catch (B) {
+        return u.logger.debug(f({ err: B })), {
           error: "access_denied",
           error_description: "Invalid OTP"
         };
       }
       try {
         await this.keyStorage.deleteKey(I.key.value);
-      } catch (z) {
-        u.logger.debug(f({ err: z })), u.logger.warn(f({
-          cerr: z,
+      } catch (B) {
+        u.logger.debug(f({ err: B })), u.logger.warn(f({
+          cerr: B,
           msg: "Couldn't delete mfa token",
           hashedMfaToken: I.key.value
         }));
@@ -6037,8 +6038,8 @@ class zt {
         client: A,
         client_secret: i,
         codeVerifier: a,
-        scopes: R,
-        issueRefreshToken: j,
+        scopes: N,
+        issueRefreshToken: H,
         user: I.user
       });
     } else if (s == "urn:ietf:params:oauth:grant-type:device_code") {
@@ -6047,9 +6048,9 @@ class zt {
           error: "invalid_request",
           error_description: "No device code given"
         };
-      let R;
+      let N;
       try {
-        R = await this.keyStorage.getKey(U.deviceCode + C);
+        N = await this.keyStorage.getKey(U.deviceCode + C);
       } catch (P) {
         const F = o.asCrossauthError(P);
         return u.logger.debug(f({ err: F })), u.logger.error(f({ msg: "Couldn't get device code", cerr: F })), {
@@ -6058,8 +6059,8 @@ class zt {
         };
       }
       try {
-        const P = JSON.parse(R.data ?? "{}"), F = (/* @__PURE__ */ new Date()).getTime();
-        if (R.expires && F > R.expires.getTime())
+        const P = JSON.parse(N.data ?? "{}"), F = (/* @__PURE__ */ new Date()).getTime();
+        if (N.expires && F > N.expires.getTime())
           return await this.deleteDeviceCode(C), {
             error: "expired_token",
             error_description: "Code has expired"
@@ -6070,13 +6071,13 @@ class zt {
             error_description: "Waiting for user code to be entered"
           };
         {
-          let I = P.scope ? P.scope.split(" ") : void 0, $ = P.userid ? await ((B = this.userStorage) == null ? void 0 : B.getUserById(P.userid)) : void 0;
+          let I = P.scope ? P.scope.split(" ") : void 0, $ = P.userid ? await ((M = this.userStorage) == null ? void 0 : M.getUserById(P.userid)) : void 0;
           return await this.deleteDeviceCode(C), await this.makeAccessToken({
             client: A,
             client_secret: i,
             codeVerifier: a,
             scopes: I,
-            issueRefreshToken: j,
+            issueRefreshToken: H,
             user: $ == null ? void 0 : $.user
           });
         }
@@ -6156,13 +6157,13 @@ class zt {
       };
     }
     let c, d = !1;
-    const g = /* @__PURE__ */ new Date(), y = this.userCodeExpiry, p = new Date(g.getTime() + this.userCodeExpiry * 1e3 + this.clockTolerance * 1e3);
+    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)
       try {
         c = T.randomValue(this.deviceCodeLength), await this.keyStorage.saveKey(
           void 0,
           U.deviceCode + c,
-          g,
+          m,
           p,
           JSON.stringify({ scope: e, client_id: s })
         ), d = !0;
@@ -6181,7 +6182,7 @@ class zt {
         _ = T.randomBase32(this.userCodeLength), await this.keyStorage.saveKey(
           void 0,
           U.userCode + _,
-          g,
+          m,
           p,
           JSON.stringify({ deviceCode: c })
         ), d = !0;
@@ -6221,7 +6222,7 @@ class zt {
     userCode: s,
     user: e
   }) {
-    var g;
+    var m;
     s = s.replace(/[ -]*/g, "");
     let t, r = {};
     try {
@@ -6267,7 +6268,7 @@ class zt {
         error_description: "Unexpected or incomplete data in device code key"
       };
     }
-    if ((/* @__PURE__ */ new Date()).getTime() > ((g = r.expires) == null ? void 0 : g.getTime()))
+    if ((/* @__PURE__ */ new Date()).getTime() > ((m = r.expires) == null ? void 0 : m.getTime()))
       return await this.deleteUserCode(s), {
         ok: !1,
         error: "expired_token",
@@ -6447,7 +6448,7 @@ class zt {
         error_description: "Invalid MFA token"
       };
     try {
-      if (L.decodeData(t.data).omfaaid != e.factor2)
+      if (D.decodeData(t.data).omfaaid != e.factor2)
         return {
           error: "access_denied",
           error_description: "authenticatorId not valid for user"
@@ -6508,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 g = await this.validateMfaToken(s);
-    if (!g.user || !g.key) return g;
-    if (g.user.factor2 != i)
+    const m = await this.validateMfaToken(s);
+    if (!m.user || !m.key) return m;
+    if (m.user.factor2 != i)
       return {
         error: "access_denied",
         error_description: "Invalid MFA authenticator"
@@ -6525,15 +6526,15 @@ class zt {
       oobCode: T.randomValue(this.codeLength)
     });
     try {
-      const p = this.authenticators[g.user.factor2];
+      const p = this.authenticators[m.user.factor2];
       if (!p)
         throw new o(
           l.Configuration,
           "User's authenticator has not been loaded"
         );
-      const _ = await p.createOneTimeSecrets(g.user);
+      const _ = await p.createOneTimeSecrets(m.user);
       await this.keyStorage.updateData(
-        g.key.value,
+        m.key.value,
         "omfa",
         { ...y, ..._ }
       );
@@ -6600,7 +6601,7 @@ class zt {
         error: "invalid_request",
         error_description: `The redirect uri ${e} is invalid`
       };
-    const d = /* @__PURE__ */ new Date(), g = this.authorizationCodeExpiry ? new Date(d.getTime() + this.authorizationCodeExpiry * 1e3 + this.clockTolerance * 1e3) : void 0, y = {};
+    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 p = JSON.stringify(y);
     let _ = !1, C = "";
@@ -6610,7 +6611,7 @@ class zt {
           void 0,
           U.authorizationCode + T.hash(C),
           d,
-          g,
+          m,
           p
         ), _ = !0;
       } catch {
@@ -6635,15 +6636,15 @@ class zt {
     issueRefreshToken: a = !1,
     user: n
   }) {
-    var M, j;
+    var z, H;
     let c = !0;
     try {
       s.client_secret != null && (c = await T.passwordsEqual(
         t ?? "",
         s.client_secret ?? ""
       ));
-    } catch (N) {
-      return u.logger.error(f({ err: N })), { error: "server_error", error_description: "Couldn't validate client" };
+    } catch (K) {
+      return u.logger.error(f({ err: K })), { error: "server_error", error_description: "Couldn't validate client" };
     }
     if (!c) return {
       error: "access_denied",
@@ -6651,20 +6652,20 @@ class zt {
     };
     let d = {};
     if (e) {
-      let N;
+      let K;
       try {
-        N = await this.keyStorage.getKey(U.authorizationCode + T.hash(e)), d = L.decodeData(N.data);
-      } catch (K) {
-        return u.logger.debug(f({ err: K })), {
+        K = await this.keyStorage.getKey(U.authorizationCode + T.hash(e)), d = D.decodeData(K.data);
+      } catch (O) {
+        return u.logger.debug(f({ err: O })), {
           error: "access_denied",
           error_description: "Invalid or expired authorization code"
         };
       }
       try {
-        await this.keyStorage.deleteKey(N.value);
-      } catch (K) {
+        await this.keyStorage.deleteKey(K.value);
+      } catch (O) {
         u.logger.warn(f({
-          err: K,
+          err: O,
           msg: "Couldn't delete authorization code from storatge",
           client_id: s == null ? void 0 : s.client_id
         }));
@@ -6677,66 +6678,67 @@ class zt {
         error_description: "Invalid code challenge/code challenge method method for authorization code"
       };
     if (d.challenge) {
-      const N = d.challengeMethod == "plain" ? r ?? "" : T.sha256(r ?? "");
-      if (T.hash(N) != d.challenge)
+      const K = d.challengeMethod == "plain" ? r ?? "" : T.sha256(r ?? "");
+      if (T.hash(K) != d.challenge)
         return {
           error: "access_denied",
           error_description: "Code verifier is incorrect"
         };
     }
-    const g = /* @__PURE__ */ new Date(), y = Math.ceil(g.getTime() / 1e3);
+    const m = /* @__PURE__ */ new Date(), y = Math.ceil(m.getTime() / 1e3);
     let p;
-    const _ = T.uuid(), C = {
+    if ((i && i.includes("openid") || Object.keys(this.accessTokenClaims).length > 0) && this.userStorage && d.username)
+      try {
+        const { user: K } = await this.userStorage.getUserByUsername(d.username);
+        n = K;
+      } catch (K) {
+        return u.logger.error(f({ err: K })), {
+          error: "server_error",
+          error_description: "Couldn't load user data"
+        };
+      }
+    const _ = T.uuid();
+    let C = {
       jti: _,
       iat: y,
       iss: this.oauthIssuer,
       sub: d.username,
       type: "access"
     };
-    i && (C.scope = i), this.accessTokenExpiry != null && (C.exp = y + this.accessTokenExpiry, p = new Date(g.getTime() + this.accessTokenExpiry * 1e3 + this.clockTolerance * 1e3)), this.audience && (C.aud = this.audience);
-    const v = await new Promise((N, K) => {
+    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) => {
       se.sign(
         C,
         this.secretOrPrivateKey,
         { algorithm: this.jwtAlgorithmChecked, keyid: "1" },
-        (O, B) => {
-          B ? N(B) : K(O || new o(
+        (V, M) => {
+          M ? K(M) : O(V || new o(
             l.Unauthorized,
             "Couldn't create jwt"
           ));
         }
       );
     });
-    this.persistAccessToken && this.keyStorage && await ((M = this.keyStorage) == null ? void 0 : M.saveKey(
+    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(_),
-      g,
+      m,
       p
     ));
     let k;
     if (i && i.includes("openid")) {
-      if (this.userStorage && d.username)
-        try {
-          const { user: O } = await this.userStorage.getUserByUsername(d.username);
-          n = O;
-        } catch (O) {
-          return u.logger.error(f({ err: O })), {
-            error: "server_error",
-            error_description: "Couldn't load user data"
-          };
-        }
-      const N = T.uuid();
-      let K = {
+      const K = T.uuid();
+      let O = {
         aud: s.client_id,
-        jti: N,
+        jti: K,
         iat: y,
         iss: this.oauthIssuer,
         sub: d.username,
         type: "id"
       };
-      if (i.includes("email") && (n != null && n.email) && (K.email = n.email), i.includes("address") && n && "address" in n && (K.address = n.address), i.includes("phone") && n && "phone" in n && (K.phone = n.phone), i.includes("profile") && n)
-        for (let O of [
+      if (i.includes("email") && (n != null && n.email) && (O.email = n.email), i.includes("address") && n && "address" in n && (O.address = n.address), i.includes("phone") && n && "phone" in n && (O.phone = n.phone), i.includes("profile") && n)
+        for (let V of [
           "name",
           "family_name",
           "given_name",
@@ -6752,42 +6754,17 @@ class zt {
           "locale",
           "updated_at"
         ])
-          K[O] = n[O];
-      if (n) {
-        if (i) {
-          for (let O of i)
-            if (O in this.idTokenClaims)
-              if (this.idTokenClaims[O] == "all")
-                K = {
-                  ...K,
-                  ...n
-                };
-              else
-                for (let B in this.idTokenClaims[O])
-                  K[B] = n[this.idTokenClaims[O][B]];
-        }
-        if ("all" in this.idTokenClaims) {
-          const O = this.idTokenClaims.all;
-          if (O == "all")
-            K = {
-              ...K,
-              ...n
-            };
-          else
-            for (let B in O)
-              K[B] = n[O[B]];
-        }
-      }
-      K.scope = i, this.accessTokenExpiry != null && (K.exp = y + this.accessTokenExpiry), k = await new Promise((O, B) => {
+          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) => {
         se.sign(
-          K,
+          O,
           this.secretOrPrivateKey,
           {
             algorithm: this.jwtAlgorithmChecked,
             keyid: this.jwtKid
           },
-          (R, P) => {
-            P ? O(P) : B(R || new o(
+          (N, P) => {
+            P ? V(P) : M(N || new o(
               l.Unauthorized,
               "Couldn't create jwt"
             ));
@@ -6797,38 +6774,38 @@ class zt {
     }
     let A;
     if (a) {
-      const N = {
+      const K = {
         username: d.username,
         client_id: s.client_id
       };
-      i && (N.scope = i);
-      let K;
-      const B = {
+      i && (K.scope = i);
+      let O;
+      const M = {
         jti: T.uuid(),
         iat: y,
         iss: this.oauthIssuer,
         sub: d.username,
         type: "refresh"
       };
-      this.refreshTokenExpiry != null && (B.exp = y + this.refreshTokenExpiry, K = this.refreshTokenExpiry ? new Date(y + this.refreshTokenExpiry * 1e3 + this.clockTolerance * 1e3) : void 0), this.oauthIssuer && (B.aud = this.oauthIssuer), A = await new Promise((R, P) => {
+      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) => {
         se.sign(
-          B,
+          M,
           this.secretOrPrivateKey,
           { algorithm: this.jwtAlgorithmChecked, keyid: "1" },
           (F, I) => {
-            I ? R(I) : P(F || new o(
+            I ? N(I) : P(F || new o(
               l.Unauthorized,
               "Couldn't create jwt"
             ));
           }
         );
-      }), A && await ((j = this.keyStorage) == null ? void 0 : j.saveKey(
+      }), A && await ((H = this.keyStorage) == null ? void 0 : H.saveKey(
         void 0,
         // to avoid user storage dependency
         U.refreshToken + T.hash(A),
-        g,
-        K,
-        JSON.stringify(N)
+        m,
+        O,
+        JSON.stringify(K)
       ));
     }
     return {
@@ -6840,6 +6817,37 @@ class zt {
       scope: i ? i.join(" ") : void 0
     };
   }
+  addClaims(s, e, t, r) {
+    if (r) {
+      if (t) {
+        for (let i of t)
+          if (i in e)
+            if (e[i] == "all")
+              s = {
+                ...s,
+                ...r
+              };
+            else {
+              let a = e[i];
+              typeof a == "string" && (a = [a]);
+              for (let n of a)
+                s[n] = r[n];
+            }
+      }
+      if ("all" in e) {
+        let i = e.all;
+        if (typeof i == "string" && (i = [i]), i == "all")
+          s = {
+            ...s,
+            ...r
+          };
+        else
+          for (let a of i)
+            s[a] = r[a];
+      }
+    }
+    return s;
+  }
   /**
    * Returns whether the given authorization code is valid (in the database)
    * 
@@ -7112,7 +7120,7 @@ class nt extends Pe {
    */
   constructor(e, t = {}) {
     const r = {};
-    w("jwtKeyType", m.String, r, t, "JWT_KEY_TYPE");
+    w("jwtKeyType", g.String, r, t, "JWT_KEY_TYPE");
     super(e, { ...t, ...r });
     /**
      * Value passed to the constructor.  The `aud` claim must match it
@@ -7126,7 +7134,7 @@ class nt extends Pe {
     h(this, "keyStorage");
     h(this, "jwtSecretKeyFile", "");
     h(this, "jwtPublicKeyFile", "");
-    if (this.audience = e, w("authServerBaseUrl", m.String, this, t, "AUTH_SERVER_BASE_URL", !0), w("jwtSecretKeyFile", m.String, this, t, "JWT_SECRET_KEY_FILE"), w("jwtPublicKeyFile", m.String, this, t, "JWT_PUBLIC_KEY_FILE"), w("jwtSecretKey", m.String, this, t, "JWT_SECRET_KEY"), w("jwtPublicKey", m.String, this, t, "JWT_PUBLIC_KEY"), w("clockTolerance", m.Number, this, t, "OAUTH_CLOCK_TOLERANCE"), w("persistAccessToken", m.Boolean, this, t, "OAUTH_PERSIST_ACCESS_TOKEN"), this.keyStorage = t.keyStorage, this.jwtSecretKey || this.jwtSecretKeyFile) {
+    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.jwtPublicKey || this.jwtPublicKeyFile)
         throw new o(
           l.Configuration,
@@ -7202,7 +7210,7 @@ class Ht extends Ke {
     const r = {
       client_id: ""
     };
-    w("client_id", m.String, r, t, "OAUTH_CLIENT_ID", !0);
+    w("client_id", g.String, r, t, "OAUTH_CLIENT_ID", !0);
     super({
       authServerBaseUrl: e,
       tokenConsumer: new nt(
@@ -7223,7 +7231,7 @@ class Ht extends Ke {
     h(this, "userStorage");
     this.client_id = r.client_id;
     let i = {};
-    w("stateLength", m.String, this, t, "OAUTH_STATE_LENGTH"), w("verifierLength", m.String, this, t, "OAUTH_VERIFIER_LENGTH"), w("client_secret", m.String, i, t, "OAUTH_CLIENT_SECRET"), w("codeChallengeMethod", m.String, this, t, "OAUTH_CODE_CHALLENGE_METHOD"), w("deviceAuthorizationUrl", m.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", m.String, this, t, "OAUTH_USER_CREATION_TYPE"), w("userMatchField", m.String, this, t, "OAUTH_USER_MATCH_FIELD"), w("idTokenMatchField", m.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);
+    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);
   }
   /**
    * Uses {@link @crossauth/backend!Crypto.randomValue} to create a random string
@@ -7327,7 +7335,7 @@ export {
   Pt as InMemoryOAuthAuthorizationStorage,
   It as InMemoryOAuthClientStorage,
   Ut as InMemoryUserStorage,
-  L as KeyStorage,
+  D as KeyStorage,
   xt as LdapAuthenticator,
   oe as LdapUserStorage,
   Te as LocalPasswordAuthenticator,
@@ -7338,7 +7346,7 @@ export {
   me as OAuthClientStorage,
   Mt as OAuthResourceServer,
   nt as OAuthTokenConsumer,
-  m as ParamType,
+  g as ParamType,
   be as PasswordAuthenticator,
   Ft as PostgresKeyStorage,
   Nt as PostgresOAuthAuthorizationStorage,
@@ -7348,13 +7356,13 @@ export {
   bt as PrismaOAuthAuthorizationStorage,
   Et as PrismaOAuthClientStorage,
   G as PrismaUserStorage,
-  D as SessionCookie,
+  x as SessionCookie,
   Lt as SessionManager,
   Q as SmsAuthenticator,
-  x as TokenEmailer,
+  R as TokenEmailer,
   Dt as TotpAuthenticator,
   Ue as TwilioAuthenticator,
-  H as UserStorage,
+  L as UserStorage,
   w as setParameter,
   Bt as toCookieSerializeOptions
 };