@opengis/fastify-table 2.1.4 → 2.1.6

package/dist/module/core/select/core.user_mentioned.sql

@@ -1,2 +1,2 @@
-select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
+select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
 where enabled order by coalesce(sur_name,'')||coalesce(' '||user_name,'')

package/dist/server/helpers/list/tableList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tableList.d.ts","sourceRoot":"","sources":["../../../../server/helpers/list/tableList.ts"],"names":[],"mappings":"AA+BA,wBAA8B,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,gBA+F1D"}
+{"version":3,"file":"tableList.d.ts","sourceRoot":"","sources":["../../../../server/helpers/list/tableList.ts"],"names":[],"mappings":"AA8BA,wBAA8B,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,gBA4F1D"}

package/dist/server/helpers/list/tableList.js

@@ -73,7 +73,7 @@ export default async function tableList(data, opt) {
     // body
     for (let k = 0; k < data.length; k += 1) {
         const row = data[k];
-        result.push('<tr class="bg-white odd:bg-gray-50 ">');
+        result.push('<tr class="bg-white odd:bg-gray-50" style="page-break-inside: avoid; break-inside: avoid;">');
         const obj = { form: hash.form, table: hash.table, id: row[hash.id] };
         const token = hash.table
             ? setToken({ ids: [JSON.stringify(obj)], uid: hash.uid, array: 1 })[0]
@@ -100,5 +100,5 @@ export default async function tableList(data, opt) {
     }
     result.push("</tbody>");
     //    console.log(Date.now() - time)
-    return `<table class="min-w-full relative divide-y-2 divide-gray-200 bg-white min-w-full overflow-auto divide-y-2 divide-gray-200 bg-white text-[12px] text-gray-600">${result.join("")}</table>`;
+    return `<table class="min-w-full relative divide-y-2 divide-gray-200 bg-white min-w-full overflow-auto divide-y-2 divide-gray-200 bg-white text-[12px] text-gray-600" style="page-break-inside: avoid;">${result.join("")}</table>`;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"getResources.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getResources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa,KAEb,CAAC;AAEP,QAAA,MAAM,mBAAmB,EAAE,GAAG,EAM7B,CAAC;AAEF,QAAA,MAAM,SAAS,KAGd,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,SAAS,EAAE,CAAC;;AACzD,wBAAoB"}
+{"version":3,"file":"getResources.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getResources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa,KAEb,CAAC;AAEP,QAAA,MAAM,mBAAmB,EAAE,GAAG,EAO7B,CAAC;AAEF,QAAA,MAAM,SAAS,KAGd,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,SAAS,EAAE,CAAC;;AACzD,wBAAoB"}

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

@@ -2,8 +2,9 @@ import { existsSync, readFileSync } from "node:fs";
 const resourcesList = existsSync("config/resources.json")
     ? JSON.parse(readFileSync("config/resources.json", "utf-8") || "[]")
     : [];
-const publicResourcesList = resourcesList.map(({ name, actions, feature }) => ({
+const publicResourcesList = resourcesList.map(({ name, title, actions, feature }) => ({
     name,
+    title,
     actions,
     feature,
 }));

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/access/index.ts"],"names":[],"mappings":"AAgBA,wBAA8B,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,iBA2B9D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/access/index.ts"],"names":[],"mappings":"AAgBA,wBAA8B,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,iBA8B9D"}

package/dist/server/routes/access/index.js

@@ -8,8 +8,11 @@ import { accessGroupPostSchema, accessGroupSchema, accessInterfaceSchema, access
 export default async function route(fastify, opt = {}) {
     fastify.get("/access-group/:id", { schema: accessGroupSchema }, accessGroup);
     fastify.post("/access-group/:id", { schema: accessGroupPostSchema }, accessGroupPost);
-    fastify.get("/access-user/:id", { permission: "admin.users.read", schema: accessUserSchema }, accessUser);
-    fastify.post("/access-user/:id", { permission: "admin.users.update", schema: accessUserPostSchema }, accessUserPost);
+    fastify.get("/access-user/:id", { config: { permission: "admin.users.read" }, schema: accessUserSchema }, accessUser);
+    fastify.post("/access-user/:id", {
+        config: { permission: "admin.users.update" },
+        schema: accessUserPostSchema,
+    }, accessUserPost);
     fastify.get("/access-interface/:name", { schema: accessInterfaceSchema }, accessInterface);
     fastify.get("/resources", { config: { policy: "L0" } }, async () => publicResourcesList);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -91,4 +91,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

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

@@ -1,2 +0,0 @@
-export default function getUserPermissions(uid?: string, pg?: any): Promise<any>;
-//# sourceMappingURL=getUserPermissions.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getUserPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/getUserPermissions.ts"],"names":[],"mappings":"AAUA,wBAA8B,kBAAkB,CAC9C,GAAG,CAAC,EAAE,MAAM,EACZ,EAAE,MAAmB,gBAoBtB"}

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

@@ -1,24 +0,0 @@
-import pgClients from "../../pg/pgClients.js";
-const q = `select resource_id as name,
-        array_intersect(coalesce(a.actions, array['read']), coalesce(c.actions, array['create', 'read','update','delete'])) as actions,
-        b.name as role
-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, pg = pgClients.client) {
-    if (!uid)
-        return [];
-    // ? in case pg.pk not set yet
-    const pks = await pg
-        .query(`SELECT json_object_agg(conrelid::regclass, (SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]) ) 
-      FROM pg_constraint c WHERE contype = 'p' AND connamespace::regnamespace::text = 'admin'`)
-        .then((el) => el.rows?.[0]?.json_object_agg || {});
-    const permissions = pks["admin.role_access"] &&
-        pks["admin.user_roles"] &&
-        pks["admin.users"] &&
-        uid
-        ? await pg.query(q, [uid]).then((el) => el.rows || [])
-        : [];
-    return permissions;
-}

package/dist/server/plugins/auth/onRequest.d.ts

@@ -1,4 +0,0 @@
-import { FastifyReply } from "fastify";
-import { ExtendedRequest } from "../../types/core.js";
-export default function onRequest(req: ExtendedRequest, reply: FastifyReply): Promise<null>;
-//# sourceMappingURL=onRequest.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"onRequest.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/onRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAItD,wBAA8B,SAAS,CACrC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,iBA+HpB"}

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

@@ -1,104 +0,0 @@
-import { existsSync } from "node:fs";
-import config from "../../../config.js";
-const { prefix = "/api" } = config;
-export default async function onRequest(req, reply) {
-    const { hostname, headers, routeOptions } = req;
-    const { config: routeConfig, method, handler, url } = routeOptions || {};
-    const { policy } = routeConfig || {};
-    const isApi = method && url && typeof handler === "function" && url !== "*";
-    // handle non-api at vite/vike
-    if (!isApi) {
-        return null;
-    }
-    // proxy from old apps to editor, bi etc.
-    const validToken = (req.ip === "193.239.152.181" ||
-        req.ip === "127.0.0.1" ||
-        req.ip?.startsWith?.("192.168.") ||
-        config.debug) &&
-        req.headers?.token &&
-        config.auth?.tokens?.includes?.(headers.token);
-    if (validToken && !req?.user?.uid) {
-        req.user = {
-            uid: req.headers?.uid?.toString?.(),
-            user_type: req.headers?.user_type?.toString?.() || "regular",
-        };
-    }
-    const isAdmin = process.env.NODE_ENV === "admin" ||
-        hostname?.split?.(":")?.shift?.() === config.adminDomain ||
-        config.admin ||
-        hostname?.startsWith?.("admin");
-    const isPublic = Array.isArray(policy)
-        ? policy.includes("public")
-        : policy === "L0";
-    if (req.cookies?.["session_auth"] &&
-        !req.session?.passport?.user?.uid &&
-        (config.auth?.disable || config.auth?.user)) {
-        req.session = req.session || {};
-        req.session.passport = req.session.passport || {}; // ensure passport session exists
-        req.session.passport.user = {
-            ...(config.auth?.user || {}),
-            uid: config.auth?.user?.uid?.toString?.() || "1",
-            user_rnokpp: config.auth?.user?.rnokpp,
-            user_type: config.auth?.user?.type || "regular",
-        };
-        req.user = req.session.passport.user;
-    }
-    // ! intentional: null || undefined > undefined
-    req.user = req.user || req.session?.passport?.user || undefined; // fix for user.uid errors, by default user is null, while with express passport it was {}, unauthorized user does not trigger serializer
-    // currently 2factor + auth with passwd file not supported
-    const ispasswd = (existsSync("passwd") && !config.auth?.["2factor"]) || config.auth?.passwd;
-    const loginPageUrl = config.auth?.link?.core?.login || config?.auth?.redirect || "/login";
-    if (!req.user?.uid &&
-        !config.auth?.disable &&
-        isAdmin &&
-        !isPublic &&
-        !config.auth?.disableRedirect &&
-        !req.url.startsWith(prefix) &&
-        !req.url.startsWith("/api") &&
-        !req.url.includes(loginPageUrl) &&
-        !req.url.includes(".") &&
-        !req.url.includes("@")) {
-        if (isApi) {
-            return reply.status(401).send({ error: "unauthorized", code: 401 });
-        }
-        return reply.redirect(`${loginPageUrl}` + `?redirect=${req.url}`);
-    }
-    // by default, disable 2factor for id.gov.ua auth
-    const check = req.user?.auth_type === "govid" ? config.auth?.["2factor"]?.govid : true;
-    const login2faPage = config.auth?.link?.["2fa"]?.login || "/2factor";
-    // example: 2factor for admin env only, while public env does not require it
-    const checkEnv = () => {
-        if (!config.auth?.["2factorEnv"])
-            return true;
-        if ((config.auth?.["2factorEnv"] &&
-            process.env.NODE_ENV === config.auth?.["2factorEnv"]) ||
-            (config.auth?.["2factorEnv"] === "admin" && isAdmin)) {
-            return true;
-        }
-        return false;
-    };
-    // if 2factor is enabled globally + for user and secondFactorPassed not true => redirect to 2factor login page
-    if (req.user?.uid &&
-        req.user?.twofa &&
-        // config.auth?.["2factor"] &&
-        // !isPublic &&
-        (routeOptions?.method || "GET") === "GET" &&
-        !req.session?.secondFactorPassed &&
-        !ispasswd &&
-        !config.auth?.disableRedirect &&
-        !config.auth?.disable &&
-        check &&
-        checkEnv() &&
-        !req.url.startsWith(login2faPage) &&
-        !routeOptions.url?.includes?.("/logout") &&
-        !routeOptions.url?.includes?.("/2fa") &&
-        !routeOptions.url?.includes?.("/assets")) {
-        if (isApi) {
-            return reply
-                .status(403)
-                .send({ error: "access restricted: twofa", code: 403 });
-        }
-        return reply.redirect(login2faPage);
-    }
-    return null;
-}

package/dist/server/plugins/policy/funcs/checkAuth.d.ts

@@ -1,4 +0,0 @@
-import { FastifyReply } from "fastify";
-import { ExtendedRequest } from "../../../types/core.js";
-export default function onRequest(req: ExtendedRequest, reply: FastifyReply): Promise<null>;
-//# sourceMappingURL=checkAuth.d.ts.map

package/dist/server/plugins/policy/funcs/checkAuth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"checkAuth.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,SAAS,CACrC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,iBA+HpB"}

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

@@ -1,104 +0,0 @@
-import { existsSync } from "node:fs";
-import config from "../../../../config.js";
-const { prefix = "/api" } = config;
-export default async function onRequest(req, reply) {
-    const { hostname, headers, routeOptions } = req;
-    const { config: routeConfig, method, handler, url } = routeOptions || {};
-    const { policy } = routeConfig || {};
-    const isApi = method && url && typeof handler === "function" && url !== "*";
-    // handle non-api at vite/vike
-    if (!isApi) {
-        return null;
-    }
-    // proxy from old apps to editor, bi etc.
-    const validToken = (req.ip === "193.239.152.181" ||
-        req.ip === "127.0.0.1" ||
-        req.ip?.startsWith?.("192.168.") ||
-        config.debug) &&
-        req.headers?.token &&
-        config.auth?.tokens?.includes?.(headers.token);
-    if (validToken && !req?.user?.uid) {
-        req.user = {
-            uid: req.headers?.uid?.toString?.(),
-            user_type: req.headers?.user_type?.toString?.() || "regular",
-        };
-    }
-    const isAdmin = process.env.NODE_ENV === "admin" ||
-        hostname?.split?.(":")?.shift?.() === config.adminDomain ||
-        config.admin ||
-        hostname?.startsWith?.("admin");
-    const isPublic = Array.isArray(policy)
-        ? policy.includes("public")
-        : policy === "L0";
-    if (req.cookies?.["session_auth"] &&
-        !req.session?.passport?.user?.uid &&
-        (config.auth?.disable || config.auth?.user)) {
-        req.session = req.session || {};
-        req.session.passport = req.session.passport || {}; // ensure passport session exists
-        req.session.passport.user = {
-            ...(config.auth?.user || {}),
-            uid: config.auth?.user?.uid?.toString?.() || "1",
-            user_rnokpp: config.auth?.user?.rnokpp,
-            user_type: config.auth?.user?.type || "regular",
-        };
-        req.user = req.session.passport.user;
-    }
-    // ! intentional: null || undefined > undefined
-    req.user = req.user || req.session?.passport?.user || undefined; // fix for user.uid errors, by default user is null, while with express passport it was {}, unauthorized user does not trigger serializer
-    // currently 2factor + auth with passwd file not supported
-    const ispasswd = (existsSync("passwd") && !config.auth?.["2factor"]) || config.auth?.passwd;
-    const loginPageUrl = config.auth?.link?.core?.login || config?.auth?.redirect || "/login";
-    if (!req.user?.uid &&
-        !config.auth?.disable &&
-        isAdmin &&
-        !isPublic &&
-        !config.auth?.disableRedirect &&
-        !req.url.startsWith(prefix) &&
-        !req.url.startsWith("/api") &&
-        !req.url.includes(loginPageUrl) &&
-        !req.url.includes(".") &&
-        !req.url.includes("@")) {
-        if (isApi) {
-            return reply.status(401).send({ error: "unauthorized", code: 401 });
-        }
-        return reply.redirect(`${loginPageUrl}` + `?redirect=${req.url}`);
-    }
-    // by default, disable 2factor for id.gov.ua auth
-    const check = req.user?.auth_type === "govid" ? config.auth?.["2factor"]?.govid : true;
-    const login2faPage = config.auth?.link?.["2fa"]?.login || "/2factor";
-    // example: 2factor for admin env only, while public env does not require it
-    const checkEnv = () => {
-        if (!config.auth?.["2factorEnv"])
-            return true;
-        if ((config.auth?.["2factorEnv"] &&
-            process.env.NODE_ENV === config.auth?.["2factorEnv"]) ||
-            (config.auth?.["2factorEnv"] === "admin" && isAdmin)) {
-            return true;
-        }
-        return false;
-    };
-    // if 2factor is enabled globally + for user and secondFactorPassed not true => redirect to 2factor login page
-    if (req.user?.uid &&
-        req.user?.twofa &&
-        // config.auth?.["2factor"] &&
-        // !isPublic &&
-        (routeOptions?.method || "GET") === "GET" &&
-        !req.session?.secondFactorPassed &&
-        !ispasswd &&
-        !config.auth?.disableRedirect &&
-        !config.auth?.disable &&
-        check &&
-        checkEnv() &&
-        !req.url.startsWith(login2faPage) &&
-        !routeOptions.url?.includes?.("/logout") &&
-        !routeOptions.url?.includes?.("/2fa") &&
-        !routeOptions.url?.includes?.("/assets")) {
-        if (isApi) {
-            return reply
-                .status(403)
-                .send({ error: "access restricted: twofa", code: 403 });
-        }
-        return reply.redirect(login2faPage);
-    }
-    return null;
-}

package/dist/server/routes/access/controllers/access.resources.d.ts

@@ -1,6 +0,0 @@
-declare const arr: any;
-declare const publicResources: any[];
-declare const accessResources: (req?: any) => Promise<any[]>;
-export { arr as resources, publicResources };
-export default accessResources;
-//# sourceMappingURL=access.resources.d.ts.map

package/dist/server/routes/access/controllers/access.resources.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"access.resources.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.resources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,GAAG,KAEH,CAAC;AAEP,QAAA,MAAM,eAAe,EAAE,GAAG,EAIvB,CAAC;AAEJ,QAAA,MAAM,eAAe,GAAU,MAAM,GAAG,KAAG,OAAO,CAAC,GAAG,EAAE,CAEvD,CAAC;AAEF,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,eAAe,EAAE,CAAC;AAC7C,eAAe,eAAe,CAAC"}

package/dist/server/routes/access/controllers/access.resources.js

@@ -1,14 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-const arr = existsSync("config/resources.json")
-    ? JSON.parse(readFileSync("config/resources.json", "utf-8") || "[]")
-    : [];
-const publicResources = arr.map(({ name, actions, feature }) => ({
-    name,
-    actions,
-    feature,
-}));
-const accessResources = async (req) => {
-    return publicResources;
-};
-export { arr as resources, publicResources };
-export default accessResources;

package/dist/server/routes/access/controllers/resources.d.ts

@@ -1,11 +0,0 @@
-declare const arr: any;
-interface Resource {
-    name: string;
-    actions: string[];
-    feature: string;
-}
-declare const publicResources: Resource[];
-declare const resources: (req?: any) => Promise<Resource[]>;
-export { arr as resources, publicResources };
-export default resources;
-//# sourceMappingURL=resources.d.ts.map

package/dist/server/routes/access/controllers/resources.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/resources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,GAAG,KAEH,CAAC;AAEP,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,eAAe,EAAE,QAAQ,EAM9B,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,MAAM,GAAG,KAAG,OAAO,CAAC,QAAQ,EAAE,CAEtD,CAAC;AAEF,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,eAAe,EAAE,CAAC;AAC7C,eAAe,SAAS,CAAC"}

package/dist/server/routes/access/controllers/resources.js

@@ -1,14 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-const arr = existsSync("config/resources.json")
-    ? JSON.parse(readFileSync("config/resources.json", "utf-8") || "[]")
-    : [];
-const publicResources = arr.map(({ name, actions, feature }) => ({
-    name,
-    actions,
-    feature,
-}));
-const resources = async (req) => {
-    return publicResources;
-};
-export { arr as resources, publicResources };
-export default resources;

package/dist/server/routes/access/functions/resources.d.ts

@@ -1,6 +0,0 @@
-declare const resourcesList: any;
-declare const publicResourcesList: any[];
-export { resourcesList, publicResourcesList };
-declare const _default: null;
-export default _default;
-//# sourceMappingURL=resources.d.ts.map

package/dist/server/routes/access/functions/resources.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/functions/resources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa,KAEb,CAAC;AAEP,QAAA,MAAM,mBAAmB,EAAE,GAAG,EAM7B,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;;AAC9C,wBAAoB"}

package/dist/server/routes/access/functions/resources.js

@@ -1,11 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-const resourcesList = existsSync("config/resources.json")
-    ? JSON.parse(readFileSync("config/resources.json", "utf-8") || "[]")
-    : [];
-const publicResourcesList = resourcesList.map(({ name, actions, feature }) => ({
-    name,
-    actions,
-    feature,
-}));
-export { resourcesList, publicResourcesList };
-export default null;