@opengis/fastify-table 2.2.10 → 2.2.12

package/dist/server/plugins/access/funcs/getUserPermissions.d.ts

@@ -1,6 +1,7 @@
-export default function getUserPermissions({ uid, resource, userType, }: {
+export default function getUserPermissions({ uid, resource, table, userType, }: {
     uid?: string;
     resource?: string;
+    table?: string;
     userType?: string;
 }, pg?: any): Promise<any>;
 //# sourceMappingURL=getUserPermissions.d.ts.map

package/dist/server/plugins/access/funcs/getUserPermissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getUserPermissions.ts"],"names":[],"mappings":"AAYA,wBAA8B,kBAAkB,CAC9C,EACE,GAAG,EACH,QAAQ,EACR,QAAQ,GACT,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EACzD,EAAE,MAAmB,gBAsCtB"}
+{"version":3,"file":"getUserPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getUserPermissions.ts"],"names":[],"mappings":"AAYA,wBAA8B,kBAAkB,CAC9C,EACE,GAAG,EACH,QAAQ,EACR,KAAK,EACL,QAAQ,GACT,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EACzE,EAAE,MAAmB,gBAyCtB"}

package/dist/server/plugins/access/funcs/getUserPermissions.js

@@ -7,7 +7,7 @@ from admin.role_access a
 left join admin.roles b on a.role_id=b.role_id and b.enabled
 left join admin.user_roles c on a.role_id=c.role_id
 where resource_id is not null and $1 in (a.user_uid, c.user_uid)`;
-export default async function getUserPermissions({ uid, resource, userType, }, pg = pgClients.client) {
+export default async function getUserPermissions({ uid, resource, table, userType, }, pg = pgClients.client) {
     if (!uid)
         return [];
     if (userType === "admin") {
@@ -27,7 +27,7 @@ export default async function getUserPermissions({ uid, resource, userType, }, p
     const filteredPermissions = resource
         ? permissions.filter((el) => el.name === resource)
         : permissions;
-    const userPermissions = (filteredPermissions || [])
+    const userPermissions1 = (filteredPermissions || [])
         .map((e) => {
         const resource = resourcesList.find((el) => el.name === e.name);
         if (resource) {
@@ -35,5 +35,8 @@ export default async function getUserPermissions({ uid, resource, userType, }, p
         }
     })
         .filter(Boolean);
+    const userPermissions = table
+        ? userPermissions1.filter((el) => el.table === table)
+        : userPermissions1;
     return userPermissions;
 }

package/dist/server/plugins/crud/funcs/getAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AA8BA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,MAAc,EAAE,EAAE,GAAG,EACzD,EAAE,MAAmB,sBA8GtB"}
+{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AA8BA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,MAAc,EAAE,EAAE,GAAG,EACzD,EAAE,MAAmB,sBA4HtB"}

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

@@ -54,6 +54,7 @@ export default async function getAccess({ resource, table, form, user = {}, meth
     if (userType === "viewer") {
         return { actions: ["view"], query: "1=1" };
     }
+    // get request, example: /api/data
     if (resource) {
         const permissions = await getUserPermissions({ resource, uid, userType }, pg);
         const actions = (permissions || [])
@@ -65,6 +66,18 @@ export default async function getAccess({ resource, table, form, user = {}, meth
             query: permissions?.query || "1=1",
         };
     }
+    // get / post / put / delete, example: /api/form/:table/:id
+    const permissions = await getUserPermissions({ table, uid, userType }, pg);
+    const permissionActions = (permissions || [])
+        .flatMap((el) => el.actions.map((e) => matches[e] || e))
+        .filter((el, idx, arr) => arr.indexOf(el) === idx);
+    if (table && permissions?.length) {
+        return {
+            scope: permissions?.scope,
+            actions: permissionActions,
+            query: permissions?.query || "1=1",
+        };
+    }
     const body = await getTemplate("table", table);
     const tableActions = !body && form
         ? allActions // if db table and form => full access (token)

package/dist/server/routes/table/controllers/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAaA,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;CAC3B;AAED,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,GAC5C,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CAoSvE"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAaA,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;CAC3B;AAED,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,GAC5C,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CAqSvE"}

package/dist/server/routes/table/controllers/filter.js

@@ -84,7 +84,8 @@ export default async function filterAPI(req, reply, iscalled) {
         .filter((el) => el.id &&
         el.type !== "Autocomplete" &&
         !el.sql &&
-        !el.options?.find?.((item) => item.sql))
+        // !el.options?.find?.((item: any) => item.sql)
+        !el.options)
         .map(async (el) => {
         const cls = el.data ? await getSelect(el.data, pg) : null;
         if (!cls && !el.type?.includes?.("Check"))

package/package.json

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