@opengis/fastify-table 2.4.13 → 2.4.15

package/dist/server/plugins/logger/errorStatus.js

@@ -7,13 +7,13 @@ function errorStatus(error) {
         return 422;
     }
     if (error.routine === "exec_stmt_raise" && error.file === "pl_exec.c") {
-        return 601;
+        return 422;
     }
     if (error.routine === "ExecConstraints") {
-        return 602;
+        return 422;
     }
     if (error.type === "DatabaseError") {
-        return 600;
+        return 500;
     }
     if (error.statusCode) {
         return error.statusCode;

package/dist/server/routes/auth/controllers/2factor/verify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA2BvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAyDzE"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA2BvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA6DzE"}

package/dist/server/routes/auth/controllers/2factor/verify.js

@@ -31,9 +31,9 @@ const defaultPt = existsSync(path.join(dirname, `../../../../templates/pt/${temp
  * @returns {String} redirect Шлях до переадресації
  */
 export default async function verifyFunction(req, reply) {
-    const { pg = pgClients.client, user = {}, body = {} } = req;
+    const code = req.method === "POST" ? req.body?.code : req.query?.code;
+    const { pg = pgClients.client, user = {} } = req;
     const { uid, twofa, email } = user || {};
-    const { code } = body;
     if (!twofa) {
         throw BadRequestError("2fa not enabled");
     }
@@ -41,7 +41,7 @@ export default async function verifyFunction(req, reply) {
         throw Error("empty pg");
     }
     if (!code) {
-        throw BadRequestError("not enough body params: code");
+        throw BadRequestError(`not enough ${req.method === "POST" ? "body" : "query"} params: code`);
     }
     const { enabled } = await verify({ uid, code, pg });
     await enableSecret({ pg, uid });
@@ -67,8 +67,9 @@ export default async function verifyFunction(req, reply) {
         });
     }
     const redirectUrl = req.headers?.referer?.match?.(/[?&]redirect=([^&]+)/)?.[1] || "/";
-    // return reply.redirect(redirectUrl.startsWith("/") ? redirectUrl : "/");
-    return reply
-        .status(200)
-        .send({ redirectUrl: redirectUrl.startsWith("/") ? redirectUrl : "/" });
+    const safeRedirectUrl = redirectUrl.startsWith("/") ? redirectUrl : "/";
+    if (req.method === "POST") {
+        return reply.status(200).send({ redirectUrl: safeRedirectUrl });
+    }
+    return reply.redirect(safeRedirectUrl);
 }

package/dist/server/routes/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/auth/index.ts"],"names":[],"mappings":"AA+CA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QA4FtC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/auth/index.ts"],"names":[],"mappings":"AA+CA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QA+FtC;AAED,eAAe,MAAM,CAAC"}

package/dist/server/routes/auth/index.js

@@ -56,6 +56,9 @@ function plugin(app, opt = {}) {
     }
     // 2factor
     if (!app.hasRoute({ method: "GET", url: "/2factor/verify" })) {
+        app.get("/2factor/verify", params, verify);
+    }
+    if (!app.hasRoute({ method: "POST", url: "/2factor/verify" })) {
         app.post("/2factor/verify", params, verify);
     }
     if (!app.hasRoute({ method: "POST", url: "/2factor/recovery" })) {

package/dist/server/templates/page/2factor.html

@@ -65,9 +65,9 @@
                   Enter the 2-step verification code from your authenticator app.
                 </p>
 
-                <form action="/2factor/verify" method="post">
+                <form action="/2factor/verify" method="get">
                   <div class="space-y-5">
-                  <div>    
+                  <div>
                   <input type="text" name="code"  class="form-input hidden">
                    <div class="space-y-5">
                    <div class="my-3 flex gap-x-2" data-hs-pin-input>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.4.13",
+  "version": "2.4.15",
   "type": "module",
   "description": "core-plugins",
   "keywords": [