npm - @opengis/fastify-table - Versions diffs - 2.0.55 → 2.0.57 - Mend

@opengis/fastify-table 2.0.55 → 2.0.57

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/server/plugins/auth/index.d.ts CHANGED Viewed

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

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

	@@ -1 +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,~~QAuIvC~~;AAED,eAAe,MAAM,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAMtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBA6GxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QA6BvC;AAED,eAAe,MAAM,CAAC"}

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

@@ -7,6 +7,91 @@ import config from "../../../config.js";
 import getRedis from "../redis/funcs/getRedis.js";
 const fastifyPassport = new Authenticator();
 const { prefix = "/api" } = config;
+export async function onRequest(req, reply) {
+    const { hostname, headers, routeOptions } = req;
+    const { policy = [] } = routeOptions?.config || {};
+    // 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.session?.passport?.user?.uid &&
+        (config.auth?.disable || config.auth?.user) &&
+        !isPublic) {
+        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.startsWith(loginPageUrl) &&
+        !req.url.includes(".") &&
+        !req.url.includes("@")) {
+        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()) {
+        if (!req.url.startsWith(login2faPage)) {
+            return reply.redirect(login2faPage);
+        }
+    }
+    return null;
+}
 function plugin(fastify) {
     if (!config.redis) {
         return;
@@ -27,82 +112,6 @@ function plugin(fastify) {
     fastifyPassport.registerUserSerializer(async (user) => ({ user }));
     // deserialize user used to add user info from session store to req
     fastifyPassport.registerUserDeserializer(async (passport) => passport?.user || passport);
-    fastify.addHook("onRequest", async (req, reply) => {
-        const { pg, hostname, headers, routeOptions } = req;
-        const { policy = [] } = routeOptions?.config || {};
-        // 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 2factor is enabled globally + for user and secondFactorPassed not true => redirect to 2factor login page
-        const { secondFactorPassed, passport = {} } = req.session || {}; // base login +
-        if (!passport.user?.uid &&
-            (config.auth?.disable || config.auth?.user) &&
-            !isPublic) {
-            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
-        if (config.trace && false) {
-            console.log("req.user?.uid", req.user?.uid, "req.session?.passport?.user?.uid", req.session?.passport?.user?.uid, "config.auth", config.auth);
-        }
-        // currently 2factor + auth with passwd file not supported
-        const ispasswd = (existsSync("passwd") && !config.auth?.["2factor"]) ||
-            config.auth?.passwd;
-        if (!passport.user?.uid &&
-            !config.auth?.disable &&
-            isAdmin &&
-            !isPublic &&
-            !config.auth?.disableRedirect &&
-            !req.url.startsWith(prefix) &&
-            !req.url.startsWith("/api") &&
-            !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
-        const check = passport.user?.auth_type === "govid"
-            ? config.auth?.["2factor"]?.govid
-            : true;
-        if (passport.user?.uid &&
-            passport.user?.twofa &&
-            config.auth?.["2factor"] &&
-            !isPublic &&
-            (routeOptions?.method || "GET") === "GET" &&
-            !secondFactorPassed &&
-            !ispasswd &&
-            check) {
-            const href = config.auth?.["2factorRedirect"] || "/2factor";
-            if (!href.includes(req.url)) {
-                return reply.redirect(href);
-            }
-        }
-        return null;
-    });
+    fastify.addHook("onRequest", onRequest);
 }
 export default plugin;

package/dist/server/routes/file/controllers/export.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0B5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,IAAI,EACJ,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,~~gBAmVpB~~"}
1	+ {"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0B5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,IAAI,EACJ,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBAgWpB"}

package/dist/server/routes/file/controllers/export.js CHANGED Viewed

@@ -51,7 +51,7 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         return reply.status(400).send("param format is invalid");
     }
     const date = new Date();
-    const sufixName = `${filter}-${cols || "all"}-${search}-${query.limit || "unlimited"}`;
+    const sufixName = `${filter}-${cols || "all"}-${search}-${query.limit || "unlimited"}-${id}`;
     const sufixDate = [
         date.getFullYear(),
         date.getMonth(),
@@ -91,7 +91,8 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
     }
     const loadTable = await getTemplate("table", table);
     const meta = await getMeta({ pg, table: loadTable?.table || table });
-    if (!meta?.pk && !meta?.view && !tableSql) {
+    const viewSql = await getTemplate("view", loadTable?.table || table);
+    if (!meta?.pk && !meta?.view && !tableSql && !viewSql) {
         return reply.status(404).send("table not found");
     }
     if (format === "geojson" && !meta?.geom) {
@@ -110,9 +111,11 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         sufix: false,
     };
     // check total count, debug sql etc.
-    const result = tableSql
+    const result = tableSql || viewSql
         ? await pg
-            .query(`select count(*) as total, json_agg(row_to_json(q)) as rows from (${tableSql})q`)
+            .query(`select count(*) as total, json_agg(row_to_json(q)) as rows from (${tableSql || viewSql})q where ${loadTable?.key && id
+            ? `${loadTable?.key}::text = '${id}'`
+            : "true"}`)
             .then((el) => el.rows?.[0] || {})
         : await getData(options, reply, true);
     if (sql)
@@ -174,8 +177,10 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         while (+filtered - offset > 0 && !res?.error) {
             try {
                 send(`Оброблено: ${offset}/${filtered}`);
-                const { rows = [] } = tableSql
-                    ? await pg.query(`select * from (${tableSql})q limit ${options.limit} offset ${offset}`)
+                const { rows = [] } = tableSql || viewSql
+                    ? await pg.query(`select * from (${tableSql || viewSql})q where ${loadTable?.key && id
+                        ? `${loadTable?.key}::text = '${id}'`
+                        : "true"} limit ${options.limit} offset ${offset}`)
                     : await getData({ ...options, page }, reply, true);
                 send(`seq: ${++seq}`);
                 send(`Обробка ${rows.length} об'єктів...`);

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

	@@ -1 +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,~~gBAgzBb~~"}
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,gBAwzBb"}

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

@@ -137,13 +137,16 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             user,
         }, null)) || {};
     const tableMeta = await getMeta({ pg, table: table1 });
+    const viewSql = await getTemplate("view", table1);
     timeArr.push(Date.now());
     if (tableMeta?.view) {
         if (!loadTable?.key && !tokenData?.key)
             return { message: `key not found: ${table1}`, status: 404 };
         Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
     }
-    const { pk, columns: dbColumns = [] } = tableMeta || {};
+    const { pk, columns: dbColumns = [] } = (viewSql
+        ? { pk: loadTable?.key, columns: loadTable?.columns }
+        : tableMeta) || {};
     const columns1 = columns ||
         dbColumns.map(({ name, title, dataTypeID }) => ({
             name,
@@ -176,9 +179,9 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         ?.filter?.((el) => el.inline)
         ?.map((el) => `,(${el.sql})`)
         ?.join("") || "";
-    const { fields = [] } = pg.queryCache
-        ? await pg.queryCache(`select * ${sqlInline} from ${table1} t ${sqlTable} ${cardSqlTable} limit 0`)
-        : {};
+    const { fields = [] } = !viewSql
+        ? await pg.query(`select * ${sqlInline} from ${table1} t ${sqlTable} ${cardSqlTable} limit 0`)
+        : await pg.query(`select * from (${viewSql})q limit 0`);
     const dbColumnsTable = fields.map((el) => el.name);
     const cols = columns
         .filter((el) => el.name !== "geom" && dbColumnsTable.includes(el.name))
@@ -295,7 +298,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                      from (select * ${sql
         ?.filter((el) => el.inline)
         .map((el) => `,(${el.sql})`)
-        .join("") || ""} from ${table1} t  ${sqlTable} ) t
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t  ${sqlTable} ) t
                      ${objectId ? cardSqlTable : ""}
                      where ${where.join(" and ") || "true"}
@@ -373,7 +376,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             from (select * ${sql
         ?.filter((el) => el.inline)
         .map((el) => `,(${el.sql})`)
-        .join("") || ""} from ${table1} t ${sqlTable})q
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t ${sqlTable})q
             where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
         .filter(Boolean)
         .filter((el) => checkQuery(el))

package/package.json CHANGED Viewed

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