@opengis/fastify-table 2.0.92 → 2.0.94

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/routes/auth/controllers/2factor/qrcode.js

@@ -24,11 +24,11 @@ export default async function qrCode(req, reply) {
         return reply.status(404).send({ error: "invalid user", code: 404 });
     }
     const { enabled, secret } = await getSecret({ pg, uid });
-    const otp = secret
+    const { otp } = secret
         ? await pg
-            .query(`select social_auth_url
-  from admin.users_social_auth where uid=$1 and social_auth_type=$2`, [uid, "TOTP"])
-            ?.then((el) => el.rows?.[0]?.social_auth_url)
+            .query(`select social_auth_url as otp from admin.users_social_auth 
+          where uid=$1 and social_auth_type=$2`, [uid, "TOTP"])
+            ?.then((el) => el.rows?.[0] || {})
         : await generate({ uid, pg });
     const base64 = otp ? await qr.toDataURL(otp) : undefined;
     if (enabled && !config.local && !config.debug) {

package/package.json

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