@opengis/admin 0.2.6 → 0.2.7

package/server/routes/menu/controllers/getMenu.js

@@ -1,59 +1,59 @@
-
-import { join } from 'path';
-import { userTemplateDir, config, getAccess, pgClients } from '@opengis/fastify-table/utils.js';
-
-import { existsSync, readdirSync, readFileSync } from 'fs';
-const menuCache = [];
-// check module dir
-const moduleDir = join(process.cwd(), 'module');
-const dirs = existsSync(moduleDir) ?
-    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
-
-// all menu files module + user 
-
-
-
-const isProduction = process.env.NODE_ENV === 'production';
-// readMenu();
-
-async function readMenu() {
-    const menuList = dirs.concat(userTemplateDir)
-        .map(el => join(el, 'menu.json'))
-        .filter(el => existsSync(el))
-    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync 
-    const list = await Promise.all(menuList.filter((el, idx, arr) => el && arr.indexOf(el) === idx).map(el => readFileSync(el, 'utf-8'))); // sync 
-    const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
-        .map(el => ({ order: 0, ...el }))
-        .sort((a, b) => (a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0))
-
-    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
-    return menus;
-}
-export default async function adminMenu({ user = {}, session, pg = pgClients.client }) {
-    if (!user.uid) return { status: 403, message: 'access restricted' }
-
-    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
-
-    // update user access
-    if (session && user?.uid && user.type !== 'admin' && pg.pk['admin.role_access']) {
-        const { type, gl = [], routes = [] } = await pg.query(`select user_type as type, b.gl,routes from admin.users a
-        left join lateral ( select array_agg(role_id) as gl from admin.user_roles where user_uid=a.uid)b on 1=1
-        left join lateral ( select array_agg(route_id) as routes from admin.role_access where role_id=any(b.gl))r on 1=1
-        where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
-        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.role_access
-        where user_uid=$1 or role_id=any($2::text[])`, [user.uid, gl]).then((res) => res.rows?.[0] || {}); */
-
-        Object.assign(user, { type, group_list: gl, routes });
-        session?.set?.('passport', { user });
-        if (type === 'admin') return menus;
-        const userMenus = menus.map(el => (el.menu ? { ...el, menu: el.menu.filter(item => routes?.includes(item.path)) } : el))
-        return userMenus.filter(el => el.menu?.length || routes?.includes(el.path));
-        // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
-    }
-
-    // skip dupes?
-    // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
-    return menus;
-
-
+
+import { join } from 'path';
+import { userTemplateDir, config, getAccess, pgClients } from '@opengis/fastify-table/utils.js';
+
+import { existsSync, readdirSync, readFileSync } from 'fs';
+const menuCache = [];
+// check module dir
+const moduleDir = join(process.cwd(), 'module');
+const dirs = existsSync(moduleDir) ?
+    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
+
+// all menu files module + user 
+
+
+
+const isProduction = process.env.NODE_ENV === 'production';
+// readMenu();
+
+async function readMenu() {
+    const menuList = dirs.concat(userTemplateDir)
+        .map(el => join(el, 'menu.json'))
+        .filter(el => existsSync(el))
+    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync 
+    const list = await Promise.all(menuList.filter((el, idx, arr) => el && arr.indexOf(el) === idx).map(el => readFileSync(el, 'utf-8'))); // sync 
+    const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
+        .map(el => ({ order: 0, ...el }))
+        .sort((a, b) => (a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0))
+
+    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
+    return menus;
+}
+export default async function adminMenu({ user = {}, session, pg = pgClients.client }) {
+    if (!user.uid) return { status: 403, message: 'access restricted' }
+
+    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
+
+    // update user access
+    if (session && user?.uid && user.type !== 'admin' && pg.pk['admin.role_access']) {
+        const { type, gl = [], routes = [] } = await pg.query(`select user_type as type, b.gl,routes from admin.users a
+        left join lateral ( select array_agg(role_id) as gl from admin.user_roles where user_uid=a.uid)b on 1=1
+        left join lateral ( select array_agg(route_id) as routes from admin.role_access where role_id=any(b.gl))r on 1=1
+        where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
+        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.role_access
+        where user_uid=$1 or role_id=any($2::text[])`, [user.uid, gl]).then((res) => res.rows?.[0] || {}); */
+
+        Object.assign(user, { type, group_list: gl, routes });
+        session?.set?.('passport', { user });
+        if (type === 'admin') return menus;
+        const userMenus = menus.map(el => (el.menu ? { ...el, menu: el.menu.filter(item => routes?.includes(item.path)) } : el))
+        return userMenus.filter(el => el.menu?.length || routes?.includes(el.path));
+        // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
+    }
+
+    // skip dupes?
+    // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
+    return menus;
+
+
 }

package/server/routes/menu/index.mjs

@@ -1,5 +1,5 @@
-import getMenu from './controllers/getMenu.js';
-
-export default async function (fastify, opts) {
-  fastify.get(`/user-menu`, getMenu);
-}
+import getMenu from './controllers/getMenu.js';
+
+export default async function (fastify, opts) {
+  fastify.get(`/user-menu`, getMenu);
+}

package/server/routes/notifications/controllers/readNotifications.js

@@ -1,27 +1,27 @@
-export default async function readNotifications({
-  pg, params = {}, query = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-
-    const { userId } = await pg.query('select uid as "userId" from admin.users where $1 in (uid,login) limit 1', [uid])
-      .then((res) => res.rows?.[0] || {});
-
-    if (!userId) {
-      return { message: 'access restricted: 2', status: 403 };
-    }
-
-    const q = `update crm.notifications set read=true where read is not true 
-    and ${params?.id ? 'notification_id=$2' : '1=1'} and addressee_id=$1`;
-
-    if (query.sql) return q;
-
-    const { rowCount = 0 } = await pg.query(q, [userId, params?.id].filter((el) => el));
-
-    return { message: `${rowCount} unread notifications marked as read`, status: 200 };
-
-}
+export default async function readNotifications({
+  pg, params = {}, query = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+
+    const { userId } = await pg.query('select uid as "userId" from admin.users where $1 in (uid,login) limit 1', [uid])
+      .then((res) => res.rows?.[0] || {});
+
+    if (!userId) {
+      return { message: 'access restricted: 2', status: 403 };
+    }
+
+    const q = `update crm.notifications set read=true where read is not true 
+    and ${params?.id ? 'notification_id=$2' : '1=1'} and addressee_id=$1`;
+
+    if (query.sql) return q;
+
+    const { rowCount = 0 } = await pg.query(q, [userId, params?.id].filter((el) => el));
+
+    return { message: `${rowCount} unread notifications marked as read`, status: 200 };
+
+}

package/server/routes/notifications/controllers/testEmail.js

@@ -1,35 +1,35 @@
-import config from '../../../../config.js';
-
-import sendNotification from '../funcs/sendNotification.js';
-
-export default async function testNotification({
-  pg, query = {}, session = {},
-}) {
-  const { local } = config || {};
-
-  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
-    return { message: 'Forbidden', status: 403 };
-  }
-
-  const date = new Date().toISOString().split('T')[0];
-  if (!query.to) {
-    return { message: 'param to is required', status: 400 };
-  }
-
-  const {
-    to, template, table, id, nocache,
-  } = query;
-
-  const data = await sendNotification({
-    pg,
-    to,
-    template,
-    title: `Test Softpro ${date}`,
-    table,
-    nocache,
-    id,
-    message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
-  });
-
-  return { message: data || 'ok' };
-}
+import config from '../../../../config.js';
+
+import sendNotification from '../funcs/sendNotification.js';
+
+export default async function testNotification({
+  pg, query = {}, session = {},
+}) {
+  const { local } = config || {};
+
+  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
+    return { message: 'Forbidden', status: 403 };
+  }
+
+  const date = new Date().toISOString().split('T')[0];
+  if (!query.to) {
+    return { message: 'param to is required', status: 400 };
+  }
+
+  const {
+    to, template, table, id, nocache,
+  } = query;
+
+  const data = await sendNotification({
+    pg,
+    to,
+    template,
+    title: `Test Softpro ${date}`,
+    table,
+    nocache,
+    id,
+    message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
+  });
+
+  return { message: data || 'ok' };
+}

package/server/routes/notifications/controllers/userNotifications.js

@@ -1,53 +1,53 @@
-// for example only
-/*
-    const res = await dataInsert({
-      pg,
-      table: 'crm.notifications',
-      data: {
-        subject: 'notif title',
-        body: 'notif body',
-        link: 'http://localhost:3000/api/notification',
-        addressee_id: userId,
-        author_id: userId,
-      },
-    });
-*/
-
-import { getSelectVal } from '@opengis/fastify-table/utils.js';
-
-const maxLimit = 100;
-
-export default async function userNotifications({
-  pg, query = {}, session = {},
-}) {
-  const time = Date.now();
-
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const limit = Math.min(maxLimit, +(query.limit || 5));
-  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-  const q = `select notification_id as id, subject, body, cdate,
-  author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar from crm.notifications a where addressee_id=$1 order by cdate desc limit $2 offset $3`;
-
-  if (query.sql) return q;
-
-  const { rows = [] } = await pg.query(q, [uid, limit, offset]);
-
-  const values = rows.map((el) => el.author_id)
-    ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);
-
-  if (values?.length) {
-    const vals = await getSelectVal({ name: 'core.user_mentioned', values });
-    rows.forEach((row) => {
-      Object.assign(row, { author: vals?.[row.author_id] });
-    });
-  }
-
-  return { time: Date.now() - time, total: rows?.length, rows };
-
-}
+// for example only
+/*
+    const res = await dataInsert({
+      pg,
+      table: 'crm.notifications',
+      data: {
+        subject: 'notif title',
+        body: 'notif body',
+        link: 'http://localhost:3000/api/notification',
+        addressee_id: userId,
+        author_id: userId,
+      },
+    });
+*/
+
+import { getSelectVal } from '@opengis/fastify-table/utils.js';
+
+const maxLimit = 100;
+
+export default async function userNotifications({
+  pg, query = {}, session = {},
+}) {
+  const time = Date.now();
+
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const limit = Math.min(maxLimit, +(query.limit || 5));
+  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+  const q = `select notification_id as id, subject, body, cdate,
+  author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar from crm.notifications a where addressee_id=$1 order by cdate desc limit $2 offset $3`;
+
+  if (query.sql) return q;
+
+  const { rows = [] } = await pg.query(q, [uid, limit, offset]);
+
+  const values = rows.map((el) => el.author_id)
+    ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);
+
+  if (values?.length) {
+    const vals = await getSelectVal({ name: 'core.user_mentioned', values });
+    rows.forEach((row) => {
+      Object.assign(row, { author: vals?.[row.author_id] });
+    });
+  }
+
+  return { time: Date.now() - time, total: rows?.length, rows };
+
+}

package/server/routes/notifications/funcs/addNotification.js

@@ -1,21 +1,21 @@
-import { dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function addNotification({
-  pg, session = {}, subject, body, link, uid, entity,
-}) {
-  const { uid: author } = session.passport?.user || {};
-  const res = await dataInsert({
-    pg,
-    table: 'crm.notifications',
-    data: {
-      subject,
-      body,
-      link,
-      addressee_id: uid,
-      author_id: author,
-      entity_id: entity,
-      uid: author,
-    },
-  });
-  return res?.rows?.[0] || {};
-}
+import { dataInsert } from '@opengis/fastify-table/utils.js';
+
+export default async function addNotification({
+  pg, session = {}, subject, body, link, uid, entity,
+}) {
+  const { uid: author } = session.passport?.user || {};
+  const res = await dataInsert({
+    pg,
+    table: 'crm.notifications',
+    data: {
+      subject,
+      body,
+      link,
+      addressee_id: uid,
+      author_id: author,
+      entity_id: entity,
+      uid: author,
+    },
+  });
+  return res?.rows?.[0] || {};
+}

package/server/routes/notifications/funcs/sendNotification.js

@@ -1,92 +1,92 @@
-// eslint-disable-next-line max-len, no-control-regex
-const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
-
-import sendEmail from './utils/sendEmail.js';
-
-import { handlebars, pgClients, getTemplate, getRedis, logger } from '@opengis/fastify-table/utils.js';
-
-async function generateNotificationContent({
-  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 = 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 = pgClients.client,
-  provider = ['email'],
-  from,
-  to,
-  template,
-  table,
-  message,
-  title,
-  file,
-  data,
-  id,
-  nocache,
-}) {
-  const rclient = getRedis();
-
-  if (!pg) throw new Error('need pg');
-
-  if (pg?.readonly) {
-    return null;
-  }
-
-  const keyTo = `${pg.options?.database}:mail:${provider[0]}:${to || ''}${id || ''}${table || ''}${title || ''}`;
-  const uniqueTo = await rclient.setnx(keyTo, 1);
-
-
-  if (!uniqueTo && !nocache) {
-    logger.file('notification/sent', { keyTo, send: uniqueTo, nocache });
-    return `already sent: ${keyTo}`;
-  }
-  await rclient.expire(keyTo, 1000 * 600);
-
-  if (!to.length) {
-    return null;
-  }
-
-  if (!(Array.isArray(provider) && provider.length)) {
-    return 'notification provider - must be array and not empty';
-  }
-
-  const html = await generateNotificationContent({
-    pg, table, template, id, message, data,
-  });
-
-  if (provider.includes('email')) {
-    const files = Array.isArray(file) ? file : [file];
-    const attachments = files?.length && false ? await Promise.all(files?.filter((el) => el).map(async (el) => {
-      /* const content = await downloadFile(el, { buffer: true }); // ?
-      return {
-        filename: el.split('/').pop(),
-        encoding: 'base64',
-        content,
-      }; */
-    })) : [];
-
-    const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
-
-    const result = await sendEmail({
-      attachments,
-      html,
-      subject: title,
-      from,
-      to: toEmail,
-    });
-
-    return result;
-  }
-  return null;
-}
+// eslint-disable-next-line max-len, no-control-regex
+const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
+
+import sendEmail from './utils/sendEmail.js';
+
+import { handlebars, pgClients, getTemplate, getRedis, logger } from '@opengis/fastify-table/utils.js';
+
+async function generateNotificationContent({
+  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 = 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 = pgClients.client,
+  provider = ['email'],
+  from,
+  to,
+  template,
+  table,
+  message,
+  title,
+  file,
+  data,
+  id,
+  nocache,
+}) {
+  const rclient = getRedis();
+
+  if (!pg) throw new Error('need pg');
+
+  if (pg?.readonly) {
+    return null;
+  }
+
+  const keyTo = `${pg.options?.database}:mail:${provider[0]}:${to || ''}${id || ''}${table || ''}${title || ''}`;
+  const uniqueTo = await rclient.setnx(keyTo, 1);
+
+
+  if (!uniqueTo && !nocache) {
+    logger.file('notification/sent', { keyTo, send: uniqueTo, nocache });
+    return `already sent: ${keyTo}`;
+  }
+  await rclient.expire(keyTo, 1000 * 600);
+
+  if (!to.length) {
+    return null;
+  }
+
+  if (!(Array.isArray(provider) && provider.length)) {
+    return 'notification provider - must be array and not empty';
+  }
+
+  const html = await generateNotificationContent({
+    pg, table, template, id, message, data,
+  });
+
+  if (provider.includes('email')) {
+    const files = Array.isArray(file) ? file : [file];
+    const attachments = files?.length && false ? await Promise.all(files?.filter((el) => el).map(async (el) => {
+      /* const content = await downloadFile(el, { buffer: true }); // ?
+      return {
+        filename: el.split('/').pop(),
+        encoding: 'base64',
+        content,
+      }; */
+    })) : [];
+
+    const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
+
+    const result = await sendEmail({
+      attachments,
+      html,
+      subject: title,
+      from,
+      to: toEmail,
+    });
+
+    return result;
+  }
+  return null;
+}