@opengis/fastify-table 1.1.42 → 1.1.44

package/crud/funcs/getAccess.js

@@ -1,8 +1,9 @@
 import getMeta from '../../pg/funcs/getMeta.js';
 import getTemplate from '../../table/controllers/utils/getTemplate.js';
 import config from '../../config.js';
+import pgClients from '../../pg/pgClients.js';
 
-const q = `select a.route_id as id, b.actions, b.scope 
+const q = `select a.route_id as id, coalesce(b.actions,array['get']) as actions, b.scope 
 from admin.routes a 
 left join admin.access b on 
   a.route_id=b.route_id
@@ -16,36 +17,39 @@ left join admin.user_roles d on
             then d.expiration > CURRENT_DATE 
             else 1=1 
         end )
-where a.route_id=$1 and $2 in (b.user_uid, d.user_uid)`;
+where $1 in (a.route_id, a.alias) and $2 in (b.user_uid, d.user_uid)`;
 
-export default async function getAccess(req, template, id = null) {
-  if (config.disableAccessRestriction || true) {
+export default async function getAccess({ table, id, user }) {
+  if (config.auth?.disable || user?.user_type?.includes('admin')) {
     return { actions: ['get', 'edit', 'del'], my: true, query: '1=1' };
   }
-  const { pg, session = {} } = req;
-  const { uid, user_type: userType } = session.passport?.user || {};
-  if (!uid || !template) return null;
+
+  const { client: pg } = pgClients || {};
+  const { uid, user_type: userType } = user || {};
+
+  if (!uid || !table) return null;
 
   if (!pg.pk?.['admin.access']) return null;
 
-  const { table } = await getTemplate('table', template) || {};
-  if (!table) return null;
+  const body = await getTemplate('table', table) || {};
+  if (!body?.table) return null;
 
-  const { scope = 'my', actions = [] } = await pg.one(q, [template, uid]);
-  // console.log(scope, actions);
+  const { scope = 'my', actions = [] } = await pg.query(q, [table, uid]).then((res) => res.rows?.[0] || {});
 
-  const { columns = [] } = await getMeta(table);
-  const columnList = columns.map((el) => el.name || el).join(',');
+  const { columns = [] } = await getMeta({ table: body?.table });
 
   const query = userType?.includes('admin') ? '1=1' : {
     my: `uid='${uid}'`,
-    responsible: columnList.includes('responsible_id')
+    responsible: columns.map((el) => el?.name || el).includes('responsible_id')
       ? `responsible_id='${uid}'`
       : `uid='${uid}'`,
     all: '1=1',
   }[scope];
 
-  const { my } = pg.pk?.[table] && id ? await pg.one(`select uid=$1 as my from ${table} where ${pg.pk?.[table]}=$2`, [uid, id]) : {};
+  const { my } = pg.pk?.[body?.table] && id
+    ? await pg.query(`select uid=$1 as my from ${body?.table} where ${pg.pk?.[body?.table]}=$2`, [uid, id])
+      .then((res) => res.rows?.[0] || {})
+    : {};
 
   return {
     scope, actions, query, my,

package/crud/funcs/getToken.js

@@ -1,27 +1,27 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-import config from '../../config.js';
-
-function sprintf(str, ...args) {
-  return str.replace(/%s/g, () => args.shift());
-}
-
-const keys = {
-  r: '%s:token:view:%s',
-  a: '%s:token:add:%s',
-  w: '%s:token:edit:%s',
-  e: '%s:token:exec:%s',
-};
-
-async function getToken({
-  uid, token, mode = 'r', json,
-}) {
-  if (mode === 'r') return token;
-
-  const rclient = getRedis({ db: 0 });
-
-  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
-  const id = await rclient.hget(key, token);
-  return json && id?.[0] === '{' ? JSON.parse(id) : id;
-}
-
-export default getToken;
+import getRedis from '../../redis/funcs/getRedis.js';
+import config from '../../config.js';
+
+function sprintf(str, ...args) {
+  return str.replace(/%s/g, () => args.shift());
+}
+
+const keys = {
+  r: '%s:token:view:%s',
+  a: '%s:token:add:%s',
+  w: '%s:token:edit:%s',
+  e: '%s:token:exec:%s',
+};
+
+async function getToken({
+  uid, token, mode = 'r', json,
+}) {
+  if (mode === 'r') return token;
+
+  const rclient = getRedis({ db: 0 });
+
+  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
+  const id = await rclient.hget(key, token);
+  return json && id?.[0] === '{' ? JSON.parse(id) : id;
+}
+
+export default getToken;

package/crud/funcs/isFileExists.js

@@ -1,13 +1,13 @@
-import { access } from 'fs/promises';
-
-const isFileExists = async (filepath) => {
-  try {
-    await access(filepath);
-    return true;
-  }
-  catch (err) {
-    return false;
-  }
-};
-
-export default isFileExists;
+import { access } from 'fs/promises';
+
+const isFileExists = async (filepath) => {
+  try {
+    await access(filepath);
+    return true;
+  }
+  catch (err) {
+    return false;
+  }
+};
+
+export default isFileExists;

package/crud/funcs/setToken.js

@@ -1,53 +1,53 @@
-import { createHash, randomUUID } from 'crypto';
-
-import config from '../../config.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const generateCodes = (ids, userToken) => {
-  const token = userToken || randomUUID();
-  const notNullIds = ids.filter((el) => el);
-  const obj = {};
-  const codes = notNullIds.reduce((acc, id) => {
-    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
-    acc[newToken] = id; obj[id] = newToken;
-    return acc;
-  }, {});
-  return { codes, obj };
-};
-
-function setToken({
-  ids: idsOrigin, mode = 'r', uid, referer, array,
-}) {
-  const rclient2 = getRedis({ db: 0 });
-  //  const rclient5 = getRedis({ db: 0, funcs });
-
-  if (!uid) return { user: 'empty' };
-  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
-
-  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
-  // update/delete
-
-  if (mode === 'r') return null;
-
-  // TODO generate salt
-  const { codes, obj } = generateCodes(ids, uid);
-
-  if (!Object.keys(codes).length) return { ids: 'empty' };
-
-  rclient2.hmset(`${config.pg.database}:token:${{
-    e: 'exec', r: 'view', w: 'edit', a: 'add',
-  }[mode]}:${uid}`, codes);
-
-  // log token for debug. add extra data - uid, mode, date
-  /* const dt = new Date().toISOString();
-   const codesLog = Object.keys(codes).reduce((acc, key) => {
-    acc[key] = `{"referer": "${referer}" ,"uid":"${uid}","mode":"${mode}","date":"${dt}",${codes[key].substr(1)}`;
-    return acc;
-  }, {});
-   rclient5.hmset(`${config.pg.database}:token:edit`, codesLog); // 'EX', 64800 */
-
-  // TODO дополнительно писать в hset token -> uid
-  return array ? Object.values(obj) : obj;
-}
-
-export default setToken;
+import { createHash, randomUUID } from 'crypto';
+
+import config from '../../config.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const generateCodes = (ids, userToken) => {
+  const token = userToken || randomUUID();
+  const notNullIds = ids.filter((el) => el);
+  const obj = {};
+  const codes = notNullIds.reduce((acc, id) => {
+    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
+    acc[newToken] = id; obj[id] = newToken;
+    return acc;
+  }, {});
+  return { codes, obj };
+};
+
+function setToken({
+  ids: idsOrigin, mode = 'r', uid, referer, array,
+}) {
+  const rclient2 = getRedis({ db: 0 });
+  //  const rclient5 = getRedis({ db: 0, funcs });
+
+  if (!uid) return { user: 'empty' };
+  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
+
+  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
+  // update/delete
+
+  if (mode === 'r') return null;
+
+  // TODO generate salt
+  const { codes, obj } = generateCodes(ids, uid);
+
+  if (!Object.keys(codes).length) return { ids: 'empty' };
+
+  rclient2.hmset(`${config.pg.database}:token:${{
+    e: 'exec', r: 'view', w: 'edit', a: 'add',
+  }[mode]}:${uid}`, codes);
+
+  // log token for debug. add extra data - uid, mode, date
+  /* const dt = new Date().toISOString();
+   const codesLog = Object.keys(codes).reduce((acc, key) => {
+    acc[key] = `{"referer": "${referer}" ,"uid":"${uid}","mode":"${mode}","date":"${dt}",${codes[key].substr(1)}`;
+    return acc;
+  }, {});
+   rclient5.hmset(`${config.pg.database}:token:edit`, codesLog); // 'EX', 64800 */
+
+  // TODO дополнительно писать в hset token -> uid
+  return array ? Object.values(obj) : obj;
+}
+
+export default setToken;

package/crud/index.js

@@ -28,9 +28,9 @@ async function plugin(fastify, config = {}) {
   fastify.decorate('isFileExists', isFileExists);
 
   // api
-  fastify.put(`${prefix}/table/:table/:id`, { schema: tableSchema }, update);
-  fastify.delete(`${prefix}/table/:table/:id`, { schema: tableSchema }, deleteCrud);
-  fastify.post(`${prefix}/table/:table`, { schema: tableSchema }, insert);
+  fastify.put(`${prefix}/table/:table/:id?`, { schema: tableSchema }, update);
+  fastify.delete(`${prefix}/table/:table/:id?`, { schema: tableSchema }, deleteCrud);
+  fastify.post(`${prefix}/table/:table?`, { schema: tableSchema }, insert);
 }
 
 export default plugin;

package/index.js

@@ -20,7 +20,7 @@ import userPlugin from './user/index.js';
 
 // import pgClients from './pg/pgClients.js';
 
-import { addTemplateDir, execMigrations } from './utils.js';
+import { addTemplateDir, execMigrations, logger } from './utils.js';
 
 async function plugin(fastify, opt) {
   // console.log(opt);
@@ -65,8 +65,14 @@ async function plugin(fastify, opt) {
     return reply.status(error.statusCode || 500).send(config.local ? error.toString() : 'ServerError');
   });
 
+  execMigrations().catch(err => console.log(err));
   // core migrations
-  await execMigrations();
+  /* try {
+
+  }
+  catch (err) {
+    logger.error(err);
+  } */
 
   if (!fastify.funcs) {
     fastify.addHook('onRequest', async (req) => {

package/notification/controllers/testEmail.js

@@ -2,6 +2,8 @@ import path from 'path';
 import { existsSync } from 'fs';
 import { fileURLToPath } from 'url';
 
+import config from '../../config.js';
+
 const fileName = fileURLToPath(import.meta.url);
 const dirName = path.dirname(fileName);
 
@@ -10,7 +12,7 @@ import notification from '../funcs/sendNotification.js';
 export default async function testNotification({
   pg, funcs = {}, log, query = {}, session = {},
 }) {
-  const { local } = funcs.config || {};
+  const { local } = config || {};
   if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
     return { message: 'Forbidden', status: 403 };
   }
@@ -27,7 +29,6 @@ export default async function testNotification({
     const file = [path.join(dirName, '../../', 'changelog.md'), path.join(dirName, 'utils', 'pin-m-ty-media-record-outline+303070.png')].filter((el) => existsSync(el));
     const data = await notification({
       pg,
-      funcs,
       log,
       to,
       template,

package/notification/funcs/addNotification.js

@@ -1,8 +1,10 @@
+import dataInsert from '../../crud/funcs/dataInsert.js';
+
 export default async function addNotification({
-  pg, funcs, session = {}, subject, body, link, uid, entity,
+  pg, session = {}, subject, body, link, uid, entity,
 }) {
   const { uid: author } = session.passport?.user || {};
-  const res = await funcs.dataInsert({
+  const res = await dataInsert({
     pg,
     table: 'crm.notifications',
     data: {

package/notification/funcs/sendNotification.js

@@ -3,26 +3,28 @@ const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-
 
 // eslint-disable-next-line import/no-relative-packages
 // import downloadFile from '../../../fastify-file/file/funcs/downloadFile.js'; // test only
+import { handlebars } from '@opengis/fastify-hb/utils.js';
 import pgClients from '../../pg/pgClients.js';
 import sendEmail from './utils/sendEmail.js';
 import getTemplate from '../../table/controllers/utils/getTemplate.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 
 async function generateNotificationContent({
-  pg, funcs, table, template, id, message, data: data1,
+  pg, table, template, id, message, data: data1,
 }) {
   if (template) {
     const data = table && id ? await pg.one(`select * from ${table} where ${pg.pk[table]}=$1`, [id]) : data1;
     // console.log(data);
     const body = await getTemplate('pt', template);
     // console.log(body);
-    const html = funcs.handlebars.compile(body || template || 'template not found')(data || {});
+    const html = handlebars.compile(body || template || 'template not found')(data || {});
     // console.log(html);
     return html;
   }
   return message;
 }
 
+// to do: refactor fastify-file to remove funcs completely
 export default async function notification({
   pg: pg1,
   funcs,
@@ -67,7 +69,7 @@ export default async function notification({
 
   try {
     const html = await generateNotificationContent({
-      pg, funcs, table, template, id, message, data,
+      pg, table, template, id, message, data,
     });
 
     // return html;
@@ -86,7 +88,6 @@ export default async function notification({
       const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
 
       const result = await sendEmail({
-        funcs,
         attachments,
         html,
         subject: title,

package/notification/funcs/utils/sendEmail.js

@@ -1,39 +1,39 @@
-import nodemailer from 'nodemailer';
-
-/**
- * Надсилає поваідомлення на пошту
- *
- * @type function
- * @alias sendEmail
- * @summary Функція здійснює розсилку по email
- */
-
-export default async function sendEmail({
-  funcs, to, from, subject, html, attachments,
-}) {
-  const { config = {} } = funcs;
-
-  if (!to?.length) {
-    throw new Error('empty to list');
-  }
-
-  const { mailSetting = {} } = config;
-
-  /*= == check service and setting === */
-  if (!mailSetting.service) {
-    throw new Error('service is not defined in config');
-  }
-
-  Object.assign(mailSetting, { rejectUnauthorized: false });
-
-  if (mailSetting.port === 465) {
-    Object.assign(mailSetting, { secure: true });
-  }
-
-  const transport = nodemailer.createTransport(mailSetting);
-
-  const result = await transport.sendMail({
-    from: from || mailSetting.from, to, subject, html, attachments,
-  });
-  return result;
-}
+import nodemailer from 'nodemailer';
+
+import config from '../../../config.js';
+
+/**
+ * Надсилає поваідомлення на пошту
+ *
+ * @type function
+ * @alias sendEmail
+ * @summary Функція здійснює розсилку по email
+ */
+
+export default async function sendEmail({
+  to, from, subject, html, attachments,
+}) {
+  if (!to?.length) {
+    throw new Error('empty to list');
+  }
+
+  const { mailSetting = {} } = config;
+
+  /*= == check service and setting === */
+  if (!mailSetting.service) {
+    throw new Error('service is not defined in config');
+  }
+
+  Object.assign(mailSetting, { rejectUnauthorized: false });
+
+  if (mailSetting.port === 465) {
+    Object.assign(mailSetting, { secure: true });
+  }
+
+  const transport = nodemailer.createTransport(mailSetting);
+
+  const result = await transport.sendMail({
+    from: from || mailSetting.from, to, subject, html, attachments,
+  });
+  return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.42",
+  "version": "1.1.44",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
@@ -9,16 +9,16 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@opengis/fastify-hb": "^1.1.0",
     "@fastify/sensible": "^5.0.0",
     "@fastify/url-data": "^5.4.0",
+    "@opengis/fastify-hb": "^1.4.2",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
     "ioredis": "^5.3.2",
+    "nodemailer": "^6.5.0",
     "pg": "^8.11.3",
     "pino-abstract-transport": "^2.0.0",
-    "rotating-file-stream": "^3.2.3",
-    "nodemailer": "^6.5.0"
+    "rotating-file-stream": "^3.2.3"
   },
   "devDependencies": {
     "eslint": "^8.49.0",
@@ -26,4 +26,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/pg/funcs/getPG.js

@@ -7,7 +7,7 @@ function getPG(param) {
   const {
     user, password, host, port, db, database, name: origin, funcs,
   } = param || {};
-  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
+  // if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
   const name = origin || db || database || param || 'client';
   if (pgClients[name]) return pgClients[name];
 

package/redis/funcs/getRedis.js

@@ -1,23 +1,23 @@
-import Redis from 'ioredis';
-import config from '../../config.js';
-import redisClients from './redisClients.js';
-
-function getRedis({ db } = { db: 0 }) {
-  if (!config.redis) return null;
-  if (redisClients[db]) return redisClients[db];
-
-  const redisConfig = {
-    db,
-    keyPrefix: `${config.db}:`,
-    host: config.redis?.host || '127.0.0.1',
-    port: config.redis?.port || 6379, // Redis port
-    family: 4, // 4 (IPv4) or 6 (IPv6)
-    closeClient: true,
-  };
-
-  redisClients[db] = new Redis(redisConfig);
-
-  return redisClients[db];
-}
-
-export default getRedis;
+import Redis from 'ioredis';
+import config from '../../config.js';
+import redisClients from './redisClients.js';
+
+function getRedis({ db } = { db: 0 }) {
+  if (!config.redis) return null;
+  if (redisClients[db]) return redisClients[db];
+
+  const redisConfig = {
+    db,
+    keyPrefix: `${config.db}:`,
+    host: config.redis?.host || '127.0.0.1',
+    port: config.redis?.port || 6379, // Redis port
+    family: 4, // 4 (IPv4) or 6 (IPv6)
+    closeClient: true,
+  };
+
+  redisClients[db] = new Redis(redisConfig);
+
+  return redisClients[db];
+}
+
+export default getRedis;