@opengis/fastify-table 1.4.11 → 1.4.13

package/package.json

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

package/server/plugins/policy/funcs/checkPolicy.js

@@ -29,7 +29,7 @@ export default function checkPolicy(req, reply) {
   const { policy = [] } = routeOptions?.config || {};
 
   /*= == 0.Check superadmin access  === */
-  if (policy.includes('admin') && user?.user_type !== 'admin') {
+  if (policy.includes('admin') && user?.user_type !== 'admin' && !config.auth?.disable) {
     logger.file('policy/access', {
       path, method, params, query, body, message: 'access restricted: not admin', uid: user?.uid,
     });

package/server/plugins/table/funcs/metaFormat/getSelectVal.js

@@ -22,19 +22,27 @@ export default async function getSelectVal({
   if (!cls?.sql) return null;
 
   // select id column name
-  if (!selectIds[name]) selectIds[name] = await pg.queryCache(`select * from (${cls.sql})q limit 0`).then((res) => res.fields?.[0]?.name);
+  if (!selectIds[name]) {
+    selectIds[name] = await pg.queryCache(`select * from (${cls.sql})q limit 0`)
+      .then((res) => res.fields?.[0]?.name)
+      .catch(err => console.error('getSelectVal error: 1', name, cls.sql, err.toString()));
+  }
   const id = selectIds[name];
 
   // cache
   const key = `select:${name}`;
+
   const cache = values?.length && config.redis ? (await rclient.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
   const filteredValues = values.filter(el => !cache[el]);
 
   // query select
+  const q = `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${filteredValues.join(',').replace(/\"/g, '\\"').replace(/'/g, "''")}}')) select * from c`;
 
-  const q = `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${filteredValues.join(',').replace(/\"/g, '\\"')}}')) select * from c`;
-
-  const data = filteredValues.length ? await pg.query(q).then(el => el.rows) : [];
+  const data = filteredValues.length
+    ? await pg.query(q)
+      .then(el => el.rows)
+      .catch(err => console.error('getSelectVal error: 2', name, q, err.toString()))
+    : [];
 
   const clsObj = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
 

package/server/routes/table/functions/getData.js

@@ -376,7 +376,7 @@ export default async function dataAPI(req, reply, called) {
       uid,
       array: 1,
     });
-    Object.assign(res, { addToken: addTokens[0] });
+    Object.assign(res, { addToken: addTokens?.[0] });
   }
 
   const result = await applyHook('afterData', {