@opengis/fastify-table 1.1.122 → 1.1.124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.122",
+  "version": "1.1.124",
   "type": "module",
   "description": "core-plugins",
   "keywords": ["fastify", "table", "crud", "pg", "backend" ],

package/server/plugins/crud/funcs/utils/logChanges.js

@@ -26,7 +26,7 @@ export default async function logChanges({
 
     const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
     const columnList = fields.map((el) => el?.name);
-    const q = `select ${Object.keys(data || {}).filter((el) => columnList.includes(el)).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
+    const q = `select ${Object.keys(data || {}).filter((el) => columnList.includes(el)).map(el => `"${el.replace(/'/g, "''")}"`).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
     // console.log(q, type, id);
 
     const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};

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

@@ -9,7 +9,7 @@ export default async function getMeta(opt) {
 
   if (data[table]) return data[table];
 
-  if (!pg.tlist?.includes(table.replace(/"/g, ''))) {
+  if (!pg.tlist?.includes(table?.replace?.(/"/g, ''))) {
     return { error: `${table} - not found`, status: 400 };
   }
 
@@ -19,7 +19,9 @@ export default async function getMeta(opt) {
     left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] 
   WHERE c.contype='p'::"char" and c.conrelid::regclass = $1::regclass`, [table]).then(el => el.rows?.[0] || {});
 
-  const pk = table.startsWith('public.') ? pks1[table.replace('public.', '')] : pks1[table];
+  const pk = table.startsWith('public.')
+    ? (pks1[table.replace('public.', '')] || pks1[table.replace('public.', '').replace(/"/g, '')]) 
+    : (pks1[table] || pks1[table.replace(/"/g, '')]);
 
   const geomAttr = fields.find((el) => pg.pgType?.[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
 

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

@@ -85,7 +85,7 @@ export default function checkPolicy(req) {
 
   /* === 5. policy: site auth === */
   if (!policy.includes('site') && !isAdmin && !config.local && !config.debug
-  && !['/auth/redirect', `${config.prefix || '/api'}/login`].find(el => path.includes(el))) {
+  && !['/auth/redirect', '/logout', `${config.prefix || '/api'}/login`].find(el => path.includes(el))) {
     logger.file('policy/site', {
       path, method, params, query, body, message: 'access restricted: 5', uid: user?.uid,
     });

package/server/routes/crud/index.js

@@ -12,10 +12,11 @@ const tableSchema = {
 
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
-  fastify.put(`${prefix}/table/:table/:id?`, { schema: tableSchema }, update);
-  fastify.delete(`${prefix}/table/:table/:id?`, { schema: tableSchema }, deleteCrud);
-  fastify.post(`${prefix}/table/:table/:id?`, { schema: tableSchema }, insert);
-  fastify.get(`${prefix}/table/:table/:id?`, { schema: tableSchema }, table);
+  const policy = ['public'];
+  fastify.put(`${prefix}/table/:table/:id?`, { config: { policy }, schema: tableSchema }, update);
+  fastify.delete(`${prefix}/table/:table/:id?`, { config: { policy }, schema: tableSchema }, deleteCrud);
+  fastify.post(`${prefix}/table/:table/:id?`, { config: { policy }, schema: tableSchema }, insert);
+  fastify.get(`${prefix}/table/:table/:id?`, { config: { policy }, schema: tableSchema }, table);
 }
 
 export default plugin;

package/server/routes/logger/index.js

@@ -11,7 +11,7 @@ const loggerSchema = {
 };
 
 async function plugin(fastify) {
-  fastify.get('/logger-file/*', { schema: loggerSchema }, loggerFile);
+  fastify.get('/logger-file/*', { config: { policy: ['site'] }, schema: loggerSchema }, loggerFile);
 }
 
 export default plugin;

package/server/routes/table/index.js

@@ -14,15 +14,16 @@ import {
 
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
-  fastify.get(`${prefix}/suggest/:data`, { schema: suggestSchema }, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  const policy = ['public'];
+  fastify.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
+  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy }, schema: tableSchema }, data); // vs.crm.data.api с node
 
-  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
-  fastify.get(`${prefix}/search`, { schema: searchSchema }, search);
+  fastify.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);
+  fastify.get(`${prefix}/search`, { config: { policy }, schema: searchSchema }, search);
 
   fastify.get(`${prefix}/templates`, () => loadTemplatePath);
-  fastify.get(`${prefix}/filter/:table`, { schema: filterSchema }, filter);
-  fastify.get(`${prefix}/form/:form`, { schema: formSchema }, form);
+  fastify.get(`${prefix}/filter/:table`, { config: { policy }, schema: filterSchema }, filter);
+  fastify.get(`${prefix}/form/:form`, { config: { policy }, schema: formSchema }, form);
 }
 
 export default plugin;