@opengis/fastify-table 2.4.8 → 2.4.10

package/dist/server/plugins/crud/funcs/validateData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateData.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/validateData.ts"],"names":[],"mappings":"AA+GA,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,IAAS,EACT,MAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,OAMA"}
+{"version":3,"file":"validateData.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/validateData.ts"],"names":[],"mappings":"AAkIA,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,IAAS,EACT,MAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,OAMA"}

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

@@ -2,6 +2,11 @@ import config from "../../../../config.js";
 /* eslint-disable no-console */
 // eslint-disable-next-line no-control-regex
 const emailReg = /(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
+function isNumeric(value) {
+    if (value === null || value === "")
+        return false;
+    return Number.isFinite(Number(value));
+}
 function checkField(key, val, options, idx, body) {
     const type = options?.type?.toLowerCase?.();
     const isrequired = options?.validators?.includes?.("required");
@@ -26,6 +31,20 @@ function checkField(key, val, options, idx, body) {
             };
         }
     }
+    else if (type === "number") {
+        // required + empty
+        if (isrequired && !isNumeric(val)) {
+            return { error: "invalid value", key, idx };
+        }
+        if (isNumeric(val)) {
+            if (isNumeric(options.min) && +val < +options.min) {
+                return { error: "Number out of range", key, idx };
+            }
+            if (isNumeric(options.max) && +val > +options.max) {
+                return { error: "Number out of range", key, idx };
+            }
+        }
+    }
     else if (isrequired && !val) {
         if (options?.conditions) {
             const allowed = typeof options?.conditions?.[2] === "string" &&

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

@@ -9,8 +9,12 @@ interface ICode {
     pg: ExtendedPG;
     enable?: boolean;
 }
-declare const enableSecret: ({ uid, pg }: ISecret) => Promise<void>;
-declare const deleteSecret: ({ uid, pg }: ISecret) => Promise<void>;
+declare const enableSecret: ({ uid, pg }: ISecret) => Promise<{
+    rowCount: any;
+}>;
+declare const deleteSecret: ({ uid, pg }: ISecret) => Promise<{
+    rowCount: any;
+}>;
 declare const getSecret: ({ uid, pg }: ISecret) => Promise<{
     secret: any;
     enabled: any;

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;AAW1D,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;AAuBD,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;;;;;;;;;;;;EA0D3C,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;AAW1D,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;AAuBD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO;;EAQ/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO;;EAQ/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EA0D3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAmBpD,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

@@ -11,17 +11,23 @@ const getOTP = (id, secret) => {
     return `otpauth://totp/${issuer}:${encodeURIComponent(id.toString())}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=${encodeURIComponent(issuer)}`;
 };
 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]);
+    const rowCount = await pg
+        .query("update admin.users_social_auth set enabled=true where uid = $1 and social_auth_type = $2", [uid, TYPE])
+        .then((r) => r.rowCount);
+    return { rowCount };
 };
 const deleteSecret = async ({ uid, pg }) => {
-    await pg.query("delete from admin.users_social_auth where uid=$1 and social_auth_type = $2", [uid, TYPE]);
+    const rowCount = await pg
+        .query("delete from admin.users_social_auth where uid=$1 and social_auth_type = $2", [uid, TYPE])
+        .then((r) => r.rowCount);
+    return { rowCount };
 };
 const getSecret = async ({ uid, pg }) => {
     const { social_auth_code: secret, enabled, recoveryCodes, } = await pg
         .query(`select social_auth_code, enabled, social_auth_obj->'codesArray' as "recoveryCodes"
     from admin.users_social_auth 
     where uid = $1 and social_auth_type = $2`, [uid, TYPE])
-        .then((el) => el.rows?.[0] || {});
+        .then((r) => r.rows?.[0] || {});
     return { secret, enabled, recoveryCodes };
 };
 const addSecret = async ({ uid, secret, pg, recoveryCodes, otp }) => {
@@ -33,7 +39,7 @@ const updateSecret = async ({ uid, pg, secret, recoveryCodes, otp }) => {
         .query(`update admin.users_social_auth
     set social_auth_code=$3, social_auth_obj=$4::json, social_auth_url=$5
     where uid = $1 and social_auth_type = $2`, [uid, TYPE, secret, { codesArray: recoveryCodes }, otp])
-        .then((el) => el.rows?.[0] || {});
+        .then((r) => r.rows?.[0] || {});
     return result;
 };
 // return a new secret until it's enabled
@@ -51,7 +57,7 @@ const generate = async ({ uid, pg }) => {
     ];
     const userData = await pg
         .query(`select social_auth_id as code, coalesce(login,email) as login, email from admin.users where uid=$1`, [uid])
-        .then((el) => el.rows?.[0] || {});
+        .then((r) => r.rows?.[0] || {});
     const { sufix } = config.auth?.["2fa"] || {};
     if (sufix && !userData[sufix]) {
         console.warn("⚠️ 2fa prefix not found at userData");
@@ -90,7 +96,8 @@ const verify = async ({ uid, code: token, pg }) => {
     if (!secret) {
         throw new BadRequestError("Включіть двофакторну аутентифікацію");
     }
-    const isValid = authenticator.verify({ token, secret }) ||
+    const { valid } = await authenticator.verify({ token, secret });
+    const isValid = valid ||
         recoveryCodes.reduce((result, recoveryCode) => result || recoveryCode === token, false);
     if (!isValid) {
         throw new ForbiddenError("Невірний код");

package/dist/server/routes/util/controllers/api.list.js

@@ -49,7 +49,7 @@ export default function apiListService({ includeTags: queryIncludeTags, excludeT
         const markdownStr = toMarkdownTable(filteredRoutes3, Array.isArray(columns) ? columns : columns.split("|"));
         return {
             headers: {
-                "Content-Type": "text/markdown",
+                "Content-Type": "text/markdown; charset=utf-8",
             },
             data: markdownStr,
         };

package/package.json

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