@crossauth/backend 0.0.32 → 0.0.34

package/dist/index.js

@@ -1,10 +1,10 @@
 var Ae = Object.defineProperty;
 var Ie = (S, s, e) => s in S ? Ae(S, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : S[s] = e;
-var h = (S, s, e) => Ie(S, typeof s != "symbol" ? s + "" : s, e);
+var d = (S, s, e) => Ie(S, typeof s != "symbol" ? s + "" : s, e);
 import { CrossauthError as o, ErrorCode as l, UserState as E, CrossauthLogger as u, j as f, OAuthFlows as b, KeyPrefix as U, OAuthTokenConsumerBase as Pe, OAuthClientBase as Ke } from "@crossauth/common";
 import { PrismaClient as ce, Prisma as X } from "@prisma/client";
 import ye from "@mbakereth/ldapjs";
-import { timingSafeEqual as he, randomBytes as ue, randomUUID as Fe, createHash as Oe, pbkdf2 as Ne, createHmac as ie, createCipheriv as Re, createDecipheriv as De, randomInt as ee } from "node:crypto";
+import { timingSafeEqual as he, randomBytes as ue, randomUUID as Oe, createHash as Fe, pbkdf2 as Ne, createHmac as ie, createCipheriv as Re, createDecipheriv as De, randomInt as ee } from "node:crypto";
 import { promisify as xe } from "node:util";
 import W from "nunjucks";
 import Ee from "nodemailer";
@@ -71,10 +71,10 @@ class L {
    * @param options See {@link UserStorageOptions}
    */
   constructor(s = {}) {
-    h(this, "userEditableFields", []);
-    h(this, "adminEditableFields", []);
-    h(this, "normalizeUsername", !0);
-    h(this, "normalizeEmail", !0);
+    d(this, "userEditableFields", []);
+    d(this, "adminEditableFields", []);
+    d(this, "normalizeUsername", !0);
+    d(this, "normalizeEmail", !0);
     m("userEditableFields", g.JsonArray, this, s, "USER_EDITABLE_FIELDS"), m("adminEditableFields", g.JsonArray, this, s, "ADMIN_EDITABLE_FIELDS"), m("normalizeUsername", g.JsonArray, this, s, "NORMALIZE_USERNAME"), m("normalizeEmail", g.JsonArray, this, s, "NORMALIZE_EMAIL");
   }
   /**
@@ -173,14 +173,14 @@ class G extends L {
    */
   constructor(e = {}) {
     super(e);
-    h(this, "userTable", "user");
-    h(this, "userSecretsTable", "userSecrets");
-    h(this, "idColumn", "id");
-    h(this, "useridForeignKeyColumn", "userid");
-    h(this, "prismaClient");
-    h(this, "includes", ["secrets"]);
-    h(this, "includesObject", {});
-    h(this, "forceIdToNumber", !0);
+    d(this, "userTable", "user");
+    d(this, "userSecretsTable", "userSecrets");
+    d(this, "idColumn", "id");
+    d(this, "useridForeignKeyColumn", "userid");
+    d(this, "prismaClient");
+    d(this, "includes", ["secrets"]);
+    d(this, "includesObject", {});
+    d(this, "forceIdToNumber", !0);
     m("userTable", g.String, this, e, "USER_TABLE"), m("userSecretsTable", g.String, this, e, "USER_SECRETS_TABLE"), m("idColumn", g.String, this, e, "USER_ID_COLUMN"), m("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), m("includes", g.String, this, e, "USER_INCLUDES"), m("forceIdToNumber", g.String, this, e, "USER_FORCE_ID_TO_NUMBER"), this.includes.forEach((t) => {
       this.includesObject[t] = !0;
     }), e && e.prismaClient ? this.prismaClient = e.prismaClient : this.prismaClient = new ce();
@@ -279,16 +279,16 @@ class G extends L {
     try {
       let { id: r, ...i } = e, { userid: a, ...n } = t ?? {};
       "email" in i && i.email && (i = { email_normalized: G.normalize(i.email), ...i }), "username" in i && i.username && (i = { username_normalized: G.normalize(i.username), ...i }), t ? await this.prismaClient.$transaction(async (c) => {
-        let d = {};
+        let h = {};
         try {
-          d = await c[this.userSecretsTable].findUniqueOrThrow({
+          h = await c[this.userSecretsTable].findUniqueOrThrow({
             where: {
               [this.useridForeignKeyColumn]: e.id
             }
           });
         } catch {
         }
-        let { userid: w, ...y } = d ?? {};
+        let { userid: w, ...y } = h ?? {};
         n = { ...y, ...n }, await c[this.userTable].update({
           where: {
             [this.idColumn]: e.id
@@ -421,10 +421,10 @@ class kt extends x {
    */
   constructor(e = {}) {
     super();
-    h(this, "keyTable", "key");
-    h(this, "prismaClient");
-    h(this, "transactionTimeout", 5e3);
-    h(this, "useridForeignKeyColumn", "userid");
+    d(this, "keyTable", "key");
+    d(this, "prismaClient");
+    d(this, "transactionTimeout", 5e3);
+    d(this, "useridForeignKeyColumn", "userid");
     m("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), m("useridForeignKeyColumn", g.Number, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.keyTable && (this.keyTable = e.keyTable), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
   }
   async getKey(e) {
@@ -468,7 +468,7 @@ class kt extends x {
   async saveKey(e, t, r, i, a, n = {}) {
     let c;
     try {
-      let d = {
+      let h = {
         [this.useridForeignKeyColumn]: e,
         value: t,
         created: r,
@@ -477,10 +477,10 @@ class kt extends x {
         ...n
       };
       await this.prismaClient[this.keyTable].create({
-        data: d
+        data: h
       });
-    } catch (d) {
-      d instanceof X.PrismaClientKnownRequestError || d instanceof Object && "code" in d ? d.code == "P2002" ? (u.logger.warn(f({ msg: "Attempt to create key that already exists. Stack trace follows" })), u.logger.debug(f({ err: d })), c = new o(l.KeyExists)) : (u.logger.debug(f({ err: d })), c = new o(l.Connection, "Error saving key")) : (u.logger.debug(f({ err: d })), c = new o(l.Connection, "Error saving key"));
+    } catch (h) {
+      h instanceof X.PrismaClientKnownRequestError || h instanceof Object && "code" in h ? h.code == "P2002" ? (u.logger.warn(f({ msg: "Attempt to create key that already exists. Stack trace follows" })), u.logger.debug(f({ err: h })), c = new o(l.KeyExists)) : (u.logger.debug(f({ err: h })), c = new o(l.Connection, "Error saving key")) : (u.logger.debug(f({ err: h })), c = new o(l.Connection, "Error saving key"));
     }
     if (c)
       throw c;
@@ -691,14 +691,14 @@ class Et extends me {
    */
   constructor(e = {}) {
     super();
-    h(this, "clientTable", "oAuthClient");
-    h(this, "redirectUriTable", "OAuthClientRedirectUri");
-    h(this, "validFlowTable", "OAuthClientValidFlow");
-    h(this, "prismaClient");
+    d(this, "clientTable", "oAuthClient");
+    d(this, "redirectUriTable", "OAuthClientRedirectUri");
+    d(this, "validFlowTable", "OAuthClientValidFlow");
+    d(this, "prismaClient");
     // PrismaClient;
-    h(this, "transactionTimeout", 5e3);
-    h(this, "updateMode", "DeleteAndInsert");
-    h(this, "useridForeignKeyColumn", "userid");
+    d(this, "transactionTimeout", 5e3);
+    d(this, "updateMode", "DeleteAndInsert");
+    d(this, "useridForeignKeyColumn", "userid");
     m("clientTable", g.String, this, e, "OAUTH_CLIENT_TABLE"), m("redirectUriTable", g.String, this, e, "OAUTH_REDIRECTURI_TABLE"), m("validFlowTable", g.String, this, e, "OAUTH_VALID_FLOW_TABLE"), m("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), m("updateMode", g.String, this, e, "OAUTHCLIENT_UPDATE_MODE"), m("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
   }
   async getClientById(e) {
@@ -717,13 +717,13 @@ class Et extends me {
             ...n
           },
           include: { redirect_uri: !0, valid_flow: !0 }
-        }), d = c.redirect_uri, w = c.valid_flow;
+        }), h = c.redirect_uri, w = c.valid_flow;
         let y = c[this.useridForeignKeyColumn];
         return y === null && (y = void 0), this.useridForeignKeyColumn != "userid" && delete c[this.useridForeignKeyColumn], [{
           ...c,
           userid: y,
           client_secret: c.client_secret ?? void 0,
-          redirect_uri: d.map((p) => p.uri),
+          redirect_uri: h.map((p) => p.uri),
           valid_flow: w.map((p) => p.flow)
         }];
       } else {
@@ -734,10 +734,10 @@ class Et extends me {
           },
           include: { redirect_uri: !0, valid_flow: !0 }
         });
-        for (let d of c) {
-          const w = d.redirect_uri, y = d.valid_flow;
-          let p = d[this.useridForeignKeyColumn];
-          p == null && (p = void 0), d.userid = p, this.useridForeignKeyColumn != "userid" && delete d[this.useridForeignKeyColumn], d.client_secret = d.client_secret ?? void 0, d.redirect_uri = w.map((_) => _.uri), d.valid_flow = y.map((_) => _.flow);
+        for (let h of c) {
+          const w = h.redirect_uri, y = h.valid_flow;
+          let p = h[this.useridForeignKeyColumn];
+          p == null && (p = void 0), h.userid = p, this.useridForeignKeyColumn != "userid" && delete h[this.useridForeignKeyColumn], h.client_secret = h.client_secret ?? void 0, h.redirect_uri = w.map((_) => _.uri), h.valid_flow = y.map((_) => _.flow);
         }
         return c;
       }
@@ -768,50 +768,50 @@ class Et extends me {
     const { redirect_uri: r, valid_flow: i, userid: a, ...n } = e;
     let c;
     if (a && (n[this.useridForeignKeyColumn] = a), this.useridForeignKeyColumn != "userid" && delete e[this.useridForeignKeyColumn], r)
-      for (let d = 0; d < r.length; ++d) {
-        if (r[d].includes("#")) throw new o(l.InvalidRedirectUri, "Redirect Uri's may not contain page fragments");
+      for (let h = 0; h < r.length; ++h) {
+        if (r[h].includes("#")) throw new o(l.InvalidRedirectUri, "Redirect Uri's may not contain page fragments");
         try {
-          new URL(r[d]);
+          new URL(r[h]);
         } catch {
-          throw new o(l.InvalidRedirectUri, `Redriect uri ${r[d]} is not valid`);
+          throw new o(l.InvalidRedirectUri, `Redriect uri ${r[h]} is not valid`);
         }
       }
     if (i) {
-      for (let d = 0; d < i.length; ++d)
-        if (!b.isValidFlow(i[d])) throw new o(l.InvalidOAuthFlow, "Invalid flow " + i[d]);
+      for (let h = 0; h < i.length; ++h)
+        if (!b.isValidFlow(i[h])) throw new o(l.InvalidOAuthFlow, "Invalid flow " + i[h]);
     }
     try {
       c = await t[this.clientTable].create({
         data: n
       });
-    } catch (d) {
-      throw d instanceof X.PrismaClientKnownRequestError || d instanceof Object && "code" in d ? d.code == "P2002" ? (u.logger.debug(f({ err: d })), new o(l.ClientExists, "Attempt to create an OAuth client with a client_id that already exists. Maximum attempts failed")) : (u.logger.debug(f({ err: d })), new o(l.Connection, "Error saving OAuth client")) : (u.logger.debug(f({ err: d })), new o(l.Connection, "Error saving OAuth client"));
+    } catch (h) {
+      throw h instanceof X.PrismaClientKnownRequestError || h instanceof Object && "code" in h ? h.code == "P2002" ? (u.logger.debug(f({ err: h })), new o(l.ClientExists, "Attempt to create an OAuth client with a client_id that already exists. Maximum attempts failed")) : (u.logger.debug(f({ err: h })), new o(l.Connection, "Error saving OAuth client")) : (u.logger.debug(f({ err: h })), new o(l.Connection, "Error saving OAuth client"));
     }
     if (!c)
       throw u.logger.error(f({ msg: "Attempt to create key that already exists. Stack trace follows" })), new o(l.KeyExists);
     if (r)
       try {
-        for (let d = 0; d < r.length; ++d)
+        for (let h = 0; h < r.length; ++h)
           await t[this.redirectUriTable].create({
             data: {
               client_id: c.client_id,
-              uri: r[d]
+              uri: r[h]
             }
           });
-      } catch (d) {
-        throw d instanceof X.PrismaClientKnownRequestError || d instanceof Object && "code" in d ? d.code == "P2002" ? (u.logger.debug(f({ err: d })), new o(l.InvalidRedirectUri, "Attempt to create an OAuth client with a redirect uri that already belongs to another client")) : (u.logger.debug(f({ err: d })), new o(l.Connection, "Error saving OAuth client")) : (u.logger.debug(f({ err: d })), new o(l.Connection, "Error saving OAuth client"));
+      } catch (h) {
+        throw h instanceof X.PrismaClientKnownRequestError || h instanceof Object && "code" in h ? h.code == "P2002" ? (u.logger.debug(f({ err: h })), new o(l.InvalidRedirectUri, "Attempt to create an OAuth client with a redirect uri that already belongs to another client")) : (u.logger.debug(f({ err: h })), new o(l.Connection, "Error saving OAuth client")) : (u.logger.debug(f({ err: h })), new o(l.Connection, "Error saving OAuth client"));
       }
     if (i)
       try {
-        for (let d = 0; d < i.length; ++d)
+        for (let h = 0; h < i.length; ++h)
           await t[this.validFlowTable].create({
             data: {
               client_id: c.client_id,
-              flow: i[d]
+              flow: i[h]
             }
           });
-      } catch (d) {
-        throw d instanceof X.PrismaClientKnownRequestError || d instanceof Object && "code" in d ? (u.logger.debug(f({ err: d })), new o(l.Connection, "Error saving OAuth client")) : (u.logger.debug(f({ err: d })), new o(l.Connection, "Error saving OAuth client"));
+      } catch (h) {
+        throw h instanceof X.PrismaClientKnownRequestError || h instanceof Object && "code" in h ? (u.logger.debug(f({ err: h })), new o(l.Connection, "Error saving OAuth client")) : (u.logger.debug(f({ err: h })), new o(l.Connection, "Error saving OAuth client"));
       }
     return { ...c, redirect_uri: r, valid_flow: i };
   }
@@ -954,11 +954,11 @@ class bt extends we {
    */
   constructor(e = {}) {
     super();
-    h(this, "authorizationTable", "oAuthAuthorization");
-    h(this, "prismaClient");
+    d(this, "authorizationTable", "oAuthAuthorization");
+    d(this, "prismaClient");
     // PrismaClient;
-    h(this, "transactionTimeout", 5e3);
-    h(this, "useridForeignKeyColumn", "userid");
+    d(this, "transactionTimeout", 5e3);
+    d(this, "useridForeignKeyColumn", "userid");
     m("authorizationTable", g.String, this, e, "OAUTH_CLIENT_TABLE"), m("transactionTimeout", g.Number, this, e, "TRANSACTION_TIMEOUT"), m("useridForeignKeyColumn", g.String, this, e, "USER_ID_FOREIGN_KEY_COLUMN"), e.prismaClient == null ? this.prismaClient = new ce() : this.prismaClient = e.prismaClient;
   }
   async getAuthorizations(e, t) {
@@ -1018,10 +1018,10 @@ class Ut extends L {
   */
   constructor(e = {}) {
     super(e);
-    h(this, "usersByUsername", {});
-    h(this, "usersByEmail", {});
-    h(this, "secretsByUsername", {});
-    h(this, "secretsByEmail", {});
+    d(this, "usersByUsername", {});
+    d(this, "usersByEmail", {});
+    d(this, "secretsByUsername", {});
+    d(this, "secretsByEmail", {});
   }
   /**
    * Create a user
@@ -1163,9 +1163,9 @@ class At extends x {
    */
   constructor() {
     super();
-    h(this, "keys", {});
-    h(this, "keysByUserId", {});
-    h(this, "nonUserKeys", []);
+    d(this, "keys", {});
+    d(this, "keysByUserId", {});
+    d(this, "nonUserKeys", []);
   }
   /**
    * Returns the matching key recortd, with additional, or throws an exception.
@@ -1239,8 +1239,8 @@ class At extends x {
       for (let i = 0; i < r.length; ++i) {
         let a = !0, n = 0;
         const c = r[i];
-        for (let d in e)
-          if (d in c && c[d] != e[d]) {
+        for (let h in e)
+          if (h in c && c[h] != e[h]) {
             a = !1, n = i;
             break;
           }
@@ -1316,8 +1316,8 @@ class It extends me {
    */
   constructor(e = {}) {
     super();
-    h(this, "clients", {});
-    h(this, "clientsByName", {});
+    d(this, "clients", {});
+    d(this, "clientsByName", {});
   }
   /**
    * Returns the matching client record or throws an exception.
@@ -1407,8 +1407,8 @@ class Pt extends we {
    */
   constructor(e = {}) {
     super();
-    h(this, "byClientAndUser", {});
-    h(this, "byClient", {});
+    d(this, "byClientAndUser", {});
+    d(this, "byClient", {});
   }
   async getAuthorizations(e, t) {
     if (t) {
@@ -1447,11 +1447,11 @@ class oe extends L {
    */
   constructor(e, t = {}) {
     super(t);
-    h(this, "localStorage");
-    h(this, "ldapUrls", []);
-    h(this, "ldapUserSearchBase", "");
-    h(this, "ldapUsernameAttribute", "cn");
-    h(this, "createUserFn", $e);
+    d(this, "localStorage");
+    d(this, "ldapUrls", []);
+    d(this, "ldapUserSearchBase", "");
+    d(this, "ldapUsernameAttribute", "cn");
+    d(this, "createUserFn", $e);
     this.localStorage = e, m("ldapUrls", g.JsonArray, this, t, "LDAP_URL", !0), m("ldapUserSearchBase", g.String, this, t, "LDAP_USER_SEARCH_BASE"), m("ldapUsernameAttribute", g.String, this, t, "LDAP_USENAME_ATTRIBUTE"), t.createUserFn && (this.createUserFn = t.createUserFn);
   }
   /**
@@ -1590,17 +1590,17 @@ class oe extends L {
       r && (n.attributes = r), e.search(
         t,
         n,
-        function(c, d) {
+        function(c, h) {
           let w;
           if (c) {
             a(c), e.unbind();
             return;
           }
-          d.on("searchEntry", function(y) {
+          h.on("searchEntry", function(y) {
             w = oe.searchResultToUser(y.pojo);
-          }), d.on("error", function(y) {
+          }), h.on("error", function(y) {
             a(y), e.unbind();
-          }), d.on("end", function(y) {
+          }), h.on("end", function(y) {
             y.status != 0 ? a(new o(l.Connection, "LDAP  onnection failed")) : w ? i(w) : a(new o(l.UsernameOrPasswordInvalid)), e.unbind();
           });
         }
@@ -1638,12 +1638,12 @@ class Y extends L {
    */
   constructor(e, t = {}) {
     super(t);
-    h(this, "userTable", "users");
-    h(this, "userSecretsTable", "usersecrets");
-    h(this, "idColumn", "id");
-    h(this, "useridForeignKeyColumn", "userid");
-    h(this, "forceIdToNumber", !0);
-    h(this, "dbPool");
+    d(this, "userTable", "users");
+    d(this, "userSecretsTable", "usersecrets");
+    d(this, "idColumn", "id");
+    d(this, "useridForeignKeyColumn", "userid");
+    d(this, "forceIdToNumber", !0);
+    d(this, "dbPool");
     this.dbPool = e, m("userTable", g.String, this, t, "USER_TABLE"), m("userSecretsTable", g.String, this, t, "USER_SECRETS_TABLE"), m("idColumn", g.String, this, t, "USER_ID_COLUMN"), m("forceIdToNumber", g.String, this, t, "USER_FORCE_ID_TO_NUMBER"), m("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN");
   }
   /**
@@ -1696,7 +1696,7 @@ class Y extends L {
     let i = await this.dbPool.connect(), a, n, c = this.dbPool.parameters();
     try {
       await i.startTransaction();
-      let d = `select * from ${this.userTable} where ${e} = ` + c.nextParameter(), w = await i.execute(d, [t]);
+      let h = `select * from ${this.userTable} where ${e} = ` + c.nextParameter(), w = await i.execute(h, [t]);
       if (w.length == 0)
         throw new o(l.UserNotExist);
       let y, p, _;
@@ -1712,7 +1712,7 @@ class Y extends L {
         username: p,
         state: _
       }, !a) throw new o(l.UserNotExist);
-      if (c = this.dbPool.parameters(), d = `select * from ${this.userSecretsTable} where ${this.useridForeignKeyColumn} = ` + c.nextParameter(), w = await i.execute(d, [a.id]), w.length == 0)
+      if (c = this.dbPool.parameters(), h = `select * from ${this.userSecretsTable} where ${this.useridForeignKeyColumn} = ` + c.nextParameter(), w = await i.execute(h, [a.id]), w.length == 0)
         throw new o(l.UserNotExist);
       if (w.length > 0 ? n = { userid: a.id, ...w[0] } : n = { userid: a.id }, !n) throw new o(l.UserNotExist);
       if (this.useridForeignKeyColumn != "userid" && this.useridForeignKeyColumn in n && delete n[this.useridForeignKeyColumn], await i.commit(), (r == null ? void 0 : r.skipActiveCheck) != !0 && a.state == E.awaitingTwoFactorSetup)
@@ -1728,8 +1728,8 @@ class Y extends L {
       if ((r == null ? void 0 : r.skipActiveCheck) != !0 && a.state == E.factor2ResetNeeded)
         throw u.logger.debug(f({ msg: "2FA reset required" })), new o(l.Factor2ResetNeeded);
       return { user: a, secrets: n };
-    } catch (d) {
-      throw await i.rollback(), d;
+    } catch (h) {
+      throw await i.rollback(), h;
     } finally {
       i.release();
     }
@@ -1742,8 +1742,8 @@ class Y extends L {
    */
   async getUsers(e, t) {
     const r = await this.dbPool.connect();
-    let i = [], a = [], n = "", c = "", d = this.dbPool.parameters();
-    e && (c = "OFFSET " + d.nextParameter()), t && (a.push(t), n = "LIMIT " + d.nextParameter());
+    let i = [], a = [], n = "", c = "", h = this.dbPool.parameters();
+    e && (c = "OFFSET " + h.nextParameter()), t && (a.push(t), n = "LIMIT " + h.nextParameter());
     try {
       let w = `select * from ${this.userTable} ${n} ${c} order by username_normalized asc`, y = await r.execute(w, a);
       if (y.length == 0)
@@ -1789,7 +1789,7 @@ class Y extends L {
       let i = this.dbPool.parameters(), a = `select * from ${this.userTable} where ${this.idColumn} = ` + i.nextParameter();
       if ((await r.execute(a, [e.id])).length == 0)
         throw new o(l.UserNotExist);
-      let c = { ...e }, d = t ? { ...t } : void 0;
+      let c = { ...e }, h = 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 w = [], y = [];
       for (let p in c)
@@ -1802,8 +1802,8 @@ class Y extends L {
       }
       if (t) {
         w = [], y = [], i = this.dbPool.parameters();
-        for (let p in d)
-          d[p] != null && p != "userid" && (w.push(p + "= " + i.nextParameter()), y.push(d[p]));
+        for (let p in h)
+          h[p] != null && p != "userid" && (w.push(p + "= " + i.nextParameter()), y.push(h[p]));
         if (w.length > 0) {
           let p = w.join(", ");
           y.push(e.id);
@@ -1836,25 +1836,25 @@ class Y extends L {
       await r.startTransaction();
       let a = { ...e }, n = t ? { ...t } : void 0;
       "email" in a && a.email && (a = { email_normalized: this.normalizeEmail ? Y.normalize(a.email) : a.email, ...a }), "username" in a && a.username && (a = { username_normalized: this.normalizeUsername ? Y.normalize(a.username) : a.username, ...a });
-      let c = [], d = [], w = [];
+      let c = [], h = [], w = [];
       const y = this.dbPool.parameters();
       for (let _ in a)
-        a[_] != null && _ != "id" && (c.push(_), d.push(y.nextParameter()), w.push(a[_]));
+        a[_] != null && _ != "id" && (c.push(_), h.push(y.nextParameter()), w.push(a[_]));
       if (c.length > 0) {
-        let _ = c.join(", "), C = d.join(", ");
+        let _ = c.join(", "), C = h.join(", ");
         const T = `insert into ${this.userTable} (${_}) values (${C}) returning ${this.idColumn}`, k = await r.execute(T, w);
         if (k.length == 0 || !k[0][this.idColumn]) throw new o(l.Connection, "Couldn't create user");
         i = k[0][this.idColumn];
       }
       if (!i) throw new o(l.Connection, "Couldn't create user");
       if (t) {
-        c = [], d = [], w = [];
+        c = [], h = [], w = [];
         const _ = this.dbPool.parameters();
-        c.push("userid"), d.push(_.nextParameter()), w.push(i);
+        c.push("userid"), h.push(_.nextParameter()), w.push(i);
         for (let C in n)
-          n[C] != null && C != "userid" && (c.push(C), d.push(_.nextParameter()), w.push(n[C]));
+          n[C] != null && C != "userid" && (c.push(C), h.push(_.nextParameter()), w.push(n[C]));
         if (c.length > 0) {
-          let C = c.join(", "), T = d.join(", ");
+          let C = c.join(", "), T = h.join(", ");
           const k = `insert into ${this.userSecretsTable} (${C}) values (${T})`;
           u.logger.debug(f({ msg: "Executing query", query: k })), await r.execute(k, w);
         }
@@ -1912,9 +1912,9 @@ class qe extends x {
    */
   constructor(e, t = {}) {
     super();
-    h(this, "keyTable", "keys");
-    h(this, "dbPool");
-    h(this, "useridForeignKeyColumn", "userid");
+    d(this, "keyTable", "keys");
+    d(this, "dbPool");
+    d(this, "useridForeignKeyColumn", "userid");
     m("transactionTimeout", g.Number, this, t, "TRANSACTION_TIMEOUT"), m("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), t.keyTable && (this.keyTable = t.keyTable), this.dbPool = e;
   }
   async getKey(e) {
@@ -1962,13 +1962,13 @@ class qe extends x {
    * @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"], w = this.dbPool.parameters(), y = [];
+    let c, h = [this.useridForeignKeyColumn, "value", "created", "expires", "data"], w = this.dbPool.parameters(), y = [];
     for (let k = 0; k < 5; ++k)
       y.push(w.nextParameter());
     let p = [e ?? null, t, r, i ?? null, a ?? ""];
     for (let k in n)
-      d.push(k), y.push(w.nextParameter()), p.push(n[k]);
-    let _ = d.join(", "), C = y.join(", ");
+      h.push(k), y.push(w.nextParameter()), p.push(n[k]);
+    let _ = h.join(", "), C = y.join(", ");
     const T = await this.dbPool.connect();
     try {
       const k = `insert into ${this.keyTable} (${_}) values (${C})`;
@@ -1993,15 +1993,15 @@ class qe extends x {
   async deleteAllForUser(e, t, r) {
     const i = await this.dbPool.connect();
     try {
-      let a, n = [], c = "", d = this.dbPool.parameters();
+      let a, n = [], c = "", h = this.dbPool.parameters();
       if (e) {
-        const w = d.nextParameter(), y = d.nextParameter();
+        const w = h.nextParameter(), y = h.nextParameter();
         a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} = ${w} and value like ${y} `, n = [e];
       } else {
-        const w = d.nextParameter();
+        const w = h.nextParameter();
         a = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} is null and value like ${w}`;
       }
-      n.push(t + "%"), r && (c = "and value != " + d.nextParameter(), n.push(r)), a += " " + c, u.logger.debug(f({ msg: "Executing query", query: a })), await i.execute(a, n);
+      n.push(t + "%"), r && (c = "and value != " + h.nextParameter(), n.push(r)), a += " " + c, u.logger.debug(f({ msg: "Executing query", query: a })), await i.execute(a, n);
     } catch (a) {
       throw a;
     } finally {
@@ -2013,9 +2013,9 @@ class qe extends x {
     try {
       let r = [], i = [];
       const a = this.dbPool.parameters();
-      for (let d in e) {
-        let w = d == "userid" ? this.useridForeignKeyColumn : d;
-        e[d] == null ? r.push(w + " is null") : (r.push(w + " = " + a.nextParameter()), i.push(e[d]));
+      for (let h in e) {
+        let w = h == "userid" ? this.useridForeignKeyColumn : h;
+        e[h] == null ? r.push(w + " is null") : (r.push(w + " = " + a.nextParameter()), i.push(e[h]));
       }
       let n = r.join(" and "), c = `delete from ${this.keyTable} where ${n}`;
       await t.execute(c, i);
@@ -2031,8 +2031,8 @@ class qe extends x {
       let i, a = [];
       const n = this.dbPool.parameters();
       if (e) {
-        let c = n.nextParameter(), d = n.nextParameter();
-        i = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} = ${c} and value like ${d}`, a.push(e);
+        let c = n.nextParameter(), h = n.nextParameter();
+        i = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} = ${c} and value like ${h}`, a.push(e);
       } else {
         let c = n.nextParameter();
         i = `delete from ${this.keyTable} where ${this.useridForeignKeyColumn} is null and value like ${c}`;
@@ -2053,8 +2053,8 @@ class qe extends x {
       let c = await t.execute(i, a);
       if (c.length == 0)
         return [];
-      for (let d of c) {
-        let w = this.makeKey(d);
+      for (let h of c) {
+        let w = this.makeKey(h);
         this.useridForeignKeyColumn != "userid" && (w.userid = w[this.useridForeignKeyColumn], delete w[this.useridForeignKeyColumn]), r.push(w);
       }
       return r;
@@ -2086,12 +2086,12 @@ class qe extends x {
     delete r.value;
     let i = [], a = [], n = this.dbPool.parameters();
     for (let c in r) {
-      let d = c;
-      r[c] != null && c == "userid" && this.useridForeignKeyColumn != "userid" && (d = this.useridForeignKeyColumn), i.push(c + "= " + n.nextParameter()), a.push(r[d]);
+      let h = c;
+      r[c] != null && c == "userid" && this.useridForeignKeyColumn != "userid" && (h = this.useridForeignKeyColumn), i.push(c + "= " + n.nextParameter()), a.push(r[h]);
     }
     if (a.push(t.value), i.length > 0) {
-      let c = i.join(", "), d = `update ${this.keyTable} set ${c} where value = ` + n.nextParameter();
-      u.logger.debug(f({ msg: "Executing query", query: d })), await e.execute(d, a);
+      let c = i.join(", "), h = `update ${this.keyTable} set ${c} where value = ` + n.nextParameter();
+      u.logger.debug(f({ msg: "Executing query", query: h })), await e.execute(h, a);
     }
   }
   /**
@@ -2162,11 +2162,11 @@ class We extends me {
    */
   constructor(e, t = {}) {
     super();
-    h(this, "clientTable", "oauthclient");
-    h(this, "redirectUriTable", "oauthclientredirecturi");
-    h(this, "validFlowTable", "oauthclientvalidflow");
-    h(this, "dbPool");
-    h(this, "useridForeignKeyColumn", "userid");
+    d(this, "clientTable", "oauthclient");
+    d(this, "redirectUriTable", "oauthclientredirecturi");
+    d(this, "validFlowTable", "oauthclientvalidflow");
+    d(this, "dbPool");
+    d(this, "useridForeignKeyColumn", "userid");
     m("clientTable", g.String, this, t, "OAUTH_CLIENT_TABLE"), m("redirectUriTable", g.String, this, t, "OAUTH_REDIRECTURI_TABLE"), m("validFlowTable", g.String, this, t, "OAUTH_VALID_FLOW_TABLE"), m("updateMode", g.String, this, t, "OAUTHCLIENT_UPDATE_MODE"), m("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), this.dbPool = e;
   }
   async getClientById(e) {
@@ -2210,10 +2210,10 @@ class We extends me {
     };
   }
   async getClientWithTransaction(e, t, r, i, a, n) {
-    let c = [], d = this.dbPool.parameters(), w = [], y = `select c.*, r.uri as uri, null as flow from ${this.clientTable} as c left join ${this.redirectUriTable} r on c.client_id = r.client_id `, p = "";
-    t && r && (p = `where c.${t} = ` + d.nextParameter(), w.push(r)), i !== null && i == null || (p == "" ? p = "where " : p += " and ", i == null ? p += "userid is null" : (p += `${this.useridForeignKeyColumn} = ` + d.nextParameter(), w.push(i)));
+    let c = [], h = this.dbPool.parameters(), w = [], y = `select c.*, r.uri as uri, null as flow from ${this.clientTable} as c left join ${this.redirectUriTable} r on c.client_id = r.client_id `, p = "";
+    t && r && (p = `where c.${t} = ` + h.nextParameter(), w.push(r)), i !== null && i == null || (p == "" ? p = "where " : p += " and ", i == null ? p += "userid is null" : (p += `${this.useridForeignKeyColumn} = ` + h.nextParameter(), w.push(i)));
     let _ = `select c.*, null as uri, f.flow as flow from ${this.clientTable} as c left join ${this.validFlowTable} f on c.client_id = f.client_id `, C = "";
-    t && r && (C = `where c.${t} = ` + d.nextParameter(), w.push(r)), i !== null && i == null || (C == "" ? C = "where " : C += " and ", i == null ? C += "userid is null" : (C += `${this.useridForeignKeyColumn} = ` + d.nextParameter(), w.push(i))), n && (a || (a = 0), a = Number(a), n = Number(n), p == "" ? p = "where " : p += " and ", p += ` c.client_id in (select client_id from ${this.clientTable} limit ${n} offset ${a})`, C == "" ? C = "where " : C += " and ", C += ` c.client_id in (select client_id from ${this.clientTable} limit ${n} offset ${a})`), y += p, _ += C;
+    t && r && (C = `where c.${t} = ` + h.nextParameter(), w.push(r)), i !== null && i == null || (C == "" ? C = "where " : C += " and ", i == null ? C += "userid is null" : (C += `${this.useridForeignKeyColumn} = ` + h.nextParameter(), w.push(i))), n && (a || (a = 0), a = Number(a), n = Number(n), p == "" ? p = "where " : p += " and ", p += ` c.client_id in (select client_id from ${this.clientTable} limit ${n} offset ${a})`, C == "" ? C = "where " : C += " and ", C += ` c.client_id in (select client_id from ${this.clientTable} limit ${n} offset ${a})`), y += p, _ += C;
     let T = y + " union " + _ + " order by client_id";
     const k = await e.execute(T, w);
     let A;
@@ -2255,12 +2255,12 @@ 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 = [], w = [], y = this.dbPool.parameters();
+    let c = [], h = [], w = [], y = this.dbPool.parameters();
     try {
       for (let C in n)
-        c.push(C), d.push(y.nextParameter()), w.push(n[C]);
+        c.push(C), h.push(y.nextParameter()), w.push(n[C]);
       if (c.length > 0) {
-        let C = c.join(", "), T = d.join(", ");
+        let C = c.join(", "), T = h.join(", ");
         const k = `insert into ${this.clientTable} (${C}) values (${T})`;
         await e.execute(k, w);
       }
@@ -2341,14 +2341,14 @@ class We extends me {
         if (!b.isValidFlow(i[T])) throw new o(l.InvalidOAuthFlow, "Redirect Uri's may not contain page fragments");
     }
     if (!t.client_id) throw new o(l.InvalidClientId, "No client ig given");
-    let { client_id: a, redirect_uri: n, valid_flow: c, ...d } = t;
+    let { client_id: a, redirect_uri: n, valid_flow: c, ...h } = t;
     n || (n = []), c || (c = []);
     let w = this.dbPool.parameters(), y = `delete from ${this.redirectUriTable} where client_id = ` + w.nextParameter();
     await e.execute(y, [t.client_id]), w = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + w.nextParameter(), await e.execute(y, [t.client_id]);
     let p = [], _ = [], C = [];
     w = this.dbPool.parameters(), y = `delete from ${this.validFlowTable} where client_id = ` + w.nextParameter();
-    for (let T in d)
-      p.push(T), _.push(w.nextParameter()), C.push(d[T]);
+    for (let T in h)
+      p.push(T), _.push(w.nextParameter()), C.push(h[T]);
     if (p.length > 0) {
       let T = p.join(", "), k = _.join(", ");
       y = `update ${this.clientTable} set (${T}) values (${k})`, await e.execute(y, C);
@@ -2387,9 +2387,9 @@ class Je extends we {
    */
   constructor(e, t = {}) {
     super();
-    h(this, "authorizationTable", "oauthauthorization");
-    h(this, "useridForeignKeyColumn", "userid");
-    h(this, "dbPool");
+    d(this, "authorizationTable", "oauthauthorization");
+    d(this, "useridForeignKeyColumn", "userid");
+    d(this, "dbPool");
     m("authorizationTable", g.String, this, t, "OAUTH_CLIENT_TABLE"), m("useridForeignKeyColumn", g.String, this, t, "USER_ID_FOREIGN_KEY_COLUMN"), this.dbPool = e;
   }
   async getAuthorizations(e, t) {
@@ -2410,8 +2410,8 @@ class Je extends we {
       await i.startTransaction();
       let a = this.dbPool.parameters(), n = [], c = `delete from ${this.authorizationTable} where client_id = ` + a.nextParameter();
       n.push(e), t ? (c += ` and ${this.useridForeignKeyColumn} = ` + a.nextParameter(), n.push(t)) : c += ` and ${this.useridForeignKeyColumn} is null`, await i.execute(c, n);
-      for (let d of r)
-        a = this.dbPool.parameters(), n = [], c = `insert into ${this.authorizationTable} (client_id, userid, scope) values (` + a.nextParameter() + ", " + a.nextParameter() + ", " + a.nextParameter() + ")", n.push(e), n.push(t), n.push(d), await i.execute(c, n);
+      for (let h of r)
+        a = this.dbPool.parameters(), n = [], c = `insert into ${this.authorizationTable} (client_id, userid, scope) values (` + a.nextParameter() + ", " + a.nextParameter() + ", " + a.nextParameter() + ")", n.push(e), n.push(t), n.push(h), await i.execute(c, n);
       await i.commit();
     } catch (a) {
       throw await i.rollback(), a;
@@ -2433,7 +2433,7 @@ class Ze {
 class de extends Ye {
   constructor(e) {
     super();
-    h(this, "pgPool");
+    d(this, "pgPool");
     this.pgPool = e;
   }
   async connect() {
@@ -2447,7 +2447,7 @@ class de extends Ye {
 class Xe extends Ze {
   constructor(e) {
     super();
-    h(this, "pgClient");
+    d(this, "pgClient");
     this.pgClient = e;
   }
   crossauthErrorFromPostgresError(e) {
@@ -2482,7 +2482,7 @@ class Xe extends Ze {
 class Qe extends Ge {
   constructor() {
     super();
-    h(this, "nextParam", 1);
+    d(this, "nextParam", 1);
   }
   nextParameter() {
     return "$" + this.nextParam++;
@@ -2498,7 +2498,7 @@ class Kt extends Y {
     super(new de(s), e);
   }
 }
-class Ft extends qe {
+class Ot extends qe {
   /**
    * Creates a PostgresKeyStorage object, optionally overriding defaults.
    * @param pgPool the instance of the Posrgres client. 
@@ -2508,7 +2508,7 @@ class Ft extends qe {
     super(new de(s), e);
   }
 }
-class Ot extends We {
+class Ft extends We {
   /**
    * Creates a PostgresOAuthClientStorage object, optionally overriding defaults.
    * @param pgPool the instance of the Posrgres client. 
@@ -2535,8 +2535,8 @@ class re {
    * @param options see {@link AuthenticationOptions}
    */
   constructor(s) {
-    h(this, "friendlyName");
-    h(this, "factorName", "");
+    d(this, "friendlyName");
+    d(this, "factorName", "");
     if (!(s != null && s.friendlyName)) throw new o(l.Configuration, "Authenticator must have a friendly name");
     this.friendlyName = s == null ? void 0 : s.friendlyName;
   }
@@ -2679,7 +2679,7 @@ const Ce = process.env.PBKDF2_DIGEST || "sha256", Se = Number(process.env.PBKDF2
    * Creates a UUID
    */
   static uuid() {
-    return Fe();
+    return Oe();
   }
   /**
    * Standard hash using SHA256 (not PBKDF2 or HMAC)
@@ -2697,7 +2697,7 @@ const Ce = process.env.PBKDF2_DIGEST || "sha256", Se = Number(process.env.PBKDF2
    * @returns the string containing the hash 
    */
   static sha256(s) {
-    return Oe("sha256").update(s).digest("base64url");
+    return Fe("sha256").update(s).digest("base64url");
   }
   /**
    * Hashes a password and returns it as a base64 or base64url encoded string
@@ -2784,10 +2784,10 @@ const Ce = process.env.PBKDF2_DIGEST || "sha256", Se = Number(process.env.PBKDF2
     const i = r[0], a = r[1], n = JSON.parse(Buffer.from(i, "base64url").toString());
     if (t && n.t + t * 1e3 > (/* @__PURE__ */ new Date()).getTime())
       throw new o(l.Expired);
-    const d = ie(ae, e).update(i).digest("base64url");
-    if (d.length != a.length)
+    const h = ie(ae, e).update(i).digest("base64url");
+    if (h.length != a.length)
       throw new o(l.InvalidKey, "Signature does not match payload");
-    if (!he(Buffer.from(d), Buffer.from(a)))
+    if (!he(Buffer.from(h), Buffer.from(a)))
       throw new o(l.InvalidKey, "Signature does not match payload");
     return n;
   }
@@ -2852,7 +2852,7 @@ const Ce = process.env.PBKDF2_DIGEST || "sha256", Se = Number(process.env.PBKDF2
     return c = Buffer.concat([c, n.final()]), c.toString();
   }
 };
-h(q, "Base32", "ABCDEFGHJKLMNPQRSTUVWXYZ23456789".split(""));
+d(q, "Base32", "ABCDEFGHJKLMNPQRSTUVWXYZ23456789".split(""));
 let v = q;
 function tt(S) {
   let s = [];
@@ -2874,19 +2874,19 @@ const le = class le extends be {
    */
   constructor(e, t = {}) {
     super({ friendlyName: "Local password", ...t });
-    h(this, "secret");
+    d(this, "secret");
     /** If true, the secret key will be added to the salt when hashing.  Default false */
-    h(this, "enableSecretForPasswords", !1);
+    d(this, "enableSecretForPasswords", !1);
     /** See {@link LocalPasswordAuthenticatorOptions.pbkdf2Digest}  */
-    h(this, "pbkdf2Digest", "sha256");
+    d(this, "pbkdf2Digest", "sha256");
     /** See {@link LocalPasswordAuthenticatorOptions.pbkdf2Iterations}  */
-    h(this, "pbkdf2Iterations", 6e5);
+    d(this, "pbkdf2Iterations", 6e5);
     /** See {@link LocalPasswordAuthenticatorOptions.pbkdf2SaltLength}  */
-    h(this, "pbkdf2SaltLength", 16);
+    d(this, "pbkdf2SaltLength", 16);
     /** See {@link LocalPasswordAuthenticatorOptions.pbkdf2KeyLength}  */
-    h(this, "pbkdf2KeyLength", 32);
+    d(this, "pbkdf2KeyLength", 32);
     /** See {@link LocalPasswordAuthenticatorOptions.validatePasswordFn}  */
-    h(this, "validatePasswordFn", tt);
+    d(this, "validatePasswordFn", tt);
     m("secret", g.String, this, t, "HASHER_SECRET"), m("enableSecretForPasswordHash", g.Boolean, this, t, "ENABLE_SECRET_FOR_PASSWORDS"), m("pbkdf2Digest", g.String, this, t, "PASSWORD_PBKDF2_DIGEST"), m("pbkdf2Iterations", g.String, this, t, "PASSWORD_PBKDF2_ITERATIONS"), m("pbkdf2SaltLength", g.String, this, t, "PASSWORD_PBKDF2_SALTLENGTH"), m("pbkdf2KeyLength", g.String, this, t, "PASSWORD_PBKDF2_KEYLENGTH"), t.validatePasswordFn && (this.validatePasswordFn = t.validatePasswordFn);
   }
   /**
@@ -3019,7 +3019,7 @@ const le = class le extends be {
   async reprepareConfiguration(e, t) {
   }
 };
-h(le, "NoPassword", "********");
+d(le, "NoPassword", "********");
 let ve = le;
 class Z extends re {
   /**
@@ -3029,18 +3029,18 @@ class Z extends re {
    */
   constructor(e = {}) {
     super({ friendlyName: "Email otp", ...e });
-    h(this, "views", "views");
-    h(this, "emailAuthenticatorTextBody", "emailauthenticationtextbody.njk");
-    h(this, "emailAuthenticatorHtmlBody");
-    h(this, "emailAuthenticatorSubject", "Login code");
-    h(this, "emailFrom", "");
-    h(this, "smtpHost", "");
-    h(this, "smtpPort", 587);
-    h(this, "smtpUseTls", !0);
-    h(this, "smtpUsername");
-    h(this, "smtpPassword");
-    h(this, "emailAuthenticatorTokenExpires", 60 * 5);
-    h(this, "render");
+    d(this, "views", "views");
+    d(this, "emailAuthenticatorTextBody", "emailauthenticationtextbody.njk");
+    d(this, "emailAuthenticatorHtmlBody");
+    d(this, "emailAuthenticatorSubject", "Login code");
+    d(this, "emailFrom", "");
+    d(this, "smtpHost", "");
+    d(this, "smtpPort", 587);
+    d(this, "smtpUseTls", !0);
+    d(this, "smtpUsername");
+    d(this, "smtpPassword");
+    d(this, "emailAuthenticatorTokenExpires", 60 * 5);
+    d(this, "render");
     m("views", g.String, this, e, "VIEWS"), m("emailAuthenticatorTextBody", g.String, this, e, "EMAIL_AUTHENTICATOR_TEXT_BODY"), m("emailAuthenticatorHtmlBody", g.String, this, e, "EMAIL_AUTHENTICATOR_HTML_BODY"), m("emailAuthenticatorSubject", g.String, this, e, "EMAIL_AUTHENTICATOR_SUBJECT"), m("emailFrom", g.String, this, e, "EMAIL_FROM", !0), m("smtpHost", g.String, this, e, "SMTP_HOST", !0), m("smtpPort", g.Number, this, e, "SMTP_PORT"), m("smtpUsername", g.String, this, e, "SMTP_USERNAME"), m("smtpPassword", g.String, this, e, "SMTP_PASSWORD"), m("smtpUseTls", g.Boolean, this, e, "SMTP_USE_TLS"), m("emailAuthenticatorTokenExpires", g.Number, this, e, "EMAIL_AUTHENTICATOR_TOKEN_EXPIRES"), e.render ? this.render = e.render : W.configure(this.views, { autoescape: !0 });
   }
   /**
@@ -3098,10 +3098,10 @@ class Z extends re {
       factor2: this.factorName,
       expiry: a,
       otp: t
-    }, d = this.sendToken(r, t);
+    }, h = this.sendToken(r, t);
     return u.logger.info(f({
       msg: "Sent factor otp email",
-      emailMessageId: d,
+      emailMessageId: h,
       email: r
     })), { userData: n, sessionData: c };
   }
@@ -3244,11 +3244,11 @@ class Q extends re {
    */
   constructor(e = {}) {
     super({ friendlyName: "SMS otp", ...e });
-    h(this, "views", "views");
-    h(this, "smsAuthenticatorBody", "smsauthenticationbody.njk");
-    h(this, "smsAuthenticatorFrom", "");
-    h(this, "smsAuthenticatorTokenExpires", 60 * 5);
-    h(this, "render");
+    d(this, "views", "views");
+    d(this, "smsAuthenticatorBody", "smsauthenticationbody.njk");
+    d(this, "smsAuthenticatorFrom", "");
+    d(this, "smsAuthenticatorTokenExpires", 60 * 5);
+    d(this, "render");
     m("views", g.String, this, e, "VIEWS"), m("smsAuthenticatorBody", g.String, this, e, "SMS_AUTHENTICATOR_BODY"), m("smsAuthenticatorFrom", g.String, this, e, "SMS_AUTHENTICATOR_FROM", !0), m("smsAuthenticatorTokenExpires", g.Number, this, e, "SMS_AUTHENTICATOR_TOKEN_EXPIRES"), e.render ? this.render = e.render : W.configure(this.views, { autoescape: !0 });
   }
   /**
@@ -3288,8 +3288,8 @@ class Q extends re {
       expiry: a,
       otp: t
     };
-    let d = { otp: t };
-    const w = this.render ? this.render(this.smsAuthenticatorBody, d) : W.render(this.smsAuthenticatorBody, d), y = this.sendSms(r, w);
+    let h = { otp: t };
+    const w = this.render ? this.render(this.smsAuthenticatorBody, h) : W.render(this.smsAuthenticatorBody, h), y = this.sendSms(r, w);
     return u.logger.info(f({
       msg: "Sent factor otp sms",
       smsMessageId: y,
@@ -3442,8 +3442,8 @@ class Ue extends Q {
    */
   constructor(e = {}) {
     super(e);
-    h(this, "accountSid");
-    h(this, "authToken");
+    d(this, "accountSid");
+    d(this, "authToken");
     if (!process.env.TWILIO_ACCOUNT_SID || !process.env.TWILIO_AUTH_TOKEN)
       throw new o(
         l.Configuration,
@@ -3475,7 +3475,7 @@ class Rt extends re {
    */
   constructor(e, t = {}) {
     super({ friendlyName: "Dummy factor2", ...t });
-    h(this, "code");
+    d(this, "code");
     this.code = e;
   }
   /**
@@ -3637,8 +3637,8 @@ class Dt extends be {
    */
   constructor(e, t = {}) {
     super({ friendlyName: "LDAP", ...t });
-    h(this, "ldapAutoCreateAccount", !1);
-    h(this, "ldapStorage");
+    d(this, "ldapAutoCreateAccount", !1);
+    d(this, "ldapStorage");
     m("ldapAutoCreateAccount", g.Boolean, this, t, "LDAP_AUTO_CREATE_ACCOUNT"), this.ldapStorage = e;
   }
   /**
@@ -3730,7 +3730,7 @@ class xt extends re {
    */
   constructor(e, t) {
     super({ friendlyName: "Google Authenticator", ...t });
-    h(this, "appName");
+    d(this, "appName");
     this.appName = e;
   }
   /**
@@ -3913,26 +3913,26 @@ class R {
    * @param options see {@link TokenEmailerOptions}
    */
   constructor(s, e, t = {}) {
-    h(this, "userStorage");
-    h(this, "keyStorage");
-    h(this, "views", "views");
-    h(this, "siteUrl");
-    h(this, "prefix", "/");
-    h(this, "emailVerificationTextBody", "emailverificationtextbody.njk");
-    h(this, "emailVerificationHtmlBody");
-    h(this, "emailVerificationSubject", "Please verify your email");
-    h(this, "passwordResetTextBody", "passwordresettextbody.njk");
-    h(this, "passwordResetHtmlBody");
-    h(this, "passwordResetSubject", "Password reset");
-    h(this, "emailFrom", "");
-    h(this, "smtpHost", "");
-    h(this, "smtpPort", 587);
-    h(this, "smtpUseTls", !0);
-    h(this, "smtpUsername");
-    h(this, "smtpPassword");
-    h(this, "verifyEmailExpires", 60 * 60 * 24);
-    h(this, "passwordResetExpires", 60 * 60 * 24);
-    h(this, "render");
+    d(this, "userStorage");
+    d(this, "keyStorage");
+    d(this, "views", "views");
+    d(this, "siteUrl");
+    d(this, "prefix", "/");
+    d(this, "emailVerificationTextBody", "emailverificationtextbody.njk");
+    d(this, "emailVerificationHtmlBody");
+    d(this, "emailVerificationSubject", "Please verify your email");
+    d(this, "passwordResetTextBody", "passwordresettextbody.njk");
+    d(this, "passwordResetHtmlBody");
+    d(this, "passwordResetSubject", "Password reset");
+    d(this, "emailFrom", "");
+    d(this, "smtpHost", "");
+    d(this, "smtpPort", 587);
+    d(this, "smtpUseTls", !0);
+    d(this, "smtpUsername");
+    d(this, "smtpPassword");
+    d(this, "verifyEmailExpires", 60 * 60 * 24);
+    d(this, "passwordResetExpires", 60 * 60 * 24);
+    d(this, "render");
     this.userStorage = s, this.keyStorage = e, m("siteUrl", g.String, this, t, "SITE_URL", !0), m("prefix", g.String, this, t, "PREFIX"), m("views", g.String, this, t, "VIEWS"), m("emailVerificationTextBody", g.String, this, t, "EMAIL_VERIFICATION_TEXT_BODY"), m("emailVerificationHtmlBody", g.String, this, t, "EMAIL_VERIFICATION_HTML_BODY"), m("emailVerificationSubject", g.String, this, t, "EMAIL_VERIFICATION_SUBJECT"), m("passwordResetTextBody", g.String, this, t, "PASSWORD_RESET_TEXT_BODY"), m("passwordResetHtmlBody", g.String, this, t, "PASSWORD_RESET_HTML_BODY"), m("passwordResetSubject", g.String, this, t, "PASSWORD_RESET_SUBJECT"), m("emailFrom", g.String, this, t, "EMAIL_FROM", !0), m("smtpHost", g.String, this, t, "SMTP_HOST", !0), m("smtpPort", g.Number, this, t, "SMTP_PORT"), m("smtpUsername", g.String, this, t, "SMTP_USERNAME"), m("smtpPassword", g.String, this, t, "SMTP_PASSWORD"), m("smtpUseTls", g.Boolean, this, t, "SMTP_USE_TLS"), m("verifyEmailExpires", g.Boolean, this, t, "VERIFY_EMAIL_EXPIRES"), m("passwordResetExpires", g.String, this, t, "PASSWORD_RESET_EXPIRES"), t.render ? this.render = t.render : W.configure(this.views, { autoescape: !0 });
   }
   createEmailer() {
@@ -4166,17 +4166,17 @@ class rt {
   constructor(s = {}) {
     // header settings
     /** name of the CRSF HTTP header */
-    h(this, "headerName", "X-CROSSAUTH-CSRF");
+    d(this, "headerName", "X-CROSSAUTH-CSRF");
     // cookie settings
     /** Name of the CSRF Cookie */
-    h(this, "cookieName", "CSRFTOKEN");
-    h(this, "domain");
-    h(this, "httpOnly", !1);
-    h(this, "path", "/");
-    h(this, "secure", !0);
-    h(this, "sameSite", "lax");
+    d(this, "cookieName", "CSRFTOKEN");
+    d(this, "domain");
+    d(this, "httpOnly", !1);
+    d(this, "path", "/");
+    d(this, "secure", !0);
+    d(this, "sameSite", "lax");
     // hasher settings
-    h(this, "secret", "");
+    d(this, "secret", "");
     m("headerName", g.String, this, s, "CSRF_HEADER_NAME"), m("cookieName", g.String, this, s, "CSRF_COOKIE_NAME"), m("domain", g.String, this, s, "CSRF_COOKIE_DOMAIN"), m("httpOnly", g.Boolean, this, s, "CSRF_COOKIE_HTTPONLY"), m("path", g.String, this, s, "CSRF_COOKIE_PATH"), m("secure", g.Boolean, this, s, "CSRF_COOKIE_SECURE"), m("sameSite", g.String, this, s, "CSRF_COOKIE_SAMESITE"), m("secret", g.String, this, s, "SECRET", !0);
   }
   /**
@@ -4279,26 +4279,26 @@ class D {
    *                expires option is ignored (cookies are session-only).
    */
   constructor(s, e = {}) {
-    h(this, "userStorage");
-    h(this, "keyStorage");
+    d(this, "userStorage");
+    d(this, "keyStorage");
     /** This is set from input options.  Number of seconds before an
      * idle session will time out
      */
-    h(this, "idleTimeout", 0);
-    h(this, "persist", !0);
-    h(this, "filterFunction");
+    d(this, "idleTimeout", 0);
+    d(this, "persist", !0);
+    d(this, "filterFunction");
     // cookie settings
     /** Name of the CSRF Cookie, set from input options */
-    h(this, "cookieName", "SESSIONID");
-    h(this, "maxAge", 60 * 60 * 24 * 30);
+    d(this, "cookieName", "SESSIONID");
+    d(this, "maxAge", 60 * 60 * 24 * 30);
     // 30 days
-    h(this, "domain");
-    h(this, "httpOnly", !1);
-    h(this, "path", "/");
-    h(this, "secure", !0);
-    h(this, "sameSite", "lax");
+    d(this, "domain");
+    d(this, "httpOnly", !1);
+    d(this, "path", "/");
+    d(this, "secure", !0);
+    d(this, "sameSite", "lax");
     // hasher settings
-    h(this, "secret", "");
+    d(this, "secret", "");
     e.userStorage && (this.userStorage = e.userStorage), this.keyStorage = s, m("idleTimeout", g.Number, this, e, "SESSION_IDLE_TIMEOUT"), m("persist", g.Boolean, this, e, "PERSIST_SESSION_ID"), this.filterFunction = e.filterFunction, m("cookieName", g.String, this, e, "SESSION_COOKIE_NAME"), m("maxAge", g.String, this, e, "SESSION_COOKIE_MAX_AGE"), m("domain", g.String, this, e, "SESSION_COOKIE_DOMAIN"), m("httpOnly", g.Boolean, this, e, "SESSIONCOOKIE_HTTPONLY"), m("path", g.String, this, e, "SESSION_COOKIE_PATH"), m("secure", g.Boolean, this, e, "SESSION_COOKIE_SECURE"), m("sameSite", g.String, this, e, "SESSION_COOKIE_SAMESITE"), m("secret", g.String, this, e, "SECRET", !0);
   }
   expiry(s) {
@@ -4336,9 +4336,9 @@ class D {
     const a = /* @__PURE__ */ new Date();
     let n = this.expiry(a), c = !1;
     for (; r < 10 && !c; ) {
-      const d = D.hashSessionId(i);
+      const h = D.hashSessionId(i);
       try {
-        this.idleTimeout > 0 && s && (e = { ...e, lastActivity: /* @__PURE__ */ new Date() }), await this.keyStorage.saveKey(s, d, a, n, void 0, e), c = !0;
+        this.idleTimeout > 0 && s && (e = { ...e, lastActivity: /* @__PURE__ */ new Date() }), await this.keyStorage.saveKey(s, h, a, n, void 0, e), c = !0;
       } catch (w) {
         let y = o.asCrossauthError(w);
         if (y.code == l.KeyExists || y.code == l.InvalidKey) {
@@ -4466,17 +4466,17 @@ class Lt {
    * @param options optional parameters for authentication. See {@link SessionManagerOptions }.
    */
   constructor(s, e, t = {}) {
-    h(this, "userStorage");
-    h(this, "keyStorage");
-    h(this, "emailTokenStorage");
-    h(this, "csrfTokens");
-    h(this, "session");
-    h(this, "authenticators");
+    d(this, "userStorage");
+    d(this, "keyStorage");
+    d(this, "emailTokenStorage");
+    d(this, "csrfTokens");
+    d(this, "session");
+    d(this, "authenticators");
     //readonly authenticator : UsernamePasswordAuthenticator;
-    h(this, "enableEmailVerification", !1);
-    h(this, "enablePasswordReset", !1);
-    h(this, "tokenEmailer");
-    h(this, "allowedFactor2", []);
+    d(this, "enableEmailVerification", !1);
+    d(this, "enablePasswordReset", !1);
+    d(this, "tokenEmailer");
+    d(this, "allowedFactor2", []);
     t.userStorage && (this.userStorage = t.userStorage), this.keyStorage = s, this.authenticators = e;
     for (let r in this.authenticators)
       this.authenticators[r].factorName = r;
@@ -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(), w = this.csrfTokens.makeCsrfCookie(d), y = this.csrfTokens.makeCsrfFormOrHeaderToken(d);
+    const h = this.csrfTokens.createCsrfToken(), w = this.csrfTokens.makeCsrfCookie(h), y = this.csrfTokens.makeCsrfFormOrHeaderToken(h);
     try {
       this.emailTokenStorage.deleteAllForUser(
         i.id,
@@ -4836,12 +4836,12 @@ class Lt {
     if (!this.userStorage) throw new o(l.Configuration, "Cannot call initiateTwoFactorSignup if no user storage provided");
     if (!this.authenticators[s.factor1]) throw new o(l.Configuration, "Authenticator cannot create users");
     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);
+    const a = await this.authenticators[s.factor2].prepareConfiguration(s), n = a == null ? {} : a.userData, c = a == null ? {} : a.sessionData, h = await this.authenticators[s.factor1].createPersistentSecrets(s.username, e, r);
     return s.state = "awaitingtwofactorsetup", await this.keyStorage.updateData(
       D.hashSessionId(t),
       "2fa",
       c
-    ), { userid: (await this.userStorage.createUser(s, d)).id, userData: n };
+    ), { userid: (await this.userStorage.createUser(s, h)).id, userData: n };
   }
   /**
    * Begins the process of setting up 2FA for a user which has already been 
@@ -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, w = c == null ? {} : c.secrets, y = c == null ? {} : c.newSessionData;
+    const e = (await this.dataForSessionId(s))["2fa"], t = e.username, r = e.factor2, i = D.hashSessionId(s), a = await this.keyStorage.getKey(i), c = await this.authenticators[r].reprepareConfiguration(t, a), h = c == null ? {} : c.userData, w = c == null ? {} : c.secrets, y = c == null ? {} : c.newSessionData;
     y && await this.keyStorage.updateData(i, "2fa", y);
     const { user: p } = await this.userStorage.getUserByUsername(t, { skipActiveCheck: !0, skipEmailVerifiedCheck: !0 });
-    return { userid: p.id, userData: d, secrets: w };
+    return { userid: p.id, userData: h, secrets: w };
   }
   /**
    * Authenticates with the second factor.  
@@ -4913,9 +4913,9 @@ class Lt {
     let n = a.username;
     const c = this.authenticators[a.factor2];
     if (!c) throw new o(l.Configuration, "Unrecognised second factor authentication");
-    const d = {}, w = c.secretNames();
+    const h = {}, w = c.secretNames();
     for (let C in a)
-      w.includes(C) && (d[C] = a[C]);
+      w.includes(C) && (h[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, h) : await this.userStorage.updateUser(p), !y && t && this.enableEmailVerification && this.tokenEmailer && await ((_ = this.tokenEmailer) == null ? void 0 : _.sendEmailVerificationToken(r.id, void 0)), await this.keyStorage.updateData(D.hashSessionId(i.value), "2fa", void 0), { ...r, ...p };
   }
   /**
    * Initiates the two factor login process.
@@ -4954,13 +4954,13 @@ class Lt {
    */
   async initiateTwoFactorPageVisit(s, e, t, r, i) {
     const n = await this.authenticators[s.factor2].createOneTimeSecrets(s);
-    let c, d, w;
+    let c, h, w;
     const y = D.hashSessionId(e);
     u.logger.debug("initiateTwoFactorPageVisit " + s.username + " " + e + " " + y);
     let p = { username: s.username, factor2: s.factor2, secrets: n, body: t, url: r };
     return i && (p["content-type"] = i), await this.keyStorage.updateData(y, "pre2fa", p), {
       sessionCookie: c,
-      csrfCookie: d,
+      csrfCookie: h,
       csrfFormOrHeaderValue: w
     };
   }
@@ -4982,8 +4982,8 @@ class Lt {
     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]);
+    for (let h in i)
+      c.includes(h) && h in i && (n[h] = i[h]);
     await a.authenticateUser(void 0, { ...n, ...r.pre2fa.secrets }, s), await this.keyStorage.updateData(D.hashSessionId(t.value), "pre2fa", void 0);
   }
   /**
@@ -5024,15 +5024,15 @@ class Lt {
     let { key: i } = await this.session.getUserForSessionId(e);
     if (!i || !i.data || i.data == "") throw new o(l.Unauthorized);
     let a = x.decodeData(i.data)["2fa"], n = a.username, c = a.factor2;
-    const { user: d, secrets: w } = await this.userStorage.getUserByUsername(n), y = this.authenticators[c];
+    const { user: h, secrets: w } = await this.userStorage.getUserByUsername(n), y = this.authenticators[c];
     if (!y) throw new o(l.Configuration, "Second factor " + c + " not enabled");
-    await y.authenticateUser(d, { ...w, ...a }, s);
-    const p = await this.session.createSessionKey(d.id, t);
+    await y.authenticateUser(h, { ...w, ...a }, s);
+    const p = await this.session.createSessionKey(h.id, t);
     await this.keyStorage.deleteKey(D.hashSessionId(i.value));
     const _ = this.session.makeCookie(p, r), C = this.csrfTokens.createCsrfToken(), T = this.csrfTokens.makeCsrfCookie(C), k = this.csrfTokens.makeCsrfFormOrHeaderToken(C);
     try {
       this.emailTokenStorage.deleteAllForUser(
-        d.id,
+        h.id,
         U.passwordResetToken
       );
     } catch (A) {
@@ -5042,7 +5042,7 @@ class Lt {
       sessionCookie: _,
       csrfCookie: T,
       csrfFormOrHeaderValue: k,
-      user: d
+      user: h
     };
   }
   /**
@@ -5096,10 +5096,10 @@ class Lt {
     let { user: a, secrets: n } = await this.userStorage.getUserByUsername(s);
     const c = e == 1 ? a.factor1 : a.factor2;
     i != null && await this.authenticators[c].authenticateUser(a, n, i);
-    const d = await this.authenticators[a.factor1].createPersistentSecrets(a.username, t, r);
+    const h = await this.authenticators[a.factor1].createPersistentSecrets(a.username, t, r);
     await this.userStorage.updateUser(
       { id: a.id },
-      d
+      h
     );
     try {
       this.emailTokenStorage.deleteAllForUser(
@@ -5125,8 +5125,8 @@ class Lt {
       throw new o(l.UserNotExist, "Please specify a user id");
     if (!("username" in s) || s.username == null)
       throw new o(l.UserNotExist, "Please specify a userername");
-    let { email: a, username: n, password: c, ...d } = e;
-    d.userid = s.userid;
+    let { email: a, username: n, password: c, ...h } = e;
+    h.userid = s.userid;
     let w = !1;
     if (a)
       i = a, R.validateEmail(i), w = !0;
@@ -5138,7 +5138,7 @@ class Lt {
       }
       w && R.validateEmail(i);
     }
-    return !t && this.enableEmailVerification && w ? await ((y = this.tokenEmailer) == null ? void 0 : y.sendEmailVerificationToken(s.id, i)) : (a && (d.email = a), n && (d.username = n)), (e.state == E.passwordResetNeeded || e.state == E.passwordAndFactor2ResetNeeded) && await ((p = this.tokenEmailer) == null ? void 0 : p.sendPasswordResetToken(s.id, {}, r)), await this.userStorage.updateUser(d), {
+    return !t && this.enableEmailVerification && w ? await ((y = this.tokenEmailer) == null ? void 0 : y.sendEmailVerificationToken(s.id, i)) : (a && (h.email = a), n && (h.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(h), {
       emailVerificationTokenSent: !t && this.enableEmailVerification && w,
       passwordResetTokenSent: e.state == E.passwordResetNeeded || e.state == E.passwordAndFactor2ResetNeeded
     };
@@ -5183,15 +5183,15 @@ class ge {
    * @param options options.  See {@link ApiKeyManagerOptions}
    */
   constructor(s, e = {}) {
-    h(this, "apiKeyStorage");
-    h(this, "keyLength", 16);
-    h(this, "secret", "");
+    d(this, "apiKeyStorage");
+    d(this, "keyLength", 16);
+    d(this, "secret", "");
     /** The prefix to add to the hashed key in storage.  Defaults to 
      * {@link @crossauth/common!KeyPrefix}.apiKey
      */
-    h(this, "prefix", U.apiKey);
+    d(this, "prefix", U.apiKey);
     /** The name of the speak in the Authorization header.  Defaults to "ApiKey" */
-    h(this, "authScheme", "ApiKey");
+    d(this, "authScheme", "ApiKey");
     this.apiKeyStorage = s, m("secret", g.String, this, e, "SECRET", !0), m("keyLength", g.String, this, e, "APIKEY_LENGTH"), m("prefix", g.String, this, e, "APIKEY_PREFIX"), m("authScheme", g.String, this, e, "APIKEY_AUTHSCHEME");
   }
   /**
@@ -5213,7 +5213,7 @@ class ge {
    *          Authorization header (with the signature appended.)
    */
   async createKey(s, e, t, r, i) {
-    const a = v.randomValue(this.keyLength), n = /* @__PURE__ */ new Date(), c = r ? new Date(n.getTime() + r * 1e3) : void 0, d = ge.hashApiKeyValue(a), w = {
+    const a = v.randomValue(this.keyLength), n = /* @__PURE__ */ new Date(), c = r ? new Date(n.getTime() + r * 1e3) : void 0, h = ge.hashApiKeyValue(a), w = {
       name: s,
       value: a,
       userid: e,
@@ -5224,7 +5224,7 @@ class ge {
     };
     await this.apiKeyStorage.saveKey(
       e,
-      this.prefix + d,
+      this.prefix + h,
       n,
       c,
       w.data,
@@ -5282,10 +5282,10 @@ class J {
    * @param options See  {@link OAuthClientManagerOptions}
    */
   constructor(s = {}) {
-    h(this, "oauthPbkdf2Digest", "sha256");
-    h(this, "oauthPbkdf2Iterations", 4e4);
-    h(this, "oauthPbkdf2KeyLength", 32);
-    h(this, "clientStorage");
+    d(this, "oauthPbkdf2Digest", "sha256");
+    d(this, "oauthPbkdf2Iterations", 4e4);
+    d(this, "oauthPbkdf2KeyLength", 32);
+    d(this, "clientStorage");
     if (!s.clientStorage) throw new o(
       l.Configuration,
       "Must specify clientStorage when adding a client manager"
@@ -5315,7 +5315,7 @@ class J {
     })), e.forEach((y) => {
       J.validateUri(y);
     }), t || (t = b.allFlows());
-    const d = {
+    const h = {
       client_id: a,
       client_secret: n,
       client_name: s,
@@ -5327,13 +5327,13 @@ class J {
     let w;
     for (let y = 0; y < 5; ++y)
       try {
-        w = await this.clientStorage.createClient(d);
+        w = await this.clientStorage.createClient(h);
         break;
       } catch (p) {
         if (y == 4) {
           if (o.asCrossauthError(p).code != l.ClientExists) throw p;
         } else
-          d.client_id = J.randomClientId();
+          h.client_id = J.randomClientId();
       }
     if (!w) throw new o(l.ClientExists);
     return w.client_secret && c && (w.client_secret = c), w;
@@ -5433,57 +5433,58 @@ class zt {
    * @param options See {@link OAuthAuthorizationServerOptions }
    */
   constructor(s, e, t, r = {}) {
-    h(this, "clientStorage");
-    h(this, "keyStorage");
-    h(this, "userStorage");
-    h(this, "authenticators", {});
-    h(this, "authStorage");
+    d(this, "clientStorage");
+    d(this, "keyStorage");
+    d(this, "userStorage");
+    d(this, "authenticators", {});
+    d(this, "authStorage");
     /** For validating redirect URIs. */
-    h(this, "clientManager");
-    h(this, "oauthIssuer", "");
-    h(this, "audience", null);
-    h(this, "requireRedirectUriRegistration", !0);
-    h(this, "requireClientSecretOrChallenge", !0);
-    h(this, "jwtAlgorithm", "RS256");
-    h(this, "jwtAlgorithmChecked", "RS256");
-    h(this, "codeLength", 32);
-    h(this, "jwtKeyType", "");
-    h(this, "jwtSecretKey", "");
-    h(this, "jwtPublicKey", "");
-    h(this, "jwtPrivateKey", "");
-    h(this, "jwtSecretKeyFile", "");
-    h(this, "jwtPublicKeyFile", "");
-    h(this, "jwtPrivateKeyFile", "");
-    h(this, "jwtKid", "1");
-    h(this, "secretOrPrivateKey", "");
-    h(this, "secretOrPublicKey", "");
-    h(this, "persistAccessToken", !1);
-    h(this, "issueRefreshToken", !1);
-    h(this, "opaqueAccessToken", !1);
-    h(this, "accessTokenExpiry", 60 * 60);
-    h(this, "refreshTokenExpiry", 60 * 60);
-    h(this, "rollingRefreshToken", !0);
-    h(this, "authorizationCodeExpiry", 60 * 5);
-    h(this, "mfaTokenExpiry", 60 * 5);
-    h(this, "clockTolerance", 10);
-    h(this, "emptyScopeIsValid", !0);
-    h(this, "validateScopes", !1);
-    h(this, "validScopes", []);
-    h(this, "idTokenClaims", {});
-    h(this, "accessTokenClaims", {});
+    d(this, "clientManager");
+    d(this, "oauthIssuer", "");
+    d(this, "audience", null);
+    d(this, "requireRedirectUriRegistration", !0);
+    d(this, "requireClientSecretOrChallenge", !0);
+    d(this, "jwtAlgorithm", "RS256");
+    d(this, "jwtAlgorithmChecked", "RS256");
+    d(this, "codeLength", 32);
+    d(this, "jwtKeyType", "");
+    d(this, "jwtSecretKey", "");
+    d(this, "jwtPublicKey", "");
+    d(this, "jwtPrivateKey", "");
+    d(this, "jwtSecretKeyFile", "");
+    d(this, "jwtPublicKeyFile", "");
+    d(this, "jwtPrivateKeyFile", "");
+    d(this, "jwtKid", "1");
+    d(this, "secretOrPrivateKey", "");
+    d(this, "secretOrPublicKey", "");
+    d(this, "persistAccessToken", !1);
+    d(this, "issueRefreshToken", !1);
+    d(this, "opaqueAccessToken", !1);
+    d(this, "accessTokenExpiry", 60 * 60);
+    d(this, "refreshTokenExpiry", 60 * 60);
+    d(this, "rollingRefreshToken", !0);
+    d(this, "authorizationCodeExpiry", 60 * 5);
+    d(this, "mfaTokenExpiry", 60 * 5);
+    d(this, "clockTolerance", 10);
+    d(this, "emptyScopeIsValid", !0);
+    d(this, "validateScopes", !1);
+    d(this, "validScopes", []);
+    d(this, "idTokenClaims", {});
+    d(this, "accessTokenClaims", {});
     // device code
-    h(this, "userCodeExpiry", 60 * 5);
-    h(this, "userCodeThrottle", 1500);
-    h(this, "deviceCodePollInterval", 5);
-    h(this, "userCodeLength", 8);
-    h(this, "deviceCodeLength", 16);
-    h(this, "userCodeDashEvery", 4);
-    h(this, "deviceCodeVerificationUri", "");
+    d(this, "userCodeExpiry", 60 * 5);
+    d(this, "userCodeThrottle", 1500);
+    d(this, "deviceCodePollInterval", 5);
+    d(this, "userCodeLength", 8);
+    d(this, "deviceCodeLength", 16);
+    d(this, "userCodeDashEvery", 4);
+    d(this, "deviceCodeVerificationUri", "");
+    d(this, "authServerBaseUrl", "");
     /** Set from options.  See {@link OAuthAuthorizationServerOptions.validFlows} */
-    h(this, "validFlows", ["all"]);
+    d(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 }), m("oauthIssuer", g.String, this, r, "AUTH_SERVER_BASE_URL", !0), m("audience", g.String, this, r, "OAUTH_AUDIENCE"), m("oauthPbkdf2Iterations", g.String, this, r, "OAUTH_PBKDF2_ITERATIONS"), m("requireClientSecretOrChallenge", g.Boolean, this, r, "OAUTH_REQUIRE_CLIENT_SECRET_OR_CHALLENGE"), m("jwtAlgorithm", g.String, this, r, "JWT_ALGORITHM"), m("codeLength", g.Number, this, r, "OAUTH_CODE_LENGTH"), m("jwtKeyType", g.String, this, r, "JWT_KEY_TYPE"), m("jwtSecretKeyFile", g.String, this, r, "JWT_SECRET_KEY_FILE"), m("jwtPublicKeyFile", g.String, this, r, "JWT_PUBLIC_KEY_FILE"), m("jwtPrivateKeyFile", g.String, this, r, "JWT_PRIVATE_KEY_FILE"), m("jwtSecretKey", g.String, this, r, "JWT_SECRET_KEY"), m("jwtPublicKey", g.String, this, r, "JWT_PUBLIC_KEY"), m("jwtPrivateKey", g.String, this, r, "JWT_PRIVATE_KEY"), m("jwtKid", g.String, this, r, "JWT_KID"), m("persistAccessToken", g.String, this, r, "OAUTH_PERSIST_ACCESS_TOKEN"), m("issueRefreshToken", g.String, this, r, "OAUTH_ISSUE_REFRESH_TOKEN"), m("opaqueAccessToken", g.String, this, r, "OAUTH_OPAQUE_ACCESS_TOKEN"), m("accessTokenExpiry", g.Number, this, r, "OAUTH_ACCESS_TOKEN_EXPIRY"), m("refreshTokenExpiry", g.Number, this, r, "OAUTH_REFRESH_TOKEN_EXPIRY"), m("rollingRefreshToken", g.Boolean, this, r, "OAUTH_ROLLING_REFRESH_TOKEN"), m("authorizationCodeExpiry", g.Number, this, r, "OAUTH_AUTHORIZATION_CODE_EXPIRY"), m("mfaTokenExpiry", g.Number, this, r, "OAUTH_MFA_TOKEN_EXPIRY"), m("clockTolerance", g.Number, this, r, "OAUTH_CLOCK_TOLERANCE"), m("validateScopes", g.Boolean, this, r, "OAUTH_VALIDATE_SCOPES"), m("emptyScopeIsValid", g.Boolean, this, r, "OAUTH_EMPTY_SCOPE_VALID"), m("validScopes", g.JsonArray, this, r, "OAUTH_VALID_SCOPES"), m("validFlows", g.JsonArray, this, r, "OAUTH_validFlows"), m("idTokenClaims", g.Json, this, r, "OAUTH_ID_TOKEN_CLAIMS"), m("accessTokenClaims", g.Json, this, r, "OAUTH_ACCESS_TOKEN_CLAIMS"), m("allowedFactor2", g.JsonArray, this, r, "ALLOWED_FACTOR2"), m("userCodeExpiry", g.Number, this, r, "DEVICECODE_USERCODE_EXPIRY"), m("userCodeThrottle", g.Number, this, r, "DEVICECODE_USERCODE_THROTTLE"), m("deviceCodePollInterval", g.Number, this, r, "DEVICECODE_POLL_INTERVAL"), m("deviceCodeLength", g.Number, this, r, "DEVICECODE_LENGTH"), m("userCodeLength", g.Number, this, r, "DEVICECODE_USERCODE_LENGTH");
+    d(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 }), m("authServerBaseUrl", g.String, this, r, "AUTH_SERVER_BASE_URL", !0), m("oauthIssuer", g.String, this, r, "OAUTH_ISSUER"), this.oauthIssuer || (this.oauthIssuer = this.authServerBaseUrl), m("audience", g.String, this, r, "OAUTH_AUDIENCE"), m("oauthPbkdf2Iterations", g.String, this, r, "OAUTH_PBKDF2_ITERATIONS"), m("requireClientSecretOrChallenge", g.Boolean, this, r, "OAUTH_REQUIRE_CLIENT_SECRET_OR_CHALLENGE"), m("jwtAlgorithm", g.String, this, r, "JWT_ALGORITHM"), m("codeLength", g.Number, this, r, "OAUTH_CODE_LENGTH"), m("jwtKeyType", g.String, this, r, "JWT_KEY_TYPE"), m("jwtSecretKeyFile", g.String, this, r, "JWT_SECRET_KEY_FILE"), m("jwtPublicKeyFile", g.String, this, r, "JWT_PUBLIC_KEY_FILE"), m("jwtPrivateKeyFile", g.String, this, r, "JWT_PRIVATE_KEY_FILE"), m("jwtSecretKey", g.String, this, r, "JWT_SECRET_KEY"), m("jwtPublicKey", g.String, this, r, "JWT_PUBLIC_KEY"), m("jwtPrivateKey", g.String, this, r, "JWT_PRIVATE_KEY"), m("jwtKid", g.String, this, r, "JWT_KID"), m("persistAccessToken", g.String, this, r, "OAUTH_PERSIST_ACCESS_TOKEN"), m("issueRefreshToken", g.String, this, r, "OAUTH_ISSUE_REFRESH_TOKEN"), m("opaqueAccessToken", g.String, this, r, "OAUTH_OPAQUE_ACCESS_TOKEN"), m("accessTokenExpiry", g.Number, this, r, "OAUTH_ACCESS_TOKEN_EXPIRY"), m("refreshTokenExpiry", g.Number, this, r, "OAUTH_REFRESH_TOKEN_EXPIRY"), m("rollingRefreshToken", g.Boolean, this, r, "OAUTH_ROLLING_REFRESH_TOKEN"), m("authorizationCodeExpiry", g.Number, this, r, "OAUTH_AUTHORIZATION_CODE_EXPIRY"), m("mfaTokenExpiry", g.Number, this, r, "OAUTH_MFA_TOKEN_EXPIRY"), m("clockTolerance", g.Number, this, r, "OAUTH_CLOCK_TOLERANCE"), m("validateScopes", g.Boolean, this, r, "OAUTH_VALIDATE_SCOPES"), m("emptyScopeIsValid", g.Boolean, this, r, "OAUTH_EMPTY_SCOPE_VALID"), m("validScopes", g.JsonArray, this, r, "OAUTH_VALID_SCOPES"), m("validFlows", g.JsonArray, this, r, "OAUTH_validFlows"), m("idTokenClaims", g.Json, this, r, "OAUTH_ID_TOKEN_CLAIMS"), m("accessTokenClaims", g.Json, this, r, "OAUTH_ACCESS_TOKEN_CLAIMS"), m("allowedFactor2", g.JsonArray, this, r, "ALLOWED_FACTOR2"), m("userCodeExpiry", g.Number, this, r, "DEVICECODE_USERCODE_EXPIRY"), m("userCodeThrottle", g.Number, this, r, "DEVICECODE_USERCODE_THROTTLE"), m("deviceCodePollInterval", g.Number, this, r, "DEVICECODE_POLL_INTERVAL"), m("deviceCodeLength", g.Number, this, r, "DEVICECODE_LENGTH"), m("userCodeLength", g.Number, this, r, "DEVICECODE_USERCODE_LENGTH");
     let i = {};
     if (m("userCodeDashEvery", g.String, i, r, "DEVICECODE_USERCODE_DASH_EVERY"), i.userCodeDashEvery)
       if (i.userCodeDashEvery == "" || i.userCodeDashEvery.toLowerCase() == "null") this.userCodeDashEvery = null;
@@ -5753,14 +5754,14 @@ class zt {
     codeVerifier: a,
     refreshToken: n,
     username: c,
-    password: d,
+    password: h,
     mfaToken: w,
     oobCode: y,
     bindingCode: p,
     otp: _,
     deviceCode: C
   }) {
-    var O, V, j;
+    var F, V, j;
     const T = this.inferFlowFromPost(s, a);
     if (!T) return {
       error: "server_error",
@@ -5815,11 +5816,11 @@ class zt {
       let P;
       if (N.username)
         try {
-          const { user: F } = await ((O = this.userStorage) == null ? void 0 : O.getUserByUsername(N.username));
-          P = F;
-        } catch (F) {
+          const { user: O } = await ((F = this.userStorage) == null ? void 0 : F.getUserByUsername(N.username));
+          P = O;
+        } catch (O) {
           return u.logger.error(f({
-            err: F,
+            err: O,
             msg: "Couldn't get user for refresh token.  Doesn't exist?",
             username: N.username
           })), {
@@ -5828,11 +5829,11 @@ class zt {
           };
         }
       try {
-        const F = U.refreshToken + v.hash(n);
-        await this.keyStorage.deleteKey(F);
-      } catch (F) {
-        const I = o.asCrossauthError(F);
-        u.logger.debug(f({ err: F })), u.logger.warn(f({ msg: "Cannot delete refresh token", cerr: I }));
+        const O = U.refreshToken + v.hash(n);
+        await this.keyStorage.deleteKey(O);
+      } catch (O) {
+        const I = o.asCrossauthError(O);
+        u.logger.debug(f({ err: O })), u.logger.warn(f({ msg: "Cannot delete refresh token", cerr: I }));
       }
       return await this.makeAccessToken({
         client: A,
@@ -5846,11 +5847,11 @@ class zt {
       const {
         scopes: N,
         error: P,
-        error_description: F
+        error_description: O
       } = await this.validateAndPersistScope(e, t, void 0);
       return P ? {
         error: P,
-        error_description: F
+        error_description: O
       } : await this.makeAccessToken({
         client: A,
         client_secret: i,
@@ -5859,7 +5860,7 @@ class zt {
         issueRefreshToken: H
       });
     } else if (s == "password") {
-      if (!c || !d)
+      if (!c || !h)
         return {
           error: "access_denied",
           error_description: "Username and/or password not provided for password flow"
@@ -5879,7 +5880,7 @@ class zt {
         await B.authenticateUser(
           I,
           $,
-          { password: d }
+          { password: h }
         ), K = I;
       } catch (I) {
         return u.logger.debug(f({ err: I })), {
@@ -5890,11 +5891,11 @@ class zt {
       const {
         scopes: N,
         error: P,
-        error_description: F
+        error_description: O
       } = await this.validateAndPersistScope(e, t, K);
       return P ? {
         error: P,
-        error_description: F
+        error_description: O
       } : 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"
@@ -5910,12 +5911,12 @@ class zt {
       const {
         scopes: N,
         error: P,
-        error_description: F
+        error_description: O
       } = await this.validateAndPersistScope(e, t, void 0);
       if (P)
         return {
           error: P,
-          error_description: F
+          error_description: O
         };
       if (!_)
         return {
@@ -5973,12 +5974,12 @@ class zt {
       const {
         scopes: N,
         error: P,
-        error_description: F
+        error_description: O
       } = await this.validateAndPersistScope(e, t, void 0);
       if (P)
         return {
           error: P,
-          error_description: F
+          error_description: O
         };
       if (!y || !p)
         return {
@@ -6052,15 +6053,15 @@ class zt {
       try {
         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 })), {
+        const O = o.asCrossauthError(P);
+        return u.logger.debug(f({ err: O })), u.logger.error(f({ msg: "Couldn't get device code", cerr: O })), {
           error: "accerss_denied",
           error_description: "Invalid device code"
         };
       }
       try {
-        const P = JSON.parse(N.data ?? "{}"), F = (/* @__PURE__ */ new Date()).getTime();
-        if (N.expires && F > N.expires.getTime())
+        const P = JSON.parse(N.data ?? "{}"), O = (/* @__PURE__ */ new Date()).getTime();
+        if (N.expires && O > N.expires.getTime())
           return await this.deleteDeviceCode(C), {
             error: "expired_token",
             error_description: "Code has expired"
@@ -6082,8 +6083,8 @@ class zt {
           });
         }
       } 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 })), await this.deleteDeviceCode(C), {
+        const O = o.asCrossauthError(P);
+        return u.logger.debug(f({ err: O })), u.logger.error(f({ msg: "Couldn't get device code", cerr: O })), await this.deleteDeviceCode(C), {
           error: "accerss_denied",
           error_description: "Invalid device code"
         };
@@ -6156,9 +6157,9 @@ class zt {
         error_description: k
       };
     }
-    let c, d = !1;
+    let c, h = !1;
     const w = /* @__PURE__ */ new Date(), y = this.userCodeExpiry, p = new Date(w.getTime() + this.userCodeExpiry * 1e3 + this.clockTolerance * 1e3);
-    for (let T = 0; T < 10 && !d; ++T)
+    for (let T = 0; T < 10 && !h; ++T)
       try {
         c = v.randomValue(this.deviceCodeLength), await this.keyStorage.saveKey(
           void 0,
@@ -6166,18 +6167,18 @@ class zt {
           w,
           p,
           JSON.stringify({ scope: e, client_id: s })
-        ), d = !0;
+        ), h = !0;
       } catch {
         u.logger.debug(f({ msg: `Attempt number${T} at creating a unique authozation code failed` }));
       }
-    if (!d || !c)
+    if (!h || !c)
       return {
         error: "server_error",
         error_description: "Couldn't create device code"
       };
     let _;
-    d = !1;
-    for (let T = 0; T < 10 && !d; ++T)
+    h = !1;
+    for (let T = 0; T < 10 && !h; ++T)
       try {
         _ = v.randomBase32(this.userCodeLength), await this.keyStorage.saveKey(
           void 0,
@@ -6185,11 +6186,11 @@ class zt {
           w,
           p,
           JSON.stringify({ deviceCode: c })
-        ), d = !0;
+        ), h = !0;
       } catch {
         u.logger.debug(f({ msg: `Attempt number${T} at creating a unique authozation code failed` }));
       }
-    if (!d || !_)
+    if (!h || !_)
       return await this.deleteDeviceCode(c), {
         error: "server_error",
         error_description: "Couldn't create device code"
@@ -6282,19 +6283,19 @@ class zt {
         error_description: "User code has already been used",
         client_id: n
       };
-    let d = !1;
+    let h = !1;
     if (u.logger.debug(f({
       msg: "Checking scopes have been authorized",
       scope: a
-    })), a ? d = await this.hasAllScopes(
+    })), a ? h = await this.hasAllScopes(
       n,
       e,
       a.split(" ")
-    ) : d = await this.hasAllScopes(
+    ) : h = await this.hasAllScopes(
       n,
       e,
       [null]
-    ), !d) {
+    ), !h) {
       try {
         e != null && e.id && await this.keyStorage.updateData(U.deviceCode + r.deviceCode, "userid", e.id);
       } catch (y) {
@@ -6507,8 +6508,8 @@ class zt {
   async mfaChallengeEndpoint(s, e, t, r, i) {
     const a = b.PasswordMfa, n = await this.getClientById(e);
     if (!n.client) return n;
-    const c = n.client, d = await this.authenticateClient(a, c, t);
-    if (d.error) return d;
+    const c = n.client, h = await this.authenticateClient(a, c, t);
+    if (h.error) return h;
     const w = await this.validateMfaToken(s);
     if (!w.user || !w.key) return w;
     if (w.user.factor2 != i)
@@ -6601,7 +6602,7 @@ class zt {
         error: "invalid_request",
         error_description: `The redirect uri ${e} is invalid`
       };
-    const d = /* @__PURE__ */ new Date(), w = this.authorizationCodeExpiry ? new Date(d.getTime() + this.authorizationCodeExpiry * 1e3 + this.clockTolerance * 1e3) : void 0, y = {};
+    const h = /* @__PURE__ */ new Date(), w = this.authorizationCodeExpiry ? new Date(h.getTime() + this.authorizationCodeExpiry * 1e3 + this.clockTolerance * 1e3) : void 0, y = {};
     t && (y.scope = t), i && (y.challengeMethod = a, y.challenge = v.hash(i)), n && (y.username = n.username, y.id = n.id);
     const p = JSON.stringify(y);
     let _ = !1, C = "";
@@ -6610,7 +6611,7 @@ class zt {
         C = v.randomValue(this.codeLength), await this.keyStorage.saveKey(
           void 0,
           U.authorizationCode + v.hash(C),
-          d,
+          h,
           w,
           p
         ), _ = !0;
@@ -6650,36 +6651,36 @@ class zt {
       error: "access_denied",
       error_description: "Invalid client secret"
     };
-    let d = {};
+    let h = {};
     if (e) {
       let K;
       try {
-        K = await this.keyStorage.getKey(U.authorizationCode + v.hash(e)), d = x.decodeData(K.data);
-      } catch (O) {
-        return u.logger.debug(f({ err: O })), {
+        K = await this.keyStorage.getKey(U.authorizationCode + v.hash(e)), h = x.decodeData(K.data);
+      } catch (F) {
+        return u.logger.debug(f({ err: F })), {
           error: "access_denied",
           error_description: "Invalid or expired authorization code"
         };
       }
       try {
         await this.keyStorage.deleteKey(K.value);
-      } catch (O) {
+      } catch (F) {
         u.logger.warn(f({
-          err: O,
+          err: F,
           msg: "Couldn't delete authorization code from storatge",
           client_id: s == null ? void 0 : s.client_id
         }));
       }
-      i = d.scope;
+      i = h.scope;
     }
-    if (n && (d.username = n.username), d.challengeMethod && !d.challenge && d.challengeMethod != "plain" && d.challengeMethod != "S256")
+    if (n && (h.username = n.username), h.challengeMethod && !h.challenge && h.challengeMethod != "plain" && h.challengeMethod != "S256")
       return {
         error: "access_denied",
         error_description: "Invalid code challenge/code challenge method method for authorization code"
       };
-    if (d.challenge) {
-      const K = d.challengeMethod == "plain" ? r ?? "" : v.sha256(r ?? "");
-      if (v.hash(K) != d.challenge)
+    if (h.challenge) {
+      const K = h.challengeMethod == "plain" ? r ?? "" : v.sha256(r ?? "");
+      if (v.hash(K) != h.challenge)
         return {
           error: "access_denied",
           error_description: "Code verifier is incorrect"
@@ -6687,9 +6688,9 @@ class zt {
     }
     const w = /* @__PURE__ */ new Date(), y = Math.ceil(w.getTime() / 1e3);
     let p;
-    if ((i && i.includes("openid") || Object.keys(this.accessTokenClaims).length > 0) && this.userStorage && d.username)
+    if ((i && i.includes("openid") || Object.keys(this.accessTokenClaims).length > 0) && this.userStorage && h.username)
       try {
-        const { user: K } = await this.userStorage.getUserByUsername(d.username);
+        const { user: K } = await this.userStorage.getUserByUsername(h.username);
         n = K;
       } catch (K) {
         return u.logger.error(f({ err: K })), {
@@ -6702,17 +6703,17 @@ class zt {
       jti: _,
       iat: y,
       iss: this.oauthIssuer,
-      sub: d.username,
+      sub: h.username,
       type: "access"
     };
     C = this.addClaims(C, this.accessTokenClaims, i, n), i && (C.scope = i), this.accessTokenExpiry != null && (C.exp = y + this.accessTokenExpiry, p = new Date(w.getTime() + this.accessTokenExpiry * 1e3 + this.clockTolerance * 1e3)), this.audience && (C.aud = this.audience);
-    const T = await new Promise((K, O) => {
+    const T = await new Promise((K, F) => {
       se.sign(
         C,
         this.secretOrPrivateKey,
         { algorithm: this.jwtAlgorithmChecked, keyid: "1" },
         (V, j) => {
-          j ? K(j) : O(V || new o(
+          j ? K(j) : F(V || new o(
             l.Unauthorized,
             "Couldn't create jwt"
           ));
@@ -6729,15 +6730,15 @@ class zt {
     let k;
     if (i && i.includes("openid")) {
       const K = v.uuid();
-      let O = {
+      let F = {
         aud: s.client_id,
         jti: K,
         iat: y,
         iss: this.oauthIssuer,
-        sub: d.username,
+        sub: h.username,
         type: "id"
       };
-      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)
+      if (i.includes("email") && (n != null && n.email) && (F.email = n.email), i.includes("address") && n && "address" in n && (F.address = n.address), i.includes("phone") && n && "phone" in n && (F.phone = n.phone), i.includes("profile") && n)
         for (let V of [
           "name",
           "family_name",
@@ -6754,10 +6755,10 @@ class zt {
           "locale",
           "updated_at"
         ])
-          O[V] = n[V];
-      O = this.addClaims(O, this.idTokenClaims, i, n), O.scope = i, this.accessTokenExpiry != null && (O.exp = y + this.accessTokenExpiry), k = await new Promise((V, j) => {
+          F[V] = n[V];
+      F = this.addClaims(F, this.idTokenClaims, i, n), F.scope = i, this.accessTokenExpiry != null && (F.exp = y + this.accessTokenExpiry), k = await new Promise((V, j) => {
         se.sign(
-          O,
+          F,
           this.secretOrPrivateKey,
           {
             algorithm: this.jwtAlgorithmChecked,
@@ -6775,25 +6776,25 @@ class zt {
     let A;
     if (a) {
       const K = {
-        username: d.username,
+        username: h.username,
         client_id: s.client_id
       };
       i && (K.scope = i);
-      let O;
+      let F;
       const j = {
         jti: v.uuid(),
         iat: y,
         iss: this.oauthIssuer,
-        sub: d.username,
+        sub: h.username,
         type: "refresh"
       };
-      this.refreshTokenExpiry != null && (j.exp = y + this.refreshTokenExpiry, O = this.refreshTokenExpiry ? new Date(y + this.refreshTokenExpiry * 1e3 + this.clockTolerance * 1e3) : void 0), this.oauthIssuer && (j.aud = this.oauthIssuer), A = await new Promise((N, P) => {
+      this.refreshTokenExpiry != null && (j.exp = y + this.refreshTokenExpiry, F = this.refreshTokenExpiry ? new Date(y + this.refreshTokenExpiry * 1e3 + this.clockTolerance * 1e3) : void 0), this.oauthIssuer && (j.aud = this.oauthIssuer), A = await new Promise((N, P) => {
         se.sign(
           j,
           this.secretOrPrivateKey,
           { algorithm: this.jwtAlgorithmChecked, keyid: "1" },
-          (F, I) => {
-            I ? N(I) : P(F || new o(
+          (O, I) => {
+            I ? N(I) : P(O || new o(
               l.Unauthorized,
               "Couldn't create jwt"
             ));
@@ -6804,7 +6805,7 @@ class zt {
         // to avoid user storage dependency
         U.refreshToken + v.hash(A),
         w,
-        O,
+        F,
         JSON.stringify(K)
       ));
     }
@@ -7127,15 +7128,15 @@ class nt extends Pe {
     /**
      * Value passed to the constructor.  The `aud` claim must match it
      */
-    h(this, "audience");
+    d(this, "audience");
     /**
      * Value passed to the constructor. If true, access tokens are saved
      * in storage,
      */
-    h(this, "persistAccessToken", !1);
-    h(this, "keyStorage");
-    h(this, "jwtSecretKeyFile", "");
-    h(this, "jwtPublicKeyFile", "");
+    d(this, "persistAccessToken", !1);
+    d(this, "keyStorage");
+    d(this, "jwtSecretKeyFile", "");
+    d(this, "jwtPublicKeyFile", "");
     if (this.audience = e, m("authServerBaseUrl", g.String, this, t, "AUTH_SERVER_BASE_URL", !0), m("jwtSecretKeyFile", g.String, this, t, "JWT_SECRET_KEY_FILE"), m("jwtPublicKeyFile", g.String, this, t, "JWT_PUBLIC_KEY_FILE"), m("jwtSecretKey", g.String, this, t, "JWT_SECRET_KEY"), m("jwtPublicKey", g.String, this, t, "JWT_PUBLIC_KEY"), m("clockTolerance", g.Number, this, t, "OAUTH_CLOCK_TOLERANCE"), m("persistAccessToken", g.Boolean, this, t, "OAUTH_PERSIST_ACCESS_TOKEN"), this.keyStorage = t.keyStorage, this.jwtSecretKey || this.jwtSecretKeyFile) {
       if (this.jwtPublicKey || this.jwtPublicKeyFile)
         throw new o(
@@ -7225,15 +7226,15 @@ class Ht extends Ke {
       ),
       ...t
     });
-    h(this, "deviceAuthorizationUrl", "device_authorization");
-    h(this, "userCreationType", "idToken");
-    h(this, "userMatchField", "username");
-    h(this, "idTokenMatchField", "sub");
-    h(this, "userCreationFn");
-    h(this, "userStorage");
+    d(this, "deviceAuthorizationUrl", "device_authorization");
+    d(this, "userCreationType", "idToken");
+    d(this, "userMatchField", "username");
+    d(this, "idTokenMatchField", "sub");
+    d(this, "userCreationFn");
+    d(this, "userStorage");
     this.client_id = r.client_id;
     let i = {};
-    if (m("stateLength", g.String, this, t, "OAUTH_STATE_LENGTH"), m("verifierLength", g.String, this, t, "OAUTH_VERIFIER_LENGTH"), m("client_secret", g.String, i, t, "OAUTH_CLIENT_SECRET"), m("codeChallengeMethod", g.String, this, t, "OAUTH_CODE_CHALLENGE_METHOD"), m("deviceAuthorizationUrl", g.String, this, t, "OAUTH_DEVICE_AUTHORIZATION_URL"), m("oauthLogFetch", g.Boolean, this, t, "OAUTH_LOG_FETCH"), this.deviceAuthorizationUrl.startsWith("/") && (this.deviceAuthorizationUrl = this.deviceAuthorizationUrl.substring(1)), i.client_secret && (this.client_secret = i.client_secret), m("userCreationType", g.String, this, t, "OAUTH_USER_CREATION_TYPE"), m("userMatchField", g.String, this, t, "OAUTH_USER_MATCH_FIELD"), m("idTokenMatchField", g.String, this, t, "OAUTH_IDTOKEN_MaTCH_FIELD"), this.userCreationType == "merge" ? this.userCreationFn = ot : this.userCreationType == "embed" ? this.userCreationFn = lt : t.userCreationFn && this.userCreationType == "custom" ? this.userCreationFn = t.userCreationFn : this.userCreationFn = ct, t.userStorage && (this.userStorage = t.userStorage), m("oauthPostType", g.String, this, t, "OAUTH_POST_TYPE"), m("oauthUseUserInfoEndpoint", g.Boolean, this, t, "OAUTH_USE_USER_INFO_ENDPOINT"), this.oauthPostType != "json" && this.oauthPostType != "form")
+    if (m("stateLength", g.String, this, t, "OAUTH_STATE_LENGTH"), m("verifierLength", g.String, this, t, "OAUTH_VERIFIER_LENGTH"), m("client_secret", g.String, i, t, "OAUTH_CLIENT_SECRET"), m("codeChallengeMethod", g.String, this, t, "OAUTH_CODE_CHALLENGE_METHOD"), m("deviceAuthorizationUrl", g.String, this, t, "OAUTH_DEVICE_AUTHORIZATION_URL"), m("oauthLogFetch", g.Boolean, this, t, "OAUTH_LOG_FETCH"), this.deviceAuthorizationUrl.startsWith("/") && (this.deviceAuthorizationUrl = this.deviceAuthorizationUrl.substring(1)), i.client_secret && (this.client_secret = i.client_secret), m("userCreationType", g.String, this, t, "OAUTH_USER_CREATION_TYPE"), m("userMatchField", g.String, this, t, "OAUTH_USER_MATCH_FIELD"), m("idTokenMatchField", g.String, this, t, "OAUTH_IDTOKEN_MaTCH_FIELD"), this.userCreationType == "merge" ? this.userCreationFn = ot : this.userCreationType == "embed" ? this.userCreationFn = lt : t.userCreationFn && this.userCreationType == "custom" ? this.userCreationFn = t.userCreationFn : this.userCreationFn = ct, t.userStorage && (this.userStorage = t.userStorage), m("oauthPostType", g.String, this, t, "OAUTH_POST_TYPE"), m("oauthUseUserInfoEndpoint", g.Boolean, this, t, "OAUTH_USE_USER_INFO_ENDPOINT"), m("oauthAuthorizeRedirect", g.String, this, t, "OAUTH_AUTHORIZE_REDIRECT"), this.oauthPostType != "json" && this.oauthPostType != "form")
       throw new o(l.Configuration, "oauthPostType must be json or form");
   }
   /**
@@ -7298,7 +7299,7 @@ class jt {
      * Keyed on auth server base URL then audience.  The latter may be ""
      * for none
      */
-    h(this, "tokenConsumers");
+    d(this, "tokenConsumers");
     this.tokenConsumers = [...s];
   }
   /**
@@ -7351,9 +7352,9 @@ export {
   nt as OAuthTokenConsumer,
   g as ParamType,
   be as PasswordAuthenticator,
-  Ft as PostgresKeyStorage,
+  Ot as PostgresKeyStorage,
   Nt as PostgresOAuthAuthorizationStorage,
-  Ot as PostgresOAuthClientStorage,
+  Ft as PostgresOAuthClientStorage,
   Kt as PostgresUserStorage,
   kt as PrismaKeyStorage,
   bt as PrismaOAuthAuthorizationStorage,