@opengis/fastify-table 1.1.61 → 1.1.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/plugins/crud/funcs/getOpt.js

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

package/server/plugins/crud/funcs/getToken.js

@@ -16,14 +16,16 @@ const keys = {
 };
 
 async function getToken({
-  uid, token, mode = 'r', json,
+  uid, token, json,
 }) {
-  if (mode === 'r') return token;
+  const mode = 'w';
+  // 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);
+  // console.log(key, token);
   return json && id?.[0] === '{' ? JSON.parse(id) : id;
 }
 

package/server/plugins/crud/funcs/setOpt.js

@@ -1,4 +1,6 @@
-import { createHash } from 'crypto';
+import { createHash, randomUUID } from 'crypto';
+
+const random = randomUUID();
 
 import getRedis from '../../redis/funcs/getRedis.js';
 
@@ -8,12 +10,12 @@ function md5(string) {
   return createHash('md5').update(string).digest('hex');
 }
 
-export default async function setOpt(params) {
-  const token = Buffer.from(md5(typeof params === 'object' ? JSON.stringify(params) : params), 'hex').toString('base64').replace(/[+-=]+/g, '');
+export default function setOpt(params, uid = 0) {
+  const token = Buffer.from(md5(typeof params === 'object' ? JSON.stringify(params) : params) + random, 'hex').toString('base64').replace(/[+-=]+/g, '');
   // const token = md5(params);
-  const key = `opt:${token}`;
+  const key = `opt:${uid}:${token}`;
 
-  const rclient = getRedis({ db: 0, funcs: params.funcs });
-  await rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
+  const rclient = getRedis({ db: 0 });
+  rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
   return token;
 }

package/server/plugins/crud/funcs/setToken.js

@@ -4,6 +4,8 @@ import config from '../../../../config.js';
 
 import getRedis from '../../redis/funcs/getRedis.js';
 
+const rclient = getRedis({ db: 0 });
+
 // import { config, getRedis } from '../../../../utils.js';
 
 const generateCodes = (ids, userToken) => {
@@ -19,36 +21,22 @@ const generateCodes = (ids, userToken) => {
 };
 
 function setToken({
-  ids: idsOrigin, mode = 'r', uid, array,
+  ids: idsOrigin, uid, 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);
-  // console.log(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 */
-
+  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
+  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
   // TODO дополнительно писать в hset token -> uid
   return array ? Object.values(obj) : obj;
 }

package/server/routes/crud/controllers/insert.js

@@ -6,6 +6,7 @@ export default async function insert(req) {
   const {
     user, params = {}, body = {},
   } = req || {};
+  if (!user) return { message: 'access restricted', status: 403 };
   const hookData = await applyHook('preInsert', { table: params?.table, user });
   if (hookData?.message && hookData?.status) {
     return { message: hookData?.message, status: hookData?.status };

package/server/routes/{table → crud}/controllers/table.js

@@ -1,31 +1,40 @@
 import {
-  config, getAccess, getTemplate, getMeta, setToken, applyHook,
+  config, getAccess, getTemplate, getMeta, setToken, applyHook, getToken,
 } from '../../../../utils.js';
 
 export default async function tableAPI(req) {
   const {
-    pg, params, user, query = {},
+    pg, params, user = {}, query = {},
   } = req;
+  const tokenData = await getToken({ token: params?.table, uid: user.uid, json: 1 }) || {};
+
   const hookData = await applyHook('preTable', {
-    table: params?.table, id: params?.id, user,
+    table: params?.table, id: params?.id, ...tokenData || {}, user,
   });
 
   if (hookData?.message && hookData?.status) {
     return { message: hookData?.message, status: hookData?.status };
   }
+  const tableName1 = hookData?.table || tokenData.table || params.table;
 
-  if (!params?.id && !hookData?.id) {
-    return { message: 'not enough params', status: 400 };
-  }
-  const tableName = hookData?.table || params.table;
-  const loadTable = await getTemplate('table', tableName) || {};
-  if (!loadTable || (pg.pk?.[tableName])) {
+  const loadTable = await getTemplate('table', tableName1) || {};
+  if (!loadTable && !pg.pk?.[tokenData.table]) {
     return { message: 'not found', status: 404 };
   }
 
+  const { table, /* columns, */ form } = loadTable;
+
+  const tableName = table || hookData?.table || tokenData.table || params.table;
+
+  const id = hookData?.id || tokenData.id || params.id;
+
+  if (!tableName && !id) {
+    return { message: 'not enough params', status: 400 };
+  }
+
   const { actions = [], query: accessQuery } = await getAccess({
-    table: hookData?.table || params.table,
-    id: hookData?.id || params?.id,
+    table: tableName,
+    id,
     user,
   }) || {};
 
@@ -33,9 +42,7 @@ export default async function tableAPI(req) {
     return { message: 'access restricted', status: 403 };
   }
 
-  const { table, /* columns, */ form } = loadTable;
-
-  const { pk, columns: dbColumns = [] } = await getMeta(table || hookData?.table || params.table);
+  const { pk, columns: dbColumns = [] } = await getMeta(tableName);
   if (!pk) return { message: `table not found: ${table}`, status: 404 };
 
   // const cols = columns.map((el) => el.name || el).join(',');
@@ -45,17 +52,17 @@ export default async function tableAPI(req) {
   // skip non-existing columns
   const columnList = dbColumns.map((el) => el.name || el).join(',');
 
-  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || hookData?.table || params.table} limit 0`) : {};
+  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${tableName} limit 0`) : {};
   const cols = loadTable?.table
     ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') ? `st_asgeojson(${col})::json as "${col}"` : `"${col}"`))?.join(',')
     : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
   const where = [`"${pk}" = $1`, loadTable.query, accessQuery].filter((el) => el);
   const geom = columnList.includes('geom') ? ',st_asgeojson(geom)::json as geom' : '';
-  const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${table || hookData?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
+  const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${tableName} t where ${where.join(' and ') || 'true'} limit 1`;
 
   if (query?.sql === '1') return q;
 
-  const data = await pg.query(q, [hookData?.id || params.id]).then(el => el.rows[0]);
+  const data = await pg.query(q, [id]).then(el => el.rows[0]);
   if (!data) return { message: 'not found', status: 404 };
 
   if (extraKeys?.length) {
@@ -66,16 +73,14 @@ export default async function tableAPI(req) {
     }));
   }
   if (user.uid) {
-    const [token] = setToken({
-      ids: [JSON.stringify({ id: params?.id, table: params.table || loadTable.table, form: loadTable.form })],
-      mode: 'w',
+    data.token = tokenData?.table ? params.table : setToken({
+      ids: [JSON.stringify({ id, table: tableName, form: loadTable.form })],
       uid: user.uid,
       array: 1,
-    });
-    data.token = token;
+    })[0];
   }
   const res = await applyHook('afterTable', {
-    table: loadTable?.table, payload: [data], user,
+    table: tableName, payload: [data], user,
   });
   return res || data || {};
 }

package/server/routes/crud/controllers/update.js

@@ -5,6 +5,7 @@ import config from '../../../../config.js';
 
 export default async function update(req) {
   const { user, params = {}, body = {} } = req;
+  if (!user) return { message: 'access restricted', status: 403 };
   const hookData = await applyHook('preUpdate', {
     table: params?.table, id: params?.id, user,
   });
@@ -33,7 +34,7 @@ export default async function update(req) {
   }
 
   const loadTemplate = await getTemplate('table', edit);
-  const { table } = loadTemplate || hookData || params || {};
+  const { table } = loadTemplate || hookData || tokenData || params || {};
 
   const uid = user?.uid;
 
@@ -56,7 +57,7 @@ export default async function update(req) {
   });
 
   // form DataTable
-  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && body[key].length);
+  const extraKeys = formData ? Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && body[key].length) : [];
   if (extraKeys?.length) {
     res.extra = {};
     await Promise.all(extraKeys?.map(async (key) => {

package/server/routes/crud/index.js

@@ -1,6 +1,7 @@
 import update from './controllers/update.js';
 import insert from './controllers/insert.js';
 import deleteCrud from './controllers/deleteCrud.js';
+import table from './controllers/table.js';
 
 const tableSchema = {
   params: {
@@ -14,6 +15,7 @@ async function plugin(fastify, config = {}) {
   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.get(`${prefix}/table/:table/:id?`, { schema: tableSchema }, table);
 }
 
 export default plugin;

package/server/routes/table/controllers/data.js

@@ -128,21 +128,10 @@ export default async function dataAPI(req) {
   if (user.uid && actions.includes('add')) {
     const addTokens = setToken({
       ids: [JSON.stringify({ table: hookData?.table || params.table, form: loadTable.form })],
-      mode: 'a',
       uid,
       array: 1,
     });
     Object.assign(res, { addToken: addTokens[0] });
-
-    /* rows.forEach((row) => {
-      const editTokens = setToken({
-        ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
-        mode: 'w',
-        uid: config?.auth?.disable ? '1' : uid,
-        array: 1,
-      });
-      Object.assign(row, { token: editTokens[0] });
-    }); */
   }
 
   const result = await applyHook('afterData', {

package/server/routes/table/index.js

@@ -1,6 +1,6 @@
 import suggest from './controllers/suggest.js';
 import data from './controllers/data.js';
-import table from './controllers/table.js';
+
 import card from './controllers/card.js';
 import search from './controllers/search.js';
 import filter from './controllers/filter.js';
@@ -16,7 +16,7 @@ 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
-  fastify.get(`${prefix}/table/:table/:id?`, { schema: tableSchema }, table);
+
   fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
   fastify.get(`${prefix}/search`, { schema: searchSchema }, search);