@opengis/fastify-table 1.0.89 → 1.0.91

package/util/controllers/utils/checkUserAccess.js

@@ -0,0 +1,19 @@
+/**
+ * 
+ * @summary check user access to logger interface - per admin user type or user group
+ * @returns {Object} message, status
+ */
+
+export default async function checkUserAccess({
+  user = {}, pg,
+}) {
+    const { count = '0' } = pg.pk?.['admin.access']
+      ? await pg.query(`select count(*) from admin.access 
+        where user_uid=$1 and route_id='logger'`, [user.uid]).then((res) => res.rows[0] || {})
+      : {};
+
+    if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
+      return { message: 'access restricted', status: 403 };
+    }
+    return { message: 'access granted', status: 200 };
+}

package/util/controllers/utils/getRootDir.js

@@ -0,0 +1,21 @@
+import path from 'path';
+import { existsSync } from 'fs';
+
+export default function getRootDir(config) {
+  // absolute / relative path
+  if (config.log?.dir) {
+    return config.log.dir.startsWith('/') || config.log.dir.includes(':')
+      ? config.log.dir
+      : path.join(process.cwd(), config.log.dir);
+  }
+
+  // windows debug support
+  const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
+  // docker default path
+  if (existsSync(customLogDir)) {
+    return path.join(customLogDir, config.folder || '', 'log');
+  }
+
+  // non-docker default path
+  return path.join(config.root || '/data/local', config.folder || '', 'log');
+}

package/util/index.js

@@ -1,21 +1,23 @@
-import getExtraProperties from './controllers/properties.get.js';
-import addExtraProperties from './controllers/properties.add.js';
-import nextId from './controllers/next.id.js';
-import statusMonitor from './controllers/status.monitor.js';
-
-const propertiesSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-
-  fastify.get(`${prefix}/next-id`, {}, nextId);
-  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
-  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
-  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
-}
-
-export default plugin;
+import getExtraProperties from './controllers/properties.get.js';
+import addExtraProperties from './controllers/properties.add.js';
+import nextId from './controllers/next.id.js';
+import statusMonitor from './controllers/status.monitor.js';
+import loggerFile from './controllers/logger.file.js';
+
+const propertiesSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+
+  fastify.get(`${prefix}/next-id`, {}, nextId);
+  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
+  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
+  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
+  fastify.get('/logger-file/*', { config: { policy: ['log'] } }, loggerFile);
+}
+
+export default plugin;

package/widget/controllers/widget.get.js

@@ -29,9 +29,11 @@ export default async function widgetGet({
     from crm.communications c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`
       : 'select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc',
 
-    history: `SELECT table_change_id, entity_id, entity_type, change_key, change_date, json_old, json_new, date_old, 
-    date_new, number_old, number_new, bool_old, bool_new, text_old, 
-    text_new, uid, cdate FROM log.table_changes where entity_id=$1 order by cdate desc, change_key limit 100`,
+    history: `SELECT b.change_data_id, change_id, entity_id, entity_type, change_type, change_date, uid, cdate, b.entity_key, b.value_new, b.value_old FROM log.table_changes a
+    left join lateral(
+      select change_data_id, entity_key, value_new, value_old from log.table_changes_data where change_id=a.change_id
+    )b on 1=1
+    where entity_id=$1 and b.change_data_id is not null order by cdate desc limit 100`,
 
     checklist: pg.pk['admin.users']
       ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 

package/widget/controllers/widget.set.js

@@ -45,7 +45,9 @@ export default async function widgetSet(req) {
         return { message: 'invalid file extension', status: 400 };
       }
 
-      const { rows = [] } = await dataInsert({ table: 'crm.files', data });
+      const { rows = [] } = await dataInsert({
+        table: 'crm.files', data, uid: user?.uid,
+      });
       return {
         rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
       };
@@ -56,8 +58,12 @@ export default async function widgetSet(req) {
     const data = { ...body, uid: user?.uid, entity_id: objectid };
 
     const result = id
-      ? await dataUpdate({ table, data, id })
-      : await dataInsert({ table, data });
+      ? await dataUpdate({
+        table, data, id, uid: user?.uid,
+      })
+      : await dataInsert({
+        table, data, uid: user?.uid,
+      });
 
     return {
       rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],

package/widget/index.js

@@ -1,40 +1,40 @@
-import widgetDel from './controllers/widget.del.js';
-import widgetSet from './controllers/widget.set.js';
-import widgetGet from './controllers/widget.get.js';
-
-const tableSchema = {
-  params: {
-    // type: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-  querystring: {
-    debug: { type: 'string', pattern: '^(\\d+)$' },
-  }
-};
-
-async function route(fastify, opt) {
-  const prefix = opt.prefix || '/api';
-  fastify.route({
-    method: 'DELETE',
-    url: `${prefix}/widget/:type/:objectid/:id`,
-    schema: tableSchema,
-    handler: widgetDel,
-  });
-  fastify.route({
-    method: 'POST',
-    path: `${prefix}/widget/:type/:objectid/:id?`,
-    schema: tableSchema,
-    handler: widgetSet,
-  });
-  fastify.route({
-    method: 'GET',
-    path: `${prefix}/widget/:type/:objectid`,
-    config: {
-      policy: ['public'],
-    },
-    schema: tableSchema,
-    handler: widgetGet,
-  });
-}
-export default route;
+import widgetDel from './controllers/widget.del.js';
+import widgetSet from './controllers/widget.set.js';
+import widgetGet from './controllers/widget.get.js';
+
+const tableSchema = {
+  params: {
+    // type: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+  querystring: {
+    debug: { type: 'string', pattern: '^(\\d+)$' },
+  },
+};
+
+async function route(fastify, opt) {
+  const prefix = opt.prefix || '/api';
+  fastify.route({
+    method: 'DELETE',
+    url: `${prefix}/widget/:type/:objectid/:id`,
+    schema: tableSchema,
+    handler: widgetDel,
+  });
+  fastify.route({
+    method: 'POST',
+    path: `${prefix}/widget/:type/:objectid/:id?`,
+    schema: tableSchema,
+    handler: widgetSet,
+  });
+  fastify.route({
+    method: 'GET',
+    path: `${prefix}/widget/:type/:objectid`,
+    config: {
+      policy: ['public'],
+    },
+    schema: tableSchema,
+    handler: widgetGet,
+  });
+}
+export default route;