@opengis/fastify-table 2.5.11 → 2.5.14

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBAsIxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAmCvC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBAoIxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAmCvC;AAED,eAAe,MAAM,CAAC"}

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

@@ -5,7 +5,7 @@ import { Authenticator } from "@fastify/passport";
 import RedisStore from "fastify-session-redis-store";
 import config from "../../../config.js";
 import getRedis from "../redis/funcs/getRedis.js";
-import { ForbiddenError, UnauthorizedError } from "../../../errors.js";
+import { ForbiddenError } from "../../../errors.js";
 const fastifyPassport = new Authenticator();
 const { prefix = "/api" } = config;
 export async function onRequest(req, reply) {
@@ -68,15 +68,13 @@ export async function onRequest(req, reply) {
         !config.auth?.disable &&
         isAdmin &&
         !isPublic &&
+        !isApi &&
         !config.auth?.disableRedirect &&
         !req.url.startsWith(prefix) &&
         !req.url.startsWith("/api") &&
         !req.url.includes(loginPageUrl) &&
         !req.url.includes(".") &&
         !req.url.includes("@")) {
-        if (isApi) {
-            throw UnauthorizedError("unauthorized");
-        }
         return reply.redirect(`${loginPageUrl}` + `?redirect=${req.url}`);
     }
     // by default, disable 2factor for id.gov.ua auth

package/dist/server/plugins/crud/funcs/validateData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateData.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/validateData.ts"],"names":[],"mappings":"AAuIA,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,IAAS,EACT,MAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,OAMA"}
+{"version":3,"file":"validateData.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/validateData.ts"],"names":[],"mappings":"AAmJA,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,IAAS,EACT,MAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,OAMA"}

package/dist/server/plugins/crud/funcs/validateData.js

@@ -9,15 +9,19 @@ function isNumeric(value) {
 function checkField(key, val, options, idx, body) {
     const type = options?.type?.toLowerCase?.();
     const isrequired = options?.validators?.includes?.("required");
-    if (isrequired && !val && options.conditions) {
-        const allowed = typeof options?.conditions?.[2] === "string" &&
-            options?.conditions?.[2]?.startsWith("[")
-            ? JSON.parse(options?.conditions?.[2])
-            : options?.conditions?.[2];
-        const check = Array.isArray(allowed)
-            ? allowed.includes(body[options?.conditions?.[0] || ""])
-            : body[options?.conditions?.[0] || ""] === allowed;
-        if (options?.conditions?.[1] === "in" && !check) {
+    if (isrequired && !val && Array.isArray(options.conditions)) {
+        const [requiredKey, condition, expected] = options.conditions;
+        const expectedValue = typeof expected === "number" ? expected.toString() : expected;
+        const allowedValues = Array.isArray(expectedValue) && typeof expectedValue[0] === "number"
+            ? expectedValue.map((el) => el.toString())
+            : expectedValue;
+        const payloadValue = typeof body[requiredKey] == "number"
+            ? body[requiredKey].toString()
+            : body[requiredKey];
+        const isConditionallyRequired = Array.isArray(allowedValues)
+            ? allowedValues.includes(payloadValue)
+            : payloadValue === allowedValues;
+        if (condition === "in" && isConditionallyRequired) {
             return {
                 error: "conditions not met: not allowed",
                 key,
@@ -25,9 +29,7 @@ function checkField(key, val, options, idx, body) {
                 idx,
             };
         }
-        if (isrequired &&
-            options?.conditions?.[1] === "==" &&
-            body[options?.conditions?.[0] || ""] === options?.conditions?.[2]) {
+        if (isrequired && condition === "==" && payloadValue === expectedValue) {
             return { error: "conditions not met: empty required", key, val, idx };
         }
         return null; // conditions met, is valid
@@ -88,11 +90,18 @@ function checkField(key, val, options, idx, body) {
     return { key, val, idx };
 }
 function checkBody({ body = {}, arr = [], idx }) {
-    const res = Object.keys(body).reduce((acc1, key) => {
+    // Object.keys(body)
+    const res = arr
+        .map((e) => e.key)
+        .reduce((acc1, key) => {
         const input = arr.find((el) => el.key === key) || {};
         if (input.colModel?.length && input.type?.toLowerCase() === "datatable") {
             const result = body[key]?.reduce?.((acc, item, i) => {
-                const check = checkBody({ body: item, arr: input.colModel, idx: i });
+                const check = checkBody({
+                    body: item,
+                    arr: input.colModel,
+                    idx: i,
+                });
                 acc.push(check);
                 return acc;
             }, []) || [];

package/dist/server/plugins/pg/funcs/getMeta.js

@@ -33,7 +33,7 @@ export default async function getMeta(opt, nocache) {
     if (!tlist.includes(tableUnsafe)) {
         throw BadRequestError(`table not found: ${tableOriginal}`);
     }
-    const relkinds = tableRows.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.relkind }), {});
+    const relkinds = tableRows.reduce((acc, curr) => Object.assign(acc, { [curr.name.replace(/"/g, "")]: curr.relkind }), {});
     const fields = await pg
         .query(`select * from ${tableSafe} limit 0`)
         .then((r) => r.fields || []);
@@ -63,7 +63,7 @@ export default async function getMeta(opt, nocache) {
         pk,
         columns: fields,
         geom: geomAttr?.name,
-        view: ["v", "m"].includes(relkinds?.[tableSafe]),
+        view: ["v", "m"].includes(relkinds[tableUnsafe]),
     };
     if (!data[pg.options.database]) {
         data[pg.options.database] = {};

package/package.json

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