@opengis/fastify-table 1.0.79 → 1.0.80

package/Changelog.md

@@ -1,6 +1,6 @@
 # fastify-table
 
-## 1.0.79 - 15.08.2024
+## 1.0.80 - 15.08.2024
 
 - refactor /table API
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.79",
+  "version": "1.0.80",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/table/controllers/data.js

@@ -18,7 +18,7 @@ export default async function dataAPI(req) {
   if (!loadTable) { return { message: 'template not found', status: 404 }; }
 
   const {
-    table, columns, sql, cardSql, filters, form, meta, sqlColumns,
+    table, columns, sql, cardSql, filters, form, meta, sqlColumns, ispublic,
   } = loadTable;
   const { pk, columns: dbColumns = [] } = await getMeta(table);
 
@@ -75,7 +75,7 @@ export default async function dataAPI(req) {
     const addTokens = setToken({
       ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
       mode: 'a',
-      uid,
+      uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
       array: 1,
     });
     Object.assign(res, { addToken: addTokens[0] });
@@ -84,7 +84,7 @@ export default async function dataAPI(req) {
       const editTokens = setToken({
         ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
         mode: 'w',
-        uid,
+        uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
         array: 1,
       });
       Object.assign(row, { token: editTokens[0] });

package/table/controllers/table.js

@@ -7,14 +7,16 @@ export default async function tableAPI(req) {
   } = req;
   if (!params.id) return { message: 'not enough params', status: 400 };
 
-  const loadTable = await getTemplate('table', opt?.table || params.table);
-  if (!loadTable) { return { message: 'not found', status: 404 }; }
+  const loadTable = await getTemplate('table', opt?.table || params.table) || {};
+  if (!loadTable) {
+    if (!pg.pk?.[opt?.table || params.table]) { return { message: 'not found', status: 404 }; }
+  }
 
   const {
     table, /* columns, */ form,
   } = loadTable;
 
-  const { pk, columns: dbColumns = [] } = await getMeta(table);
+  const { pk, columns: dbColumns = [] } = await getMeta(table || opt?.table || params.table);
   if (!pk) return { message: `table not found: ${table}`, status: 404 };
 
   // const cols = columns.map((el) => el.name || el).join(',');
@@ -27,7 +29,7 @@ export default async function tableAPI(req) {
   const cols = Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',');
   const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
   const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
-  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table} t where ${where.join(' and ') || 'true'} limit 1`;
+  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
 
   if (query.sql === '1') return q;