@opengis/fastify-table 1.1.70 → 1.1.71

package/index.js

@@ -73,7 +73,8 @@ async function plugin(fastify, opt) {
 
   execMigrations().catch(err => console.log(err));
 
-  if (!fastify.funcs) {
+  // only at fastify-auth
+  if (!fastify.funcs && false) {
     fastify.addHook('onRequest', async (req) => {
       // req.funcs = fastify;
       if (!req.user && req.session?.passport?.user) {

package/package.json

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

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

@@ -23,7 +23,7 @@ export default async function deleteCrud(req) {
   }
   const loadTemplate = await getTemplate('table', del);
 
-  const { table } = loadTemplate || hookData || req.params || {};
+  const { table } = loadTemplate || hookData || tokenData || req.params || {};
 
   if (!table) return { status: 404, message: 'table is required' };
   if (!id) return { status: 404, message: 'id is required' };

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

@@ -4,7 +4,7 @@ import {
 
 export default async function insert(req) {
   const {
-    user, params = {}, body = {},
+    user = {}, params = {}, body = {},
   } = req || {};
   if (!user) return { message: 'access restricted', status: 403 };
   const hookData = await applyHook('preInsert', { table: params?.table, user });
@@ -12,7 +12,7 @@ export default async function insert(req) {
     return { message: hookData?.message, status: hookData?.status };
   }
   const tokenData = await getToken({
-    uid: user.uid, token: params.table, mode: 'a', json: 1,
+    uid: user?.uid, token: params.table, mode: 'a', json: 1,
   });
 
   const { form, table: add } = hookData || tokenData || (config.auth?.disable ? req.params : {});
@@ -42,10 +42,8 @@ export default async function insert(req) {
     return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
   }
 
-  const uid = user?.uid;
-
   if (![add, table].includes('admin.users')) {
-    Object.assign(body, { uid, editor_id: uid });
+    Object.assign(body, { uid: user?.uid, editor_id: user?.uid });
   }
   if (tokenData?.obj) {
     const objData = tokenData.obj?.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {}) || {};
@@ -53,7 +51,7 @@ export default async function insert(req) {
   }
 
   const res = await dataInsert({
-    table: loadTemplate?.table || table, data: body, uid,
+    table: loadTemplate?.table || table, data: body, uid: user?.uid,
   });
   if (!res) return { message: 'nothing added ' };
 
@@ -69,7 +67,7 @@ export default async function insert(req) {
       const objId = body[formData[key].parent_id] || req.body?.id;
       const extraRows = await Promise.all(body[key].map(async (row) => {
         const extraRes = await dataInsert({
-          table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid,
+          table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid: user?.uid,
         });
         return extraRes?.rows?.[0];
       }));

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

@@ -6,12 +6,12 @@ import {
 const maxLimit = 100;
 export default async function dataAPI(req) {
   const {
-    pg, params, query = {}, user,
+    pg, params, query = {}, user = {},
   } = req;
 
   const time = Date.now();
 
-  const uid = config?.auth?.disable ? '1' : user?.uid;
+  const { uid } = user;
 
   const hookData = await applyHook('preData', {
     table: params?.table, id: params?.id, user,