@crossauth/fastify 1.1.2 → 1.1.3

package/dist/index.js

@@ -93,23 +93,23 @@ class De {
           return await this.updateUser(
             e,
             o,
-            (r, t, n) => {
-              const i = n ? "Please click on the link in your email to verify your email address." : "Your details have been updated";
+            (r, i, n) => {
+              const t = n ? "Please click on the link in your email to verify your email address." : "Your details have been updated";
               return r.view(this.updateUserPage, {
                 csrfToken: e.csrfToken,
-                message: i,
+                message: t,
                 urlPrefix: this.prefix,
                 allowedFactor2: this.sessionServer.allowedFactor2Details()
               });
             }
           );
         } catch (r) {
-          const t = l.asCrossauthError(r);
-          d.logger.error(c({ message: "Update user failure", user: e.body.username, errorCodeName: t.codeName, errorCode: t.code })), d.logger.debug(c({ err: r }));
+          const i = l.asCrossauthError(r);
+          d.logger.error(c({ message: "Update user failure", user: e.body.username, errorCodeName: i.codeName, errorCode: i.code })), d.logger.debug(c({ err: r }));
           let n = {};
-          for (let i in e.body)
-            i.startsWith("user_") && (n[i] = e.body[i]);
-          return this.sessionServer.handleError(r, e, o, (i, a) => i.view(this.updateUserPage, {
+          for (let t in e.body)
+            t.startsWith("user_") && (n[t] = e.body[t]);
+          return this.sessionServer.handleError(r, e, o, (t, a) => t.view(this.updateUserPage, {
             user: e.user,
             errorMessage: a.message,
             errorMessages: a.messages,
@@ -144,20 +144,20 @@ class De {
           return await this.updateUser(
             e,
             o,
-            (t, n, i) => t.header(...U).send({
+            (i, n, t) => i.header(...U).send({
               ok: !0,
-              emailVerificationRequired: i
+              emailVerificationRequired: t
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             message: "Update user failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...U).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...U).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -176,7 +176,7 @@ class De {
     this.sessionServer.app.get(
       this.prefix + "changefactor2",
       async (e, o) => {
-        var r, t;
+        var r, i;
         if (d.logger.info(c({
           message: "Page visit",
           method: "GET",
@@ -197,7 +197,7 @@ class De {
           csrfToken: e.csrfToken,
           next: e.query.next ?? this.sessionServer.loginRedirect,
           allowedFactor2: this.sessionServer.allowedFactor2Details(),
-          factor2: ((t = e.user) == null ? void 0 : t.factor2) ?? "none",
+          factor2: ((i = e.user) == null ? void 0 : i.factor2) ?? "none",
           required: e.query.required ?? !1
         };
         return o.view(this.changeFactor2Page, s);
@@ -213,8 +213,8 @@ class De {
           ip: e.ip,
           user: (s = e.user) == null ? void 0 : s.username
         })), !this.sessionServer.isSessionUser(e) || !e.user) {
-          const t = await this.sessionServer.getSessionData(e, "factor2change");
-          if (!(t != null && t.username) && !this.sessionServer.isSessionUser(e))
+          const i = await this.sessionServer.getSessionData(e, "factor2change");
+          if (!(i != null && i.username) && !this.sessionServer.isSessionUser(e))
             return y.sendPageError(
               o,
               401,
@@ -225,26 +225,26 @@ class De {
           return await this.changeFactor2(
             e,
             o,
-            (t, n, i) => n.factor2 ? t.view(this.configureFactor2Page, {
+            (i, n, t) => n.factor2 ? i.view(this.configureFactor2Page, {
               csrfToken: n.csrfToken,
               next: e.body.next ?? this.sessionServer.loginRedirect,
               ...n.userData
-            }) : t.view(this.configureFactor2Page, {
+            }) : i.view(this.configureFactor2Page, {
               message: "Two factor authentication has been updated",
               next: e.body.next ?? this.sessionServer.loginRedirect,
               csrfToken: n.csrfToken
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             message: "Change two factor authentication failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
             var h;
-            return i.view(this.changeFactor2Page, {
+            return t.view(this.changeFactor2Page, {
               errorMessage: a.message,
               errorMessages: a.messages,
               errorCode: a.code,
@@ -280,19 +280,19 @@ class De {
           return await this.changeFactor2(
             e,
             o,
-            (t, n, i) => t.header(...U).send({
+            (i, n, t) => i.header(...U).send({
               ok: !0,
               ...n.userData
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             message: "Change factor2 failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => i.status(this.sessionServer.errorStatus(t)).header(...U).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => t.status(this.sessionServer.errorStatus(i)).header(...U).send({
             ok: !1,
             errorMessage: a.message,
             errorMessages: a.messages,
@@ -318,8 +318,8 @@ class De {
           ip: e.ip,
           user: (r = e.user) == null ? void 0 : r.username
         })), !this.sessionServer.isSessionUser(e) || !e.user) {
-          const t = await this.sessionServer.getSessionData(e, "passwordchange");
-          if ((t == null ? void 0 : t.username) == null && !this.sessionServer.isSessionUser(e))
+          const i = await this.sessionServer.getSessionData(e, "passwordchange");
+          if ((i == null ? void 0 : i.username) == null && !this.sessionServer.isSessionUser(e))
             return y.sendPageError(
               o,
               401,
@@ -349,7 +349,7 @@ class De {
           return await this.changePassword(
             e,
             o,
-            (t, n) => e.body.next ? t.redirect(e.body.next) : t.view(this.changePasswordPage, {
+            (i, n) => e.body.next ? i.redirect(e.body.next) : i.view(this.changePasswordPage, {
               csrfToken: e.csrfToken,
               message: "Your password has been changed.",
               urlPrefix: this.prefix,
@@ -357,14 +357,14 @@ class De {
               required: e.body.required
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             message: "Change password failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => i.view(this.changePasswordPage, {
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => t.view(this.changePasswordPage, {
             errorMessage: a.message,
             errorMessages: a.messages,
             errorCode: a.code,
@@ -397,18 +397,18 @@ class De {
           return await this.changePassword(
             e,
             o,
-            (t, n) => t.header(...U).send({
+            (i, n) => i.header(...U).send({
               ok: !0
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             message: "Change password failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => i.status(this.sessionServer.errorStatus(t)).header(...U).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => t.status(this.sessionServer.errorStatus(i)).header(...U).send({
             ok: !1,
             errorMessage: a.message,
             errorMessages: a.messages,
@@ -437,23 +437,23 @@ class De {
           return await this.reconfigureFactor2(
             e,
             o,
-            (r, t, n) => r.view(this.configureFactor2Page, {
-              ...t,
+            (r, i, n) => r.view(this.configureFactor2Page, {
+              ...i,
               next: e.query.next ?? this.sessionServer.loginRedirect
             })
           );
         } catch (r) {
-          const t = l.asCrossauthError(r);
+          const i = l.asCrossauthError(r);
           return d.logger.error(c({
             message: "Configure factor2 failure",
             user: (s = e.user) == null ? void 0 : s.username,
-            errorCodeName: t.codeName,
-            errorCode: t.code
-          })), d.logger.debug(c({ err: r })), this.sessionServer.handleError(r, e, o, (n, i) => n.view(this.configureFactor2Page, {
-            errorMessage: i.message,
-            errorMessages: i.messages,
-            errorCode: i.code,
-            errorCodeName: g[i.code],
+            errorCodeName: i.codeName,
+            errorCode: i.code
+          })), d.logger.debug(c({ err: r })), this.sessionServer.handleError(r, e, o, (n, t) => n.view(this.configureFactor2Page, {
+            errorMessage: t.message,
+            errorMessages: t.messages,
+            errorCode: t.code,
+            errorCodeName: g[t.code],
             next: e.query.next ?? this.sessionServer.loginRedirect,
             csrfToken: e.csrfToken,
             urlPrefix: this.prefix
@@ -474,8 +474,8 @@ class De {
           return d.logger.debug(c({ message: "Next page " + s })), await this.configureFactor2(
             e,
             o,
-            (r, t) => {
-              const n = t != null && t.factor2 ? this.sessionServer.authenticators[t.factor2] : void 0;
+            (r, i) => {
+              const n = i != null && i.factor2 ? this.sessionServer.authenticators[i.factor2] : void 0;
               return !this.sessionServer.isSessionUser(e) && this.enableEmailVerification && (n == null || n.skipEmailVerificationOnSignup() != !0) ? r.view(this.signupPage, {
                 next: s,
                 csrfToken: e.csrfToken,
@@ -497,10 +497,10 @@ class De {
               const a = l.asCrossauthError(r);
               return d.logger.error(c({ message: "Signup second factor failure", errorCodeName: a.codeName, errorCode: a.code })), d.logger.error(c({ message: "Session not defined during two factor process" })), o.status(500).view(this.sessionServer.errorPage, { status: 500, errorMessage: "An unknown error occurred", errorCode: g.UnknownError, errorCodeName: "UnknownError" });
             }
-            let t = (await this.sessionServer.sessionManager.dataForSessionId(e.sessionId))["2fa"];
+            let i = (await this.sessionServer.sessionManager.dataForSessionId(e.sessionId))["2fa"];
             const n = l.asCrossauthError(r);
-            d.logger.error(c({ message: "Signup two factor failure", user: t == null ? void 0 : t.username, errorCodeName: n.codeName, errorCode: n.code }));
-            const { userData: i } = await this.sessionServer.sessionManager.repeatTwoFactorSignup(e.sessionId);
+            d.logger.error(c({ message: "Signup two factor failure", user: i == null ? void 0 : i.username, errorCodeName: n.codeName, errorCode: n.code }));
+            const { userData: t } = await this.sessionServer.sessionManager.repeatTwoFactorSignup(e.sessionId);
             return this.sessionServer.handleError(r, e, o, (a, h) => a.view(this.configureFactor2Page, {
               errorMessage: h.message,
               errorMessages: h.messages,
@@ -508,11 +508,11 @@ class De {
               errorCodeName: g[h.code],
               urlPrefix: this.prefix,
               next: s,
-              ...i,
+              ...t,
               csrfToken: this.sessionServer.csrfToken(e, a)
             }));
-          } catch (t) {
-            return d.logger.error(c({ err: t })), o.status(500).view(this.sessionServer.errorPage, {
+          } catch (i) {
+            return d.logger.error(c({ err: i })), o.status(500).view(this.sessionServer.errorPage, {
               status: 500,
               errorMessage: "An unknown error occurred",
               errorCode: g.UnknownError,
@@ -542,20 +542,20 @@ class De {
           return await this.reconfigureFactor2(
             o,
             s,
-            (t, n, i) => t.header(...U).send({
+            (i, n, t) => i.header(...U).send({
               ok: !0,
               ...n
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           d.logger.error(c({
             message: "Configure 2FA configuration failure",
             user: (r = o.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, o, s, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...U).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, o, s, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...U).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -579,23 +579,23 @@ class De {
           return await this.configureFactor2(
             o,
             s,
-            (t, n) => {
-              const i = {
+            (i, n) => {
+              const t = {
                 ok: !0,
                 user: n
               };
-              return this.sessionServer.isSessionUser(o) || (i.emailVerificationNeeded = this.enableEmailVerification), t.header(...U).send(i);
+              return this.sessionServer.isSessionUser(o) || (t.emailVerificationNeeded = this.enableEmailVerification), i.header(...U).send(t);
             }
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           d.logger.error(c({
             message: "Configure 2FA configuration failure",
             user: (r = o.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, o, s, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...U).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, o, s, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...U).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -640,7 +640,7 @@ class De {
           return await this.requestPasswordReset(
             e,
             o,
-            (r, t) => r.view(this.requestPasswordResetPage, {
+            (r, i) => r.view(this.requestPasswordResetPage, {
               csrfToken: e.csrfToken,
               message: s,
               urlPrefix: this.prefix
@@ -650,13 +650,13 @@ class De {
           return d.logger.error(c({
             message: "Request password reset faiulure user failure",
             email: e.body.email
-          })), d.logger.debug(c({ err: r })), this.sessionServer.handleError(r, e, o, (t, n) => n.code == g.EmailNotExist ? t.view(this.requestPasswordResetPage, {
+          })), d.logger.debug(c({ err: r })), this.sessionServer.handleError(r, e, o, (i, n) => n.code == g.EmailNotExist ? i.view(this.requestPasswordResetPage, {
             csrfToken: e.csrfToken,
             message: s,
             urlPrefix: this.prefix,
             required: e.body.required,
             next: e.body.next
-          }) : e.body.next ? t.redirect(e.body.next) : t.view(this.requestPasswordResetPage, {
+          }) : e.body.next ? i.redirect(e.body.next) : i.view(this.requestPasswordResetPage, {
             errorMessage: n.message,
             errorMessages: n.messages,
             errorCode: n.code,
@@ -697,8 +697,8 @@ class De {
             email: e.body.email,
             errorCodeName: r.codeName,
             errorCode: r.code
-          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (t, n) => {
-            t.status(this.sessionServer.errorStatus(s)).header(...U).send({
+          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (i, n) => {
+            i.status(this.sessionServer.errorStatus(s)).header(...U).send({
               ok: !1,
               errorMessage: n.message,
               errorMessages: n.messages,
@@ -764,7 +764,7 @@ class De {
             hashedToken: F.hash(e.body.token),
             errorCodeName: r.codeName,
             errorCode: r.code
-          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (t, n) => t.view(this.resetPasswordPage, {
+          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (i, n) => i.view(this.resetPasswordPage, {
             errorMessage: n.message,
             errorMessages: n.messages,
             errorCode: n.code,
@@ -805,8 +805,8 @@ class De {
             hashedToken: F.hash(e.body.token),
             errorCodeName: r.codeName,
             errorCode: r.code
-          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (t, n) => {
-            t.status(this.sessionServer.errorStatus(s)).header(...U).send({
+          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (i, n) => {
+            i.status(this.sessionServer.errorStatus(s)).header(...U).send({
               ok: !1,
               errorMessage: n.message,
               errorMessages: n.messages,
@@ -847,7 +847,7 @@ class De {
             hashedToken: F.hash(e.params.token),
             errorCodeName: r.codeName,
             errorCode: r.code
-          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (t, n) => t.view(this.sessionServer.errorPage, {
+          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (i, n) => i.view(this.sessionServer.errorPage, {
             errorCode: n.code,
             errorCodeName: g[n.code],
             errorMessage: n.message,
@@ -887,8 +887,8 @@ class De {
             hashedToken: F.hash(e.params.token),
             errorCodeName: r.codeName,
             errorCode: r.code
-          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (t, n) => {
-            t.status(this.sessionServer.errorStatus(s)).header(...U).send({
+          })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (i, n) => {
+            i.status(this.sessionServer.errorStatus(s)).header(...U).send({
               ok: !1,
               errorMessage: n.message,
               errorMessages: n.messages,
@@ -920,28 +920,28 @@ class De {
           if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call delete user unless a user storage is provided");
           s = (await this.sessionServer.userStorage.getUserById(e.user.id)).user;
         } catch (n) {
-          const i = l.asCrossauthError(n);
-          return d.logger.debug(c({ err: n })), o.status(i.httpStatus).view(this.sessionServer.errorPage, {
-            errorMessage: i.message,
-            errorMessages: i.messages,
-            errorCode: i.code,
-            errorCodeName: g[i.code]
+          const t = l.asCrossauthError(n);
+          return d.logger.debug(c({ err: n })), o.status(t.httpStatus).view(this.sessionServer.errorPage, {
+            errorMessage: t.message,
+            errorMessages: t.messages,
+            errorCode: t.code,
+            errorCodeName: g[t.code]
           });
         }
         const r = e.query.next ?? this.prefix;
-        let t = {
+        let i = {
           urlPrefix: this.prefix,
           csrfToken: e.csrfToken,
           next: r,
           isAdmin: !1,
           user: s
         };
-        return o.view(this.deleteUserPage, t);
+        return o.view(this.deleteUserPage, i);
       }
     ), this.sessionServer.app.post(
       this.prefix + "deleteuser",
       async (e, o) => {
-        var r, t;
+        var r, i;
         if (d.logger.info(c({
           message: "Page visit",
           method: "POST",
@@ -956,24 +956,24 @@ class De {
             e,
             o,
             (n) => {
-              var i;
+              var t;
               return n.view(this.deleteUserPage, {
                 message: "User deleted",
                 csrfToken: e.csrfToken,
                 urlPrefix: this.prefix,
-                userid: (i = e.user) == null ? void 0 : i.id,
+                userid: (t = e.user) == null ? void 0 : t.id,
                 isAdmin: !1,
                 next: s
               });
             }
           );
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           return d.logger.error(c({
             message: "Failed deleting user",
-            user: (t = e.user) == null ? void 0 : t.username,
-            errorCodeName: i.codeName,
-            errorCode: i.code
+            user: (i = e.user) == null ? void 0 : i.username,
+            errorCodeName: t.codeName,
+            errorCode: t.code
           })), d.logger.debug(c({ err: n })), this.sessionServer.handleError(n, e, o, (a, h) => {
             var v;
             const p = l.asCrossauthError(n).httpStatus;
@@ -1013,23 +1013,23 @@ class De {
           return await this.deleteUser(
             e,
             o,
-            (t) => {
+            (i) => {
               var n;
-              return t.header(...U).send({
+              return i.header(...U).send({
                 ok: !0,
                 userid: (n = e.user) == null ? void 0 : n.id
               });
             }
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           d.logger.error(c({
             message: "Delete user failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...U).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...U).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -1057,9 +1057,9 @@ class De {
       e,
       this.sessionServer.userStorage.userEditableFields
     );
-    let t = this.sessionServer.validateUserFn(r);
-    if (t.length > 0)
-      throw new l(g.FormEntry, t);
+    let i = this.sessionServer.validateUserFn(r);
+    if (i.length > 0)
+      throw new l(g.FormEntry, i);
     let n = await this.sessionServer.sessionManager.updateUser(e.user, r);
     return s(o, e.user, n.emailVerificationTokenSent);
   }
@@ -1086,26 +1086,26 @@ class De {
       throw new l(g.Unauthorized);
     if (!e.csrfToken)
       throw new l(g.InvalidCsrf);
-    let t = e.body.factor2;
+    let i = e.body.factor2;
     if (e.body.factor2 && !this.sessionServer.allowedFactor2.includes(e.body.factor2))
       throw new l(
         g.Forbidden,
         "Illegal second factor " + e.body.factor2 + " requested"
       );
-    (e.body.factor2 == "none" || e.body.factor2 == "") && (t = void 0);
-    const n = await this.sessionServer.sessionManager.initiateTwoFactorSetup(r, t, e.sessionId);
-    let i = {
-      factor2: t,
+    (e.body.factor2 == "none" || e.body.factor2 == "") && (i = void 0);
+    const n = await this.sessionServer.sessionManager.initiateTwoFactorSetup(r, i, e.sessionId);
+    let t = {
+      factor2: i,
       userData: n,
       username: n.username,
       next: e.body.next ?? this.sessionServer.loginRedirect,
       csrfToken: e.csrfToken
     };
-    return s(o, i);
+    return s(o, t);
   }
   async changePassword(e, o, s) {
     if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call changePassword unless a user storage is provided");
-    let r, t = !1;
+    let r, i = !1;
     if (!this.sessionServer.isSessionUser(e) || !e.user) {
       const m = await this.sessionServer.getSessionData(e, "passwordchange");
       if (m != null && m.username) {
@@ -1115,7 +1115,7 @@ class De {
             skipActiveCheck: !0,
             skipEmailVerifiedCheck: !0
           }
-        )).user, t = !0, !e.csrfToken)
+        )).user, i = !0, !e.csrfToken)
           throw new l(g.InvalidCsrf);
       } else
         throw new l(g.Unauthorized);
@@ -1125,18 +1125,18 @@ class De {
       r = e.user;
     } else
       throw new l(g.InsufficientPriviledges);
-    const n = this.sessionServer.authenticators[r.factor1], i = n.secretNames();
+    const n = this.sessionServer.authenticators[r.factor1], t = n.secretNames();
     let a = {}, h = {}, f = {};
     for (let m in e.body)
       if (m.startsWith("new_")) {
         const w = m.replace(/^new_/, "");
-        i.includes(w) && (h[w] = e.body[m]);
+        t.includes(w) && (h[w] = e.body[m]);
       } else if (m.startsWith("old_")) {
         const w = m.replace(/^old_/, "");
-        i.includes(w) && (a[w] = e.body[m]);
+        t.includes(w) && (a[w] = e.body[m]);
       } else if (m.startsWith("repeat_")) {
         const w = m.replace(/^repeat_/, "");
-        i.includes(w) && (f[w] = e.body[m]);
+        t.includes(w) && (f[w] = e.body[m]);
       }
     Object.keys(f).length === 0 && (f = void 0);
     let p = n.validateSecrets(h);
@@ -1144,7 +1144,7 @@ class De {
       throw new l(g.PasswordFormat, p);
     const v = r.state;
     try {
-      t && (r.state = "active", await this.sessionServer.userStorage.updateUser({ id: r.id, state: r.state })), await this.sessionServer.sessionManager.changeSecrets(
+      i && (r.state = "active", await this.sessionServer.userStorage.updateUser({ id: r.id, state: r.state })), await this.sessionServer.sessionManager.changeSecrets(
         r.username,
         1,
         h,
@@ -1153,7 +1153,7 @@ class De {
       );
     } catch (m) {
       const w = l.asCrossauthError(m);
-      if (d.logger.debug(c({ err: m })), t)
+      if (d.logger.debug(c({ err: m })), i)
         try {
           await this.sessionServer.userStorage.updateUser({ id: r.id, state: v });
         } catch (P) {
@@ -1161,7 +1161,7 @@ class De {
         }
       throw w;
     }
-    return t ? await this.sessionServer.loginWithUser(r, !1, e, o, s) : s(o, void 0);
+    return i ? await this.sessionServer.loginWithUser(r, !1, e, o, s) : s(o, void 0);
   }
   async configureFactor2(e, o, s) {
     if (this.sessionServer.isSessionUser(e) && !e.csrfToken)
@@ -1179,20 +1179,20 @@ class De {
       !0,
       e,
       o,
-      (t, n) => s(t, n)
+      (i, n) => s(i, n)
     ) : s(o, r);
   }
   async reconfigureFactor2(e, o, s) {
     if (!e.user || !e.sessionId || !this.sessionServer.isSessionUser(e))
       throw new l(g.Unauthorized);
     let r = e.user.factor2;
-    const t = this.sessionServer.authenticators[r];
-    if (!t || t.secretNames().length == 0)
+    const i = this.sessionServer.authenticators[r];
+    if (!i || i.secretNames().length == 0)
       throw new l(
         g.BadRequest,
         "Selected second factor does not have configuration"
       );
-    let i = {
+    let t = {
       ...await this.sessionServer.sessionManager.initiateTwoFactorSetup(
         e.user,
         r,
@@ -1200,7 +1200,7 @@ class De {
       ),
       csrfToken: e.csrfToken
     };
-    return s(o, i);
+    return s(o, t);
   }
   async requestPasswordReset(e, o, s) {
     if (!this.enablePasswordReset)
@@ -1213,8 +1213,8 @@ class De {
     const r = e.body.email;
     try {
       await this.sessionServer.sessionManager.requestPasswordReset(r);
-    } catch (t) {
-      const n = l.asCrossauthError(t);
+    } catch (i) {
+      const n = l.asCrossauthError(i);
       if (n.code == g.UserNotExist)
         d.logger.warn(c({
           message: "Password reset requested for invalid email",
@@ -1222,7 +1222,7 @@ class De {
         }));
       else
         throw d.logger.error(c({
-          err: t,
+          err: i,
           message: "Couldn't send password reset email"
         })), n;
     }
@@ -1231,15 +1231,15 @@ class De {
   async resetPassword(e, o, s) {
     if (!e.csrfToken)
       throw new l(g.InvalidCsrf);
-    const r = e.body.token, t = await this.sessionServer.sessionManager.userForPasswordResetToken(r), n = this.sessionServer.authenticators[t.factor1], i = n.secretNames();
+    const r = e.body.token, i = await this.sessionServer.sessionManager.userForPasswordResetToken(r), n = this.sessionServer.authenticators[i.factor1], t = n.secretNames();
     let a = {}, h = {};
     for (let v in e.body)
       if (v.startsWith("new_")) {
         const m = v.replace(/^new_/, "");
-        i.includes(m) && (a[m] = e.body[v]);
+        t.includes(m) && (a[m] = e.body[v]);
       } else if (v.startsWith("repeat_")) {
         const m = v.replace(/^repeat_/, "");
-        i.includes(m) && (h[m] = e.body[v]);
+        t.includes(m) && (h[m] = e.body[v]);
       }
     Object.keys(h).length === 0 && (h = void 0);
     let f = n.validateSecrets(a);
@@ -1253,8 +1253,8 @@ class De {
       g.Configuration,
       "Email verification reset not enabled"
     );
-    const r = e.params.token, t = await this.sessionServer.sessionManager.applyEmailVerificationToken(r);
-    return await this.sessionServer.loginWithUser(t, !0, e, o, s);
+    const r = e.params.token, i = await this.sessionServer.sessionManager.applyEmailVerificationToken(r);
+    return await this.sessionServer.loginWithUser(i, !0, e, o, s);
   }
   async deleteUser(e, o, s) {
     if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call deleteUser unless a user storage is provided");
@@ -1275,10 +1275,10 @@ async function ze(S, e) {
     if (r.code != g.UserNotExist)
       throw d.logger.debug(c({ err: r })), r;
     try {
-      const { user: t } = await e.getUserByEmail(S);
-      o.push(t);
-    } catch (t) {
-      const n = l.asCrossauthError(t);
+      const { user: i } = await e.getUserByEmail(S);
+      o.push(i);
+    } catch (i) {
+      const n = l.asCrossauthError(i);
       if (n.code != g.UserNotExist)
         throw d.logger.debug(c({ err: n })), r;
     }
@@ -1339,18 +1339,18 @@ class He {
           return d.logger.debug(c({ msg: "Next page " + s })), await this.createUser(
             e,
             o,
-            (t, n, i) => t.redirect(302, s)
+            (i, n, t) => i.redirect(302, s)
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             msg: "Signup failure",
             user: e.body.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            const f = l.asCrossauthError(t).httpStatus;
-            return i.status(f).view(this.adminCreateUserPage, {
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            const f = l.asCrossauthError(i).httpStatus;
+            return t.status(f).view(this.adminCreateUserPage, {
               errorMessage: a.message,
               errorMessages: a.messages,
               errorCode: a.code,
@@ -1387,21 +1387,21 @@ class He {
           return await this.createUser(
             e,
             o,
-            (t, n, i) => t.header(...R).send({
+            (i, n, t) => i.header(...R).send({
               ok: !0,
-              user: i,
+              user: t,
               ...n.userData
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           d.logger.error(c({
             msg: "Create user failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...R).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...R).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -1428,21 +1428,21 @@ class He {
         })), !(e != null && e.user) || !y.isAdmin(e.user))
           return this.accessDeniedPage(e, o);
         try {
-          let s = [], r = Number(e.query.skip), t = Number(e.query.take);
-          r < 0 && (t = -r, r = 0), r || (r = 0), t || (t = 10), e.query.search ? s = await this.userSearchFn(
+          let s = [], r = Number(e.query.skip), i = Number(e.query.take);
+          r < 0 && (i = -r, r = 0), r || (r = 0), i || (i = 10), e.query.search ? s = await this.userSearchFn(
             e.query.search,
             this.sessionServer.userStorage
           ) : s = await this.sessionServer.userStorage.getUsers(
             r,
-            t
+            i
           );
           let n = {
             urlPrefix: this.adminPrefix,
             skip: r,
-            take: t,
+            take: i,
             users: s,
             havePrevious: r > 0,
-            haveNext: t != null && s.length == t
+            haveNext: i != null && s.length == i
           };
           return e.query.next && (n.next = e.query.next), o.view(this.adminSelectUserPage, n);
         } catch (s) {
@@ -1512,12 +1512,12 @@ class He {
         let s;
         try {
           if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call updateuser unless a user storage is provided");
-          const { user: t } = await this.sessionServer.userStorage.getUserById(e.params.id);
-          return s = t, await this.updateUser(
+          const { user: i } = await this.sessionServer.userStorage.getUserById(e.params.id);
+          return s = i, await this.updateUser(
             s,
             e,
             o,
-            (n, i, a, h) => {
+            (n, t, a, h) => {
               let f = "User's details have been updated.";
               return a ? f = "User's details have been updated and sent and an email verification link." : h && (f = "User's details have been updated and sent and a password reset token sent."), n.view(this.adminUpdateUserPage, {
                 csrfToken: e.csrfToken,
@@ -1527,9 +1527,9 @@ class He {
               });
             }
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
-          return d.logger.error(c({ msg: "Update user failure", user: e.body.username, errorCodeName: n.codeName, errorCode: n.code })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => s ? i.view(this.adminUpdateUserPage, {
+        } catch (i) {
+          const n = l.asCrossauthError(i);
+          return d.logger.error(c({ msg: "Update user failure", user: e.body.username, errorCodeName: n.codeName, errorCode: n.code })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => s ? t.view(this.adminUpdateUserPage, {
             user: s,
             errorMessage: a.message,
             errorMessages: a.messages,
@@ -1540,7 +1540,7 @@ class He {
             allowedFactor2: this.sessionServer.allowedFactor2Details(),
             ...e.body
           }) : y.sendPageError(
-            i,
+            t,
             n.httpStatus,
             this.sessionServer.errorPage,
             n.message,
@@ -1570,28 +1570,28 @@ class He {
           if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call deleteuser unless a user storage is provided");
           s = (await this.sessionServer.userStorage.getUserById(e.params.id)).user;
         } catch (n) {
-          const i = l.asCrossauthError(n);
-          return d.logger.debug(c({ err: n })), o.status(i.httpStatus).view(this.sessionServer.errorPage, {
-            errorMessage: i.message,
-            errorMessages: i.messages,
-            errorCode: i.code,
-            errorCodeName: g[i.code]
+          const t = l.asCrossauthError(n);
+          return d.logger.debug(c({ err: n })), o.status(t.httpStatus).view(this.sessionServer.errorPage, {
+            errorMessage: t.message,
+            errorMessages: t.messages,
+            errorCode: t.code,
+            errorCodeName: g[t.code]
           });
         }
         const r = e.query.next ?? this.adminPrefix + "selectuser";
-        let t = {
+        let i = {
           urlPrefix: this.adminPrefix,
           csrfToken: e.csrfToken,
           next: r,
           isAdmin: !0,
           user: s
         };
-        return o.view(this.deleteUserPage, t);
+        return o.view(this.deleteUserPage, i);
       }
     ), this.sessionServer.app.post(
       this.adminPrefix + "deleteuser/:id",
       async (e, o) => {
-        var r, t;
+        var r, i;
         d.logger.info(c({
           msg: "Page visit",
           method: "POST",
@@ -1614,12 +1614,12 @@ class He {
             })
           );
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           return d.logger.error(c({
             msg: "Failed deleting user",
-            user: (t = e.user) == null ? void 0 : t.username,
-            errorCodeName: i.codeName,
-            errorCode: i.code
+            user: (i = e.user) == null ? void 0 : i.username,
+            errorCodeName: t.codeName,
+            errorCode: t.code
           })), d.logger.debug(c({ err: n })), this.sessionServer.handleError(n, e, o, (a, h) => {
             const p = l.asCrossauthError(n).httpStatus;
             return a.status(p).view(this.deleteUserPage, {
@@ -1645,7 +1645,7 @@ class He {
     this.sessionServer.app.post(
       this.adminPrefix + "api/updateuser/:id",
       async (e, o) => {
-        var r, t;
+        var r, i;
         if (d.logger.info(c({
           msg: "API visit",
           method: "POST",
@@ -1662,18 +1662,18 @@ class He {
             s,
             e,
             o,
-            (i, a, h) => i.header(...R).send({
+            (t, a, h) => t.header(...R).send({
               ok: !0,
               emailVerificationRequired: h
             })
           );
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           return d.logger.error(c({
             msg: "Update user failure",
-            user: (t = e.user) == null ? void 0 : t.username,
-            errorCodeName: i.codeName,
-            errorCode: i.code
+            user: (i = e.user) == null ? void 0 : i.username,
+            errorCodeName: t.codeName,
+            errorCode: t.code
           })), d.logger.debug(c({ err: n })), this.sessionServer.handleError(n, e, o, (a, h) => {
             a.status(this.sessionServer.errorStatus(n)).header(...R).send({
               ok: !1,
@@ -1706,20 +1706,20 @@ class He {
           return this.accessDeniedPage(e, o);
         try {
           const { user: r } = await this.sessionServer.userStorage.getUserById(e.params.id);
-          let t = {
+          let i = {
             urlPrefix: this.adminPrefix,
             csrfToken: e.csrfToken,
             user: r
           };
-          return o.view(this.adminChangePasswordPage, t);
+          return o.view(this.adminChangePasswordPage, i);
         } catch (r) {
-          const t = l.asCrossauthError(r);
+          const i = l.asCrossauthError(r);
           return d.logger.error(c({ err: r })), y.sendPageError(
             o,
-            t.httpStatus,
+            i.httpStatus,
             this.sessionServer.errorPage,
-            t.message,
-            t
+            i.message,
+            i
           );
         }
       }
@@ -1737,12 +1737,12 @@ class He {
         let s;
         try {
           if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call changepassword unless a user storage is provided");
-          const { user: t } = await this.sessionServer.userStorage.getUserById(e.params.id);
-          return s = t, await this.changePassword(
+          const { user: i } = await this.sessionServer.userStorage.getUserById(e.params.id);
+          return s = i, await this.changePassword(
             s,
             e,
             o,
-            (n, i) => e.body.next ? n.redirect(e.body.next) : n.view(this.adminChangePasswordPage, {
+            (n, t) => e.body.next ? n.redirect(e.body.next) : n.view(this.adminChangePasswordPage, {
               csrfToken: e.csrfToken,
               message: "User's password has been changed.",
               urlPrefix: this.adminPrefix,
@@ -1751,14 +1751,14 @@ class He {
               user: s
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             msg: "Change password failure",
             userid: e.params.id,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => i.view(this.adminChangePasswordPage, {
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => t.view(this.adminChangePasswordPage, {
             errorMessage: a.message,
             errorMessages: a.messages,
             errorCode: a.code,
@@ -1777,7 +1777,7 @@ class He {
     this.sessionServer.app.post(
       this.adminPrefix + "api/changepassword/:id",
       async (e, o) => {
-        var r, t;
+        var r, i;
         if (d.logger.info(c({
           msg: "API visit",
           method: "POST",
@@ -1794,17 +1794,17 @@ class He {
             s,
             e,
             o,
-            (i, a) => i.header(...R).send({
+            (t, a) => t.header(...R).send({
               ok: !0
             })
           );
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           return d.logger.error(c({
             msg: "Update user failure",
-            user: (t = e.user) == null ? void 0 : t.username,
-            errorCodeName: i.codeName,
-            errorCode: i.code
+            user: (i = e.user) == null ? void 0 : i.username,
+            errorCodeName: t.codeName,
+            errorCode: t.code
           })), d.logger.debug(c({ err: n })), this.sessionServer.handleError(n, e, o, (a, h) => {
             a.status(this.sessionServer.errorStatus(n)).header(...R).send({
               ok: !1,
@@ -1837,20 +1837,20 @@ class He {
           return await this.deleteUser(
             e,
             o,
-            (t) => t.header(...R).send({
+            (i) => i.header(...R).send({
               ok: !0,
               client_id: e.params.id
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           d.logger.error(c({
             msg: "Delete user failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...R).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...R).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -1884,17 +1884,17 @@ class He {
       this.sessionServer.adminAllowedFactor1,
       this.sessionServer.allowedFactor2
     );
-    const t = this.sessionServer.authenticators[r.factor1].secretNames();
+    const i = this.sessionServer.authenticators[r.factor1].secretNames();
     let n = !0;
-    for (let v of t)
+    for (let v of i)
       !e.body[v] && !e.body["repeat_" + v] && (n = !1);
-    let i = [], a = {};
+    let t = [], a = {};
     if (n) {
-      i = this.sessionServer.authenticators[r.factor1].validateSecrets(e.body);
+      t = this.sessionServer.authenticators[r.factor1].validateSecrets(e.body);
       for (let v in e.body)
         if (v.startsWith("repeat_")) {
           const m = v.replace(/^repeat_/, "");
-          t.includes(m) && (a[m] = e.body[v]);
+          i.includes(m) && (a[m] = e.body[v]);
         }
       Object.keys(a).length === 0 && (a = void 0);
     }
@@ -1908,7 +1908,7 @@ class He {
       msg: `Setting state for user to ${O.passwordResetNeeded}`,
       username: r.username
     })));
-    let f = [...this.sessionServer.validateUserFn(r), ...i];
+    let f = [...this.sessionServer.validateUserFn(r), ...t];
     if (f.length > 0)
       throw new l(g.FormEntry, f);
     const p = await this.sessionServer.sessionManager.createUser(
@@ -1931,11 +1931,11 @@ class He {
   }
   async accessDeniedPage(e, o) {
     const s = new l(g.InsufficientPriviledges);
-    return this.sessionServer.handleError(s, e, o, (r, t) => r.status(s.httpStatus).view(this.sessionServer.errorPage, {
-      errorMessage: t.message,
-      errorMessages: t.messages,
-      errorCode: t.code,
-      errorCodeName: g[t.code]
+    return this.sessionServer.handleError(s, e, o, (r, i) => r.status(s.httpStatus).view(this.sessionServer.errorPage, {
+      errorMessage: i.message,
+      errorMessages: i.messages,
+      errorCode: i.code,
+      errorCodeName: g[i.code]
     }));
   }
   async updateUser(e, o, s, r) {
@@ -1943,7 +1943,7 @@ class He {
     if (!o.user || !y.isAdmin(o.user))
       throw new l(g.Unauthorized);
     if (this.sessionServer.isSessionUser(o) && !o.csrfToken) throw new l(g.InvalidCsrf);
-    const t = e.factor2, n = e.state;
+    const i = e.factor2, n = e.state;
     e.state = o.body.state, e = this.sessionServer.updateUserFn(
       e,
       o,
@@ -1952,10 +1952,10 @@ class He {
         ...this.sessionServer.userStorage.adminEditableFields
       }
     );
-    const i = e.factor2 && e.factor2 != "none" && e.factor2 != t;
-    if (i && !(e.state == n || e.state == "factor2ResetNeeded"))
+    const t = e.factor2 && e.factor2 != "none" && e.factor2 != i;
+    if (t && !(e.state == n || e.state == "factor2ResetNeeded"))
       throw new l(g.BadRequest, "Cannot change both factor2 and state at the same time");
-    i && (e.state = O.factor2ResetNeeded, d.logger.warn(c({
+    t && (e.state = O.factor2ResetNeeded, d.logger.warn(c({
       msg: `Setting state for user to ${O.factor2ResetNeeded}`,
       username: e.username
     })));
@@ -1974,22 +1974,22 @@ class He {
     if (!o.user || !y.isAdmin(o.user))
       throw new l(g.Unauthorized);
     if (this.sessionServer.isSessionUser(o) && !o.csrfToken) throw new l(g.InvalidCsrf);
-    const t = this.sessionServer.authenticators[e.factor1], n = t.secretNames();
-    let i = {}, a = {};
+    const i = this.sessionServer.authenticators[e.factor1], n = i.secretNames();
+    let t = {}, a = {};
     for (let f in o.body)
       if (f.startsWith("new_")) {
         const p = f.replace(/^new_/, "");
-        n.includes(p) && (i[p] = o.body[f]);
+        n.includes(p) && (t[p] = o.body[f]);
       } else if (f.startsWith("repeat_")) {
         const p = f.replace(/^repeat_/, "");
         n.includes(p) && (a[p] = o.body[f]);
       }
-    if (Object.keys(a).length === 0 && (a = void 0), t.validateSecrets(i).length > 0)
+    if (Object.keys(a).length === 0 && (a = void 0), i.validateSecrets(t).length > 0)
       throw new l(g.PasswordFormat);
     return e.state = "active", await this.sessionServer.userStorage.updateUser({ id: e.id, state: e.state }), await this.sessionServer.sessionManager.changeSecrets(
       e.username,
       1,
-      i,
+      t,
       a
     ), r(s, void 0);
   }
@@ -2008,15 +2008,15 @@ async function ve(S, e, o) {
     const r = await e.getClientById(S);
     s.push(r);
   } catch (r) {
-    const t = l.asCrossauthError(r);
-    if (t.code != g.UserNotExist)
-      throw d.logger.debug(c({ err: t })), t;
+    const i = l.asCrossauthError(r);
+    if (i.code != g.UserNotExist)
+      throw d.logger.debug(c({ err: i })), i;
     try {
       s = await e.getClientByName(S, o);
     } catch (n) {
-      const i = l.asCrossauthError(n);
-      if (i.code != g.UserNotExist)
-        throw d.logger.debug(c({ err: i })), t;
+      const t = l.asCrossauthError(n);
+      if (t.code != g.UserNotExist)
+        throw d.logger.debug(c({ err: t })), i;
     }
   }
   return s;
@@ -2059,42 +2059,42 @@ class Le {
           return this.accessDeniedPage(e, o);
         const s = e.query.next ?? encodeURIComponent(e.url);
         try {
-          let r = [], t = Number(e.query.skip), n = Number(e.query.take);
-          t || (t = 0), n || (n = 10);
-          let i = null, a;
+          let r = [], i = Number(e.query.skip), n = Number(e.query.take);
+          i || (i = 0), n || (n = 10);
+          let t = null, a;
           if (e.query.userid) {
             if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call selectclient with user unless a user storage is provided");
-            a = (await this.sessionServer.userStorage.getUserById(e.query.userid)).user, i = a.id;
+            a = (await this.sessionServer.userStorage.getUserById(e.query.userid)).user, t = a.id;
           }
           e.query.search ? r = await this.clientSearchFn(
             e.query.search,
             this.clientStorage,
-            i
+            t
           ) : r = await this.clientStorage.getClients(
-            t,
+            i,
             n,
-            i
+            t
           );
           let h = {
             urlPrefix: this.adminPrefix,
             user: a,
-            skip: t,
+            skip: i,
             take: n,
             clients: r,
-            havePrevious: t > 0,
+            havePrevious: i > 0,
             haveNext: n != null && r.length == n,
             isAdmin: !0,
             next: s
           };
           return e.query.next && (h.next = e.query.next), o.view(this.selectClientPage, h);
         } catch (r) {
-          const t = l.asCrossauthError(r);
+          const i = l.asCrossauthError(r);
           return d.logger.error(c({ err: r })), y.sendPageError(
             o,
-            t.httpStatus,
+            i.httpStatus,
             this.sessionServer.errorPage,
-            t.message,
-            t
+            i.message,
+            i
           );
         }
       }
@@ -2123,15 +2123,15 @@ class Le {
             r = (await this.sessionServer.userStorage.getUserById(e.query.userid)).user;
           }
         } catch (n) {
-          const i = l.asCrossauthError(n);
-          return d.logger.debug(c({ err: n })), o.status(i.httpStatus).view(this.sessionServer.errorPage, {
-            errorMessage: i.message,
-            errorMessages: i.messages,
-            errorCode: i.code,
-            errorCodeName: g[i.code]
+          const t = l.asCrossauthError(n);
+          return d.logger.debug(c({ err: n })), o.status(t.httpStatus).view(this.sessionServer.errorPage, {
+            errorMessage: t.message,
+            errorMessages: t.messages,
+            errorCode: t.code,
+            errorCodeName: g[t.code]
           });
         }
-        let t = {
+        let i = {
           urlPrefix: this.adminPrefix,
           csrfToken: e.csrfToken,
           validFlows: this.validFlows,
@@ -2140,18 +2140,18 @@ class Le {
           isAdmin: !0,
           next: s
         };
-        return o.view(this.createClientPage, t);
+        return o.view(this.createClientPage, i);
       }
     ), this.sessionServer.app.post(
       this.adminPrefix + "createclient",
       async (e, o) => {
-        var t, n;
+        var i, n;
         d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.adminPrefix + "createclient",
           ip: e.ip,
-          user: (t = e.user) == null ? void 0 : t.username
+          user: (i = e.user) == null ? void 0 : i.username
         }));
         let s = e.body.next;
         s || (e.body.userid ? s = this.adminPrefix + "selectuser" : s = this.adminPrefix + "selectclient");
@@ -2164,7 +2164,7 @@ class Le {
           return await this.createClient(
             e,
             o,
-            (i, a) => i.view(this.createClientPage, {
+            (t, a) => t.view(this.createClientPage, {
               message: "Created client",
               client: a,
               csrfToken: e.csrfToken,
@@ -2178,15 +2178,15 @@ class Le {
             }),
             r
           );
-        } catch (i) {
-          const a = l.asCrossauthError(i);
+        } catch (t) {
+          const a = l.asCrossauthError(t);
           return d.logger.error(c({
             msg: "Failed creating OAuth client",
             user: (n = e.user) == null ? void 0 : n.username,
             errorCodeName: a.codeName,
             errorCode: a.code
-          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (h, f) => {
-            const v = l.asCrossauthError(i).httpStatus;
+          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (h, f) => {
+            const v = l.asCrossauthError(t).httpStatus;
             return h.status(v).view(this.createClientPage, {
               errorMessage: f.message,
               errorMessages: f.messages,
@@ -2233,11 +2233,11 @@ class Le {
         }
         let r = e.query.next;
         r || (e.query.userid ? r = this.adminPrefix + "selectuser" : r = this.adminPrefix + "selectclient");
-        let t;
+        let i;
         try {
           if (s.userid) {
             if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call updateclient with user unless a user storage is provided");
-            t = (await this.sessionServer.userStorage.getUserById(s.userid)).user;
+            i = (await this.sessionServer.userStorage.getUserById(s.userid)).user;
           }
         } catch (a) {
           const h = l.asCrossauthError(a);
@@ -2251,13 +2251,13 @@ class Le {
         let n = {};
         for (let a of this.validFlows)
           s.valid_flow.includes(a) && (n[a] = !0);
-        let i = {
+        let t = {
           urlPrefix: this.adminPrefix,
           csrfToken: e.csrfToken,
           validFlows: this.validFlows,
           flowNames: E.flowNames(this.validFlows),
           selectedFlows: n,
-          user: t,
+          user: i,
           client_id: s.client_id,
           client_name: s.client_name,
           confidential: s.confidential,
@@ -2265,18 +2265,18 @@ class Le {
           isAdmin: !0,
           next: r
         };
-        return o.view(this.updateClientPage, i);
+        return o.view(this.updateClientPage, t);
       }
     ), this.sessionServer.app.post(
       this.adminPrefix + "updateclient/:client_id",
       async (e, o) => {
-        var t, n;
+        var i, n;
         d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.adminPrefix + "updateclient",
           ip: e.ip,
-          user: (t = e.user) == null ? void 0 : t.username
+          user: (i = e.user) == null ? void 0 : i.username
         }));
         let s = e.body.next;
         s || (e.body.userid ? s = this.adminPrefix + "selectuser" : s = this.adminPrefix + "selectclient");
@@ -2289,7 +2289,7 @@ class Le {
           return await this.updateClient(
             e,
             o,
-            (i, a, h) => i.view(this.updateClientPage, {
+            (t, a, h) => t.view(this.updateClientPage, {
               message: "Updated client",
               client: a,
               csrfToken: e.csrfToken,
@@ -2303,15 +2303,15 @@ class Le {
               ...e.body
             })
           );
-        } catch (i) {
-          const a = l.asCrossauthError(i);
+        } catch (t) {
+          const a = l.asCrossauthError(t);
           return d.logger.error(c({
             msg: "Failed updating OAuth client",
             user: (n = e.user) == null ? void 0 : n.username,
             errorCodeName: a.codeName,
             errorCode: a.code
-          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (h, f) => {
-            const v = l.asCrossauthError(i).httpStatus;
+          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (h, f) => {
+            const v = l.asCrossauthError(t).httpStatus;
             let m = {};
             for (let w of this.validFlows)
               w in e.body && (m[w] = !0);
@@ -2353,27 +2353,27 @@ class Le {
         try {
           s = await this.clientStorage.getClientById(e.params.client_id);
         } catch (n) {
-          const i = l.asCrossauthError(n);
-          return d.logger.debug(c({ err: n })), o.status(i.httpStatus).view(this.sessionServer.errorPage, {
-            errorMessage: i.message,
-            errorMessages: i.messages,
-            errorCode: i.code,
-            errorCodeName: g[i.code]
+          const t = l.asCrossauthError(n);
+          return d.logger.debug(c({ err: n })), o.status(t.httpStatus).view(this.sessionServer.errorPage, {
+            errorMessage: t.message,
+            errorMessages: t.messages,
+            errorCode: t.code,
+            errorCodeName: g[t.code]
           });
         }
         const r = e.query.next ?? this.adminPrefix + "selectclient";
-        let t = {
+        let i = {
           urlPrefix: this.adminPrefix,
           csrfToken: e.csrfToken,
           next: r,
           client: s
         };
-        return o.view(this.deleteClientPage, t);
+        return o.view(this.deleteClientPage, i);
       }
     ), this.sessionServer.app.post(
       this.adminPrefix + "deleteclient/:client_id",
       async (e, o) => {
-        var r, t;
+        var r, i;
         d.logger.info(c({
           msg: "Page visit",
           method: "POST",
@@ -2396,12 +2396,12 @@ class Le {
             })
           );
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           return d.logger.error(c({
             msg: "Failed deleting OAuth client",
-            user: (t = e.user) == null ? void 0 : t.username,
-            errorCodeName: i.codeName,
-            errorCode: i.code
+            user: (i = e.user) == null ? void 0 : i.username,
+            errorCodeName: t.codeName,
+            errorCode: t.code
           })), d.logger.debug(c({ err: n })), this.sessionServer.handleError(n, e, o, (a, h) => {
             const p = l.asCrossauthError(n).httpStatus;
             return a.status(p).view(this.deleteClientPage, {
@@ -2427,7 +2427,7 @@ class Le {
     this.sessionServer.app.post(
       this.adminPrefix + "api/createclient",
       async (e, o) => {
-        var r, t;
+        var r, i;
         d.logger.info(c({
           msg: "API visit",
           method: "POST",
@@ -2444,19 +2444,19 @@ class Le {
           return await this.createClient(
             e,
             o,
-            (n, i) => n.header(...B).send({
+            (n, t) => n.header(...B).send({
               ok: !0,
-              client: i
+              client: t
             }),
             s
           );
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           d.logger.error(c({
             msg: "Create client failure",
-            user: (t = e.user) == null ? void 0 : t.username,
-            errorCodeName: i.codeName,
-            errorCode: i.code
+            user: (i = e.user) == null ? void 0 : i.username,
+            errorCodeName: t.codeName,
+            errorCode: t.code
           })), d.logger.debug(c({ err: n })), this.sessionServer.handleError(n, e, o, (a, h) => {
             a.status(this.sessionServer.errorStatus(n)).header(...B).send({
               ok: !1,
@@ -2492,22 +2492,22 @@ class Le {
           return await this.updateClient(
             e,
             o,
-            (t, n, i) => t.header(...B).send({
+            (i, n, t) => i.header(...B).send({
               ok: !0,
               client: n,
               csrfToken: e.csrfToken,
-              newSecret: i
+              newSecret: t
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             msg: "Failed updating OAuth client",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...B).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...B).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -2538,20 +2538,20 @@ class Le {
           return await this.deleteClient(
             e,
             o,
-            (t) => t.header(...B).send({
+            (i) => i.header(...B).send({
               ok: !0,
               client_id: e.params.client_id
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           d.logger.error(c({
             msg: "Delete client failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...B).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...B).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -2566,11 +2566,11 @@ class Le {
   // Internal functions
   async accessDeniedPage(e, o) {
     const s = new l(g.InsufficientPriviledges);
-    return this.sessionServer.handleError(s, e, o, (r, t) => r.status(s.httpStatus).view(this.sessionServer.errorPage, {
-      errorMessage: t.message,
-      errorMessages: t.messages,
-      errorCode: t.code,
-      errorCodeName: g[t.code]
+    return this.sessionServer.handleError(s, e, o, (r, i) => r.status(s.httpStatus).view(this.sessionServer.errorPage, {
+      errorMessage: i.message,
+      errorMessages: i.messages,
+      errorCode: i.code,
+      errorCodeName: g[i.code]
     }));
   }
   async createClient(e, o, s, r) {
@@ -2578,9 +2578,9 @@ class Le {
       throw new l(g.InvalidCsrf);
     if (!e.user || !y.isAdmin(e.user))
       throw new l(g.InsufficientPriviledges);
-    const t = e.body.confidential == "true", n = e.body.client_name, i = e.body.redirect_uris.trim().length == 0 ? [] : e.body.redirect_uris.trim().split(/[, ][ \t\n]*/);
+    const i = e.body.confidential == "true", n = e.body.client_name, t = e.body.redirect_uris.trim().length == 0 ? [] : e.body.redirect_uris.trim().split(/[, ][ \t\n]*/);
     let a = [];
-    for (let p of i)
+    for (let p of t)
       try {
         L.validateUri(p);
       } catch (v) {
@@ -2596,9 +2596,9 @@ class Le {
       p in e.body && h.push(p);
     const f = await this.clientManager.createClient(
       n,
-      i,
-      h,
       t,
+      h,
+      i,
       r == null ? void 0 : r.id
     );
     return s(o, f);
@@ -2609,26 +2609,26 @@ class Le {
     if (!e.user || !y.isAdmin(e.user))
       throw new l(g.InsufficientPriviledges);
     const r = e.body.redirect_uris.trim().length == 0 ? [] : e.body.redirect_uris.trim().split(/[, ][ \t\n]*/);
-    let t = [];
+    let i = [];
     for (let p of r)
       try {
         L.validateUri(p);
       } catch (v) {
-        d.logger.error(c({ err: v })), t.push("[" + p + "]");
+        d.logger.error(c({ err: v })), i.push("[" + p + "]");
       }
-    if (t.length > 0)
+    if (i.length > 0)
       throw new l(
         g.BadRequest,
-        "The following redirect URIs are invalid: " + t.join(" ")
+        "The following redirect URIs are invalid: " + i.join(" ")
       );
     let n = [];
     for (let p of this.validFlows)
       p in e.body && n.push(p);
-    const i = {};
-    i.client_name = e.body.client_name, i.confidential = e.body.confidential == "true", i.valid_flow = n, i.redirect_uri = r, i.userid = e.body.userid, i.userid == null && (i.userid = null);
+    const t = {};
+    t.client_name = e.body.client_name, t.confidential = e.body.confidential == "true", t.valid_flow = n, t.redirect_uri = r, t.userid = e.body.userid, t.userid == null && (t.userid = null);
     const a = e.body.resetSecret == "true", { client: h, newSecret: f } = await this.clientManager.updateClient(
       e.params.client_id,
-      i,
+      t,
       a
     );
     return s(o, h, f);
@@ -2683,29 +2683,29 @@ class Ge {
         })), !(e != null && e.user))
           return o.redirect(this.sessionServer.loginUrl + "?next=" + this.prefix + "selectclient");
         try {
-          let s = [], r = Number(e.query.skip), t = Number(e.query.take);
-          r || (r = 0), t || (t = 10), e.query.search ? s = await this.clientSearchFn(
+          let s = [], r = Number(e.query.skip), i = Number(e.query.take);
+          r || (r = 0), i || (i = 10), e.query.search ? s = await this.clientSearchFn(
             e.query.search,
             this.clientStorage,
             e.user.id
           ) : s = await this.clientStorage.getClients(
             r,
-            t,
+            i,
             e.user.id
           );
           const n = e.query.next ?? encodeURIComponent(e.url);
-          let i = {
+          let t = {
             urlPrefix: this.prefix,
             user: e.user,
             skip: r,
-            take: t,
+            take: i,
             clients: s,
             havePrevious: r > 0,
-            haveNext: t != null && s.length == t,
+            haveNext: i != null && s.length == i,
             isAdmin: !1,
             next: n
           };
-          return e.query.next && (i.next = e.query.next), o.view(this.selectClientPage, i);
+          return e.query.next && (t.next = e.query.next), o.view(this.selectClientPage, t);
         } catch (s) {
           const r = l.asCrossauthError(s);
           return d.logger.error(c({ err: s })), y.sendPageError(
@@ -2748,7 +2748,7 @@ class Ge {
     ), this.sessionServer.app.post(
       this.prefix + "createclient",
       async (e, o) => {
-        var r, t;
+        var r, i;
         if (d.logger.info(c({
           msg: "Page visit",
           method: "POST",
@@ -2762,9 +2762,9 @@ class Ge {
           return await this.createClient(
             e,
             o,
-            (n, i) => n.view(this.createClientPage, {
+            (n, t) => n.view(this.createClientPage, {
               message: "Created client",
-              client: i,
+              client: t,
               csrfToken: e.csrfToken,
               urlPrefix: this.prefix,
               validFlows: this.validFlows,
@@ -2777,12 +2777,12 @@ class Ge {
             e.user
           );
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           return d.logger.error(c({
             msg: "Failed creating OAuth client",
-            user: (t = e.user) == null ? void 0 : t.username,
-            errorCodeName: i.codeName,
-            errorCode: i.code
+            user: (i = e.user) == null ? void 0 : i.username,
+            errorCodeName: t.codeName,
+            errorCode: t.code
           })), d.logger.debug(c({ err: n })), this.sessionServer.handleError(n, e, o, (a, h) => {
             const p = l.asCrossauthError(n).httpStatus;
             return a.status(p).view(this.createClientPage, {
@@ -2823,21 +2823,21 @@ class Ge {
           return await this.createClient(
             e,
             o,
-            (t, n) => t.header(...D).send({
+            (i, n) => i.header(...D).send({
               ok: !0,
               client: n
             }),
             e.user
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           d.logger.error(c({
             msg: "Create client failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...D).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...D).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -2877,9 +2877,9 @@ class Ge {
         }
         let r = e.query.next;
         r || (e.query.userid ? r = this.prefix + "selectuser" : r = this.prefix + "selectclient");
-        let t;
+        let i;
         try {
-          e.query.userid && (t = (await this.sessionServer.userStorage.getUserById(e.query.userid)).user);
+          e.query.userid && (i = (await this.sessionServer.userStorage.getUserById(e.query.userid)).user);
         } catch (a) {
           const h = l.asCrossauthError(a);
           return d.logger.debug(c({ err: a })), o.status(h.httpStatus).view(this.sessionServer.errorPage, {
@@ -2892,13 +2892,13 @@ class Ge {
         let n = {};
         for (let a of this.validFlows)
           s.valid_flow.includes(a) && (n[a] = !0);
-        let i = {
+        let t = {
           urlPrefix: this.prefix,
           csrfToken: e.csrfToken,
           validFlows: this.validFlows,
           flowNames: E.flowNames(this.validFlows),
           selectedFlows: n,
-          user: t,
+          user: i,
           client_id: s.client_id,
           client_name: s.client_name,
           confidential: s.confidential,
@@ -2906,19 +2906,19 @@ class Ge {
           isAdmin: !0,
           next: r
         };
-        return o.view(this.updateClientPage, i);
+        return o.view(this.updateClientPage, t);
       }
     ), this.sessionServer.app.post(
       this.prefix + "updateclient/:client_id",
       async (e, o) => {
-        var t, n;
+        var i, n;
         if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call updateclient unless a user storage is provided ");
         d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.prefix + "updateclient",
           ip: e.ip,
-          user: (t = e.user) == null ? void 0 : t.username
+          user: (i = e.user) == null ? void 0 : i.username
         }));
         let s = e.body.next;
         s || (s = this.prefix + "selectuser");
@@ -2928,7 +2928,7 @@ class Ge {
           return e.body.userid && (r = (await this.sessionServer.userStorage.getUserById(e.body.userid)).user), await this.updateClient(
             e,
             o,
-            (i, a, h) => i.view(this.updateClientPage, {
+            (t, a, h) => t.view(this.updateClientPage, {
               message: "Updated client",
               client: a,
               csrfToken: e.csrfToken,
@@ -2942,15 +2942,15 @@ class Ge {
               ...e.body
             })
           );
-        } catch (i) {
-          const a = l.asCrossauthError(i);
+        } catch (t) {
+          const a = l.asCrossauthError(t);
           return d.logger.error(c({
             msg: "Failed updating OAuth client",
             user: (n = e.user) == null ? void 0 : n.username,
             errorCodeName: a.codeName,
             errorCode: a.code
-          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (h, f) => {
-            const v = l.asCrossauthError(i).httpStatus;
+          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (h, f) => {
+            const v = l.asCrossauthError(t).httpStatus;
             let m = {};
             for (let w of this.validFlows)
               w in e.body && (m[w] = !0);
@@ -2993,22 +2993,22 @@ class Ge {
           return e.body.userid && await this.sessionServer.userStorage.getUserById(e.body.userid), await this.updateClient(
             e,
             o,
-            (t, n, i) => t.header(...D).send({
+            (i, n, t) => i.header(...D).send({
               ok: !0,
               client: n,
               csrfToken: e.csrfToken,
-              newSecret: i
+              newSecret: t
             })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             msg: "Failed updating OAuth client",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...D).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...D).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -3043,28 +3043,28 @@ class Ge {
               "You may not delete this client"
             );
         } catch (n) {
-          const i = l.asCrossauthError(n);
-          return d.logger.debug(c({ err: n })), o.status(i.httpStatus).view(this.sessionServer.errorPage, {
-            errorMessage: i.message,
-            errorMessages: i.messages,
-            errorCode: i.code,
-            errorCodeName: g[i.code]
+          const t = l.asCrossauthError(n);
+          return d.logger.debug(c({ err: n })), o.status(t.httpStatus).view(this.sessionServer.errorPage, {
+            errorMessage: t.message,
+            errorMessages: t.messages,
+            errorCode: t.code,
+            errorCodeName: g[t.code]
           });
         }
         const r = e.query.next ?? "/";
-        let t = {
+        let i = {
           urlPrefix: this.prefix,
           csrfToken: e.csrfToken,
           backUrl: this.prefix + "selectclient",
           client: s,
           next: r
         };
-        return o.view(this.deleteClientPage, t);
+        return o.view(this.deleteClientPage, i);
       }
     ), this.sessionServer.app.post(
       this.prefix + "deleteclient/:client_id",
       async (e, o) => {
-        var r, t;
+        var r, i;
         if (d.logger.info(c({
           msg: "Page visit",
           method: "POST",
@@ -3088,12 +3088,12 @@ class Ge {
             e.user
           );
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           return d.logger.error(c({
             msg: "Failed deleting OAuth client",
-            user: (t = e.user) == null ? void 0 : t.username,
-            errorCodeName: i.codeName,
-            errorCode: i.code
+            user: (i = e.user) == null ? void 0 : i.username,
+            errorCodeName: t.codeName,
+            errorCode: t.code
           })), d.logger.debug(c({ err: n })), this.sessionServer.handleError(n, e, o, (a, h) => {
             const p = l.asCrossauthError(n).httpStatus;
             return a.status(p).view(this.deleteClientPage, {
@@ -3132,21 +3132,21 @@ class Ge {
           return await this.deleteClient(
             e,
             o,
-            (t) => t.header(...D).send({
+            (i) => i.header(...D).send({
               ok: !0,
               client_id: e.params.client_id
             }),
             e.user
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           d.logger.error(c({
             msg: "Delete client failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.sessionServer.handleError(t, e, o, (i, a) => {
-            i.status(this.sessionServer.errorStatus(t)).header(...D).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
+            t.status(this.sessionServer.errorStatus(i)).header(...D).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -3164,9 +3164,9 @@ class Ge {
       throw new l(g.InvalidCsrf);
     if (!e.user)
       throw new l(g.InsufficientPriviledges);
-    const t = e.body.confidential == "true", n = e.body.client_name, i = e.body.redirect_uris.trim().length == 0 ? [] : e.body.redirect_uris.trim().split(/[, ][ \t\n]*/);
+    const i = e.body.confidential == "true", n = e.body.client_name, t = e.body.redirect_uris.trim().length == 0 ? [] : e.body.redirect_uris.trim().split(/[, ][ \t\n]*/);
     let a = [];
-    for (let p of i)
+    for (let p of t)
       try {
         L.validateUri(p);
       } catch (v) {
@@ -3181,9 +3181,9 @@ class Ge {
     e.body[E.AuthorizationCode] && h.push(E.AuthorizationCode), e.body[E.AuthorizationCodeWithPKCE] && h.push(E.AuthorizationCodeWithPKCE), e.body[E.ClientCredentials] && h.push(E.ClientCredentials), e.body[E.RefreshToken] && h.push(E.RefreshToken), e.body[E.DeviceCode] && h.push(E.DeviceCode), e.body[E.Password] && h.push(E.Password), e.body[E.PasswordMfa] && h.push(E.PasswordMfa), e.body[E.OidcAuthorizationCode] && h.push(E.OidcAuthorizationCode);
     const f = await this.clientManager.createClient(
       n,
-      i,
-      h,
       t,
+      h,
+      i,
       r == null ? void 0 : r.id
     );
     return s(o, f);
@@ -3194,26 +3194,26 @@ class Ge {
     if (!e.user)
       throw new l(g.InsufficientPriviledges);
     const r = e.body.redirect_uris.trim().length == 0 ? [] : e.body.redirect_uris.trim().split(/[, ][ \t\n]*/);
-    let t = [];
+    let i = [];
     for (let p of r)
       try {
         L.validateUri(p);
       } catch (v) {
-        d.logger.error(c({ err: v })), t.push("[" + p + "]");
+        d.logger.error(c({ err: v })), i.push("[" + p + "]");
       }
-    if (t.length > 0)
+    if (i.length > 0)
       throw new l(
         g.BadRequest,
-        "The following redirect URIs are invalid: " + t.join(" ")
+        "The following redirect URIs are invalid: " + i.join(" ")
       );
     let n = [];
     for (let p of this.validFlows)
       p in e.body && n.push(p);
-    const i = {};
-    i.client_name = e.body.client_name, i.confidential = e.body.confidential == "true", i.valid_flow = n, i.redirect_uri = r, i.userid = e.user.id;
+    const t = {};
+    t.client_name = e.body.client_name, t.confidential = e.body.confidential == "true", t.valid_flow = n, t.redirect_uri = r, t.userid = e.user.id;
     const a = e.body.resetSecret == "true", { client: h, newSecret: f } = await this.clientManager.updateClient(
       e.params.client_id,
-      i,
+      t,
       a
     );
     return s(o, h, f);
@@ -3338,22 +3338,22 @@ function je(S) {
   return S.username == null ? e.push("Username must be given") : S.username.length < 2 ? e.push("Username must be at least 2 characters") : S.username.length > 254 && e.push("Username must be no longer than 254 characters"), e;
 }
 function We(S, e, o, s) {
-  let t = {
+  let i = {
     username: S.body.username,
     state: "active"
   };
   const n = S.user && y.isAdmin(S.user);
-  for (let i in S.body) {
-    let a = i.replace(/^user_/, "");
-    i.startsWith("user_") && (n || e.includes(a)) && (t[a] = S.body[i]);
+  for (let t in S.body) {
+    let a = t.replace(/^user_/, "");
+    t.startsWith("user_") && (n || e.includes(a)) && (i[a] = S.body[t]);
   }
-  return t.factor1 = "localpassword", S.body.factor1 && o.includes("" + S.body.factor1) && (t.factor1 = S.body.factor1), S.body.factor2 && s.includes("" + S.body.factor2) && (t.factor2 = S.body.factor2), t;
+  return i.factor1 = "localpassword", S.body.factor1 && o.includes("" + S.body.factor1) && (i.factor1 = S.body.factor1), S.body.factor2 && s.includes("" + S.body.factor2) && (i.factor2 = S.body.factor2), i;
 }
 function Je(S, e, o) {
   const s = e.user && y.isAdmin(e.user);
   for (let r in e.body) {
-    let t = r.replace(/^user_/, "");
-    r.startsWith("user_") && (s || o.includes(t)) && (S[t] = e.body[r]);
+    let i = r.replace(/^user_/, "");
+    r.startsWith("user_") && (s || o.includes(i)) && (S[i] = e.body[r]);
   }
   return S;
 }
@@ -3473,23 +3473,23 @@ class Ke {
     u(this, "userAllowedFactor1", ["localpassword"]);
     u(this, "adminAllowedFactor1", ["localpassword"]);
     this.app = e, this.userEndpoints = new De(this, r), this.adminEndpoints = new He(this, r), C("prefix", k.String, this, r, "PREFIX"), this.prefix.endsWith("/") || (this.prefix += "/"), this.prefix.startsWith("/") || "" + this.prefix, this.loginUrl = this.prefix + "login", C("signupPage", k.String, this, r, "SIGNUP_PAGE"), C("loginPage", k.String, this, r, "LOGIN_PAGE"), C("factor2Page", k.String, this, r, "FACTOR2_PAGE"), C("configureFactor2Page", k.String, this, r, "SIGNUP_FACTOR2_PAGE"), C("errorPage", k.String, this, r, "ERROR_PAGE"), C("allowedFactor2", k.JsonArray, this, r, "ALLOWED_FACTOR2"), C("enableEmailVerification", k.Boolean, this, r, "ENABLE_EMAIL_VERIFICATION"), C("enablePasswordReset", k.Boolean, this, r, "ENABLE_PASSWORD_RESET"), C("factor2ProtectedPageEndpoints", k.JsonArray, this, r, "FACTOR2_PROTECTED_PAGE_ENDPOINTS"), C("factor2ProtectedApiEndpoints", k.JsonArray, this, r, "FACTOR2_PROTECTED_API_ENDPOINTS"), C("enableAdminEndpoints", k.Boolean, this, r, "ENABLE_ADMIN_ENDPOINTS"), C("enableOAuthClientManagement", k.Boolean, this, r, "ENABLE_OAUTH_CLIENT_MANAGEMENT"), C("editUserScope", k.String, this, r, "EDIT_USER_SCOPE"), C("userAllowedFactor1", k.JsonArray, this, r, "USER_ALLOWED_FACTOR1"), C("adminAllowedFactor1", k.JsonArray, this, r, "ADMIN_ALLOWED_FACTOR1"), C("loginRedirect", k.JsonArray, this, r, "LOGIN_REDIRECT"), C("logoutRedirect", k.JsonArray, this, r, "LOGOUT_REDIRECT"), r.validateUserFn && (this.validateUserFn = r.validateUserFn), r.createUserFn && (this.createUserFn = r.createUserFn), r.updateUserFn && (this.updateUserFn = r.updateUserFn), r.addToSession && (this.addToSession = r.addToSession), r.validateSession && (this.validateSession = r.validateSession), this.endpoints = [...he, ...le], this.endpoints = [...this.endpoints, ...se, ...ie], this.enableAdminEndpoints && (this.endpoints = [...this.endpoints, ...re, ...te]), this.enableOAuthClientManagement && (this.endpoints = [...this.endpoints, ...Z, ...ee, ...Q, ...q]), this.enableEmailVerification && (this.endpoints = [...this.endpoints, ...ae, ...ne]), this.enablePasswordReset && (this.endpoints = [...this.endpoints, ...de, ...ce]), r.endpoints && (C("endpoints", k.JsonArray, this, r, "SESSION_ENDPOINTS"), this.endpoints.length == 1 && this.endpoints[0] == "all" && (this.endpoints = Ve), this.endpoints.length == 1 && this.endpoints[0] == "allMinusOAuth" && (this.endpoints = Be)), this.allowedFactor2.length > 0 && (this.endpoints = [...this.endpoints, ...ge, ...oe]);
-    let t = !1;
-    for (let i of this.endpoints)
-      if (q.includes(i) || Q.includes(i)) {
-        t = !0;
+    let i = !1;
+    for (let t of this.endpoints)
+      if (q.includes(t) || Q.includes(t)) {
+        i = !0;
         break;
       }
-    t && (this.adminClientEndpoints = new Le(this, r));
+    i && (this.adminClientEndpoints = new Le(this, r));
     let n = !1;
-    for (let i of this.endpoints)
-      if (ee.includes(i) || Z.includes(i)) {
+    for (let t of this.endpoints)
+      if (ee.includes(t) || Z.includes(t)) {
         n = !0;
         break;
       }
-    n && (this.userClientEndpoints = new Ge(this, r)), this.addEndpoints(), C("endpoints", k.JsonArray, this, r, "ENDPOINTS"), r.userStorage && (this.userStorage = r.userStorage), this.authenticators = s, this.sessionManager = new Ae(o, s, r), e.addHook("preHandler", async (i, a) => {
+    n && (this.userClientEndpoints = new Ge(this, r)), this.addEndpoints(), C("endpoints", k.JsonArray, this, r, "ENDPOINTS"), r.userStorage && (this.userStorage = r.userStorage), this.authenticators = s, this.sessionManager = new Ae(o, s, r), e.addHook("preHandler", async (t, a) => {
       var v, m;
       d.logger.debug(c({ message: "Getting session cookie" }));
-      let h = this.getSessionCookieValue(i), f = {};
+      let h = this.getSessionCookieValue(t), f = {};
       if (h)
         try {
           f.hashedSessionId = F.hash(this.sessionManager.getSessionId(h));
@@ -3499,68 +3499,68 @@ class Ke {
       d.logger.debug(c({ message: "Getting csrf cookie" }));
       let p;
       try {
-        p = this.getCsrfCookieValue(i), p && this.sessionManager.validateCsrfCookie(p);
+        p = this.getCsrfCookieValue(t), p && this.sessionManager.validateCsrfCookie(p);
       } catch (w) {
-        d.logger.warn(c({ message: "Invalid csrf cookie received", cerr: w, hashedCsrfCookie: this.getHashOfCsrfCookie(i) })), a.clearCookie(this.sessionManager.csrfCookieName), p = void 0;
+        d.logger.warn(c({ message: "Invalid csrf cookie received", cerr: w, hashedCsrfCookie: this.getHashOfCsrfCookie(t) })), a.clearCookie(this.sessionManager.csrfCookieName), p = void 0;
       }
-      if (["GET", "OPTIONS", "HEAD"].includes(i.method))
+      if (["GET", "OPTIONS", "HEAD"].includes(t.method))
         try {
           if (p) {
             d.logger.debug(c({ message: "Valid CSRF cookie - creating token" }));
             const w = await this.sessionManager.createCsrfFormOrHeaderValue(p);
-            i.csrfToken = w;
+            t.csrfToken = w;
           } else {
             d.logger.debug(c({ message: "Invalid CSRF cookie - recreating" }));
             const { csrfCookie: w, csrfFormOrHeaderValue: P } = await this.sessionManager.createCsrfToken();
-            a.setCookie(w.name, w.value, w.options), i.csrfToken = P;
+            a.setCookie(w.name, w.value, w.options), t.csrfToken = P;
           }
-          a.header(this.sessionManager.csrfHeaderName, i.csrfToken);
+          a.header(this.sessionManager.csrfHeaderName, t.csrfToken);
         } catch (w) {
           d.logger.error(c({
             message: "Couldn't create CSRF token",
             cerr: w,
-            user: (v = i.user) == null ? void 0 : v.username,
+            user: (v = t.user) == null ? void 0 : v.username,
             ...f
           })), d.logger.debug(c({ err: w })), a.clearCookie(this.sessionManager.csrfCookieName);
         }
       else if (p)
         try {
-          this.csrfToken(i, a);
+          this.csrfToken(t, a);
         } catch (w) {
           d.logger.error(c({
             message: "Couldn't create CSRF token",
             cerr: w,
-            user: (m = i.user) == null ? void 0 : m.username,
+            user: (m = t.user) == null ? void 0 : m.username,
             ...f
           })), d.logger.debug(c({ err: w }));
         }
-      if (h = this.getSessionCookieValue(i), h)
+      if (h = this.getSessionCookieValue(t), h)
         try {
           const w = this.sessionManager.getSessionId(h);
           let { key: P, user: T } = await this.sessionManager.userForSessionId(w);
           this.validateSession && this.validateSession(
             P,
             T,
-            i
-          ), i.sessionId = w, i.user = T, i.authType = "cookie", d.logger.debug(c({
+            t
+          ), t.sessionId = w, t.user = T, t.authType = "cookie", d.logger.debug(c({
             message: "Valid session id",
             user: T == null ? void 0 : T.username
           }));
         } catch {
           d.logger.warn(c({
             message: "Invalid session cookie received",
-            hashOfSessionId: this.getHashOfSessionId(i)
+            hashOfSessionId: this.getHashOfSessionId(t)
           })), a.clearCookie(this.sessionManager.sessionCookieName);
         }
     }), e.addHook(
       "preHandler",
-      async (i, a) => {
+      async (t, a) => {
         var f, p, v;
-        const h = this.getSessionCookieValue(i);
-        if (h && ((f = i.user) != null && f.factor2) && (this.factor2ProtectedPageEndpoints.includes(i.url) || this.factor2ProtectedApiEndpoints.includes(i.url))) {
+        const h = this.getSessionCookieValue(t);
+        if (h && ((f = t.user) != null && f.factor2) && (this.factor2ProtectedPageEndpoints.includes(t.url) || this.factor2ProtectedApiEndpoints.includes(t.url))) {
           const m = this.sessionManager.getSessionId(h);
-          if (["GET", "OPTIONS", "HEAD"].includes(i.method)) {
-            const w = this.getSessionCookieValue(i);
+          if (["GET", "OPTIONS", "HEAD"].includes(t.method)) {
+            const w = this.getSessionCookieValue(t);
             if (w) {
               const P = this.sessionManager.getSessionId(w);
               if ("pre2fa" in await this.sessionManager.dataForSessionId(P)) {
@@ -3568,7 +3568,7 @@ class Ke {
                 try {
                   await this.sessionManager.cancelTwoFactorPageVisit(P);
                 } catch (N) {
-                  d.logger.debug(c({ err: N })), d.logger.error(c({ message: "Failed cancelling 2FA", cerr: N, user: (v = i.user) == null ? void 0 : v.username, hashOfSessionId: this.getHashOfSessionId(i) }));
+                  d.logger.debug(c({ err: N })), d.logger.error(c({ message: "Failed cancelling 2FA", cerr: N, user: (v = t.user) == null ? void 0 : v.username, hashOfSessionId: this.getHashOfSessionId(t) }));
                 }
               }
             }
@@ -3578,8 +3578,8 @@ class Ke {
               d.logger.debug("Completing 2FA");
               const T = [...this.authenticators[w.pre2fa.factor2].transientSecretNames()];
               let N = {};
-              for (let M in i.body)
-                T.includes(M) && (N[M] = i.body[M]);
+              for (let M in t.body)
+                T.includes(M) && (N[M] = t.body[M]);
               let b;
               try {
                 await this.sessionManager.completeTwoFactorPageVisit(N, m);
@@ -3589,28 +3589,28 @@ class Ke {
                 d.logger.error(c({
                   message: b.message,
                   cerr: M,
-                  user: i.body.username,
+                  user: t.body.username,
                   errorCode: I.code,
                   errorCodeName: I.codeName
                 }));
               }
-              if (i.body = w.pre2fa.body, b)
+              if (t.body = w.pre2fa.body, b)
                 if (b.code == g.Expired) {
                   d.logger.debug("Error - cancelling 2FA");
                   try {
                     await this.sessionManager.cancelTwoFactorPageVisit(m);
                   } catch (M) {
-                    d.logger.error(c({ message: "Failed cancelling 2FA", cerr: M, user: (p = i.user) == null ? void 0 : p.username, hashOfSessionId: this.getHashOfSessionId(i) })), d.logger.debug(c({ err: M }));
+                    d.logger.error(c({ message: "Failed cancelling 2FA", cerr: M, user: (p = t.user) == null ? void 0 : p.username, hashOfSessionId: this.getHashOfSessionId(t) })), d.logger.debug(c({ err: M }));
                   }
-                  i.body = {
-                    ...i.body,
+                  t.body = {
+                    ...t.body,
                     errorMessage: b.message,
                     errorMessages: b.message,
                     errorCode: "" + b.code,
                     errorCodeName: g[b.code]
                   };
                 } else
-                  return this.factor2ProtectedPageEndpoints.includes(i.url) ? a.redirect(this.prefix + "factor2?error=" + g[b.code]) : a.status(b.httpStatus).send(JSON.stringify({
+                  return this.factor2ProtectedPageEndpoints.includes(t.url) ? a.redirect(this.prefix + "factor2?error=" + g[b.code]) : a.status(b.httpStatus).send(JSON.stringify({
                     ok: !1,
                     errorMessage: b.message,
                     errorMessages: b.messages,
@@ -3618,7 +3618,7 @@ class Ke {
                     errorCodeName: g[b.code]
                   }));
             } else
-              return this.validateCsrfToken(i), d.logger.debug("Starting 2FA"), await this.sessionManager.initiateTwoFactorPageVisit(i.user, m, i.body, i.url.replace(/\?.*$/, "")), this.factor2ProtectedPageEndpoints.includes(i.url) ? a.redirect(this.prefix + "factor2") : a.send(JSON.stringify({
+              return this.validateCsrfToken(t), d.logger.debug("Starting 2FA"), await this.sessionManager.initiateTwoFactorPageVisit(t.user, m, t.body, t.url.replace(/\?.*$/, "")), this.factor2ProtectedPageEndpoints.includes(t.url) ? a.redirect(this.prefix + "factor2") : a.send(JSON.stringify({
                 ok: !0,
                 factor2Required: !0
               }));
@@ -3685,13 +3685,13 @@ class Ke {
           return await this.login(
             e,
             o,
-            (r, t) => {
-              if (t.state == O.passwordChangeNeeded) {
+            (r, i) => {
+              if (i.state == O.passwordChangeNeeded) {
                 if (this.endpoints.includes("changepassword"))
                   return d.logger.debug(c({ message: "Password change needed - sending redirect" })), r.redirect("/changepassword?required=true&next=" + encodeURIComponent("login?next=" + s));
                 {
                   const n = new l(g.PasswordChangeNeeded);
-                  return this.handleError(n, e, r, (i, a) => i.view(this.loginPage, {
+                  return this.handleError(n, e, r, (t, a) => t.view(this.loginPage, {
                     errorMessage: a.message,
                     errorMessages: a.messages,
                     errorCode: a.code,
@@ -3703,10 +3703,10 @@ class Ke {
                     urlPrefix: this.prefix
                   }));
                 }
-              } else if (t.state == O.passwordResetNeeded || t.state == O.passwordAndFactor2ResetNeeded) {
+              } else if (i.state == O.passwordResetNeeded || i.state == O.passwordAndFactor2ResetNeeded) {
                 d.logger.debug(c({ message: "Password reset needed - sending error" }));
                 const n = new l(g.PasswordResetNeeded);
-                return this.handleError(n, e, r, (i, a) => i.view(this.loginPage, {
+                return this.handleError(n, e, r, (t, a) => t.view(this.loginPage, {
                   errorMessage: a.message,
                   errorMessages: a.messages,
                   errorCode: a.code,
@@ -3717,15 +3717,15 @@ class Ke {
                   csrfToken: e.csrfToken,
                   urlPrefix: this.prefix
                 }));
-              } else if (this.allowedFactor2.length > 0 && (t.state == O.factor2ResetNeeded || !this.allowedFactor2.includes(t.factor2 ? t.factor2 : "none"))) {
+              } else if (this.allowedFactor2.length > 0 && (i.state == O.factor2ResetNeeded || !this.allowedFactor2.includes(i.factor2 ? i.factor2 : "none"))) {
                 if (d.logger.debug(c({
-                  message: `Factor2 reset needed.  Factor2 is ${t.factor2}, state is ${t.state}, allowed factor2 is [${this.allowedFactor2.join(", ")}]`,
-                  username: t.username
+                  message: `Factor2 reset needed.  Factor2 is ${i.factor2}, state is ${i.state}, allowed factor2 is [${this.allowedFactor2.join(", ")}]`,
+                  username: i.username
                 })), this.endpoints.includes("changefactor2"))
                   return d.logger.debug(c({ message: "Factor 2 reset needed - sending redirect" })), r.redirect("/changefactor2?required=true&next=" + encodeURIComponent("login?next=" + s));
                 {
                   const n = new l(g.Factor2ResetNeeded);
-                  return this.handleError(n, e, r, (i, a) => i.view(this.loginPage, {
+                  return this.handleError(n, e, r, (t, a) => t.view(this.loginPage, {
                     errorMessage: a.message,
                     errorMessages: a.messages,
                     errorCode: a.code,
@@ -3738,7 +3738,7 @@ class Ke {
                   }));
                 }
               } else {
-                if (!t.factor2 || t.factor2.length == 0)
+                if (!i.factor2 || i.factor2.length == 0)
                   return d.logger.debug(c({ message: "Successful login - sending redirect" })), r.redirect(s);
                 {
                   let n = {
@@ -3746,7 +3746,7 @@ class Ke {
                     next: e.body.next ?? this.loginRedirect,
                     persist: e.body.persist ? "on" : "",
                     urlPrefix: this.prefix,
-                    factor2: t.factor2,
+                    factor2: i.factor2,
                     action: "loginfactor2"
                   };
                   return r.view(this.factor2Page, n);
@@ -3755,7 +3755,7 @@ class Ke {
             }
           );
         } catch (r) {
-          return d.logger.debug(c({ err: r })), this.handleError(r, e, o, (t, n) => t.view(this.loginPage, {
+          return d.logger.debug(c({ err: r })), this.handleError(r, e, o, (i, n) => i.view(this.loginPage, {
             errorMessage: n.message,
             errorMessages: n.messages,
             errorCode: n.code,
@@ -3780,33 +3780,33 @@ class Ke {
           return d.logger.debug(c({ message: "Next page " + s })), await this.loginFactor2(
             e,
             o,
-            (r, t) => (d.logger.debug(c({ message: "Successful login - sending redirect to" })), r.redirect(s))
+            (r, i) => (d.logger.debug(c({ message: "Successful login - sending redirect to" })), r.redirect(s))
           );
         } catch (r) {
           d.logger.debug(c({ err: r }));
-          let t;
+          let i;
           try {
             const n = e.sessionId ? await this.sessionManager.dataForSessionId(e.sessionId) : void 0;
-            t = n == null ? void 0 : n.factor2;
+            i = n == null ? void 0 : n.factor2;
           } catch (n) {
             d.logger.error(c({ err: n }));
           }
-          return t && t in this.authenticators ? this.handleError(r, e, o, (n, i) => n.view(this.factor2Page, {
-            errorMessage: i.message,
-            errorMessages: i.messages,
-            errorCode: i.code,
-            errorCodeName: g[i.code],
+          return i && i in this.authenticators ? this.handleError(r, e, o, (n, t) => n.view(this.factor2Page, {
+            errorMessage: t.message,
+            errorMessages: t.messages,
+            errorCode: t.code,
+            errorCodeName: g[t.code],
             next: e.body.next,
             persist: e.body.persist ? "on" : "",
             csrfToken: e.csrfToken,
             urlPrefix: this.prefix,
-            factor2: t,
+            factor2: i,
             action: "loginfactor2"
-          })) : this.handleError(r, e, o, (n, i) => n.view(this.loginPage, {
-            errorMessage: i.message,
-            errorMessages: i.messages,
-            errorCode: i.code,
-            errorCodeName: g[i.code],
+          })) : this.handleError(r, e, o, (n, t) => n.view(this.loginPage, {
+            errorMessage: t.message,
+            errorMessages: t.messages,
+            errorCode: t.code,
+            errorCodeName: g[t.code],
             next: e.body.next,
             persist: e.body.persist ? "on" : "",
             csrfToken: e.csrfToken,
@@ -3829,17 +3829,17 @@ class Ke {
           g.Unauthorized,
           "No session cookie present"
         );
-        const s = this.getSessionCookieValue(e), r = this.sessionManager.getSessionId(s ?? ""), t = await this.sessionManager.dataForSessionId(r);
-        if (!(t != null && t.pre2fa)) throw new l(
+        const s = this.getSessionCookieValue(e), r = this.sessionManager.getSessionId(s ?? ""), i = await this.sessionManager.dataForSessionId(r);
+        if (!(i != null && i.pre2fa)) throw new l(
           g.Unauthorized,
           "2FA not initiated"
         );
         let n = {
           urlPrefix: this.prefix,
           csrfToken: e.csrfToken,
-          action: t.pre2fa.url,
+          action: i.pre2fa.url,
           errorCodeName: e.query.error,
-          factor2: t.pre2fa.factor2
+          factor2: i.pre2fa.factor2
         };
         return o.view(this.factor2Page, n);
       }
@@ -3877,39 +3877,39 @@ class Ke {
           return d.logger.debug(c({ message: "Next page " + s })), await this.signup(
             e,
             o,
-            (r, t, n) => {
+            (r, i, n) => {
               var a, h;
-              const i = (a = t == null ? void 0 : t.userData) != null && a.factor2 ? this.authenticators[t.userData.factor2] : void 0;
-              return (h = t.userData) != null && h.factor2 ? r.view(this.configureFactor2Page, {
-                csrfToken: t.csrfToken,
-                ...t.userData
-              }) : this.enableEmailVerification && (i == null || i.skipEmailVerificationOnSignup() != !0) ? r.view(this.signupPage, {
+              const t = (a = i == null ? void 0 : i.userData) != null && a.factor2 ? this.authenticators[i.userData.factor2] : void 0;
+              return (h = i.userData) != null && h.factor2 ? r.view(this.configureFactor2Page, {
+                csrfToken: i.csrfToken,
+                ...i.userData
+              }) : this.enableEmailVerification && (t == null || t.skipEmailVerificationOnSignup() != !0) ? r.view(this.signupPage, {
                 next: s,
                 csrfToken: e.csrfToken,
                 message: "Please check your email to finish signing up.",
                 allowedFactor2: this.allowedFactor2Details(),
                 urlPrefix: this.prefix,
                 factor2: e.body.factor2,
-                ...t.userData
+                ...i.userData
               }) : r.redirect(this.loginRedirect);
             }
           );
         } catch (r) {
-          const t = l.asCrossauthError(r);
+          const i = l.asCrossauthError(r);
           return d.logger.error(c({
             message: "Signup failure",
             user: e.body.username,
-            errorCodeName: t.codeName,
-            errorCode: t.code
-          })), d.logger.debug(c({ err: r })), this.handleError(r, e, o, (n, i) => {
+            errorCodeName: i.codeName,
+            errorCode: i.code
+          })), d.logger.debug(c({ err: r })), this.handleError(r, e, o, (n, t) => {
             let a = {};
             for (let h in e.body)
               h.startsWith("user_") && (a[h] = e.body[h]);
             return n.view(this.signupPage, {
-              errorMessage: i.message,
-              errorMessages: i.messages,
-              errorCode: i.code,
-              errorCodeName: g[i.code],
+              errorMessage: t.message,
+              errorMessages: t.messages,
+              errorCode: t.code,
+              errorCodeName: g[t.code],
               next: s,
               persist: e.body.persist,
               username: e.body.username,
@@ -3940,16 +3940,16 @@ class Ke {
           return await this.logout(
             e,
             o,
-            (t) => t.redirect(e.body.next ? e.body.next : this.logoutRedirect)
+            (i) => i.redirect(e.body.next ? e.body.next : this.logoutRedirect)
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             message: "Logout failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.handleError(t, e, o, (i, a) => i.view(this.errorPage, {
+          })), d.logger.debug(c({ err: i })), this.handleError(i, e, o, (t, a) => t.view(this.errorPage, {
             urlPrefix: this.prefix,
             errorMessage: a.message,
             errorMessages: a.messages,
@@ -3978,36 +3978,36 @@ class Ke {
             o,
             (s, r) => {
               if (r.state == O.passwordChangeNeeded) {
-                const t = new l(g.PasswordChangeNeeded);
-                return this.handleError(t, e, s, (n, i) => {
-                  n.status(this.errorStatus(t)).header(...A).send({
+                const i = new l(g.PasswordChangeNeeded);
+                return this.handleError(i, e, s, (n, t) => {
+                  n.status(this.errorStatus(i)).header(...A).send({
                     ok: !1,
-                    errorMessage: i.message,
-                    errorMessages: i.messages,
-                    errorCode: i.code,
-                    errorCodeName: g[i.code]
+                    errorMessage: t.message,
+                    errorMessages: t.messages,
+                    errorCode: t.code,
+                    errorCodeName: g[t.code]
                   });
                 });
               } else if (r.state == O.passwordResetNeeded || r.state == O.passwordAndFactor2ResetNeeded) {
-                const t = new l(g.PasswordResetNeeded);
-                return this.handleError(t, e, s, (n, i) => {
-                  n.status(this.errorStatus(t)).header(...A).send({
+                const i = new l(g.PasswordResetNeeded);
+                return this.handleError(i, e, s, (n, t) => {
+                  n.status(this.errorStatus(i)).header(...A).send({
                     ok: !1,
-                    errorMessage: i.message,
-                    errorMessages: i.messages,
-                    errorCode: i.code,
-                    errorCodeName: g[i.code]
+                    errorMessage: t.message,
+                    errorMessages: t.messages,
+                    errorCode: t.code,
+                    errorCodeName: g[t.code]
                   });
                 });
               } else if (this.allowedFactor2.length > 0 && (r.state == O.factor2ResetNeeded || !this.allowedFactor2.includes(r.factor2 ? r.factor2 : "none"))) {
-                const t = new l(g.Factor2ResetNeeded);
-                return this.handleError(t, e, s, (n, i) => {
-                  n.status(this.errorStatus(t)).header(...A).send({
+                const i = new l(g.Factor2ResetNeeded);
+                return this.handleError(i, e, s, (n, t) => {
+                  n.status(this.errorStatus(i)).header(...A).send({
                     ok: !1,
-                    errorMessage: i.message,
-                    errorMessages: i.messages,
-                    errorCode: i.code,
-                    errorCodeName: g[i.code]
+                    errorMessage: t.message,
+                    errorMessages: t.messages,
+                    errorCode: t.code,
+                    errorCodeName: g[t.code]
                   });
                 });
               } else return "factor2" in r && r.factor2 != "" && r.factor2 in this.authenticators ? s.header(...A).send({ ok: !0, twoFactorRequired: !0 }) : s.header(...A).send({ ok: !0, user: r });
@@ -4020,8 +4020,8 @@ class Ke {
             user: e.body.username,
             errorCodeName: r.codeName,
             errorCode: r.code
-          })), d.logger.debug(c({ err: s })), this.handleError(s, e, o, (t, n) => {
-            t.status(this.errorStatus(s)).header(...A).send({
+          })), d.logger.debug(c({ err: s })), this.handleError(s, e, o, (i, n) => {
+            i.status(this.errorStatus(s)).header(...A).send({
               ok: !1,
               errorMessage: n.message,
               errorMessages: n.messages,
@@ -4050,14 +4050,14 @@ class Ke {
             (s) => s.header(...A).send({ ok: !0 })
           );
         } catch (s) {
-          const t = e.user || "", n = l.asCrossauthError(s);
+          const i = e.user || "", n = l.asCrossauthError(s);
           return d.logger.error(c({
             message: "Cancel 2FA failure",
-            user: t,
+            user: i,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: s })), this.handleError(s, e, o, (i, a) => {
-            i.status(this.errorStatus(s)).header(...A).send({
+          })), d.logger.debug(c({ err: s })), this.handleError(s, e, o, (t, a) => {
+            t.status(this.errorStatus(s)).header(...A).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -4092,7 +4092,7 @@ class Ke {
             hashOfSessionId: this.getHashOfSessionId(e),
             errorCodeName: r.codeName,
             errorCode: r.code
-          })), d.logger.debug(c({ err: s })), this.handleError(s, e, o, (t, n) => t.status(this.errorStatus(s)).header(...A).send({
+          })), d.logger.debug(c({ err: s })), this.handleError(s, e, o, (i, n) => i.status(this.errorStatus(s)).header(...A).send({
             ok: !1,
             errorMessage: n.message,
             errorMessages: n.messages,
@@ -4119,17 +4119,17 @@ class Ke {
           return await this.logout(
             e,
             o,
-            (t) => t.header(...A).send({ ok: !0 })
+            (i) => i.header(...A).send({ ok: !0 })
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             message: "Logout failure",
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: t })), this.handleError(t, e, o, (i, a) => {
-            i.status(this.errorStatus(t)).header(...A).send({
+          })), d.logger.debug(c({ err: i })), this.handleError(i, e, o, (t, a) => {
+            t.status(this.errorStatus(i)).header(...A).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -4156,26 +4156,26 @@ class Ke {
           return await this.signup(
             e,
             o,
-            (r, t, n) => r.header(...A).send({
+            (r, i, n) => r.header(...A).send({
               ok: !0,
               user: n,
               emailVerificationNeeded: this.enableEmailVerification ?? !1,
-              ...t.userData
+              ...i.userData
             })
           );
         } catch (r) {
-          const t = l.asCrossauthError(r);
+          const i = l.asCrossauthError(r);
           d.logger.error(c({
             message: "Signup failure",
             user: (s = e.user) == null ? void 0 : s.username,
-            errorCodeName: t.codeName,
-            errorCode: t.code
-          })), d.logger.debug(c({ err: r })), this.handleError(r, e, o, (n, i) => {
+            errorCodeName: i.codeName,
+            errorCode: i.code
+          })), d.logger.debug(c({ err: r })), this.handleError(r, e, o, (n, t) => {
             n.status(this.errorStatus(r)).header(...A).send({
               ok: !1,
-              errorMessage: i.message,
-              errorMessages: i.messages,
-              errorCode: g[i.code]
+              errorMessage: t.message,
+              errorMessages: t.messages,
+              errorCode: g[t.code]
             });
           });
         }
@@ -4200,28 +4200,28 @@ class Ke {
           "No CSRF token present"
         );
         try {
-          let t;
-          return e.sessionId ? (t = (await this.sessionManager.userForSessionId(e.sessionId)).user, o.header(...A).send({ ok: !0, user: t })) : this.sendJsonError(
+          let i;
+          return e.sessionId ? (i = (await this.sessionManager.userForSessionId(e.sessionId)).user, o.header(...A).send({ ok: !0, user: i })) : this.sendJsonError(
             o,
             401,
             "User not logged in"
           );
-        } catch (t) {
-          const n = l.asCrossauthError(t);
-          let i = n.message, a = n.code, h = n.codeName;
+        } catch (i) {
+          const n = l.asCrossauthError(i);
+          let t = n.message, a = n.code, h = n.codeName;
           switch (n.code) {
             case g.UserNotExist:
             case g.PasswordInvalid:
-              i = "Invalid username or password", a = g.UsernameOrPasswordInvalid, h = g[a];
+              t = "Invalid username or password", a = g.UsernameOrPasswordInvalid, h = g[a];
               break;
           }
           return d.logger.error(c({
-            message: i,
+            message: t,
             user: (r = e.user) == null ? void 0 : r.username,
             hashOfSessionId: this.getHashOfSessionId(e),
             errorCodeName: h,
             errorCode: a
-          })), d.logger.debug(c({ err: t })), o.status(this.errorStatus(t)).header(...A).send({
+          })), d.logger.debug(c({ err: i })), o.status(this.errorStatus(i)).header(...A).send({
             ok: !1,
             errorCode: a,
             errorCodeName: h
@@ -4247,15 +4247,15 @@ class Ke {
             ok: !0,
             csrfToken: e.csrfToken
           });
-        } catch (t) {
-          const n = l.asCrossauthError(t);
+        } catch (i) {
+          const n = l.asCrossauthError(i);
           return d.logger.error(c({
             message: "getcsrftoken failure",
             user: (r = e.user) == null ? void 0 : r.username,
             hashedCsrfCookie: this.getHashOfCsrfCookie(e),
             errorCode: n.code,
             errorCodeName: n.codeName
-          })), d.logger.debug(c({ err: t })), o.status(this.errorStatus(t)).header(...A).send({
+          })), d.logger.debug(c({ err: i })), o.status(this.errorStatus(i)).header(...A).send({
             ok: !1,
             errorCode: n.code,
             errorCodeName: n.codeName,
@@ -4272,10 +4272,10 @@ class Ke {
       o,
       e.user
     );
-    const r = e.body.username, t = e.body.persist;
+    const r = e.body.username, i = e.body.persist;
     if (!e.csrfToken) throw new l(g.InvalidCsrf);
     const n = this.getSessionCookieValue(e);
-    let i = this.addToSession ? this.addToSession(e) : {}, { sessionCookie: a, csrfCookie: h, user: f } = await this.sessionManager.login(r, e.body, i, t);
+    let t = this.addToSession ? this.addToSession(e) : {}, { sessionCookie: a, csrfCookie: h, user: f } = await this.sessionManager.login(r, e.body, t, i);
     if (d.logger.debug(c({
       message: "Login: set session cookie " + a.name + " opts " + JSON.stringify(a.options),
       user: e.body.username
@@ -4304,24 +4304,24 @@ class Ke {
     );
     const r = e.sessionId;
     if (!r) throw new l(g.Unauthorized);
-    const t = e.body.persist;
+    const i = e.body.persist;
     if (this.isSessionUser(e) && !e.csrfToken) throw new l(g.InvalidCsrf);
     let n = this.addToSession ? this.addToSession(e) : {};
-    const { sessionCookie: i, csrfCookie: a, user: h } = await this.sessionManager.completeTwoFactorLogin(
+    const { sessionCookie: t, csrfCookie: a, user: h } = await this.sessionManager.completeTwoFactorLogin(
       e.body,
       r,
       n,
-      t
+      i
     );
     return d.logger.debug(c({
-      message: "Login: set session cookie " + i.name + " opts " + JSON.stringify(i.options),
+      message: "Login: set session cookie " + t.name + " opts " + JSON.stringify(t.options),
       user: h == null ? void 0 : h.username
     })), o.cookie(
-      i.name,
-      i.value,
-      i.options
+      t.name,
+      t.value,
+      t.options
     ), d.logger.debug(c({
-      message: "Login: set csrf cookie " + a.name + " opts " + JSON.stringify(i.options),
+      message: "Login: set csrf cookie " + a.name + " opts " + JSON.stringify(t.options),
       user: h == null ? void 0 : h.username
     })), o.cookie(a.name, a.value, a.options), e.csrfToken = await this.sessionManager.createCsrfFormOrHeaderValue(a.value), s(o, h);
   }
@@ -4333,9 +4333,9 @@ class Ke {
   /**
    * This is called after the user has been validated to log the user in
    */
-  async loginWithUser(e, o, s, r, t) {
+  async loginWithUser(e, o, s, r, i) {
     const n = this.getSessionCookieValue(s);
-    let i = this.addToSession ? this.addToSession(s) : {}, { sessionCookie: a, csrfCookie: h } = await this.sessionManager.login("", {}, i, void 0, e, o);
+    let t = this.addToSession ? this.addToSession(s) : {}, { sessionCookie: a, csrfCookie: h } = await this.sessionManager.login("", {}, t, void 0, e, o);
     if (d.logger.debug(c({
       message: "Login: set session cookie " + a.name + " opts " + JSON.stringify(a.options),
       user: e.username
@@ -4355,19 +4355,19 @@ class Ke {
           hashOfSessionId: this.getHashOfSessionId(s)
         })), d.logger.debug(c({ err: f }));
       }
-    return t(r, e);
+    return i(r, e);
   }
   async signup(e, o, s) {
     if (!this.userStorage) throw new l(g.Configuration, "Cannot call signup unless you provide a user stotage");
     if (this.isSessionUser(e) && !e.csrfToken) throw new l(g.InvalidCsrf);
-    const r = e.body.username, t = e.body.next;
+    const r = e.body.username, i = e.body.next;
     if (e.body.factor2 || (e.body.factor2 = this.allowedFactor2[0]), e.body.factor2 && !this.allowedFactor2.includes(e.body.factor2 ?? "none"))
       throw new l(
         g.Forbidden,
         "Illegal second factor " + e.body.factor2 + " requested"
       );
     (e.body.factor2 == "none" || e.body.factor2 == "") && (e.body.factor2 = void 0);
-    let n = this.createUserFn(e, this.userStorage.userEditableFields, this.userAllowedFactor1, this.allowedFactor2), i = this.authenticators[n.factor1].validateSecrets(e.body);
+    let n = this.createUserFn(e, this.userStorage.userEditableFields, this.userAllowedFactor1, this.allowedFactor2), t = this.authenticators[n.factor1].validateSecrets(e.body);
     const a = this.authenticators[n.factor1].secretNames();
     let h = {};
     for (let m in e.body)
@@ -4376,7 +4376,7 @@ class Ke {
         a.includes(w) && (h[w] = e.body[m]);
       }
     Object.keys(h).length === 0 && (h = void 0), n.state = "active", e.body.factor2 && e.body.factor2 != "none" ? this.enableEmailVerification ? n.state = O.awaitingTwoFactorSetupAndEmailVerification : n.state = O.awaitingTwoFactorSetup : this.enableEmailVerification && (n.state = "awaitingemailverification");
-    let p = [...this.validateUserFn(n), ...i];
+    let p = [...this.validateUserFn(n), ...t];
     if (p.length > 0)
       throw new l(g.FormEntry, p);
     let v = !1;
@@ -4410,7 +4410,7 @@ class Ke {
         let w = {
           userData: m,
           username: r,
-          next: t ?? this.loginRedirect,
+          next: i ?? this.loginRedirect,
           csrfToken: e.csrfToken
         };
         return s(o, w);
@@ -4453,14 +4453,14 @@ class Ke {
     d.logger.debug(c({ message: "Creating session ID" }));
     let r = this.addToSession ? this.addToSession(e) : {};
     s && (r.data = JSON.stringify(s));
-    let { sessionCookie: t, csrfCookie: n, csrfFormOrHeaderValue: i } = await this.sessionManager.createAnonymousSession(r);
+    let { sessionCookie: i, csrfCookie: n, csrfFormOrHeaderValue: t } = await this.sessionManager.createAnonymousSession(r);
     o.cookie(
-      t.name,
-      t.value,
-      t.options
-    ), e.csrfToken = i, o.setCookie(n.name, n.value, n.options), e.user = void 0;
-    const a = this.sessionManager.getSessionId(t.value);
-    return e.sessionId = a, t.value;
+      i.name,
+      i.value,
+      i.options
+    ), e.csrfToken = t, o.setCookie(n.name, n.value, n.options), e.user = void 0;
+    const a = this.sessionManager.getSessionId(i.value);
+    return e.sessionId = a, i.value;
   }
   /**
    * Called by each endpoint on error.  
@@ -4476,27 +4476,27 @@ class Ke {
    *        incorrect.  If false, report that the username or password is
    *        incorrect.  Default false.
    */
-  handleError(e, o, s, r, t = !1) {
+  handleError(e, o, s, r, i = !1) {
     var n;
     try {
-      let i = l.asCrossauthError(e);
-      if (!t)
-        switch (i.code) {
+      let t = l.asCrossauthError(e);
+      if (!i)
+        switch (t.code) {
           case g.UserNotExist:
           case g.PasswordInvalid:
-            i = new l(
+            t = new l(
               g.UsernameOrPasswordInvalid,
               "Invalid username or password"
             );
             break;
         }
-      return d.logger.debug(c({ err: i })), d.logger.error(c({
-        cerr: i,
+      return d.logger.debug(c({ err: t })), d.logger.error(c({
+        cerr: t,
         hashOfSessionId: this.getHashOfSessionId(o),
         user: (n = o.user) == null ? void 0 : n.username
-      })), r(s, i);
-    } catch (i) {
-      return d.logger.error(c({ err: i })), r(s, new l(g.UnknownError));
+      })), r(s, t);
+    } catch (t) {
+      return d.logger.error(c({ err: t })), r(s, new l(g.UnknownError));
     }
   }
   //////////////
@@ -4572,14 +4572,14 @@ class Ke {
    * @returns the Fastiy reply
    */
   csrfToken(e, o) {
-    var t;
+    var i;
     let s;
     const r = this.sessionManager.csrfHeaderName;
     if (e.headers && r.toLowerCase() in e.headers) {
       const n = e.headers[r.toLowerCase()];
       Array.isArray(n) ? s = n[0] : s = n;
     }
-    if (!s && ((t = e.body) != null && t.csrfToken) && (s = e.body.csrfToken), s)
+    if (!s && ((i = e.body) != null && i.csrfToken) && (s = e.body.csrfToken), s)
       try {
         this.sessionManager.validateDoubleSubmitCsrfToken(
           this.getCsrfCookieValue(e),
@@ -4605,18 +4605,18 @@ class Ke {
    */
   sendJsonError(e, o, s, r) {
     (!s || !r) && (s = "Unknown error");
-    const t = r ? l.asCrossauthError(r) : void 0;
+    const i = r ? l.asCrossauthError(r) : void 0;
     return d.logger.warn(c({
       message: s,
-      errorCode: t == null ? void 0 : t.code,
-      errorCodeName: t == null ? void 0 : t.codeName,
+      errorCode: i == null ? void 0 : i.code,
+      errorCodeName: i == null ? void 0 : i.codeName,
       httpStatus: o
     })), e.header(...A).status(o).send({
       ok: !1,
       status: o,
       errorMessage: s,
-      errorCode: t == null ? void 0 : t.code,
-      errorCodeName: t == null ? void 0 : t.codeName
+      errorCode: i == null ? void 0 : i.code,
+      errorCodeName: i == null ? void 0 : i.codeName
     });
   }
   /**
@@ -4743,35 +4743,35 @@ class Ye {
     u(this, "apiKeyManager");
     this.app = e, this.userStorage = o, this.apiKeyManager = new Y(s, r), this.app.addHook(
       "preHandler",
-      async (t, n) => {
-        if (t.headers.authorization)
+      async (i, n) => {
+        if (i.headers.authorization)
           try {
             d.logger.debug(c({
               msg: "Received authorization header"
             }));
-            const i = await this.apiKeyManager.validateToken(
-              t.headers.authorization
+            const t = await this.apiKeyManager.validateToken(
+              i.headers.authorization
             );
             d.logger.debug(c({
               msg: "Valid API key",
-              hahedApiKey: Y.hashSignedApiKeyValue(i.value)
+              hahedApiKey: Y.hashSignedApiKeyValue(t.value)
             }));
-            const a = Fe.decodeData(i.data);
-            if (t.apiKey = { ...i, ...a }, "scope" in a && Array.isArray(a.scope)) {
+            const a = Fe.decodeData(t.data);
+            if (i.apiKey = { ...t, ...a }, "scope" in a && Array.isArray(a.scope)) {
               let h = [];
               for (let f of a.scope)
                 typeof f == "string" && h.push(f);
-              t.scope = h;
+              i.scope = h;
             }
-            if (i.userid)
+            if (t.userid)
               try {
-                const { user: h } = await this.userStorage.getUserById(i.userid);
-                t.user = h, t.authType = "apiKey", d.logger.debug(c({ msg: "API key is for user", userid: h.id, user: h.username, hahedApiKey: Y.hashSignedApiKeyValue(i.value) }));
+                const { user: h } = await this.userStorage.getUserById(t.userid);
+                i.user = h, i.authType = "apiKey", d.logger.debug(c({ msg: "API key is for user", userid: h.id, user: h.username, hahedApiKey: Y.hashSignedApiKeyValue(t.value) }));
               } catch (h) {
-                d.logger.error(c({ msg: "API key has invalid user", userid: i.userid, hashedApiKey: Y.hashSignedApiKeyValue(i.value) })), d.logger.debug(c({ err: h }));
+                d.logger.error(c({ msg: "API key has invalid user", userid: t.userid, hashedApiKey: Y.hashSignedApiKeyValue(t.value) })), d.logger.debug(c({ err: h }));
               }
-          } catch (i) {
-            d.logger.error(c({ msg: "Invalid authorization header received", header: t.headers.authorization })), d.logger.debug(c({ err: i }));
+          } catch (t) {
+            d.logger.error(c({ msg: "Invalid authorization header received", header: i.headers.authorization })), d.logger.debug(c({ err: t }));
           }
       }
     );
@@ -4789,7 +4789,7 @@ class $e {
    *        for the password flow
    * @param options see {@link FastifyAuthorizationServerOptions}
    */
-  constructor(e, o, s, r, t, n = {}) {
+  constructor(e, o, s, r, i, n = {}) {
     /** The Fastify app passed to the constructor */
     u(this, "app");
     /** The underlying framework-independent authorization server */
@@ -4814,11 +4814,11 @@ class $e {
     this.app = e, this.fastifyServer = o, this.clientStorage = s, this.authServer = new Ne(
       this.clientStorage,
       r,
-      t,
+      i,
       n
     ), C("prefix", k.String, this, n, "PREFIX"), this.prefix.endsWith("/") || (this.prefix += "/"), C("errorPage", k.String, this, n, "ERROR_PAGE"), C("devicePage", k.String, this, n, "OAUTH_DEVICE_PAGE"), C("loginUrl", k.String, this, n, "LOGIN_URL"), C("oauthAuthorizePage", k.String, this, n, "OAUTH_AUTHORIZE_PAGE"), C("refreshTokenType", k.String, this, n, "OAUTH_REFRESH_TOKEN_TYPE"), C("refreshTokenCookieName", k.String, this, n, "OAUTH_REFRESH_TOKEN_COOKIE_NAME"), C("refreshTokenCookieDomain", k.String, this, n, "OAUTH_REFRESH_TOKEN_COOKIE_DOMAIN"), C("refreshTokenCookieHttpOnly", k.Boolean, this, n, "OAUTH_REFRESH_TOKEN_COOKIE_HTTPONLY"), C("refreshTokenCookiePath", k.String, this, n, "OAUTH_REFRESH_TOKEN_COOKIE_PATH"), C("refreshTokenCookieSecure", k.Boolean, this, n, "OAUTH_REFRESH_TOKEN_COOKIE_SECURE"), C("refreshTokenCookieSameSite", k.String, this, n, "OAUTH_REFRESH_TOKEN_COOKIE_SAMESITE"), C("createGetCsrfTokenEndpoint", k.String, this, n, "OAUTH_CREATE_GET_CSRF_TOKEN_ENDPOINT"), this.refreshTokenType != "json" && (this.createGetCsrfTokenEndpoint ? this.csrfTokens = new Ue(n.doubleSubmitCookieOptions) : this.fastifyServer.sessionServer && (this.csrfTokens = this.fastifyServer.sessionServer.sessionManager.csrfTokens)), this.createGetCsrfTokenEndpoint && this.addApiGetCsrfTokenEndpoints(), e.get(
       this.prefix + ".well-known/openid-configuration",
-      async (i, a) => a.header(...x).status(200).send(
+      async (t, a) => a.header(...x).status(200).send(
         this.authServer.oidcConfiguration({
           authorizeEndpoint: this.prefix + "authorize",
           tokenEndpoint: this.prefix + "token",
@@ -4828,32 +4828,32 @@ class $e {
       )
     ), e.get(
       this.prefix + "jwks",
-      async (i, a) => a.header(...x).status(200).send(
+      async (t, a) => a.header(...x).status(200).send(
         this.authServer.jwks()
       )
-    ), (this.authServer.validFlows.includes(E.AuthorizationCode) || this.authServer.validFlows.includes(E.AuthorizationCodeWithPKCE) || this.authServer.validFlows.includes(E.OidcAuthorizationCode)) && (e.get(this.prefix + "authorize", async (i, a) => {
+    ), (this.authServer.validFlows.includes(E.AuthorizationCode) || this.authServer.validFlows.includes(E.AuthorizationCodeWithPKCE) || this.authServer.validFlows.includes(E.OidcAuthorizationCode)) && (e.get(this.prefix + "authorize", async (t, a) => {
       var h;
-      return d.logger.info(c({ msg: "Page visit", method: "GET", url: this.prefix + "authorize", ip: i.ip, user: (h = i.user) == null ? void 0 : h.username })), await this.authorizeEndpoint(i, a, i.query);
-    }), e.post(this.prefix + "authorize", async (i, a) => {
+      return d.logger.info(c({ msg: "Page visit", method: "GET", url: this.prefix + "authorize", ip: t.ip, user: (h = t.user) == null ? void 0 : h.username })), await this.authorizeEndpoint(t, a, t.query);
+    }), e.post(this.prefix + "authorize", async (t, a) => {
       var h;
-      return d.logger.info(c({ msg: "Page visit", method: "POST", url: this.prefix + "authorize", ip: i.ip, user: (h = i.user) == null ? void 0 : h.username })), await this.authorizeEndpoint(i, a, i.body);
+      return d.logger.info(c({ msg: "Page visit", method: "POST", url: this.prefix + "authorize", ip: t.ip, user: (h = t.user) == null ? void 0 : h.username })), await this.authorizeEndpoint(t, a, t.body);
     }), this.app.post(
       this.prefix + "userauthorize",
-      async (i, a) => {
+      async (t, a) => {
         var p, v;
-        if (d.logger.info(c({ msg: "Page visit", method: "POST", url: this.prefix + "authorize", ip: i.ip, user: (p = i.user) == null ? void 0 : p.username })), !i.user) return y.sendPageError(
+        if (d.logger.info(c({ msg: "Page visit", method: "POST", url: this.prefix + "authorize", ip: t.ip, user: (p = t.user) == null ? void 0 : p.username })), !t.user) return y.sendPageError(
           a,
           401,
           this.errorPage
         );
         let h, f;
         try {
-          h = await this.fastifyServer.validateCsrfToken(i);
+          h = await this.fastifyServer.validateCsrfToken(t);
         } catch (m) {
           f = l.asCrossauthError(m), f.message = "Invalid csrf cookie received", d.logger.error(c({
             msg: f.message,
             hashedCsrfCookie: h ? F.hash(h) : void 0,
-            user: (v = i.user) == null ? void 0 : v.username,
+            user: (v = t.user) == null ? void 0 : v.username,
             cerr: f
           }));
         }
@@ -4882,45 +4882,45 @@ class $e {
           }
         }
         if (!f) {
-          const m = i.body.authorized == "true";
-          return await this.authorize(i, a, m, {
-            responseType: i.body.response_type,
-            client_id: i.body.client_id,
-            redirect_uri: i.body.redirect_uri,
-            scope: i.body.scope,
-            state: i.body.state,
-            codeChallenge: i.body.code_challenge,
-            codeChallengeMethod: i.body.code_challenge_method
+          const m = t.body.authorized == "true";
+          return await this.authorize(t, a, m, {
+            responseType: t.body.response_type,
+            client_id: t.body.client_id,
+            redirect_uri: t.body.redirect_uri,
+            scope: t.body.scope,
+            state: t.body.state,
+            codeChallenge: t.body.code_challenge,
+            codeChallengeMethod: t.body.code_challenge_method
           });
         }
       }
     )), (this.authServer.validFlows.includes(E.AuthorizationCode) || this.authServer.validFlows.includes(E.AuthorizationCodeWithPKCE) || this.authServer.validFlows.includes(E.OidcAuthorizationCode) || this.authServer.validFlows.includes(E.ClientCredentials) || this.authServer.validFlows.includes(E.RefreshToken) || this.authServer.validFlows.includes(E.Password) || this.authServer.validFlows.includes(E.PasswordMfa) || this.authServer.validFlows.includes(E.DeviceCode)) && this.app.post(
       this.prefix + "token",
-      async (i, a) => {
+      async (t, a) => {
         var m;
         d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.prefix + "token",
-          ip: i.ip,
-          user: (m = i.user) == null ? void 0 : m.username
+          ip: t.ip,
+          user: (m = t.user) == null ? void 0 : m.username
         }));
-        let h = i.body.client_id, f = i.body.client_secret;
-        if (i.headers.authorization) {
+        let h = t.body.client_id, f = t.body.client_secret;
+        if (t.headers.authorization) {
           let w, P;
-          const T = i.headers.authorization.split(" ");
+          const T = t.headers.authorization.split(" ");
           if (T.length == 2 && T[0].toLocaleLowerCase() == "basic") {
             const b = F.base64Decode(T[1]).split(":", 2);
             b.length == 2 && (w = b[0], P = b[1]);
           }
           w == null || P == null ? d.logger.warn(c({
-            msg: "Ignoring malform authenization header " + i.headers.authorization
+            msg: "Ignoring malform authenization header " + t.headers.authorization
           })) : (h = w, f = P);
         }
-        let p = i.body.refresh_token;
-        if ((this.refreshTokenType == "cookie" && i.cookies && this.refreshTokenCookieName in i.cookies || this.refreshTokenType == "both" && i.cookies && this.refreshTokenCookieName in i.cookies && p == null) && this.csrfTokens) {
-          const w = i.cookies[this.csrfTokens.cookieName];
-          let P = i.headers[this.csrfTokens.headerName.toLowerCase()];
+        let p = t.body.refresh_token;
+        if ((this.refreshTokenType == "cookie" && t.cookies && this.refreshTokenCookieName in t.cookies || this.refreshTokenType == "both" && t.cookies && this.refreshTokenCookieName in t.cookies && p == null) && this.csrfTokens) {
+          const w = t.cookies[this.csrfTokens.cookieName];
+          let P = t.headers[this.csrfTokens.headerName.toLowerCase()];
           if (Array.isArray(P) && (P = P[0]), !w || !P)
             return {
               error: "access_denied",
@@ -4929,28 +4929,28 @@ class $e {
           try {
             this.csrfTokens.validateDoubleSubmitCsrfToken(w, P);
           } catch (T) {
-            return d.logger.debug(c({ err: T })), d.logger.warn(c({ cerr: T, msg: "Invalid csrf token", client_id: i.body.client_id })), {
+            return d.logger.debug(c({ err: T })), d.logger.warn(c({ cerr: T, msg: "Invalid csrf token", client_id: t.body.client_id })), {
               error: "access_denied",
               error_description: "Invalid csrf token"
             };
           }
-          p = i.cookies[this.refreshTokenCookieName];
+          p = t.cookies[this.refreshTokenCookieName];
         }
         const v = await this.authServer.tokenEndpoint({
-          grantType: i.body.grant_type,
+          grantType: t.body.grant_type,
           client_id: h,
           client_secret: f,
-          scope: i.body.scope,
-          codeVerifier: i.body.code_verifier,
-          code: i.body.code,
-          username: i.body.username,
-          password: i.body.password,
-          mfaToken: i.body.mfa_token,
-          oobCode: i.body.oob_code,
-          bindingCode: i.body.binding_code,
-          otp: i.body.otp,
+          scope: t.body.scope,
+          codeVerifier: t.body.code_verifier,
+          code: t.body.code,
+          username: t.body.username,
+          password: t.body.password,
+          mfaToken: t.body.mfa_token,
+          oobCode: t.body.oob_code,
+          bindingCode: t.body.binding_code,
+          otp: t.body.otp,
           refreshToken: p,
-          deviceCode: i.body.device_code
+          deviceCode: t.body.device_code
         });
         if (v.error == "authorization_pending")
           return a.header(...x).status(200).send(v);
@@ -4964,67 +4964,67 @@ class $e {
       }
     ), this.authServer.validFlows.includes(E.PasswordMfa) && (e.get(
       this.prefix + "mfa/authenticators",
-      async (i, a) => {
+      async (t, a) => {
         var h;
         return d.logger.info(c({
           msg: "Page visit",
           method: "GET",
           url: this.prefix + "mfa/authenticators",
-          ip: i.ip,
-          user: (h = i.user) == null ? void 0 : h.username
-        })), await this.mfaAuthenticatorsEndpoint(i, a);
+          ip: t.ip,
+          user: (h = t.user) == null ? void 0 : h.username
+        })), await this.mfaAuthenticatorsEndpoint(t, a);
       }
     ), e.post(
       this.prefix + "mfa/authenticators",
-      async (i, a) => {
+      async (t, a) => {
         var h;
         return d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.prefix + "mfa/authenticators",
-          ip: i.ip,
-          user: (h = i.user) == null ? void 0 : h.username
-        })), await this.mfaAuthenticatorsEndpoint(i, a);
+          ip: t.ip,
+          user: (h = t.user) == null ? void 0 : h.username
+        })), await this.mfaAuthenticatorsEndpoint(t, a);
       }
     ), e.post(
       this.prefix + "mfa/challenge",
-      async (i, a) => {
+      async (t, a) => {
         var h;
         return d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.prefix + "mfa/challenge",
-          ip: i.ip,
-          user: (h = i.user) == null ? void 0 : h.username
-        })), await this.mfaChallengeEndpoint(i, a, i.body);
+          ip: t.ip,
+          user: (h = t.user) == null ? void 0 : h.username
+        })), await this.mfaChallengeEndpoint(t, a, t.body);
       }
     )), this.authServer.validFlows.includes(E.DeviceCode) && (this.app.post(
       this.prefix + "device_authorization",
-      async (i, a) => {
+      async (t, a) => {
         var v;
         d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.prefix + "device_authorization",
-          ip: i.ip,
-          user: (v = i.user) == null ? void 0 : v.username
+          ip: t.ip,
+          user: (v = t.user) == null ? void 0 : v.username
         }));
-        let h = i.body.client_id, f = i.body.client_secret;
-        if (i.headers.authorization) {
+        let h = t.body.client_id, f = t.body.client_secret;
+        if (t.headers.authorization) {
           let m, w;
-          const P = i.headers.authorization.split(" ");
+          const P = t.headers.authorization.split(" ");
           if (P.length == 2 && P[0].toLocaleLowerCase() == "basic") {
             const N = F.base64Decode(P[1]).split(":", 2);
             N.length == 2 && (m = N[0], w = N[1]);
           }
           m == null || w == null ? d.logger.warn(c({
-            msg: "Ignoring malform authenization header " + i.headers.authorization
+            msg: "Ignoring malform authenization header " + t.headers.authorization
           })) : (h = m, f = w);
         }
         const p = await this.authServer.deviceAuthorizationEndpoint({
           client_id: h,
           client_secret: f,
-          scope: i.body.scope
+          scope: t.body.scope
         });
         if (p.error || !p.device_code || !p.user_code) {
           let m = "server_error", w = "Neither code nor error received when requesting authorization";
@@ -5036,27 +5036,27 @@ class $e {
       }
     ), e.get(
       this.prefix + "device",
-      async (i, a) => {
+      async (t, a) => {
         var h;
         return d.logger.info(c({
           msg: "Page visit",
           method: "GET",
           url: this.prefix + "device",
-          ip: i.ip,
-          user: (h = i.user) == null ? void 0 : h.username
-        })), i.user ? await this.deviceGet(!1, i, a, i.user) : a.redirect(this.loginUrl + "?next=" + encodeURIComponent(i.url), 302);
+          ip: t.ip,
+          user: (h = t.user) == null ? void 0 : h.username
+        })), t.user ? await this.deviceGet(!1, t, a, t.user) : a.redirect(this.loginUrl + "?next=" + encodeURIComponent(t.url), 302);
       }
     ), e.get(
       this.prefix + "api/device",
-      async (i, a) => {
+      async (t, a) => {
         var h;
         if (d.logger.info(c({
           msg: "Page visit",
           method: "GET",
           url: this.prefix + "device",
-          ip: i.ip,
-          user: (h = i.user) == null ? void 0 : h.username
-        })), !i.user) {
+          ip: t.ip,
+          user: (h = t.user) == null ? void 0 : h.username
+        })), !t.user) {
           const f = new l(g.Unauthorized, "Not logged in");
           return a.header(...x).status(401).send({
             errorMessage: f.message,
@@ -5064,31 +5064,31 @@ class $e {
             errorCodeName: f.codeName
           });
         }
-        return await this.deviceGet(!0, i, a, i.user);
+        return await this.deviceGet(!0, t, a, t.user);
       }
     ), this.app.post(
       this.prefix + "device",
-      async (i, a) => {
+      async (t, a) => {
         var h;
         return d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.prefix + "device",
-          ip: i.ip,
-          user: (h = i.user) == null ? void 0 : h.username
-        })), i.user ? await this.deviceCodePost(!1, i, a) : a.redirect(this.loginUrl + "?next=" + encodeURIComponent(i.url), 302);
+          ip: t.ip,
+          user: (h = t.user) == null ? void 0 : h.username
+        })), t.user ? await this.deviceCodePost(!1, t, a) : a.redirect(this.loginUrl + "?next=" + encodeURIComponent(t.url), 302);
       }
     ), this.app.post(
       this.prefix + "api/device",
-      async (i, a) => {
+      async (t, a) => {
         var h;
         return d.logger.info(c({
           msg: "Page visit",
           method: "POST",
           url: this.prefix + "device",
-          ip: i.ip,
-          user: (h = i.user) == null ? void 0 : h.username
-        })), await this.deviceCodePost(!0, i, a);
+          ip: t.ip,
+          user: (h = t.user) == null ? void 0 : h.username
+        })), await this.deviceCodePost(!0, t, a);
       }
     ));
   }
@@ -5109,7 +5109,7 @@ class $e {
     this.csrfTokens && this.app.get(
       this.prefix + "getcsrftoken",
       async (e, o) => {
-        var r, t;
+        var r, i;
         if (d.logger.info(c({
           msg: "API visit",
           method: "POST",
@@ -5121,56 +5121,56 @@ class $e {
         try {
           const {
             csrfCookie: n,
-            csrfFormOrHeaderValue: i
+            csrfFormOrHeaderValue: t
           } = await this.createCsrfToken();
           return s = n.value, o.setCookie(n.name, n.value, n.options), o.header(...x).send({
             ok: !0,
-            csrfToken: i
+            csrfToken: t
           });
         } catch (n) {
-          const i = l.asCrossauthError(n);
+          const t = l.asCrossauthError(n);
           return d.logger.error(c({
             msg: "getcsrftoken failure",
-            user: (t = e.user) == null ? void 0 : t.username,
+            user: (i = e.user) == null ? void 0 : i.username,
             hashedCsrfCookie: F.hash(s.split(".")[0]),
-            errorCode: i.code,
-            errorCodeName: i.codeName
-          })), d.logger.debug(c({ err: n })), o.status(i.httpStatus).header(...x).send({
+            errorCode: t.code,
+            errorCodeName: t.codeName
+          })), d.logger.debug(c({ err: n })), o.status(t.httpStatus).header(...x).send({
             ok: !1,
-            errorCode: i.code,
-            errorCodeName: i.codeName,
-            error: i.message
+            errorCode: t.code,
+            errorCodeName: t.codeName,
+            error: t.message
           });
         }
       }
     );
   }
   async authorizeEndpoint(e, o, s) {
-    var i, a, h;
+    var t, a, h;
     if (!e.user) return o.redirect(this.loginUrl + "?next=" + encodeURIComponent(e.url), 302);
     d.logger.debug(c({ msg: "validating authorize parameters" }));
-    let { error_description: r } = this.authServer.validateAuthorizeParameters(s), t;
-    if (r ? (t = new l(g.BadRequest, r), d.logger.error(c({
+    let { error_description: r } = this.authServer.validateAuthorizeParameters(s), i;
+    if (r ? (i = new l(g.BadRequest, r), d.logger.error(c({
       msg: "authorize parameter invalid",
-      cerr: t,
-      user: (i = e.user) == null ? void 0 : i.username
+      cerr: i,
+      user: (t = e.user) == null ? void 0 : t.username
     }))) : d.logger.error(c({
       msg: "authorize parameter valid",
       user: (a = e.user) == null ? void 0 : a.username
-    })), t) {
+    })), i) {
       if (this.errorPage)
-        return o.status(t.httpStatus).view(
+        return o.status(i.httpStatus).view(
           this.errorPage,
           {
-            status: t.httpStatus,
-            errorMessage: t.message,
-            errorCode: t.code,
-            errorCodeName: t.codeName
+            status: i.httpStatus,
+            errorMessage: i.message,
+            errorCode: i.code,
+            errorCodeName: i.codeName
           }
         );
       {
         let f = "500";
-        switch (t.httpStatus) {
+        switch (i.httpStatus) {
           case 401:
             f = "401";
             break;
@@ -5178,7 +5178,7 @@ class $e {
             f = "400";
             break;
         }
-        return o.status(t.httpStatus).send($[f] ?? G);
+        return o.status(i.httpStatus).send($[f] ?? G);
       }
     }
     let n = !1;
@@ -5240,9 +5240,9 @@ class $e {
   }
   async authorize(e, o, s, {
     responseType: r,
-    client_id: t,
+    client_id: i,
     redirect_uri: n,
-    scope: i,
+    scope: t,
     state: a,
     codeChallenge: h,
     codeChallengeMethod: f
@@ -5251,9 +5251,9 @@ class $e {
     if (s) {
       const w = await this.authServer.authorizeGetEndpoint({
         responseType: r,
-        client_id: t,
+        client_id: i,
         redirect_uri: n,
-        scope: i,
+        scope: t,
         state: a,
         codeChallenge: h,
         codeChallengeMethod: f,
@@ -5312,18 +5312,18 @@ class $e {
     }
   }
   async mfaAuthenticatorsEndpoint(e, o) {
-    var i;
-    const s = (i = e.headers.authorization) == null ? void 0 : i.split(" ");
+    var t;
+    const s = (t = e.headers.authorization) == null ? void 0 : t.split(" ");
     if (!s || s.length != 2)
       return {
         error: "access_denied",
         error_desciption: "Invalid authorization header"
       };
-    const r = s[1], t = await this.authServer.mfaAuthenticatorsEndpoint(r);
-    if (t.authenticators)
-      return o.header(...x).status(200).send(t.authenticators);
-    const n = l.fromOAuthError(t.error ?? "server_error");
-    return o.header(...x).status(n.httpStatus).send(t);
+    const r = s[1], i = await this.authServer.mfaAuthenticatorsEndpoint(r);
+    if (i.authenticators)
+      return o.header(...x).status(200).send(i.authenticators);
+    const n = l.fromOAuthError(i.error ?? "server_error");
+    return o.header(...x).status(n.httpStatus).send(i);
   }
   async mfaChallengeEndpoint(e, o, s) {
     const r = await this.authServer.mfaChallengeEndpoint(
@@ -5334,15 +5334,15 @@ class $e {
       s.authenticator_id
     );
     if (r.error) {
-      const t = l.fromOAuthError(r.error);
-      return o.header(...x).status(t.httpStatus).send(r);
+      const i = l.fromOAuthError(r.error);
+      return o.header(...x).status(i.httpStatus).send(r);
     }
     return o.header(...x).status(200).send(r);
   }
   setRefreshTokenCookie(e, o, s) {
     if (!this.refreshTokenCookieName) return;
-    let r = s ? new Date(Date.now() + s * 1e3).toUTCString() : void 0, t = this.refreshTokenCookieName + "=" + o;
-    r && (t += "; expires=" + new Date(r).toUTCString()), this.refreshTokenCookieSameSite && (t += "; SameSite=" + this.refreshTokenCookieSameSite), this.refreshTokenCookieDomain && (t += "; domain=" + this.refreshTokenCookieDomain), this.refreshTokenCookiePath && (t += "; path=" + this.refreshTokenCookiePath), this.refreshTokenCookieHttpOnly == !0 && (t += "; httpOnly"), this.refreshTokenCookieSecure == !0 && (t += "; secure"), e.setCookie(this.refreshTokenCookieName, t);
+    let r = s ? new Date(Date.now() + s * 1e3).toUTCString() : void 0, i = this.refreshTokenCookieName + "=" + o;
+    r && (i += "; expires=" + new Date(r).toUTCString()), this.refreshTokenCookieSameSite && (i += "; SameSite=" + this.refreshTokenCookieSameSite), this.refreshTokenCookieDomain && (i += "; domain=" + this.refreshTokenCookieDomain), this.refreshTokenCookiePath && (i += "; path=" + this.refreshTokenCookiePath), this.refreshTokenCookieHttpOnly == !0 && (i += "; httpOnly"), this.refreshTokenCookieSecure == !0 && (i += "; secure"), e.setCookie(this.refreshTokenCookieName, i);
   }
   /**
    * Returns this server's OIDC configuration.  Just wraps
@@ -5360,18 +5360,18 @@ class $e {
   /////
   // Device code flow
   async applyUserCode(e, o, s) {
-    var r, t, n;
+    var r, i, n;
     try {
-      const i = await this.authServer.deviceEndpoint({ userCode: e, user: s });
-      if (i.error)
+      const t = await this.authServer.deviceEndpoint({ userCode: e, user: s });
+      if (t.error)
         return {
           ok: !1,
           completed: !1,
           retryAllowed: !1,
-          error: i.error,
-          error_description: i.error_description
+          error: t.error,
+          error_description: t.error_description
         };
-      if (!i.client_id)
+      if (!t.client_id)
         return d.logger.error(c({ msg: "No client id found for user code", userCodeHash: F.hash(e), ip: o.ip, username: (r = o.user) == null ? void 0 : r.username })), {
           ok: !1,
           completed: !1,
@@ -5379,33 +5379,33 @@ class $e {
           error: "server_error",
           error_description: "No client id found for user code"
         };
-      if (i.error == "access_denied")
-        return d.logger.error(c({ msg: "Incorrect user code given", userCodeHash: F.hash(e), ip: o.ip, username: (t = o.user) == null ? void 0 : t.username })), this.authServer.userCodeThrottle > 0 && await ((f) => new Promise((p) => setTimeout(p, f)))(this.authServer.userCodeThrottle), {
+      if (t.error == "access_denied")
+        return d.logger.error(c({ msg: "Incorrect user code given", userCodeHash: F.hash(e), ip: o.ip, username: (i = o.user) == null ? void 0 : i.username })), this.authServer.userCodeThrottle > 0 && await ((f) => new Promise((p) => setTimeout(p, f)))(this.authServer.userCodeThrottle), {
           ok: !1,
           completed: !1,
           retryAllowed: !0,
-          error: i.error,
-          error_description: i.error_description
+          error: t.error,
+          error_description: t.error_description
         };
-      if (i.error == "expired_token")
+      if (t.error == "expired_token")
         return d.logger.error(c({ msg: "Expired user code", userCodeHash: F.hash(e), ip: o.ip, username: (n = o.user) == null ? void 0 : n.username })), {
           ok: !1,
           completed: !1,
           retryAllowed: !1,
-          error: i.error,
-          error_description: i.error_description
+          error: t.error,
+          error_description: t.error_description
         };
-      const a = await this.clientStorage.getClientById(i.client_id);
-      return i.scopeAuthorizationNeeded ? {
+      const a = await this.clientStorage.getClientById(t.client_id);
+      return t.scopeAuthorizationNeeded ? {
         ok: !0,
         completed: !1,
         retryAllowed: !0,
         authorizationNeeded: {
           user: s,
-          client_id: i.client_id,
+          client_id: t.client_id,
           client_name: a.client_name,
-          scope: i.scope,
-          scopes: i.scope ? i.scope.split(" ") : [],
+          scope: t.scope,
+          scopes: t.scope ? t.scope.split(" ") : [],
           csrfToken: o.csrfToken
         },
         user: o.user,
@@ -5418,8 +5418,8 @@ class $e {
         user: o.user,
         csrfToken: o.csrfToken
       };
-    } catch (i) {
-      const a = l.asCrossauthError(i);
+    } catch (t) {
+      const a = l.asCrossauthError(t);
       return d.logger.debug(c({ err: a })), d.logger.error(c({ msg: a.message, cerr: a })), {
         ok: !1,
         completed: !1,
@@ -5431,34 +5431,34 @@ class $e {
   }
   async deviceGet(e, o, s, r) {
     if (o.query.user_code) {
-      let t = await this.applyUserCode(o.query.user_code, o, r);
-      if (t.error) {
-        const i = l.fromOAuthError(t.error, t.error_description);
-        d.logger.debug({ err: i }), d.logger.error({ cerr: i });
+      let i = await this.applyUserCode(o.query.user_code, o, r);
+      if (i.error) {
+        const t = l.fromOAuthError(i.error, i.error_description);
+        d.logger.debug({ err: t }), d.logger.error({ cerr: t });
         const a = {
           ok: !1,
           completed: !1,
-          status: i.httpStatus,
-          errorMessage: i.message,
-          errorCode: i.code,
-          errorCodeName: i.codeName,
-          retryAllowed: t.retryAllowed
+          status: t.httpStatus,
+          errorMessage: t.message,
+          errorCode: t.code,
+          errorCodeName: t.codeName,
+          retryAllowed: i.retryAllowed
         };
-        return e ? s.header(...x).status(i.httpStatus).send(a) : s.status(i.httpStatus).view(this.devicePage, {
+        return e ? s.header(...x).status(t.httpStatus).send(a) : s.status(t.httpStatus).view(this.devicePage, {
           csrfToken: o.csrfToken,
           ...a
         });
-      } else if (t.authorizationNeeded) {
-        const i = {
+      } else if (i.authorizationNeeded) {
+        const t = {
           ok: !0,
           completed: !1,
-          retryAllowed: t.retryAllowed,
-          authorizationNeeded: t.authorizationNeeded,
-          user_code: t.user_code
+          retryAllowed: i.retryAllowed,
+          authorizationNeeded: i.authorizationNeeded,
+          user_code: i.user_code
         };
-        return e ? s.header(...x).status(200).send(i) : s.status(200).view(this.devicePage, {
+        return e ? s.header(...x).status(200).send(t) : s.status(200).view(this.devicePage, {
           csrfToken: o.csrfToken,
-          ...i
+          ...t
         });
       }
       const n = {
@@ -5470,13 +5470,13 @@ class $e {
         ...n
       });
     } else {
-      const t = {
+      const i = {
         ok: !1,
         completed: !1,
         user_code: o.query.user_code,
         csrfToken: o.csrfToken
       };
-      return e ? s.header(...x).status(200).send(t) : s.status(200).view(this.devicePage, t);
+      return e ? s.header(...x).status(200).send(i) : s.status(200).view(this.devicePage, i);
     }
   }
   async deviceCodePost(e, o, s) {
@@ -5489,7 +5489,7 @@ class $e {
           if (r.error) {
             const n = l.fromOAuthError(r.error, r.error_description);
             d.logger.debug({ err: n }), d.logger.error({ cerr: n });
-            const i = {
+            const t = {
               ok: !1,
               completed: !1,
               status: n.httpStatus,
@@ -5498,9 +5498,9 @@ class $e {
               errorCodeName: n.codeName,
               retryAllowed: r.retryAllowed
             };
-            return e ? s.header(...x).status(200).send(i) : s.status(n.httpStatus).view(this.devicePage, {
+            return e ? s.header(...x).status(200).send(t) : s.status(n.httpStatus).view(this.devicePage, {
               csrfToken: o.csrfToken,
-              ...i
+              ...t
             });
           } else if (r.authorizationNeeded) {
             const n = {
@@ -5515,14 +5515,14 @@ class $e {
               ...n
             });
           }
-          const t = {
+          const i = {
             ok: !0,
             completed: !0,
             csrfToken: o.csrfToken
           };
-          return e ? s.header(...x).status(200).send(t) : s.status(200).view(this.devicePage, t);
+          return e ? s.header(...x).status(200).send(i) : s.status(200).view(this.devicePage, i);
         } else {
-          const r = l.fromOAuthError("unauthorized", "Please enter the code"), t = {
+          const r = l.fromOAuthError("unauthorized", "Please enter the code"), i = {
             ok: !1,
             completed: !1,
             user_code: o.body.user_code,
@@ -5533,22 +5533,22 @@ class $e {
             errorCode: r.code,
             errorCodeName: r.codeName
           };
-          return e ? s.header(...x).status(401).send(t) : s.status(200).view(this.devicePage, {
+          return e ? s.header(...x).status(401).send(i) : s.status(200).view(this.devicePage, {
             csrfToken: o.csrfToken,
-            ...t
+            ...i
           });
         }
       else if (o.body.authorized == "true") {
-        let r = o.body.user_code, t = o.body.scope;
-        t == "";
+        let r = o.body.user_code, i = o.body.scope;
+        i == "";
         const n = o.body.client_id;
         if (!r) throw new l(g.BadRequest, "user_code missing");
         if (!n) throw new l(g.BadRequest, "client_id missing");
-        let i = await this.authServer.validateAndPersistScope(n, t, o.user);
-        if (i.error)
-          throw l.fromOAuthError(i.error, i.error_description);
-        if (i = await this.applyUserCode(r, o, o.user), i.error)
-          throw l.fromOAuthError(i.error, i.error_description);
+        let t = await this.authServer.validateAndPersistScope(n, i, o.user);
+        if (t.error)
+          throw l.fromOAuthError(t.error, t.error_description);
+        if (t = await this.applyUserCode(r, o, o.user), t.error)
+          throw l.fromOAuthError(t.error, t.error_description);
         const a = {
           ok: !0,
           completed: !0,
@@ -5558,16 +5558,16 @@ class $e {
       } else
         throw new l(g.Unauthorized, "You did not authorize the client");
     } catch (r) {
-      const t = l.asCrossauthError(r);
-      d.logger.debug({ err: t }), d.logger.error({ cerr: t });
+      const i = l.asCrossauthError(r);
+      d.logger.debug({ err: i }), d.logger.error({ cerr: i });
       const n = {
         ok: !1,
-        status: t.httpStatus,
-        errorMessage: t.message,
-        errorCode: t.code,
-        errorCodeName: t.codeName
+        status: i.httpStatus,
+        errorMessage: i.message,
+        errorCode: i.code,
+        errorCodeName: i.codeName
       };
-      return e ? s.header(...x).status(401).send(n) : s.status(t.httpStatus).view(this.devicePage, {
+      return e ? s.header(...x).status(401).send(n) : s.status(i.httpStatus).view(this.devicePage, {
         csrfToken: o.csrfToken,
         ...n
       });
@@ -5616,10 +5616,10 @@ function fe(S, e) {
   if (S.access_token)
     try {
       if (S.access_token && e.includes("access")) {
-        const s = J(S.access_token), r = s.jti ? s.jti : s.sid ? s.sid : "", t = r ? F.hash(r) : void 0;
+        const s = J(S.access_token), r = s.jti ? s.jti : s.sid ? s.sid : "", i = r ? F.hash(r) : void 0;
         d.logger.debug(c({
           msg: "Got access token",
-          accessTokenHash: t
+          accessTokenHash: i
         }));
       }
     } catch (s) {
@@ -5630,10 +5630,10 @@ function fe(S, e) {
       if (S.id_token && e.includes("id")) {
         let s = S.id_payload ?? J(S.id_token);
         if (s) {
-          const r = s.jti ? s.jti : s.sid ? s.sid : "", t = r ? F.hash(r) : void 0;
+          const r = s.jti ? s.jti : s.sid ? s.sid : "", i = r ? F.hash(r) : void 0;
           d.logger.debug(c({
             msg: "Got id token",
-            idTokenHash: t
+            idTokenHash: i
           }));
         }
       }
@@ -5672,11 +5672,11 @@ async function Qe(S, e, o, s) {
       let r = { ...S };
       return e.jwtTokens.includes("id") && S.id_token && (r.id_payload = S.id_payload ?? V(S.id_token)), s.status(200).view(e.authorizedPage, r);
     } catch (r) {
-      const t = l.asCrossauthError(r);
-      return s.status(t.httpStatus).view(e.errorPage, {
-        status: t.httpStatus,
-        errorMessage: t.message,
-        errorCodeName: t.codeName
+      const i = l.asCrossauthError(r);
+      return s.status(i.httpStatus).view(e.errorPage, {
+        status: i.httpStatus,
+        errorMessage: i.message,
+        errorCodeName: i.codeName
       });
     }
 }
@@ -5708,37 +5708,37 @@ async function Ze(S, e, o, s) {
       return e.jwtTokens.includes("id") && (r.id_payload = S.id_payload ?? V(S.id_token)), s.status(200).view(e.authorizedPage, r);
     }
   } catch (r) {
-    const t = l.asCrossauthError(r);
-    if (d.logger.debug(c({ err: t })), d.logger.debug(c({ cerr: t, msg: "Error receiving tokens" })), s)
-      return s.status(t.httpStatus).view(e.errorPage, {
-        status: t.httpStatus,
-        errorMessage: t.message,
-        errorCodeName: t.codeName
+    const i = l.asCrossauthError(r);
+    if (d.logger.debug(c({ err: i })), d.logger.debug(c({ cerr: i, msg: "Error receiving tokens" })), s)
+      return s.status(i.httpStatus).view(e.errorPage, {
+        status: i.httpStatus,
+        errorMessage: i.message,
+        errorCodeName: i.codeName
       });
   }
 }
-async function Se(S, e, o, s) {
+async function Se(S, e, o, s, r) {
   if (!e.server.sessionAdapter) throw new l(
     g.Configuration,
     "Cannot update session data if sessions not enabled"
   );
-  let r = S.expires_in;
-  if (!r && S.access_token && e.jwtTokens.includes("access")) {
-    const i = J(S.access_token);
-    i.exp && (r = i.exp);
+  let i = S.expires_in;
+  if (!i && S.access_token && e.jwtTokens.includes("access")) {
+    const a = J(S.access_token);
+    a.exp && (i = a.exp);
   }
-  if (!r)
+  if (!i)
     throw new l(
       g.BadRequest,
       "OAuth server did not return an expiry for the access token"
     );
-  const t = Date.now() + r * 1e3;
-  let n = { ...S, expires_at: t };
-  if ("id_token" in S) {
-    let i = S.id_payload ?? V(S.id_token);
-    i && (n.id_token = i);
+  const n = Date.now() + i * 1e3;
+  let t = {};
+  if (t = { ...S, expires_at: n }, "id_token" in S) {
+    let a = S.id_payload ?? V(S.id_token);
+    a && (t.id_token = a);
   }
-  await e.storeSessionData(n, o, s);
+  await e.storeSessionData(t, o, s);
 }
 async function qe(S, e, o, s) {
   if (S.error) {
@@ -5764,12 +5764,12 @@ async function qe(S, e, o, s) {
         errorCode: g.Configuration
       });
   } catch (r) {
-    const t = l.asCrossauthError(r);
-    if (d.logger.debug(c({ err: t })), d.logger.debug(c({ cerr: t, msg: "Error receiving tokens" })), s)
-      return s.status(t.httpStatus).view(e.errorPage, {
-        status: t.httpStatus,
-        errorMessage: t.message,
-        errorCodeName: t.codeName
+    const i = l.asCrossauthError(r);
+    if (d.logger.debug(c({ err: i })), d.logger.debug(c({ cerr: i, msg: "Error receiving tokens" })), s)
+      return s.status(i.httpStatus).view(e.errorPage, {
+        status: i.httpStatus,
+        errorMessage: i.message,
+        errorCodeName: i.codeName
       });
   }
 }
@@ -5781,7 +5781,7 @@ class we extends Oe {
    * @param options See {@link FastifyOAuthClientOptions}
    */
   constructor(o, s, r) {
-    var t, n, i;
+    var i, n, t;
     super(s, r);
     u(this, "server");
     u(this, "siteUrl", "/");
@@ -5821,7 +5821,7 @@ class we extends Oe {
     u(this, "bffEndpointName", "bff");
     u(this, "bffBaseUrl");
     u(this, "tokenEndpoints", []);
-    if (this.server = o, C("sessionDataName", k.String, this, r, "OAUTH_SESSION_DATA_NAME"), C("siteUrl", k.String, this, r, "SITE_URL", !0), C("tokenResponseType", k.String, this, r, "OAUTH_TOKEN_RESPONSE_TYPE"), C("errorResponseType", k.String, this, r, "OAUTH_ERROR_RESPONSE_TYPE"), C("prefix", k.String, this, r, "PREFIX"), this.prefix.endsWith("/") || (this.prefix += "/"), C("loginUrl", k.String, this, r, "LOGIN_URL"), C("errorPage", k.String, this, r, "ERROR_PAGE"), C("authorizedPage", k.String, this, r, "AUTHORIZED_PAGE"), C("authorizedUrl", k.String, this, r, "AUTHORIZED_URL"), C("loginProtectedFlows", k.JsonArray, this, r, "OAUTH_LOGIN_PROTECTED_FLOWS"), C("passwordFlowUrl", k.String, this, r, "OAUTH_PASSWORD_FLOW_URL"), C("passwordOtpUrl", k.String, this, r, "OAUTH_PASSWORD_OTP_URL"), C("passwordOobUrl", k.String, this, r, "OAUTH_PASSWORD_OOB_URL"), C("passwordFlowPage", k.String, this, r, "OAUTH_PASSWORD_FLOW_PAGE"), C("deviceCodeFlowPage", k.String, this, r, "OAUTH_DEVICECODE_FLOW_PAGE"), C("deleteTokensPage", k.String, this, r, "OAUTH_DELETE_TOKENS_PAGE"), C("deleteTokensGetUrl", k.String, this, r, "OAUTH_DELETE_TOKENS_GET_URL"), C("deleteTokensPostUrl", k.String, this, r, "OAUTH_DELETE_TOKENS_POST_URL"), C("apiDeleteTokensPostUrl", k.String, this, r, "OAUTHAPI__DELETE_TOKENS_POST_URL"), C("mfaOtpPage", k.String, this, r, "OAUTH_MFA_OTP_PAGE"), C("mfaOobPage", k.String, this, r, "OAUTH_MFA_OOB_PAGE"), C("deviceCodeFlowUrl", k.String, this, r, "OAUTH_DEVICECODE_FLOW_URL"), C("deviceCodePollUrl", k.String, this, r, "OAUTH_DEVICECODE_POLL_URL"), C("bffEndpointName", k.String, this, r, "OAUTH_BFF_ENDPOINT_NAME"), C("bffBaseUrl", k.String, this, r, "OAUTH_BFF_BASEURL"), C("validFlows", k.JsonArray, this, r, "OAUTH_VALIDFLOWS"), C("jwtTokens", k.JsonArray, this, r, "OAUTH_JWT_TOKENS"), (t = this.deleteTokensGetUrl) != null && t.startsWith("/") && (this.deleteTokensGetUrl = this.deleteTokensGetUrl.substring(1)), (n = this.deleteTokensPostUrl) != null && n.startsWith("/") && (this.deleteTokensPostUrl = this.deleteTokensPostUrl.substring(1)), (i = this.deleteTokensPostUrl) != null && i.startsWith("/") && (this.deleteTokensPostUrl = this.deleteTokensPostUrl.substring(1)), this.validFlows.length == 1 && this.validFlows[0] == E.All)
+    if (this.server = o, C("sessionDataName", k.String, this, r, "OAUTH_SESSION_DATA_NAME"), C("siteUrl", k.String, this, r, "SITE_URL", !0), C("tokenResponseType", k.String, this, r, "OAUTH_TOKEN_RESPONSE_TYPE"), C("errorResponseType", k.String, this, r, "OAUTH_ERROR_RESPONSE_TYPE"), C("prefix", k.String, this, r, "PREFIX"), this.prefix.endsWith("/") || (this.prefix += "/"), C("loginUrl", k.String, this, r, "LOGIN_URL"), C("errorPage", k.String, this, r, "ERROR_PAGE"), C("authorizedPage", k.String, this, r, "AUTHORIZED_PAGE"), C("authorizedUrl", k.String, this, r, "AUTHORIZED_URL"), C("loginProtectedFlows", k.JsonArray, this, r, "OAUTH_LOGIN_PROTECTED_FLOWS"), C("passwordFlowUrl", k.String, this, r, "OAUTH_PASSWORD_FLOW_URL"), C("passwordOtpUrl", k.String, this, r, "OAUTH_PASSWORD_OTP_URL"), C("passwordOobUrl", k.String, this, r, "OAUTH_PASSWORD_OOB_URL"), C("passwordFlowPage", k.String, this, r, "OAUTH_PASSWORD_FLOW_PAGE"), C("deviceCodeFlowPage", k.String, this, r, "OAUTH_DEVICECODE_FLOW_PAGE"), C("deleteTokensPage", k.String, this, r, "OAUTH_DELETE_TOKENS_PAGE"), C("deleteTokensGetUrl", k.String, this, r, "OAUTH_DELETE_TOKENS_GET_URL"), C("deleteTokensPostUrl", k.String, this, r, "OAUTH_DELETE_TOKENS_POST_URL"), C("apiDeleteTokensPostUrl", k.String, this, r, "OAUTHAPI__DELETE_TOKENS_POST_URL"), C("mfaOtpPage", k.String, this, r, "OAUTH_MFA_OTP_PAGE"), C("mfaOobPage", k.String, this, r, "OAUTH_MFA_OOB_PAGE"), C("deviceCodeFlowUrl", k.String, this, r, "OAUTH_DEVICECODE_FLOW_URL"), C("deviceCodePollUrl", k.String, this, r, "OAUTH_DEVICECODE_POLL_URL"), C("bffEndpointName", k.String, this, r, "OAUTH_BFF_ENDPOINT_NAME"), C("bffBaseUrl", k.String, this, r, "OAUTH_BFF_BASEURL"), C("validFlows", k.JsonArray, this, r, "OAUTH_VALIDFLOWS"), C("jwtTokens", k.JsonArray, this, r, "OAUTH_JWT_TOKENS"), (i = this.deleteTokensGetUrl) != null && i.startsWith("/") && (this.deleteTokensGetUrl = this.deleteTokensGetUrl.substring(1)), (n = this.deleteTokensPostUrl) != null && n.startsWith("/") && (this.deleteTokensPostUrl = this.deleteTokensPostUrl.substring(1)), (t = this.deleteTokensPostUrl) != null && t.startsWith("/") && (this.deleteTokensPostUrl = this.deleteTokensPostUrl.substring(1)), this.validFlows.length == 1 && this.validFlows[0] == E.All)
       this.validFlows = E.allFlows();
     else if (!E.areAllValidFlows(this.validFlows))
       throw new l(g.Configuration, "Invalid flows specificied in " + this.validFlows.join(","));
@@ -5869,7 +5869,7 @@ class we extends Oe {
         }
         const f = this.randomValue(this.stateLength), p = { scope: a.query.scope, state: f };
         await this.storeSessionData(p, a, h);
-        const { url: v, error: m, error_description: w } = await this.startAuthorizationCodeFlow(f, a.query.scope);
+        const { url: v, error: m, error_description: w } = await this.startAuthorizationCodeFlow(f, { scope: a.query.scope });
         if (m || !v) {
           const T = l.fromOAuthError(
             m ?? "server_error",
@@ -5920,12 +5920,11 @@ class we extends Oe {
           return h.redirect(this.loginUrl + "?next=" + encodeURIComponent(a.url), 302);
         const f = this.randomValue(this.stateLength), { codeChallenge: p, codeVerifier: v } = await this.codeChallengeAndVerifier(), m = { scope: a.query.scope, state: f, codeChallenge: p, codeVerifier: v };
         await this.storeSessionData(m, a, h);
-        const { url: w, error: P, error_description: T } = await this.startAuthorizationCodeFlow(
-          f,
-          a.query.scope,
-          p,
-          !0
-        );
+        const { url: w, error: P, error_description: T } = await this.startAuthorizationCodeFlow(f, {
+          scope: a.query.scope,
+          codeChallenge: p,
+          pkce: !0
+        });
         if (P || !w) {
           const b = l.fromOAuthError(
             P ?? "server_error",
@@ -5952,13 +5951,13 @@ class we extends Oe {
         const f = await ((m = this.server.sessionAdapter) == null ? void 0 : m.getSessionData(a, this.sessionDataName));
         if (!(f != null && f.state) || (f == null ? void 0 : f.state) != a.query.state)
           throw new l(g.Unauthorized, "State does not match");
-        let p = await this.redirectEndpoint(
-          a.query.code,
-          f == null ? void 0 : f.scope,
-          f == null ? void 0 : f.codeVerifier,
-          a.query.error,
-          a.query.error_description
-        );
+        let p = await this.redirectEndpoint({
+          code: a.query.code,
+          scope: f == null ? void 0 : f.scope,
+          codeVerifier: f == null ? void 0 : f.codeVerifier,
+          error: a.query.error,
+          errorDescription: a.query.error_description
+        });
         try {
           if (p.error) {
             const P = l.fromOAuthError(
@@ -6472,14 +6471,14 @@ class we extends Oe {
     }
   }
   async passwordPost(o, s, r) {
-    var t;
+    var i;
     if (this.server.sessionAdapter) {
-      const { error: n, reply: i } = await this.server.errorIfCsrfInvalid(
+      const { error: n, reply: t } = await this.server.errorIfCsrfInvalid(
         s,
         r,
         this.errorFn
       );
-      if (n) return i;
+      if (n) return t;
     }
     try {
       let n = await this.passwordFlow(
@@ -6488,10 +6487,10 @@ class we extends Oe {
         s.body.scope
       );
       if (n.error == "mfa_required" && n.mfa_token && this.validFlows.includes(E.PasswordMfa)) {
-        const i = n.mfa_token;
+        const t = n.mfa_token;
         if (n = await this.passwordMfa(
           o,
-          i,
+          t,
           s.body.scope,
           s,
           r
@@ -6521,56 +6520,56 @@ class we extends Oe {
         }
         return await this.receiveTokenFn(n, this, s, r);
       } else if (n.error) {
-        const i = l.fromOAuthError(
+        const t = l.fromOAuthError(
           n.error,
           n.error_description
         );
-        return o ? await this.errorFn(this.server, s, r, i) : r.view(
+        return o ? await this.errorFn(this.server, s, r, t) : r.view(
           this.passwordFlowPage,
           {
             user: s.user,
             username: s.body.username,
             //password: request.body.password,
             scope: s.body.scope,
-            errorMessage: i.message,
-            errorCode: i.code,
-            errorCodeName: i.codeName,
+            errorMessage: t.message,
+            errorCode: t.code,
+            errorCodeName: t.codeName,
             csrfToken: s.csrfToken
           }
         );
       }
       return await this.receiveTokenFn(n, this, s, r);
     } catch (n) {
-      const i = l.asCrossauthError(n);
+      const t = l.asCrossauthError(n);
       return d.logger.error(c({
         msg: "Error receiving token",
-        cerr: i,
-        user: (t = s.user) == null ? void 0 : t.user
+        cerr: t,
+        user: (i = s.user) == null ? void 0 : i.user
       })), d.logger.debug(c({ err: n })), o ? await this.errorFn(
         this.server,
         s,
         r,
-        i
+        t
       ) : r.view(this.passwordFlowPage, {
         user: s.user,
         username: s.body.username,
         password: s.body.password,
         scope: s.body.scope,
-        errorMessage: i.message,
-        errorCode: i.code,
-        errorCodeName: i.codeName,
+        errorMessage: t.message,
+        errorCode: t.code,
+        errorCodeName: t.codeName,
         csrfToken: s.csrfToken
       });
     }
   }
-  async passwordMfa(o, s, r, t, n) {
-    const i = await this.mfaAuthenticators(s);
-    if (i.error || !i.authenticators || !Array.isArray(i.authenticators) || i.authenticators.length == 0 || i.authenticators.length > 1 && !i.authenticators[0].active)
-      return i.error ? i : {
+  async passwordMfa(o, s, r, i, n) {
+    const t = await this.mfaAuthenticators(s);
+    if (t.error || !t.authenticators || !Array.isArray(t.authenticators) || t.authenticators.length == 0 || t.authenticators.length > 1 && !t.authenticators[0].active)
+      return t.error ? t : {
         error: "access_denied",
         error_description: "No MFA authenticators available"
       };
-    const a = i.authenticators[0];
+    const a = t.authenticators[0];
     if (a.authenticator_type == "otp") {
       const f = await this.mfaOtpRequest(s, a.id);
       return f.error || f.challenge_type != "otp" ? {
@@ -6606,60 +6605,60 @@ class we extends Oe {
   }
   async passwordOtp(o, s, r) {
     var n;
-    const t = await this.mfaOtpComplete(
+    const i = await this.mfaOtpComplete(
       s.body.mfa_token,
       s.body.otp
     );
-    if (t.error) {
-      const i = l.fromOAuthError(
-        t.error,
-        t.error_description ?? "Error completing MFA"
+    if (i.error) {
+      const t = l.fromOAuthError(
+        i.error,
+        i.error_description ?? "Error completing MFA"
       );
       return d.logger.warn(c({
         msg: "Error completing MFA",
-        cerr: i,
+        cerr: t,
         user: (n = s.user) == null ? void 0 : n.user,
         hashedMfaToken: F.hash(s.body.mfa_token)
-      })), d.logger.debug(c({ err: i })), o ? await this.errorFn(
+      })), d.logger.debug(c({ err: t })), o ? await this.errorFn(
         this.server,
         s,
         r,
-        i
+        t
       ) : r.view(this.mfaOtpPage, {
         user: s.user,
         scope: s.body.scope,
         mfa_token: s.body.mfa_token,
         challenge_tpye: s.body.challenge_type,
-        errorMessage: i.message,
-        errorCode: i.code,
-        errorCodeName: i.codeName,
+        errorMessage: t.message,
+        errorCode: t.code,
+        errorCodeName: t.codeName,
         csrfToken: s.csrfToken
       });
     }
-    return await this.receiveTokenFn(t, this, s, r) ?? r;
+    return await this.receiveTokenFn(i, this, s, r) ?? r;
   }
   async passwordOob(o, s, r) {
     var n;
-    const t = await this.mfaOobComplete(
+    const i = await this.mfaOobComplete(
       s.body.mfa_token,
       s.body.oob_code,
       s.body.binding_code
     );
-    if (t.error) {
-      const i = l.fromOAuthError(
-        t.error,
-        t.error_description ?? "Error completing MFA"
+    if (i.error) {
+      const t = l.fromOAuthError(
+        i.error,
+        i.error_description ?? "Error completing MFA"
       );
       return d.logger.warn(c({
         msg: "Error completing MFA",
-        cerr: i,
+        cerr: t,
         user: (n = s.user) == null ? void 0 : n.user,
         hashedMfaToken: F.hash(s.body.mfa_token)
-      })), d.logger.debug(c({ err: i })), o ? await this.errorFn(
+      })), d.logger.debug(c({ err: t })), o ? await this.errorFn(
         this.server,
         s,
         r,
-        i
+        t
       ) : r.view(this.mfaOobPage, {
         user: s.user,
         scope: s.body.scope,
@@ -6667,70 +6666,70 @@ class we extends Oe {
         name: s.body.name,
         challenge_tpye: s.body.challenge_type,
         mfa_token: s.body.mfa_token,
-        errorMessage: i.message,
-        errorCode: i.code,
-        errorCodeName: i.codeName,
+        errorMessage: t.message,
+        errorCode: t.code,
+        errorCodeName: t.codeName,
         csrfToken: s.csrfToken
       });
     }
-    return await this.receiveTokenFn(t, this, s, r) ?? r;
+    return await this.receiveTokenFn(i, this, s, r) ?? r;
   }
   async deviceCodePost(o, s, r) {
-    var t;
+    var i;
     if (this.server.sessionAdapter) {
-      const { error: n, reply: i } = await this.server.errorIfCsrfInvalid(
+      const { error: n, reply: t } = await this.server.errorIfCsrfInvalid(
         s,
         r,
         this.errorFn
       );
-      if (n) return i;
+      if (n) return t;
     }
     try {
       if (!s.csrfToken)
         throw new l(g.Unauthorized, "CSRF token missing or invalid");
       let n = this.authServerBaseUrl;
       n.endsWith("/") || (n += "/"), n += this.deviceAuthorizationUrl;
-      const i = await this.startDeviceCodeFlow(n, s.body.scope);
-      if (i.error) {
-        const h = l.fromOAuthError(i.error, i.error_description), f = {
+      const t = await this.startDeviceCodeFlow(n, s.body.scope);
+      if (t.error) {
+        const h = l.fromOAuthError(t.error, t.error_description), f = {
           user: s.user,
           scope: s.body.scope,
           errorMessage: h.message,
           errorCode: h.code,
           errorCodeName: h.codeName,
           csrfToken: s.csrfToken,
-          error: i.error,
-          error_description: i.error_description
+          error: t.error,
+          error_description: t.error_description
         };
-        return o ? r.header(..._).status(h.httpStatus).send(i) : r.view(this.deviceCodeFlowPage, f);
+        return o ? r.header(..._).status(h.httpStatus).send(t) : r.view(this.deviceCodeFlowPage, f);
       }
       let a;
-      return i.verification_uri_complete && await Re.toDataURL(i.verification_uri_complete).then((h) => {
+      return t.verification_uri_complete && await Re.toDataURL(t.verification_uri_complete).then((h) => {
         a = h;
       }).catch((h) => {
         d.logger.debug(c({ err: h })), d.logger.warn(c({ msg: "Couldn't generate verification URL QR Code" }));
-      }), o ? r.header(..._).send(i) : r.view(
+      }), o ? r.header(..._).send(t) : r.view(
         this.deviceCodeFlowPage,
         {
           user: s.user,
           scope: s.body.scope,
           verification_uri_qrdata: a,
-          ...i
+          ...t
         }
       );
     } catch (n) {
-      const i = l.asCrossauthError(n);
+      const t = l.asCrossauthError(n);
       d.logger.error(c({
         msg: "Error receiving token",
-        cerr: i,
-        user: (t = s.user) == null ? void 0 : t.user
+        cerr: t,
+        user: (i = s.user) == null ? void 0 : i.user
       })), d.logger.debug(c({ err: n }));
       const a = {
-        errorMessage: i.message,
-        errorCode: i.code,
-        errorCodeName: i.codeName
+        errorMessage: t.message,
+        errorCode: t.code,
+        errorCodeName: t.codeName
       };
-      return o ? r.header(..._).status(i.httpStatus).send(a) : r.view(this.deviceCodeFlowPage, {
+      return o ? r.header(..._).status(t.httpStatus).send(a) : r.view(this.deviceCodeFlowPage, {
         user: s.user,
         csrfToken: s.csrfToken,
         scope: s.body.scope,
@@ -6739,7 +6738,7 @@ class we extends Oe {
     }
   }
   async deviceCodePoll(o, s, r) {
-    var t;
+    var i;
     try {
       const n = await this.pollDeviceCodeFlow(s.body.device_code);
       return n.error ? r.header(..._).send(n) : await this.receiveTokenFn(
@@ -6749,28 +6748,28 @@ class we extends Oe {
         o ? void 0 : r
       );
     } catch (n) {
-      const i = l.asCrossauthError(n);
+      const t = l.asCrossauthError(n);
       return d.logger.error(c({
         msg: "Error receiving token",
-        cerr: i,
-        user: (t = s.user) == null ? void 0 : t.user
+        cerr: t,
+        user: (i = s.user) == null ? void 0 : i.user
       })), d.logger.debug(c({ err: n })), await this.errorFn(
         this.server,
         s,
         r,
-        i
+        t
       );
     }
   }
-  async refresh(o, s, r, t, n, i) {
-    if (!i || !n)
+  async refresh(o, s, r, i, n, t) {
+    if (!t || !n)
       return r ? void 0 : await this.receiveTokenFn(
         {},
         this,
         o,
         r ? void 0 : s
       );
-    if (!t || i <= Date.now())
+    if (!i || t <= Date.now())
       try {
         const a = await this.refreshTokenFlow(n);
         if (!a.error && !a.access_token && (a.error = "server_error", a.error_description = "Unexpectedly did not receive error or access token"), !a.error) {
@@ -6822,7 +6821,7 @@ class we extends Oe {
         };
       }
   }
-  async refreshTokens(o, s, r, t) {
+  async refreshTokens(o, s, r, i) {
     if (!o.csrfToken)
       return s.header(..._).status(401).send({ ok: !1, msg: "No csrf token given" });
     if (!this.server.sessionAdapter) throw new l(
@@ -6846,20 +6845,20 @@ class we extends Oe {
         );
       }
     }
-    const i = await this.refresh(
+    const t = await this.refresh(
       o,
       s,
       r,
-      t,
+      i,
       n.refresh_token,
       //onlyIfExpired ? oauthData.expires_at : undefined
       n.expires_at
     );
     if (!r) {
-      if (i == null) return this.receiveTokenFn({}, this, o, s);
-      if (i != null) return i;
+      if (t == null) return this.receiveTokenFn({}, this, o, s);
+      if (t != null) return t;
     }
-    return s.header(..._).status(200).send({ ok: !0, expires_at: i == null ? void 0 : i.expires_at });
+    return s.header(..._).status(200).send({ ok: !0, expires_at: t == null ? void 0 : t.expires_at });
   }
   async deleteTokens(o) {
     if (!this.server.sessionAdapter) throw new l(
@@ -6878,14 +6877,14 @@ class we extends Oe {
     await this.server.sessionAdapter.deleteSessionData(o, this.sessionDataName);
   }
   async storeSessionData(o, s, r) {
-    var t;
+    var i;
     if (this.server.sessionServer) {
       let n = this.server.sessionServer.getSessionCookieValue(s);
       !n && r ? n = await this.server.createAnonymousSession(
         s,
         r,
         { [this.sessionDataName]: o }
-      ) : await ((t = this.server.sessionAdapter) == null ? void 0 : t.updateSessionData(s, this.sessionDataName, o));
+      ) : await ((i = this.server.sessionAdapter) == null ? void 0 : i.updateSessionData(s, this.sessionDataName, o));
     } else {
       if (!this.server.sessionAdapter) throw new l(
         g.Configuration,
@@ -6912,65 +6911,65 @@ class es extends Ie {
     u(this, "tokenLocations", ["header"]);
     u(this, "sessionAdapter");
     if (C("errorBody", k.Json, this, r, "OAUTH_RESSERVER_ACCESS_DENIED_BODY"), C("tokenLocations", k.JsonArray, this, r, "OAUTH_TOKEN_LOCATIONS"), C("sessionDataName", k.String, this, r, "OAUTH_SESSION_DATA_NAME"), this.userStorage = r.userStorage, this.sessionAdapter = r.sessionAdapter, r.protectedEndpoints) {
-      const t = /^[!#\$%&'\(\)\*\+,\.\/a-zA-Z\[\]\^_`-]+/;
-      for (const [n, i] of Object.entries(r.protectedEndpoints)) {
+      const i = /^[!#\$%&'\(\)\*\+,\.\/a-zA-Z\[\]\^_`-]+/;
+      for (const [n, t] of Object.entries(r.protectedEndpoints)) {
         if (!n.startsWith("/"))
           throw new l(g.Configuration, "protected endpoints must be absolute paths without the protocol and hostname");
-        i.scope && i.scope.forEach((a) => {
-          if (!t.test(a)) throw new l(g.Configuration, "Illegal characters in scope " + a);
+        t.scope && t.scope.forEach((a) => {
+          if (!i.test(a)) throw new l(g.Configuration, "Illegal characters in scope " + a);
         });
       }
       this.protectedEndpoints = { ...r.protectedEndpoints };
       for (let n in r.protectedEndpoints) {
-        let i = this.protectedEndpoints[n];
-        i.suburls == !0 && (n.endsWith("/") || (n += "/", this.protectedEndpoints[n] = i), this.protectedEndpointPrefixes.push(n));
+        let t = this.protectedEndpoints[n];
+        t.suburls == !0 && (n.endsWith("/") || (n += "/", this.protectedEndpoints[n] = t), this.protectedEndpointPrefixes.push(n));
       }
     }
-    r.protectedEndpoints && o.addHook("preHandler", async (t, n) => {
+    r.protectedEndpoints && o.addHook("preHandler", async (i, n) => {
       var p, v;
-      const i = t.url.split("?", 2)[0];
+      const t = i.url.split("?", 2)[0];
       let a = !1, h = "";
-      if (i in this.protectedEndpoints)
-        a = !0, h = i;
+      if (t in this.protectedEndpoints)
+        a = !0, h = t;
       else
         for (let m of this.protectedEndpointPrefixes)
-          i.startsWith(m) && (a = !0), h = m;
+          t.startsWith(m) && (a = !0), h = m;
       if (!a) return;
-      const f = await this.authorized(t);
-      if (!(t.user && t.authType == "cookie" && this.protectedEndpoints[h].acceptSessionAuthorization != !0)) {
+      const f = await this.authorized(i);
+      if (!(i.user && i.authType == "cookie" && this.protectedEndpoints[h].acceptSessionAuthorization != !0)) {
         if (!f) {
-          t.authError = "access_denied", t.authErrorDescription = "No access token";
-          const m = this.authenticateHeader(t);
+          i.authError = "access_denied", i.authErrorDescription = "No access token";
+          const m = this.authenticateHeader(i);
           return n.header("WWW-Authenticate", m).status(401).send(this.errorBody);
         }
         if (!f.authorized) {
-          const m = this.authenticateHeader(t);
+          const m = this.authenticateHeader(i);
           return n.header("WWW-Authenticate", m).status(401).send(this.errorBody);
         }
       }
       if (f) {
-        if (t.accessTokenPayload = f.tokenPayload, t.user = f.user, (p = f.tokenPayload) != null && p.scope)
+        if (i.accessTokenPayload = f.tokenPayload, i.user = f.user, (p = f.tokenPayload) != null && p.scope)
           if (Array.isArray(f.tokenPayload.scope)) {
             let m = [];
             for (let w of f.tokenPayload.scope)
               typeof w == "string" && m.push(w);
-            t.scope = m;
-          } else typeof f.tokenPayload.scope == "string" && (t.scope = f.tokenPayload.scope.split(" "));
+            i.scope = m;
+          } else typeof f.tokenPayload.scope == "string" && (i.scope = f.tokenPayload.scope.split(" "));
         if (this.protectedEndpoints[h].scope) {
           for (let m of this.protectedEndpoints[h].scope ?? [])
-            if (!t.scope || !t.scope.includes(m) && this.protectedEndpoints[h].acceptSessionAuthorization != !0)
+            if (!i.scope || !i.scope.includes(m) && this.protectedEndpoints[h].acceptSessionAuthorization != !0)
               return d.logger.warn(c({
                 msg: "Access token does not have sufficient scope",
-                username: (v = t.user) == null ? void 0 : v.username,
-                url: t.url
-              })), t.scope = void 0, t.accessTokenPayload = void 0, t.user = void 0, t.authError = "access_denied", t.authErrorDescription = "Access token does not have sufficient scope", n.status(401).send(this.errorBody);
+                username: (v = i.user) == null ? void 0 : v.username,
+                url: i.url
+              })), i.scope = void 0, i.accessTokenPayload = void 0, i.user = void 0, i.authError = "access_denied", i.authErrorDescription = "Access token does not have sufficient scope", n.status(401).send(this.errorBody);
         }
-        if (t.authType = "oauth", t.authError = f == null ? void 0 : f.error, (f == null ? void 0 : f.error) == "access_denied") {
-          const m = this.authenticateHeader(t);
+        if (i.authType = "oauth", i.authError = f == null ? void 0 : f.error, (f == null ? void 0 : f.error) == "access_denied") {
+          const m = this.authenticateHeader(i);
           return n.header("WWW-Authenticate", m).status(401).send(this.errorBody);
         } else if (f != null && f.error)
           return n.status(500).send(this.errorBody);
-        t.authErrorDescription = f == null ? void 0 : f.error_description, d.logger.debug(c({ msg: "Resource server url", url: t.url, authorized: t.accessTokenPayload != null }));
+        i.authErrorDescription = f == null ? void 0 : f.error_description, d.logger.debug(c({ msg: "Resource server url", url: i.url, authorized: i.accessTokenPayload != null }));
       }
     });
   }
@@ -6996,8 +6995,8 @@ class es extends Ie {
   async authorized(o) {
     try {
       let s;
-      for (let t of this.tokenLocations)
-        if (t == "header") {
+      for (let i of this.tokenLocations)
+        if (i == "header") {
           const n = await this.tokenFromHeader(o);
           if (n) {
             s = n;
@@ -7013,8 +7012,8 @@ class es extends Ie {
       let r;
       if (s) {
         if (s.sub && this.userStorage) {
-          const t = await this.userStorage.getUserByUsername(s.sub);
-          t && (r = t.user), o.user = r;
+          const i = await this.userStorage.getUserByUsername(s.sub);
+          i && (r = i.user), o.user = r;
         } else s.sub && (o.user = {
           id: s.userid ?? s.sub,
           username: s.sub,
@@ -7126,9 +7125,9 @@ const K = class K {
     sessionAdapter: o,
     apiKey: s,
     oAuthAuthServer: r,
-    oAuthClient: t,
+    oAuthClient: i,
     oAuthClients: n,
-    oAuthResServer: i
+    oAuthResServer: t
   }, a = {}) {
     u(this, "views", "views");
     /** The Fastify app, which was either passed in the constructor or
@@ -7208,12 +7207,12 @@ const K = class K {
         { ...f, ...a, ...r.options }
       );
     }
-    if (t && this.oAuthClients)
+    if (i && this.oAuthClients)
       throw new l(g.Configuration, "Do not use both oAuthClient and oAuthClients");
-    if (t && (this.oAuthClient = new we(
+    if (i && (this.oAuthClient = new we(
       this,
-      t.authServerBaseUrl,
-      { ...a, ...t.options }
+      i.authServerBaseUrl,
+      { ...a, ...i.options }
     )), n) {
       this.oAuthClients = [];
       for (let f of n)
@@ -7225,10 +7224,10 @@ const K = class K {
           )
         );
     }
-    i && (this.audience = "", C("audience", k.String, this, a, "OAUTH_AUDIENCE", !0), this.oAuthResServer = new es(
+    t && (this.audience = "", C("audience", k.String, this, a, "OAUTH_AUDIENCE", !0), this.oAuthResServer = new es(
       this.app,
       [new Me(this.audience, a)],
-      { sessionAdapter: this.sessionAdapter, ...i.options, ...a }
+      { sessionAdapter: this.sessionAdapter, ...t.options, ...a }
     ));
   }
   /**
@@ -7260,7 +7259,7 @@ const K = class K {
    * from calling `errorFn`.
    */
   async errorIfCsrfInvalid(e, o, s) {
-    var r, t;
+    var r, i;
     try {
       if (!e.csrfToken) throw new l(g.InvalidCsrf);
       return { error: !1, reply: o };
@@ -7271,23 +7270,23 @@ const K = class K {
       }));
       try {
         if (s) {
-          const i = l.asCrossauthError(n);
-          return { error: !0, reply: await s(this, e, o, i) };
+          const t = l.asCrossauthError(n);
+          return { error: !0, reply: await s(this, e, o, t) };
         } else if ((r = this.sessionServer) != null && r.errorPage) {
-          const i = new l(g.InvalidCsrf, "CSRF Token not provided");
+          const t = new l(g.InvalidCsrf, "CSRF Token not provided");
           return { error: !0, reply: o.status(401).view(
-            ((t = this.sessionServer) == null ? void 0 : t.errorPage) ?? "",
+            ((i = this.sessionServer) == null ? void 0 : i.errorPage) ?? "",
             {
-              errorMessage: i.message,
-              errorMessages: i.messages,
-              status: i.httpStatus,
+              errorMessage: t.message,
+              errorMessages: t.messages,
+              status: t.httpStatus,
               errorCode: g.InvalidCsrf,
               errorCodeName: g[g.InvalidCsrf]
             }
           ) };
         }
-      } catch (i) {
-        return d.logger.error(c({ err: i })), { error: !0, reply: o.status(401).send(z) };
+      } catch (t) {
+        return d.logger.error(c({ err: t })), { error: !0, reply: o.status(401).send(z) };
       }
       return { error: !0, reply: o.status(401).send(z) };
     }
@@ -7305,7 +7304,7 @@ const K = class K {
    * from calling `errorFn`.
    */
   async errorIfNotLoggedIn(e, o, s) {
-    var r, t, n;
+    var r, i, n;
     if (!e.user) {
       d.logger.warn(c({
         msg: "Attempt to access url without csrf token",
@@ -7313,14 +7312,14 @@ const K = class K {
       }));
       try {
         if (s) {
-          const i = new l(
+          const t = new l(
             g.Unauthorized,
             "User is not logged in"
           );
-          return await s(this, e, o, i);
+          return await s(this, e, o, t);
         } else if ((r = this.sessionServer) != null && r.errorPage)
           return o.status(401).view(
-            ((t = this.sessionServer) == null ? void 0 : t.errorPage) ?? "",
+            ((i = this.sessionServer) == null ? void 0 : i.errorPage) ?? "",
             {
               errorMessage: "User is not logged in",
               status: 401,
@@ -7328,9 +7327,9 @@ const K = class K {
               codeName: g[g.Unauthorized]
             }
           );
-      } catch (i) {
-        return d.logger.debug(c({ err: i })), d.logger.error(c({
-          cerr: i,
+      } catch (t) {
+        return d.logger.debug(c({ err: t })), d.logger.error(c({
+          cerr: t,
           hashedSessionCookie: (n = this.sessionServer) == null ? void 0 : n.getHashOfSessionId(e)
         })), o.status(401).send(z);
       }
@@ -7357,8 +7356,8 @@ const K = class K {
    * @returns the reply from rendering the error page.
    * 
    */
-  static sendPageError(e, o, s, r, t) {
-    if (!r || !t)
+  static sendPageError(e, o, s, r, i) {
+    if (!r || !i)
       return d.logger.warn(c({
         msg: r,
         errorCode: g.UnknownError,
@@ -7372,15 +7371,15 @@ const K = class K {
         }
       ) : e.status(o).send(o == 401 ? z : G);
     try {
-      let n = 0, i = "UnknownError";
-      if ("isCrossAuthError" in t) {
-        const a = l.asCrossauthError(t);
-        n = a.code, i = a.name, r || (r = t.message);
+      let n = 0, t = "UnknownError";
+      if ("isCrossAuthError" in i) {
+        const a = l.asCrossauthError(i);
+        n = a.code, t = a.name, r || (r = i.message);
       }
-      return r || (o == 401 ? (r = "You are not authorized to access this page", n = g.Unauthorized, i = g[n]) : o == 403 ? (r = "You do not have permission to access this page", n = g.Forbidden, i = g[n]) : r = "An unknwon error has occurred"), d.logger.warn(c({
+      return r || (o == 401 ? (r = "You are not authorized to access this page", n = g.Unauthorized, t = g[n]) : o == 403 ? (r = "You do not have permission to access this page", n = g.Forbidden, t = g[n]) : r = "An unknwon error has occurred"), d.logger.warn(c({
         msg: r,
         errorCode: n,
-        errorCodeName: i,
+        errorCodeName: t,
         httpStatus: o
       })), s ? e.status(o).view(
         s,
@@ -7388,7 +7387,7 @@ const K = class K {
           status: o,
           errorMessage: r,
           errorCode: n,
-          errorCodeName: i
+          errorCodeName: t
         }
       ) : e.status(o).send(o == 401 ? z : G);
     } catch (n) {