@opengis/fastify-table 2.0.93 → 2.0.95

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA4EA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QA4H3B;;AACD,wBAA0B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAsFA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QA0J3B;;AACD,wBAA0B"}

package/dist/index.js

@@ -7,6 +7,16 @@ import { preForm, afterInsert, afterTable, afterTemplate, afterUpdate, preTempla
 import addHook from "./server/plugins/hook/addHook.js";
 const { maxFileSize = 512 } = config;
 const { name: execName } = path.parse(process.argv0);
+const routes = [];
+const policyCls = {
+    public: "Public", // old policy support
+    user: "User", // old policy support
+    site: "Public", // old policy support
+    L0: "Public",
+    L1: "User",
+    L2: "User",
+    L3: "User",
+};
 // helpers
 // import helperPlugin from './server/helpers/index.js';
 // plugins
@@ -53,6 +63,32 @@ function plugin(fastify) {
             reply.header("Access-Control-Allow-Origin", "*");
         });
     }
+    if (!fastify.hasRoute({ method: "GET", url: "/api/list" })) {
+        fastify.get(`${opt.prefix}/list`, { config: { role: "admin" } }, () => ({
+            rows: routes,
+        }));
+    }
+    fastify.addHook("onRoute", (r) => {
+        if (r.method === "HEAD")
+            return;
+        const method = Array.isArray(r.method) ? "ALL" : r.method;
+        const query = r.schema?.querystring
+            ? Object.keys(r.schema?.querystring?.properties || {}).reduce((acc, curr) => ({
+                ...acc,
+                [curr]: r.schema?.querystring?.properties?.[curr]?.type,
+            }), {})
+            : undefined;
+        routes.push({
+            method,
+            route: r.url,
+            description: r.config?.description,
+            query,
+            roles: r.config?.role?.split?.("|"),
+            policy: (Array.isArray(r.config?.policy)
+                ? r.config?.policy
+                : r.config?.policy?.split?.(","))?.map?.((name) => policyCls[name] || name),
+        });
+    });
     fastify.addHook("onListen", onListen1);
     fastify.addHook("onListen", onListen2);
     fastify.addHook("onReady", onReady);

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

@@ -62,7 +62,7 @@ export default async function authorizeUser(user, req, authType = "creds-user",
     const redirectUrl = req.headers?.referer?.match?.(/[?&]redirect=([^&]+)/)?.[1] || "/";
     const twofaEnabled = user?.twofa && user.uid && pg;
     const registered = false; // ? check by created/updated date?
-    if (config.auth?.oneUser || true) {
+    if (config.auth?.oneUser) {
         const userSessionKey = `${config.pg?.database}:user:${user.uid}`;
         const sessionID = await rclient.get(userSessionKey);
         await rclient2.del(`session_auth:${config.pg?.database}:${sessionID}`);

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

@@ -1 +1 @@
-{"version":3,"file":"logAuth.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/logAuth.ts"],"names":[],"mappings":"AAIA,wBAA8B,OAAO,CACnC,EACE,GAAG,EACH,IAAc,EACd,IAAI,EACJ,EAAE,GACH,EAAE;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,EACD,EAAE,MAAmB,gBAetB"}
+{"version":3,"file":"logAuth.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/logAuth.ts"],"names":[],"mappings":"AAGA,wBAA8B,OAAO,CACnC,EACE,GAAG,EACH,IAAc,EACd,IAAI,EACJ,EAAE,GACH,EAAE;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,EACD,EAAE,MAAmB,gBAetB"}

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,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAMtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBA+HxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAgCvC;AAED,eAAe,MAAM,CAAC"}
+{"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,iBA8HxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAgCvC;AAED,eAAe,MAAM,CAAC"}

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

@@ -38,8 +38,7 @@ export async function onRequest(req, reply) {
         : policy === "L0";
     if (req.cookies?.["session_auth"] &&
         !req.session?.passport?.user?.uid &&
-        (config.auth?.disable || config.auth?.user) &&
-        !isPublic) {
+        (config.auth?.disable || config.auth?.user)) {
         req.session = req.session || {};
         req.session.passport = req.session.passport || {}; // ensure passport session exists
         req.session.passport.user = {

package/dist/server/plugins/table/funcs/metaFormat/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/index.ts"],"names":[],"mappings":"AAOA,wBAA8B,UAAU,CACtC,EACE,IAAI,EAAE,QAAQ,EACd,KAAK,EACL,GAAQ,EACR,KAAU,EACV,KAAY,EACZ,QAAe,GAChB,EAAE;IACD,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,EAAE,MAAmB,gBAkGtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/index.ts"],"names":[],"mappings":"AAOA,wBAA8B,UAAU,CACtC,EACE,IAAI,EAAE,QAAQ,EACd,KAAK,EACL,GAAQ,EACR,KAAU,EACV,KAAY,EACZ,QAAe,GAChB,EAAE;IACD,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,EAAE,MAAmB,gBAwGtB"}

package/dist/server/plugins/table/funcs/metaFormat/index.js

@@ -12,9 +12,13 @@ export default async function metaFormat({ rows: original, table, cls = {}, html
         name: el,
         data: loadTable?.meta?.cls[el],
     }));
+    const actualClsObj = selectCols
+        .concat(metaCls)
+        .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
     const list = getTemplates(["cls", "select"]).map((el) => el[0]);
     const columnNameAsCls = Object.keys(original?.[0] || {})
-        .filter((key) => list.includes(`${table}.${key}`) || list.includes(key))
+        .filter((key) => !actualClsObj[key] &&
+        (list.includes(`${table}.${key}`) || list.includes(key)))
         .map((key) => ({
         name: key,
         data: list.find((clsName) => [key, `${table}.${key}`].includes(clsName)),

package/dist/server/plugins/util/funcs/routeOptions.d.ts

@@ -0,0 +1,3 @@
+declare const routeOptions: any[];
+export default routeOptions;
+//# sourceMappingURL=routeOptions.d.ts.map

package/dist/server/plugins/util/funcs/routeOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routeOptions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/util/funcs/routeOptions.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,YAAY,EAAE,GAAG,EAAO,CAAC;AAC/B,eAAe,YAAY,CAAC"}

package/dist/server/plugins/util/funcs/routeOptions.js

@@ -0,0 +1,2 @@
+const routeOptions = [];
+export default routeOptions;

package/dist/server/routes/auth/controllers/2factor/providers/totp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"totp.d.ts","sourceRoot":"","sources":["../../../../../../../server/routes/auth/controllers/2factor/providers/totp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAQ1D,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAYD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EA0C3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAiBpD,CAAC;AAKF,QAAA,MAAM,MAAM,GAAU,2BAA2B,KAAK,iBAqBrD,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;;AAE3E,wBAAoB"}
+{"version":3,"file":"totp.d.ts","sourceRoot":"","sources":["../../../../../../../server/routes/auth/controllers/2factor/providers/totp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAU1D,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAmBD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EA6D3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAiBpD,CAAC;AAKF,QAAA,MAAM,MAAM,GAAU,2BAA2B,KAAK,iBAqBrD,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;;AAE3E,wBAAoB"}

package/dist/server/routes/auth/controllers/2factor/providers/totp.js

@@ -1,7 +1,9 @@
 import crypto from "node:crypto";
 import qrcode from "qrcode";
 import { authenticator } from "otplib";
+import config from "../../../../../../config.js";
 const TYPE = "TOTP";
+const getOTP = (id, secret) => authenticator.keyuri(id.toString(), config.auth?.["2fa"]?.prefix || "SOFTPRO", secret);
 const enableSecret = async ({ uid, pg }) => {
     await pg.query("update admin.users_social_auth set enabled=true where uid = $1 and social_auth_type = $2", [uid, TYPE]);
 };
@@ -41,7 +43,16 @@ const generate = async ({ uid, pg }) => {
         crypto.randomUUID(),
         crypto.randomUUID(),
     ];
-    const otp = authenticator.keyuri(uid, "SOFTPRO", secret);
+    const userData = await pg
+        .query(`select social_auth_id as code, login, email from admin.users where uid=$1`, [uid])
+        .then((el) => el.rows?.[0] || {});
+    if (config.auth?.["2fa"]?.["sufix"] &&
+        !userData[config.auth?.["2fa"]?.["sufix"]]) {
+        throw new Error("2fa prefix not found at userData");
+    }
+    const otp = getOTP(config.auth?.["2fa"]?.["sufix"]
+        ? userData[config.auth?.["2fa"]?.["sufix"]]
+        : userData.login || userData.code || uid, secret);
     const qrCodeAsImageSource = await qrcode.toDataURL(otp);
     // no entry in db
     if (enabled === undefined) {

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/crud/index.ts"],"names":[],"mappings":"AAiBA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAqBtC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/crud/index.ts"],"names":[],"mappings":"AAiBA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAwBtC;AAED,eAAe,MAAM,CAAC"}

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

@@ -13,9 +13,12 @@ const tableSchema = {
 };
 const policy = "L0";
 function plugin(app, opt = {}) {
-    app.put("/table/:table/:id?", { config: { policy }, schema: tableSchema }, update);
-    app.delete("/table/:table/:id?", { config: { policy }, schema: tableSchema }, deleteCrud);
-    app.post("/table/:table/:id?", { config: { policy }, schema: tableSchema }, insert);
-    app.get("/table/:table/:id?", { config: { policy }, schema: tableSchema }, table);
+    app.put("/table/:table/:id?", { config: { policy, description: "Edit table data" }, schema: tableSchema }, update);
+    app.delete("/table/:table/:id?", {
+        config: { policy, description: "Delete table data" },
+        schema: tableSchema,
+    }, deleteCrud);
+    app.post("/table/:table/:id?", { config: { policy, description: "Add table data" }, schema: tableSchema }, insert);
+    app.get("/table/:table/:id?", { config: { policy, description: "Get table data" }, schema: tableSchema }, table);
 }
 export default plugin;

package/package.json

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