@opengis/fastify-table 2.0.84 → 2.0.85

package/dist/server/plugins/auth/funcs/authorizeUser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorizeUser.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/authorizeUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA4BtD,wBAA8B,aAAa,CACzC,IAAI,EAAE,YAAY,EAClB,GAAG,EAAE,GAAG,EACR,QAAQ,SAAe,EACvB,MAAM,CAAC,EAAE,MAAM,gBA+HhB"}
+{"version":3,"file":"authorizeUser.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/authorizeUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA4BtD,wBAA8B,aAAa,CACzC,IAAI,EAAE,YAAY,EAClB,GAAG,EAAE,GAAG,EACR,QAAQ,SAAe,EACvB,MAAM,CAAC,EAAE,MAAM,gBA8HhB"}

package/dist/server/plugins/auth/funcs/authorizeUser.js

@@ -57,7 +57,7 @@ export default async function authorizeUser(user, req, authType = "creds-user",
         {};
     await req.session?.save?.();
     const redirectUrl = req.headers?.referer?.match?.(/[?&]redirect=([^&]+)/)?.[1] || "/";
-    const twofaEnabled = config.auth?.["2factor"] && user?.twofa && user.uid && pg;
+    const twofaEnabled = user?.twofa && user.uid && pg;
     const registered = false; // ? check by created/updated date?
     if (req.method === "POST" &&
         (!twofaEnabled || req.session?.secondFactorPassed)) {
@@ -91,7 +91,7 @@ export default async function authorizeUser(user, req, authType = "creds-user",
     }
     // by default, disable 2factor for id.gov.ua auth
     const check = authType === "govid" ? config.auth?.["2factor"]?.govid : true;
-    if (config.auth?.["2factor"] && user?.twofa && check) {
+    if (user?.twofa && check) {
         return ("/2factor?redirect=" +
             (href ||
                 config.auth?.redirectAfter ||

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

@@ -56,7 +56,7 @@ export async function onRequest(req, reply) {
         !config.auth?.disableRedirect &&
         !req.url.startsWith(prefix) &&
         !req.url.startsWith("/api") &&
-        !req.url.startsWith(loginPageUrl) &&
+        !req.url.includes(loginPageUrl) &&
         !req.url.includes(".") &&
         !req.url.includes("@")) {
         return reply.redirect(`${loginPageUrl}` + `?redirect=${req.url}`);

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;AAiBvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAkEzE"}
+{"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;AAiBvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAuEzE"}

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

@@ -28,10 +28,10 @@ const dirname = path.dirname(fileURLToPath(import.meta.url));
  */
 export default async function verifyFunction(req, reply) {
     const { pg = pgClients.client, session = {}, body = {} } = req;
-    const { uid, email } = session?.passport?.user || {};
+    const { uid, twofa, email } = session?.passport?.user || {};
     // const { nocache = config.local } = query;
     const { code } = body;
-    if (!config?.auth?.["2factor"]) {
+    if (!twofa) {
         return reply.status(400).send("2fa not enabled");
     }
     if (!config.pg) {
@@ -55,7 +55,7 @@ export default async function verifyFunction(req, reply) {
                 ?.then((el) => el.rows?.[0] || {});
             const customPt = await getTemplate("pt", template);
             const pt = customPt ||
-                (await readFile(path.join(dirname, `../../../../../templates/pt/${template}.html`), "utf8"));
+                (await readFile(path.join(dirname, `../../../../../templates/pt/${template}.hbs`), "utf8"));
             const html = await handlebars.compile(pt)({
                 recoveryCodes,
                 domain: `${req.protocol || "https"}://${req.hostname}`,
@@ -69,9 +69,15 @@ export default async function verifyFunction(req, reply) {
             });
         }
         const redirectUrl = req.headers?.referer?.match?.(/[?&]redirect=([^&]+)/)?.[1] || "/";
-        return reply.redirect(redirectUrl.startsWith("/") ? redirectUrl : "/");
+        // return reply.redirect(redirectUrl.startsWith("/") ? redirectUrl : "/");
+        return reply
+            .status(200)
+            .send({ redirectUrl: redirectUrl.startsWith("/") ? redirectUrl : "/" });
     }
     catch (err) {
+        if (err.message === "Невірний код") {
+            return reply.status(401).send({ error: err.message, code: 401 });
+        }
         return reply.status(500).send(err.toString());
     }
 }

package/package.json

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