@crossauth/fastify 0.0.7 → 0.0.9

package/dist/index.js

@@ -7,11 +7,11 @@ import be from "@fastify/formbody";
 import ye from "@fastify/cors";
 import xe from "@fastify/cookie";
 import ue from "nunjucks";
-import { setParameter as S, ParamType as C, Crypto as A, TokenEmailer as _e, OAuthClientManager as G, SessionManager as Ae, ApiKeyManager as Y, KeyStorage as Ne, OAuthAuthorizationServer as Fe, DoubleSubmitCsrfToken as Ue, OAuthClientBackend as Oe, OAuthResourceServer as Ie, OAuthTokenConsumer as Me } from "@crossauth/backend";
+import { setParameter as S, ParamType as C, Crypto as A, TokenEmailer as _e, OAuthClientManager as G, SessionManager as Ae, ApiKeyManager as Y, KeyStorage as Fe, OAuthAuthorizationServer as Ne, DoubleSubmitCsrfToken as Ue, OAuthClientBackend as Oe, OAuthResourceServer as Ie, OAuthTokenConsumer as Me } from "@crossauth/backend";
 import { CrossauthLogger as d, j as c, CrossauthError as l, ErrorCode as g, UserState as U, OAuthFlows as E } from "@crossauth/common";
 import { jwtDecode as W } from "jwt-decode";
 import Re from "qrcode";
-const F = ["Content-Type", "application/json; charset=utf-8"];
+const N = ["Content-Type", "application/json; charset=utf-8"];
 class De {
   /**
    * Constructor.
@@ -144,7 +144,7 @@ class De {
           return await this.updateUser(
             e,
             o,
-            (i, n, t) => i.header(...F).send({
+            (i, n, t) => i.header(...N).send({
               ok: !0,
               emailVerificationRequired: t
             })
@@ -157,7 +157,7 @@ class De {
             errorCodeName: n.codeName,
             errorCode: n.code
           })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
-            t.status(this.sessionServer.errorStatus(i)).header(...F).send({
+            t.status(this.sessionServer.errorStatus(i)).header(...N).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -280,7 +280,7 @@ class De {
           return await this.changeFactor2(
             e,
             o,
-            (i, n, t) => i.header(...F).send({
+            (i, n, t) => i.header(...N).send({
               ok: !0,
               ...n.userData
             })
@@ -292,7 +292,7 @@ class De {
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => t.status(this.sessionServer.errorStatus(i)).header(...F).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => t.status(this.sessionServer.errorStatus(i)).header(...N).send({
             ok: !1,
             errorMessage: a.message,
             errorMessages: a.messages,
@@ -397,7 +397,7 @@ class De {
           return await this.changePassword(
             e,
             o,
-            (i, n) => i.header(...F).send({
+            (i, n) => i.header(...N).send({
               ok: !0
             })
           );
@@ -408,7 +408,7 @@ class De {
             user: (r = e.user) == null ? void 0 : r.username,
             errorCodeName: n.codeName,
             errorCode: n.code
-          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => t.status(this.sessionServer.errorStatus(i)).header(...F).send({
+          })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => t.status(this.sessionServer.errorStatus(i)).header(...N).send({
             ok: !1,
             errorMessage: a.message,
             errorMessages: a.messages,
@@ -542,7 +542,7 @@ class De {
           return await this.reconfigureFactor2(
             o,
             s,
-            (i, n, t) => i.header(...F).send({
+            (i, n, t) => i.header(...N).send({
               ok: !0,
               ...n
             })
@@ -555,7 +555,7 @@ class De {
             errorCodeName: n.codeName,
             errorCode: n.code
           })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, o, s, (t, a) => {
-            t.status(this.sessionServer.errorStatus(i)).header(...F).send({
+            t.status(this.sessionServer.errorStatus(i)).header(...N).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -584,7 +584,7 @@ class De {
                 ok: !0,
                 user: n
               };
-              return this.sessionServer.isSessionUser(o) || (t.emailVerificationNeeded = this.enableEmailVerification), i.header(...F).send(t);
+              return this.sessionServer.isSessionUser(o) || (t.emailVerificationNeeded = this.enableEmailVerification), i.header(...N).send(t);
             }
           );
         } catch (i) {
@@ -595,7 +595,7 @@ class De {
             errorCodeName: n.codeName,
             errorCode: n.code
           })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, o, s, (t, a) => {
-            t.status(this.sessionServer.errorStatus(i)).header(...F).send({
+            t.status(this.sessionServer.errorStatus(i)).header(...N).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -686,7 +686,7 @@ class De {
           return await this.requestPasswordReset(
             e,
             o,
-            (s, r) => s.header(...F).send({
+            (s, r) => s.header(...N).send({
               ok: !0
             })
           );
@@ -698,7 +698,7 @@ class De {
             errorCodeName: r.codeName,
             errorCode: r.code
           })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (i, n) => {
-            i.status(this.sessionServer.errorStatus(s)).header(...F).send({
+            i.status(this.sessionServer.errorStatus(s)).header(...N).send({
               ok: !1,
               errorMessage: n.message,
               errorMessages: n.messages,
@@ -794,7 +794,7 @@ class De {
           return await this.resetPassword(
             e,
             o,
-            (s, r) => s.header(...F).send({
+            (s, r) => s.header(...N).send({
               ok: !0
             })
           );
@@ -806,7 +806,7 @@ class De {
             errorCodeName: r.codeName,
             errorCode: r.code
           })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (i, n) => {
-            i.status(this.sessionServer.errorStatus(s)).header(...F).send({
+            i.status(this.sessionServer.errorStatus(s)).header(...N).send({
               ok: !1,
               errorMessage: n.message,
               errorMessages: n.messages,
@@ -875,7 +875,7 @@ class De {
           return await this.verifyEmail(
             e,
             o,
-            (s, r) => s.header(...F).send({
+            (s, r) => s.header(...N).send({
               ok: !0,
               user: r
             })
@@ -888,7 +888,7 @@ class De {
             errorCodeName: r.codeName,
             errorCode: r.code
           })), d.logger.debug(c({ err: s })), this.sessionServer.handleError(s, e, o, (i, n) => {
-            i.status(this.sessionServer.errorStatus(s)).header(...F).send({
+            i.status(this.sessionServer.errorStatus(s)).header(...N).send({
               ok: !1,
               errorMessage: n.message,
               errorMessages: n.messages,
@@ -1008,14 +1008,14 @@ class De {
           ip: e.ip,
           user: (s = e.user) == null ? void 0 : s.username
         })), !e.user)
-          return o.status(401).header(...F).send({ ok: !1 });
+          return o.status(401).header(...N).send({ ok: !1 });
         try {
           return await this.deleteUser(
             e,
             o,
             (i) => {
               var n;
-              return i.header(...F).send({
+              return i.header(...N).send({
                 ok: !0,
                 userid: (n = e.user) == null ? void 0 : n.id
               });
@@ -1029,7 +1029,7 @@ class De {
             errorCodeName: n.codeName,
             errorCode: n.code
           })), d.logger.debug(c({ err: i })), this.sessionServer.handleError(i, e, o, (t, a) => {
-            t.status(this.sessionServer.errorStatus(i)).header(...F).send({
+            t.status(this.sessionServer.errorStatus(i)).header(...N).send({
               ok: !1,
               errorMessage: a.message,
               errorMessages: a.messages,
@@ -1061,7 +1061,7 @@ class De {
     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);
+    return s(o, e.user, n.emailVerificationTokenSent);
   }
   async changeFactor2(e, o, s) {
     if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call changeFactor2 unless a user storage is provided");
@@ -1509,11 +1509,11 @@ class He {
             s,
             e,
             o,
-            (n, t, a) => {
-              const h = a ? "Please click on the link in your email to verify your email address." : "User's details have been updated";
-              return n.view(this.adminUpdateUserPage, {
+            (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,
-                message: h,
+                message: f,
                 urlPrefix: this.adminPrefix,
                 allowedFactor2: this.sessionServer.allowedFactor2Details()
               });
@@ -1957,7 +1957,7 @@ class He {
       //await this.sessionServer.sessionManager.updateUser(request.user, user,);
       await this.sessionServer.sessionManager.updateUser(e, e, !0)
     );
-    return r(s, o.user, h);
+    return r(s, o.user, h.emailVerificationTokenSent, h.passwordResetTokenSent);
   }
   async changePassword(e, o, s, r) {
     if (!this.sessionServer.userStorage) throw new l(g.Configuration, "Cannot call updateUser unless a user storage is provided");
@@ -3568,22 +3568,22 @@ class Ke {
               let M = {};
               for (let I in t.body)
                 T.includes(I) && (M[I] = t.body[I]);
-              let N;
+              let F;
               try {
                 await this.sessionManager.completeTwoFactorPageVisit(M, w);
               } catch (I) {
-                N = l.asCrossauthError(I), d.logger.debug(c({ err: I }));
+                F = l.asCrossauthError(I), d.logger.debug(c({ err: I }));
                 const O = l.asCrossauthError(I);
                 d.logger.error(c({
-                  msg: N.message,
+                  msg: F.message,
                   cerr: I,
                   user: t.body.username,
                   errorCode: O.code,
                   errorCodeName: O.codeName
                 }));
               }
-              if (t.body = m.pre2fa.body, N)
-                if (N.code == g.Expired) {
+              if (t.body = m.pre2fa.body, F)
+                if (F.code == g.Expired) {
                   d.logger.debug("Error - cancelling 2FA");
                   try {
                     await this.sessionManager.cancelTwoFactorPageVisit(w);
@@ -3592,18 +3592,18 @@ class Ke {
                   }
                   t.body = {
                     ...t.body,
-                    errorMessage: N.message,
-                    errorMessages: N.message,
-                    errorCode: "" + N.code,
-                    errorCodeName: g[N.code]
+                    errorMessage: F.message,
+                    errorMessages: F.message,
+                    errorCode: "" + F.code,
+                    errorCodeName: g[F.code]
                   };
                 } else
-                  return this.factor2ProtectedPageEndpoints.includes(t.url) ? a.redirect(this.prefix + "factor2?error=" + g[N.code]) : a.status(N.httpStatus).send(JSON.stringify({
+                  return this.factor2ProtectedPageEndpoints.includes(t.url) ? a.redirect(this.prefix + "factor2?error=" + g[F.code]) : a.status(F.httpStatus).send(JSON.stringify({
                     ok: !1,
-                    errorMessage: N.message,
-                    errorMessages: N.messages,
-                    errorCode: N.code,
-                    errorCodeName: g[N.code]
+                    errorMessage: F.message,
+                    errorMessages: F.messages,
+                    errorCode: F.code,
+                    errorCodeName: g[F.code]
                   }));
             } else
               return this.validateCsrfToken(t), d.logger.debug("Starting 2FA"), this.sessionManager.initiateTwoFactorPageVisit(t.user, w, t.body, t.url.replace(/\?.*$/, "")), this.factor2ProtectedPageEndpoints.includes(t.url) ? a.redirect(this.prefix + "factor2") : a.send(JSON.stringify({
@@ -3692,22 +3692,19 @@ class Ke {
                   }));
                 }
               } else if (i.state == U.passwordResetNeeded || i.state == U.passwordAndFactor2ResetNeeded) {
-                if (this.endpoints.includes("requestpasswordreset"))
-                  return d.logger.debug(c({ msg: "Password reset needed - sending redirect" })), r.redirect("/requestpasswordreset?required=true&next=" + encodeURIComponent("login?next=" + s));
-                {
-                  const n = new l(g.PasswordResetNeeded);
-                  return this.handleError(n, e, r, (t, a) => t.view(this.loginPage, {
-                    errorMessage: a.message,
-                    errorMessages: a.messages,
-                    errorCode: a.code,
-                    errorCodeName: g[a.code],
-                    next: s,
-                    persist: e.body.persist,
-                    username: e.body.username,
-                    csrfToken: e.csrfToken,
-                    urlPrefix: this.prefix
-                  }));
-                }
+                d.logger.debug(c({ msg: "Password reset needed - sending error" }));
+                const n = new l(g.PasswordResetNeeded);
+                return this.handleError(n, e, r, (t, a) => t.view(this.loginPage, {
+                  errorMessage: a.message,
+                  errorMessages: a.messages,
+                  errorCode: a.code,
+                  errorCodeName: g[a.code],
+                  next: s,
+                  persist: e.body.persist,
+                  username: e.body.username,
+                  csrfToken: e.csrfToken,
+                  urlPrefix: this.prefix
+                }));
               } else if (this.allowedFactor2.length > 0 && (i.state == U.factor2ResetNeeded || !this.allowedFactor2.includes(i.factor2 ? i.factor2 : "none"))) {
                 if (d.logger.debug(c({
                   msg: `Factor2 reset needed.  Factor2 is ${i.factor2}, state is ${i.state}, allowed factor2 is [${this.allowedFactor2.join(", ")}]`,
@@ -4752,7 +4749,7 @@ class Ye {
               msg: "Valid API key",
               hahedApiKey: Y.hashSignedApiKeyValue(t.value)
             }));
-            const a = Ne.decodeData(t.data);
+            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)
@@ -4807,7 +4804,7 @@ class $e {
     p(this, "refreshTokenCookieSameSite", "strict");
     p(this, "csrfTokens");
     p(this, "createGetCsrfTokenEndpoint", !1);
-    this.app = e, this.fastifyServer = o, this.clientStorage = s, this.authServer = new Fe(
+    this.app = e, this.fastifyServer = o, this.clientStorage = s, this.authServer = new Ne(
       this.clientStorage,
       r,
       i,
@@ -4906,8 +4903,8 @@ class $e {
           let m, P;
           const T = t.headers.authorization.split(" ");
           if (T.length == 2 && T[0].toLocaleLowerCase() == "basic") {
-            const N = A.base64Decode(T[1]).split(":", 2);
-            N.length == 2 && (m = N[0], P = N[1]);
+            const F = A.base64Decode(T[1]).split(":", 2);
+            F.length == 2 && (m = F[0], P = F[1]);
           }
           m == null || P == null ? d.logger.warn(c({
             msg: "Ignoring malform authenization header " + t.headers.authorization
@@ -6372,13 +6369,13 @@ class we extends Oe {
           method: f[w],
           url: this.prefix + this.bffEndpointName + h,
           handler: async (m, P) => {
-            var N, I;
+            var F, I;
             d.logger.info(c({
               msg: "Page visit",
               method: m.method,
               url: m.url,
               ip: m.ip,
-              user: (N = m.user) == null ? void 0 : N.username
+              user: (F = m.user) == null ? void 0 : F.username
             }));
             const T = m.url.substring(this.prefix.length + this.bffEndpointName.length);
             d.logger.debug(c({ msg: "Resource server URL " + T }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@crossauth/fastify",
   "private": false,
-  "version": "0.0.7",
+  "version": "0.0.9",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -59,8 +59,8 @@
     "prisma": "^5.9.1",
     "qrcode": "^1.5.3",
     "sonic-boom": "^3.7.0",
-    "@crossauth/backend": "^0.0.7",
-    "@crossauth/common": "^0.0.7"
+    "@crossauth/backend": "^0.0.9",
+    "@crossauth/common": "^0.0.9"
   },
   "scripts": {
     "dev": "vite",