@opengis/fastify-table 1.1.7 → 1.1.9

package/crud/controllers/update.js

@@ -1,62 +1,62 @@
-import dataUpdate from '../funcs/dataUpdate.js';
-import dataInsert from '../funcs/dataInsert.js';
-import pgClients from '../../pg/pgClients.js';
-import getToken from '../funcs/getToken.js';
-import checkXSS from './utils/checkXSS.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-import getAccess from '../funcs/getAccess.js';
-
-export default async function update(req) {
-  const { actions = [], scope, my } = await getAccess(req, req.params.table, req.params.id) || {};
-  if (!actions.includes('edit') || (scope === 'my' && !my)) {
-    return { message: 'access restricted', status: 403 };
-  }
-  if (!req.params?.table) {
-    return { message: 'table is required', status: 400 };
-  }
-  if (!req.params?.id) {
-    return { message: 'id is required', status: 404 };
-  }
-  const loadTemplate = await getTemplate('table', req.params.table);
-  const { table, public: ispublic } = loadTemplate || req.params || {};
-  const { id } = req.params || {};
-
-  const { funcs = {}, user = {}, params = {} } = req;
-  const uid = funcs.config?.auth?.disable || ispublic ? '1' : user.uid;
-  const tokenDataString = await getToken({
-    funcs, uid, token: params.table, mode: 'w', json: 0,
-  });
-
-  const tokenData = JSON.parse(tokenDataString || '{}');
-
-  const formData = tokenData?.form || loadTemplate?.form ? await getTemplate('form', tokenData.form || loadTemplate?.form) : {};
-
-  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
-
-  if (xssCheck.error && formData?.xssCheck !== false) {
-    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
-    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
-  }
-
-  const res = await dataUpdate({
-    table: tokenData?.table || table, id: tokenData?.id || id, data: req.body, uid,
-  });
-
-  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && req.body[key].length);
-  if (extraKeys?.length) {
-    res.extra = {};
-    await Promise.all(extraKeys?.map(async (key) => {
-      const objId = req.body[formData[key].parent_id] || req.body?.id;
-      // delete old extra data
-      await pgClients.client.query(`delete from ${formData[key].table} where ${formData[key].parent_id}=$1`, [objId]); // rewrite?
-      // insert new extra data
-      const extraRows = await Promise.all(req.body[key].map(async (row) => {
-        const extraRes = await dataInsert({ table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid });
-        return extraRes?.rows?.[0];
-      }));
-      Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });
-    }));
-  }
-
-  return res;
-}
+import dataUpdate from '../funcs/dataUpdate.js';
+import dataInsert from '../funcs/dataInsert.js';
+import pgClients from '../../pg/pgClients.js';
+import getToken from '../funcs/getToken.js';
+import checkXSS from './utils/checkXSS.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
+import getAccess from '../funcs/getAccess.js';
+
+export default async function update(req) {
+  const { actions = [], scope, my } = await getAccess(req, req.params.table, req.params.id) || {};
+  if (!actions.includes('edit') || (scope === 'my' && !my)) {
+    return { message: 'access restricted', status: 403 };
+  }
+  if (!req.params?.table) {
+    return { message: 'table is required', status: 400 };
+  }
+  if (!req.params?.id) {
+    return { message: 'id is required', status: 404 };
+  }
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table, public: ispublic } = loadTemplate || req.params || {};
+  const { id } = req.params || {};
+
+  const { funcs = {}, user = {}, params = {} } = req;
+  const uid = funcs.config?.auth?.disable || ispublic ? '1' : user.uid;
+  const tokenDataString = await getToken({
+    funcs, uid, token: params.table, mode: 'w', json: 0,
+  });
+
+  const tokenData = JSON.parse(tokenDataString || '{}');
+
+  const formData = tokenData?.form || loadTemplate?.form ? await getTemplate('form', tokenData.form || loadTemplate?.form) : {};
+
+  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
+
+  if (xssCheck.error && formData?.xssCheck !== false) {
+    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
+    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
+  }
+
+  const res = await dataUpdate({
+    table: tokenData?.table || table, id: tokenData?.id || id, data: req.body, uid,
+  });
+
+  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && req.body[key].length);
+  if (extraKeys?.length) {
+    res.extra = {};
+    await Promise.all(extraKeys?.map(async (key) => {
+      const objId = req.body[formData[key].parent_id] || req.body?.id;
+      // delete old extra data
+      await pgClients.client.query(`delete from ${formData[key].table} where ${formData[key].parent_id}=$1`, [objId]); // rewrite?
+      // insert new extra data
+      const extraRows = await Promise.all(req.body[key].map(async (row) => {
+        const extraRes = await dataInsert({ table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid });
+        return extraRes?.rows?.[0];
+      }));
+      Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });
+    }));
+  }
+
+  return res;
+}

package/crud/controllers/utils/checkXSS.js

@@ -1,45 +1,45 @@
-/* import sqlInjection from '../../../policy/funcs/sqlInjection.js'; */
-import xssInjection from './xssInjection.js';
-
-/* const checkList = xssInjection.concat(sqlInjection); */
-
-// RTE - rich text editor
-
-function checkXSS({ body, schema = {} }) {
-  const data = typeof body === 'string' ? body : JSON.stringify(body);
-  const stopWords = xssInjection.filter((el) => data.toLowerCase().includes(el));
-
-  // check sql injection
-  const stopSpecialSymbols = data.match(/\p{S}OR\p{S}|\p{P}OR\p{P}| OR |\+OR\+/gi);
-  if (stopSpecialSymbols?.length) stopSpecialSymbols?.forEach((el) => stopWords.push(el));
-
-  // escape arrows on non-RTE
-  Object.keys(body)
-    .filter((key) => ['<', '>'].find((el) => body[key]?.includes?.(el))
-  && !['Summernote', 'Tiny', 'Ace'].includes(schema[key]?.type))
-    ?.forEach((key) => {
-      Object.assign(body, { [key]: body[key].replace(/</g, '&lt;').replace(/>/g, '&gt;') });
-    });
-  // try { } catch (err) { return { error: err.toString() }; }
-
-  if (!stopWords.length) return { body };
-
-  const disabledCheckFields = Object.keys(schema)?.filter((el) => schema[el]?.xssCheck === false); // exclude specific columns
-
-  // check RTE
-  /* const richTextFields = Object.keys(schema).filter((el) => ['Summernote', 'Tiny', 'Ace'].includes(schema[el]?.type));
-  richTextFields.filter((key) => !checkList.find((el) => body[key].includes(el)))?.forEach((key) => {
-    disabledCheckFields.push(key);
-  }); */
-
-  const field = Object.keys(body)
-    ?.find((key) => body[key]
-        && !disabledCheckFields.includes(key)
-        && body[key].toLowerCase().includes(stopWords[0]));
-  if (field) {
-    return { error: `rule: ${stopWords[0]} | attr: ${field} | val: ${body[field]}`, body };
-  }
-  return { body };
-}
-
-export default checkXSS;
+/* import sqlInjection from '../../../policy/funcs/sqlInjection.js'; */
+import xssInjection from './xssInjection.js';
+
+/* const checkList = xssInjection.concat(sqlInjection); */
+
+// RTE - rich text editor
+
+function checkXSS({ body, schema = {} }) {
+  const data = typeof body === 'string' ? body : JSON.stringify(body);
+  const stopWords = xssInjection.filter((el) => data.toLowerCase().includes(el));
+
+  // check sql injection
+  const stopSpecialSymbols = data.match(/\p{S}OR\p{S}|\p{P}OR\p{P}| OR |\+OR\+/gi);
+  if (stopSpecialSymbols?.length) stopSpecialSymbols?.forEach((el) => stopWords.push(el));
+
+  // escape arrows on non-RTE
+  Object.keys(body)
+    .filter((key) => ['<', '>'].find((el) => body[key]?.includes?.(el))
+  && !['Summernote', 'Tiny', 'Ace'].includes(schema[key]?.type))
+    ?.forEach((key) => {
+      Object.assign(body, { [key]: body[key].replace(/</g, '&lt;').replace(/>/g, '&gt;') });
+    });
+  // try { } catch (err) { return { error: err.toString() }; }
+
+  if (!stopWords.length) return { body };
+
+  const disabledCheckFields = Object.keys(schema)?.filter((el) => schema[el]?.xssCheck === false); // exclude specific columns
+
+  // check RTE
+  /* const richTextFields = Object.keys(schema).filter((el) => ['Summernote', 'Tiny', 'Ace'].includes(schema[el]?.type));
+  richTextFields.filter((key) => !checkList.find((el) => body[key].includes(el)))?.forEach((key) => {
+    disabledCheckFields.push(key);
+  }); */
+
+  const field = Object.keys(body)
+    ?.find((key) => body[key]
+        && !disabledCheckFields.includes(key)
+        && body[key].toLowerCase().includes(stopWords[0]));
+  if (field) {
+    return { error: `rule: ${stopWords[0]} | attr: ${field} | val: ${body[field]}`, body };
+  }
+  return { body };
+}
+
+export default checkXSS;

package/crud/controllers/utils/xssInjection.js

@@ -1,72 +1,72 @@
-const xssInjection = [
-  'onkeypress=',
-  'onkeyup=',
-  'ondblclick=',
-  'onerror=',
-  'onmouseover=',
-  '<meta',
-  '<script',
-  'vascript:',
-  'onkeydown=',
-  'onmousedown=',
-  'onmouseenter=',
-  'onmouseleave=',
-  'onmousemove=',
-  'onmouseout=',
-  'onmouseup=',
-  'onmousewheel=',
-  'onpaste=',
-  'onscroll=',
-  'onwheel=',
-  'javascript:',
-  '\\x',
-  'eval(',
-  'onmouseover=',
-  'action=',
-  'xlink:',
-  'allowscriptaccess',
-  'href=',
-  'behavior:',
-  'onreadystatechange=',
-  'onstart=',
-  'offline=',
-  'onabort=',
-  'onafterprint=',
-  'onbeforeonload=',
-  'onbeforeprint=',
-  'onblur=',
-  'oncanplay=',
-  'oncanplaythrough=',
-  'onchange=',
-  'onclick=',
-  'oncontextmenu=',
-  'ondblclick=',
-  'ondrag=',
-  'ondragend=',
-  'ondragenter=',
-  'ondragleave=',
-  'ondragover=',
-  'ondragstart=',
-  'ondrop=',
-  'ondurationchange=',
-  'onemptied=',
-  'onended=',
-  'onerror=',
-  'onfocus=',
-  'onformchange=',
-  'onforminput=',
-  'onhaschange=',
-  'oninput=',
-  'oninvalid=',
-  'onkeydown=',
-  'onkeypress=',
-  'onkeyup=',
-  'onload=',
-  'onloadeddata=',
-  'onloadedmetadata=',
-  'onloadstart=',
-  'alert(',
-  'script:',
-];
-
-export default xssInjection;
+const xssInjection = [
+  'onkeypress=',
+  'onkeyup=',
+  'ondblclick=',
+  'onerror=',
+  'onmouseover=',
+  '<meta',
+  '<script',
+  'vascript:',
+  'onkeydown=',
+  'onmousedown=',
+  'onmouseenter=',
+  'onmouseleave=',
+  'onmousemove=',
+  'onmouseout=',
+  'onmouseup=',
+  'onmousewheel=',
+  'onpaste=',
+  'onscroll=',
+  'onwheel=',
+  'javascript:',
+  '\\x',
+  'eval(',
+  'onmouseover=',
+  'action=',
+  'xlink:',
+  'allowscriptaccess',
+  'href=',
+  'behavior:',
+  'onreadystatechange=',
+  'onstart=',
+  'offline=',
+  'onabort=',
+  'onafterprint=',
+  'onbeforeonload=',
+  'onbeforeprint=',
+  'onblur=',
+  'oncanplay=',
+  'oncanplaythrough=',
+  'onchange=',
+  'onclick=',
+  'oncontextmenu=',
+  'ondblclick=',
+  'ondrag=',
+  'ondragend=',
+  'ondragenter=',
+  'ondragleave=',
+  'ondragover=',
+  'ondragstart=',
+  'ondrop=',
+  'ondurationchange=',
+  'onemptied=',
+  'onended=',
+  'onerror=',
+  'onfocus=',
+  'onformchange=',
+  'onforminput=',
+  'onhaschange=',
+  'oninput=',
+  'oninvalid=',
+  'onkeydown=',
+  'onkeypress=',
+  'onkeyup=',
+  'onload=',
+  'onloadeddata=',
+  'onloadedmetadata=',
+  'onloadstart=',
+  'alert(',
+  'script:',
+];
+
+export default xssInjection;

package/crud/funcs/dataDelete.js

@@ -1,19 +1,19 @@
-import getPG from '../../pg/funcs/getPG.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-import logChanges from './utils/logChanges.js';
-
-export default async function dataDelete({
-  table, id, pg: pg1, uid,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  const { pk } = await getMeta(table);
-  if (!pg.tlist?.includes(table)) return 'table not exist';
-  const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
-  //  console.log(updateDataset);
-  const res = await pg.one(delQuery, [id]) || {};
-  await logChanges({
-    pg, table, id, uid, type: 'DELETE',
-  });
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+import logChanges from './utils/logChanges.js';
+
+export default async function dataDelete({
+  table, id, pg: pg1, uid,
+}) {
+  const pg = pg1 || getPG({ name: 'client' });
+  const { pk } = await getMeta(table);
+  if (!pg.tlist?.includes(table)) return 'table not exist';
+  const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
+  //  console.log(updateDataset);
+  const res = await pg.one(delQuery, [id]) || {};
+  await logChanges({
+    pg, table, id, uid, type: 'DELETE',
+  });
+  return res;
+}

package/crud/funcs/dataInsert.js

@@ -1,30 +1,30 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import logChanges from './utils/logChanges.js';
-
-export default async function dataInsert({
-  table, data, pg: pg1, uid,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  if (!data) return null;
-  const { columns } = await getMeta(table);
-  if (!columns) return null;
-
-  const names = columns.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
-
-  const insertQuery = `insert into ${table}
-
-    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
-
-    values  (${filterData?.map((key, i) => (key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`)).join(',')}) 
-    
-    returning *`;
-
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
-  await logChanges({
-    pg, table, data, id: res.rows?.[0]?.[pg.pk[table]], uid, type: 'INSERT',
-  });
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import logChanges from './utils/logChanges.js';
+
+export default async function dataInsert({
+  table, data, pg: pg1, uid,
+}) {
+  const pg = pg1 || getPG({ name: 'client' });
+  if (!data) return null;
+  const { columns } = await getMeta(table);
+  if (!columns) return null;
+
+  const names = columns.map((el) => el.name);
+  const filterData = Object.keys(data)
+    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
+
+  const insertQuery = `insert into ${table}
+
+    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
+
+    values  (${filterData?.map((key, i) => (key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`)).join(',')}) 
+    
+    returning *`;
+
+  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+  await logChanges({
+    pg, table, data, id: res.rows?.[0]?.[pg.pk[table]], uid, type: 'INSERT',
+  });
+  return res;
+}

package/crud/funcs/dataUpdate.js

@@ -1,30 +1,36 @@
-import getPG from '../../pg/funcs/getPG.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-import logChanges from './utils/logChanges.js';
-
-export default async function dataUpdate({
-  table, id, data, pg: pg1, uid,
-}) {
-  if (!data || !table || !id) return null;
-
-  const pg = pg1 || getPG({ name: 'client' });
-  const { columns, pk } = await getMeta(table);
-
-  const names = columns?.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el)));
-
-  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
-
-  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => (key === 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)` : `"${key}"=$${i + 2}`)).join(',')} 
-      WHERE ${pk} = $1 returning *`;
-  // console.log(updateQuery, filterValue);
-  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
-  
-  await logChanges({
-    pg, table, data, id, uid, type: 'UPDATE',
-  });
-  
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+import logChanges from './utils/logChanges.js';
+
+export default async function dataUpdate({
+  table, id, data, pg: pg1, uid,
+}) {
+  if (!data || !table || !id) return null;
+
+  const pg = pg1 || getPG({ name: 'client' });
+  const { columns, pk } = await getMeta(table);
+
+  const names = columns?.map((el) => el.name);
+  Object.assign(data, { editor_id: uid });
+  const filterData = Object.keys(data)
+    .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el) && el !== 'editor_date'));
+
+  const editorDate = names?.includes('editor_date') ? 'editor_date=now(),' : undefined;
+
+  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
+
+  const updateQuery = `UPDATE ${table} SET ${editorDate} ${filterData
+    ?.map((key, i) => (key?.includes('geom') && key !== 'geom' ? `"${key}"=st_geomfromgeojson($${i + 2}::json)` : undefined) 
+      || (key === 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)` : `"${key}"=$${i + 2}`))
+    .join(',')} 
+      WHERE ${pk} = $1 returning *`;
+  // console.log(updateQuery, filterValue);
+  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
+
+  await logChanges({
+    pg, table, data, id, uid, type: 'UPDATE',
+  });
+
+  return res;
+}

package/crud/funcs/getAccess.js

@@ -1,53 +1,53 @@
-import getMeta from '../../pg/funcs/getMeta.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-import config from '../../config.js';
-
-const q = `select a.route_id as id, b.actions, b.scope 
-from admin.routes a 
-left join admin.access b on 
-  a.route_id=b.route_id
-left join admin.roles c on 
-  b.role_id=c.role_id 
-  and c.enabled
-left join admin.user_roles d on 
-  c.role_id=d.role_id 
-  and ( case when 
-            d.expiration is not null 
-            then d.expiration > CURRENT_DATE 
-            else 1=1 
-        end )
-where a.route_id=$1 and $2 in (b.user_uid, d.user_uid)`;
-
-export default async function getAccess(req, template, id = null) {
-  if (config.disableAccessRestriction || true) {
-    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;
-
-  if (!pg.pk?.['admin.access']) return null;
-
-  const { table } = await getTemplate('table', template) || {};
-  if (!table) return null;
-
-  const { scope = 'my', actions = [] } = await pg.one(q, [template, uid]);
-  // console.log(scope, actions);
-
-  const { columns = [] } = await getMeta(table);
-  const columnList = columns.map((el) => el.name || el).join(',');
-
-  const query = userType?.includes('admin') ? '1=1' : {
-    my: `uid='${uid}'`,
-    responsible: columnList.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]) : {};
-
-  return {
-    scope, actions, query, my,
-  };
-}
+import getMeta from '../../pg/funcs/getMeta.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
+import config from '../../config.js';
+
+const q = `select a.route_id as id, b.actions, b.scope 
+from admin.routes a 
+left join admin.access b on 
+  a.route_id=b.route_id
+left join admin.roles c on 
+  b.role_id=c.role_id 
+  and c.enabled
+left join admin.user_roles d on 
+  c.role_id=d.role_id 
+  and ( case when 
+            d.expiration is not null 
+            then d.expiration > CURRENT_DATE 
+            else 1=1 
+        end )
+where a.route_id=$1 and $2 in (b.user_uid, d.user_uid)`;
+
+export default async function getAccess(req, template, id = null) {
+  if (config.disableAccessRestriction || true) {
+    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;
+
+  if (!pg.pk?.['admin.access']) return null;
+
+  const { table } = await getTemplate('table', template) || {};
+  if (!table) return null;
+
+  const { scope = 'my', actions = [] } = await pg.one(q, [template, uid]);
+  // console.log(scope, actions);
+
+  const { columns = [] } = await getMeta(table);
+  const columnList = columns.map((el) => el.name || el).join(',');
+
+  const query = userType?.includes('admin') ? '1=1' : {
+    my: `uid='${uid}'`,
+    responsible: columnList.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]) : {};
+
+  return {
+    scope, actions, query, my,
+  };
+}

package/crud/funcs/getOpt.js

@@ -1,10 +1,10 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-
-export default async function getOpt(token, funcs) {
-  const rclient = getRedis({ db: 0, funcs });
-
-  const key = `opt:${token}`;
-  const data = await rclient.get(key);
-  if (!data) return null;
-  return JSON.parse(data);
-}
+import getRedis from '../../redis/funcs/getRedis.js';
+
+export default async function getOpt(token, funcs) {
+  const rclient = getRedis({ db: 0, funcs });
+
+  const key = `opt:${token}`;
+  const data = await rclient.get(key);
+  if (!data) return null;
+  return JSON.parse(data);
+}