@opengis/fastify-table 2.0.42 → 2.0.44

package/dist/server/migrations/users.sql

@@ -6,6 +6,7 @@ ALTER TABLE admin.users add column if not exists uid text NOT NULL DEFAULT next_
 ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_uid_pkey cascade;
 ALTER TABLE admin.users DROP CONSTRAINT if exists user_pk cascade;
 ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_user_rnokpp;
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_type_check;
 
 ALTER TABLE admin.users add column if not exists login text;
 ALTER TABLE admin.users add column if not exists password text NOT NULL DEFAULT ''::text;
@@ -32,6 +33,11 @@ ALTER TABLE admin.users add column if not exists twofa boolean not null DEFAULT
 ALTER TABLE admin.users add CONSTRAINT admin_user_uid_pkey PRIMARY KEY (uid);
 ALTER TABLE admin.users add CONSTRAINT admin_user_user_rnokpp UNIQUE (user_rnokpp);
 
+update admin.users set user_type='regular' where user_type not in ('viewer', 'regular','admin','superadmin');
+ALTER TABLE admin.users add constraint admin_user_type_check CHECK (user_type=any(array['viewer', 'regular','admin','superadmin']));
+insert into admin.users (uid,login,password,user_type,enabled)values('viewer','viewer','viewer','viewer', false) on conflict (uid) do update set enabled=excluded.enabled;
+-- update admin.users set enabled=true where uid='viewer';
+
 COMMENT ON TABLE admin.users IS 'Користувачі';
 
 COMMENT ON COLUMN admin.users.uid IS 'ID користувача';

package/dist/server/plugins/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkB1C,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAsIvC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkB1C,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAuIvC;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/auth/index.js

@@ -80,7 +80,9 @@ function plugin(fastify) {
             !config.auth?.disableRedirect &&
             !req.url.startsWith(prefix) &&
             !req.url.startsWith("/api") &&
-            !req.url.startsWith("/login")) {
+            !req.url.startsWith("/login") &&
+            !req.url.includes('.') &&
+            !req.url.includes('@')) {
             return reply.redirect(`${config?.auth?.redirect || "/login"}` + `?redirect=${req.url}`);
         }
         // by default, disable 2factor for id.gov.ua auth

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":"AAsBA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,EAAE,GAAG,EAC/B,EAAE,MAAmB,sBAmEtB"}
+{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,EAAE,GAAG,EAC/B,EAAE,MAAmB,sBAuEtB"}

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

@@ -37,6 +37,9 @@ export default async function getAccess({ table, form, user = {} }, pg = pgClien
     if (userType === "superadmin") {
         return { actions: allActions, query: "1=1" };
     }
+    if (userType === "viewer") {
+        return { actions: ["view"], 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/plugins/policy/funcs/checkPolicy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,oSAiK5E"}
+{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,oSA6K5E"}

package/dist/server/plugins/policy/funcs/checkPolicy.js

@@ -3,8 +3,10 @@ import block from "../sqlInjection.js";
 export default function checkPolicy(req, reply) {
     const { originalUrl: path, hostname, query, params, headers, method, routeOptions, unittest, // legacy
      } = req;
+    const user = req.user || req.session?.passport?.user;
     // ! skip locally, skip tests
-    if (config.local || unittest || process.env.NODE_ENV === "test") {
+    if ((config.local || unittest || process.env.NODE_ENV === "test") &&
+        user?.user_type !== "viewer") {
         return null;
     }
     // ! skip non-API Requests
@@ -19,8 +21,6 @@ export default function checkPolicy(req, reply) {
         hostname.split(":").shift() === config.adminDomain ||
         config.admin ||
         hostname.startsWith("admin");
-    const user = req.user || req.session?.passport?.user;
-    // const isServer = process.argv[2];
     const { role, referer, policy = [], } = (routeOptions?.config || {});
     const isRole = (role && user?.user_type !== role) ||
         (policy.includes("admin") && user?.user_type !== "admin");
@@ -35,9 +35,19 @@ export default function checkPolicy(req, reply) {
     const requireReferer = Array.isArray(policy)
         ? policy.includes("referer")
         : referer;
+    if (method !== "GET" && user?.user_type === "viewer") {
+        logger.file("policy/role", {
+            path,
+            method,
+            userRole: user.user_type,
+        });
+        return reply.status(403).send("access restricted: 0");
+    }
     // ! role
     if (isRole) {
         logger.file("policy/role", {
+            role,
+            userRole: user?.user_type || "none",
             path,
             method,
             params,

package/dist/server/routes/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAiC1C,iBAAe,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,GAAE,GAAQ,iBA0ExD;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAiC1C,iBAAe,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,GAAE,GAAQ,iBA4ExD;AAED,eAAe,MAAM,CAAC"}

package/dist/server/routes/menu/controllers/getMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMenu.d.ts","sourceRoot":"","sources":["../../../../../server/routes/menu/controllers/getMenu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4CzD,wBAA8B,SAAS,CACrC,EACE,IAAS,EACT,OAAO,EACP,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,EAAE,EAAE,UAAU,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,GAAG,IAAI;;;;;;;;;;;;GAuG3B"}
+{"version":3,"file":"getMenu.d.ts","sourceRoot":"","sources":["../../../../../server/routes/menu/controllers/getMenu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4CzD,wBAA8B,SAAS,CACrC,EACE,IAAS,EACT,OAAO,EACP,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,EAAE,EAAE,UAAU,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,GAAG,IAAI;;;;;;;;;;;;GAwG3B"}

package/dist/server/routes/menu/controllers/getMenu.js

@@ -66,6 +66,7 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
         user?.uid &&
         !user.user_type?.includes?.("admin") &&
         !user.type?.includes?.("admin") &&
+        user.user_type !== "viewer" &&
         pg.pk?.["admin.role_access"]) {
         const { type, gl = [], routes = [], } = await pg
             .query(`select user_type as type, b.gl,routes from admin.users a

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAkzBb"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAgzBb"}

package/dist/server/routes/table/functions/getData.js

@@ -48,11 +48,10 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     if (!paramsTable) {
         return { message: "not enough params: table", status: 400 };
     }
-    const paramsId = params?.id || id;
     const hookData = (await applyHook("preData", {
         pg,
         table: paramsTable,
-        id: paramsId,
+        id: params?.id || id,
         user,
     }));
     if (hookData?.message && hookData?.status) {
@@ -108,10 +107,10 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         !(called && pkey)) {
         return reply.status(404).send("template not found");
     }
-    const id1 = tokenData?.id || hookData?.id || paramsId;
+    const objectId = tokenData?.id || hookData?.id || params?.id || id;
     const { actions = [], query: accessQuery } = (await getAccess({
         table: templateName,
-        id: id1,
+        id: objectId,
         user,
     }, pg));
     if (!actions.includes("view") && !config?.local && !called) {
@@ -130,7 +129,6 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         // console.warn('invalid filters in template: filter_list / filterList');
         // logger.file('crud/warning', { msg: 'invalid filters', template: templateName });
     }
-    const objectId = tokenData?.id || hookData?.id || paramsId;
     const { list: filters = [] } = objectId
         ? {}
         : (await getFilter({
@@ -166,7 +164,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         (!el.sql.includes("{{uid}}") || uid))
         .map((el, i) => ` left join lateral (${el.sql.replace("{{uid}}", uid)}) ${el.name || `t${i}`} on 1=1 `)
         ?.join("") || "";
-    const cardSqlFiltered = hookData?.id || paramsId
+    const cardSqlFiltered = objectId
         ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []
         : [];
     const cardSqlTable = cardSqlFiltered.length
@@ -191,11 +189,11 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             ?.filter((el) => !cols.includes(el))
             .join(",")}`
         : "";
-    if (paramsId && columnList.includes(paramsId)) {
+    if (objectId && columnList.includes(objectId)) {
         return gisIRColumn({
             pg,
             layer: paramsTable,
-            column: paramsId,
+            column: objectId,
             sql: query.sql,
             filter: query.filter,
             search: query.search,
@@ -269,7 +267,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         ? await handlebars.compile(params?.query)({ user, uid })
         : undefined;
     const where = [
-        id1 ? ` "${pk}" = $1` : null,
+        objectId ? ` "${pk}" = $1` : null,
         keyQuery,
         loadTable?.query,
         tokenData?.query,
@@ -285,7 +283,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         .filter(Boolean)
         .filter((el) => checkQuery(el));
     const q = `select  ${pk ? `"${pk}" as id,` : ""} 
-                     ${paramsId || query.key ? "*" : sqlColumns || cols || "*"} 
+                     ${objectId || query.key ? "*" : sqlColumns || cols || "*"} 
                      ${metaCols} 
                      
                      ${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry").length
@@ -299,7 +297,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         .map((el) => `,(${el.sql})`)
         .join("") || ""} from ${table1} t  ${sqlTable} ) t 
                       
-                     ${paramsId ? cardSqlTable : ""} 
+                     ${objectId ? cardSqlTable : ""} 
                      where ${where.join(" and ") || "true"} 
                      ${order} ${offset} limit ${limit}`.replace(/{{uid}}/g, uid);
     if (config.trace)
@@ -308,7 +306,8 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         return q;
     }
     const { rows = [] } = await pg
-        .query(q, (id1 ? [id1] : null) || (query.key && loadTable.key ? [query.key] : []))
+        .query(q, (objectId ? [objectId] : null) ||
+        (query.key && loadTable.key ? [query.key] : []))
         .catch((err) => {
         console.error(err.toString());
         throw err;
@@ -382,7 +381,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     if (query.sql === "2") {
         return qCount;
     }
-    const counts = keyQuery || id1
+    const counts = keyQuery || objectId
         ? { total: rows.length, filtered: rows.length }
         : await pg
             .queryCache?.(qCount, {
@@ -428,6 +427,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                 .filter((key) => index?.tokens[key]?.public ||
                 actions?.includes?.("edit") ||
                 actions?.includes?.("add") ||
+                user?.user_type === "viewer" ||
                 !index?.tokens[key]?.table)
                 .forEach((key) => {
                 const item = index?.tokens[key];
@@ -437,7 +437,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                     item[el] = handlebarsSync.compile(item[el])({
                         user,
                         uid,
-                        id,
+                        id: objectId,
                         data: rows[0],
                     });
                 });
@@ -469,7 +469,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             .map(async (el) => {
             const filtered1 = el.items.filter((item) => item.count?.toLowerCase?.().includes("select"));
             const data = await Promise.all(filtered1.map(async (item) => pg
-                .query(item.count.replace(/{{id}}/g, paramsId))
+                .query(item.count.replace(/{{id}}/g, objectId))
                 .then((item1) => item1.rows[0] || {})));
             filtered1.forEach((el1, i) => {
                 // el1.title = data[i].title;
@@ -479,9 +479,9 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                 .map((item) => item.component ? components[item.component] : null)
                 .filter((item) => item)
                 .join(" union all ");
-            const counts1 = q1 && id
+            const counts1 = q1 && objectId
                 ? await pg
-                    .query(q1, [id1])
+                    .query(q1, [objectId])
                     .then((e) => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
                 : {};
             el.items
@@ -498,7 +498,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                     data: rows[0],
                     user,
                     uid,
-                    id: id1,
+                    id: objectId,
                 });
                 const { rows: sqlData } = await pg.query(q2);
                 data[el.name] = sqlData;
@@ -528,7 +528,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                 const name = el[0].substring(0, el[0].lastIndexOf("."));
                 logger.file("handlebars/error", {
                     table,
-                    id: paramsId,
+                    id: objectId,
                     error: err.toString(),
                     stack: err.stack,
                 });
@@ -602,7 +602,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const result = await applyHook("afterData", {
         pg,
         table: loadTable?.table || tokenData?.table,
-        id: id1,
+        id: objectId,
         template: templateName,
         payload: res,
         user,

package/package.json

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