@opengis/fastify-table 1.2.15 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

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

@@ -13,7 +13,7 @@ import applyHook from '../../hook/funcs/applyHook.js';
  * @returns { scope: String, actions: String[], query: String }
  */
 
-const q = `select a.route_id as id, coalesce(d.actions, b.actions, array['view']) as actions, b.scope, c.role_id
+const q = `select a.route_id as id, d.actions as user_roles, d.actions as role_actions, coalesce(b.actions, array['view']) as interface_actions, b.scope, c.role_id
 from admin.routes a 
 left join admin.role_access b on 
   a.route_id=b.route_id
@@ -73,7 +73,10 @@ export default async function getAccess({ table, user = {} }) {
     : {};
 
   const query = userAccess?.scope === 'my' ? `uid='${uid}'` : '1=1';
-  const actions = userAccess?.actions?.filter?.((el, idx, arr) => arr.indexOf(el) === idx && tableActions.includes(el));
+  const actions = userAccess?.interface_actions
+    ?.filter?.((el, idx, arr) => arr.indexOf(el) === idx)
+    ?.filter(el => userAccess?.role_actions?.length ? userAccess?.role_actions.includes(el) : true)
+    ?.filter(el => tableActions.includes(el));
   return {
     scope: userAccess?.scope,
     roles: userAccess?.roles,

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

@@ -1,5 +1,5 @@
 
-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;
+const emailReg = /(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-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-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
 
 function checkField(key, val, options, idx) {
     // validators: [required]
@@ -49,5 +49,5 @@ function checkBody({ body = {}, arr = [], idx }) {
 
 export default function validateData({ body = {}, schema = {} }) {
     const res = checkBody({ body, arr: Object.keys(schema).map(key => ({ ...schema[key], key })) });
-    return res;    
+    return res;
 }