@opengis/fastify-table 2.4.15 → 2.4.17

package/dist/module/core/select/core.user_mentioned.sql

@@ -1,2 +1,2 @@
-select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
+select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
 where enabled order by coalesce(sur_name,'')||coalesce(' '||user_name,'')

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":"AAkIA,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":"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"}

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

@@ -1,4 +1,3 @@
-import config from "../../../../config.js";
 /* eslint-disable no-console */
 // eslint-disable-next-line no-control-regex
 const emailReg = /(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
@@ -10,8 +9,30 @@ function isNumeric(value) {
 function checkField(key, val, options, idx, body) {
     const type = options?.type?.toLowerCase?.();
     const isrequired = options?.validators?.includes?.("required");
-    // validators: [required]
-    if (type === "switcher") {
+    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) {
+            return {
+                error: "conditions not met: not allowed",
+                key,
+                val,
+                idx,
+            };
+        }
+        if (isrequired &&
+            options?.conditions?.[1] === "==" &&
+            body[options?.conditions?.[0] || ""] === options?.conditions?.[2]) {
+            return { error: "conditions not met: empty required", key, val, idx };
+        }
+        return null; // conditions met, is valid
+    }
+    else if (type === "switcher") {
         // skip nulls at non-required switchers, restrict invalid values
         if (val && typeof val !== "boolean" && !["true", "false"].includes(val)) {
             return {
@@ -46,21 +67,6 @@ function checkField(key, val, options, idx, body) {
         }
     }
     else if (isrequired && !val) {
-        if (options?.conditions) {
-            const allowed = typeof options?.conditions?.[2] === "string" &&
-                options?.conditions?.[2]?.startsWith("[")
-                ? JSON.parse(options?.conditions?.[2])
-                : options?.conditions?.[2];
-            const check = options?.conditions?.[1] === "in" && Array.isArray(allowed)
-                ? allowed.includes(body[options?.conditions?.[0] || ""])
-                : body[options?.conditions?.[0] || ""] === allowed;
-            if (!check) {
-                if (config.trace)
-                    console.log("validateData", "skip conditions", key, body[options?.conditions?.[0] || ""], allowed);
-                return { key, val, idx };
-            }
-            return null; // conditions met, is valid
-        }
         return {
             error: "empty required",
             key,

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

@@ -28,7 +28,7 @@ export default async function getMeta(opt, nocache) {
         .then((el) => el.rows[0].pks1 || {});
     const pk = table.startsWith("public.")
         ? pks1[table.replace("public.", "")]
-        : pks1[table];
+        : pks1[table] || pg.pk[table];
     const geomColumns = fields.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry");
     const geomAttr = geomColumns.find((el) => el.name === "geom_4326") || geomColumns[0];
     const dbColumns = await pg

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

@@ -1 +1 @@
-{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAsBvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA4EnE"}
+{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/2factor/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAsBvC;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA+EnE"}

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

@@ -46,7 +46,7 @@ export default async function recovery(req, reply) {
         }
         const customPt = await getTemplate("pt", template);
         const pt = customPt ||
-            (await readFile(path.join(dirname, `../../../../../templates/pt/${template}.html`), "utf8"));
+            (await readFile(path.join(dirname, `../../../../../dist/server/templates/pt/${template}.hbs`), "utf8"));
         const recoveryCodes = await pg
             .query(`select social_auth_obj->'codesArray' as "recoveryCodes" from admin.users_social_auth 
       where uid = $1 and social_auth_type = $2`, [uid, "TOTP"])

package/package.json

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

package/dist/server.js

@@ -1,97 +0,0 @@
-/* eslint-disable no-return-assign */
-// This file contains code that we reuse
-// between our tests.
-import Fastify from 'fastify';
-
-import config from './config.js';
-import plugin from './index.js';
-import loginEuSign from './server/routes/auth/controllers/page/loginEuSign.js';
-
-import loggerTest from './server/routes/logger/controllers/logger.test.api.js';
-import { addHook, logger, addTemplateDir, pgClients } from './utils.js';
-import { BadRequestError } from './errors.js';
-
-addHook('afterChunkedUpload', async ({ id, meta }) => {
-  console.log('chunked upload finished', id, meta);
-});
-
-const cwd = process.cwd();
-
-const app = Fastify({ loggerInstance: logger });
-function contentParser(req, body, done) {
-  const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
-    const [key, val] = el.split('=');
-    return { ...acc, [key]: val };
-  }, {});
-  done(null, parseBody);
-}
-
-app.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
-
-await app.register(plugin, config);
-
-// debug only
-app.get('/login1', { config: { policy: 'L0' } }, loginEuSign);
-addHook("afterAuth", async () => {
-  if (config.auth?.redirectAfter) return; // let config decide
-  return { href: "/user" }; // force redirect to specific page after login
-});
-
-addTemplateDir(`${cwd}/module/test`);
-
-app.get('/logger-test', { config: { policy: 'L0' } }, loggerTest);
-app.get('/err', { config: { policy: 'L0' } }, ({ query }) => {
-  if (query.custom) {
-    throw BadRequestError('this is message');
-  }
-  if (query.custom1) {
-    throw new BadRequestError('this is stil same message');
-  }
-  throw new Error('test error code 500');
-});
-app.get('/test-permissions', { config: { permission: 'orders.read' } }, async () => {
-  return 'allowed';
-});
-
-app.get('/health', {
-  // preHandler: userJwt,
-  config: {
-    tags: ['server.js'],
-    policy: 'L1', // L0, L1, L2
-    auth: 'user-jwt', // none, user-jwt, creds 
-    role: 'admin',    // role
-    scope: 'logger',  // logger, admin, gis, bi 
-    rateLimit: { max: 100, timeWindow: '1 minute', hook: 'preHandler' },
-    cors: { origins: ['https://app.example.com'] },
-    rbac: { resource: 'id', action: 'add' },
-  }
-}, async () => {
-  const clients = await Promise.all(Object.keys(pgClients || {}).map(async key => {
-    const connected = await pgClients[key]?.query('select 1').catch(err => { err }).then(el => el?.rowCount);
-    const keys = Object.keys(pgClients[key] || {});
-    return {
-      name: key,
-      init: !!pgClients[key]?.tlist
-        && !!pgClients[key]?.pk
-        && !!pgClients[key]?.pgType
-        && !!pgClients[key]?.relkinds
-        && !!pgClients[key]?.queryCache,
-      connected: !!connected,
-      keys,
-    };
-  }));
-  return { ok: true, pgClients: clients };
-});
-
-/* addCron(async function testCron() {
-  return (config.local || true) ? null : { message: 'Done', status: 200 };
-}, 60 * 1); */
-
-app.listen({ host: config.host || '0.0.0.0', port: config.port || process.env.PORT || 3000 }, (err) => {
-  console.log(`Server started via port: ${config.port || process.env.PORT || 3000}`);
-  if (err) {
-    console.error(err.toString());
-    logger.error(err);
-    process.exit(1);
-  }
-});