Updates

package-shared/functions/backend/db/addDbEntry.js

@@ -1,9 +1,5 @@
 // @ts-check
 
-/**
- * Imports: Handle imports
- */
-const encrypt = require("../encrypt");
 const sanitizeHtml = require("sanitize-html");
 const sanitizeHtmlOptions = require("../html/sanitizeHtmlOptions");
 const updateDb = require("./updateDbEntry");
@@ -11,6 +7,7 @@ const updateDbEntry = require("./updateDbEntry");
 const _ = require("lodash");
 const DB_HANDLER = require("../../../utils/backend/global-db/DB_HANDLER");
 const DSQL_USER_DB_HANDLER = require("../../../utils/backend/global-db/DSQL_USER_DB_HANDLER");
+const encrypt = require("../../dsql/encrypt");
 
 /**
  * Add a db Entry Function
@@ -146,7 +143,11 @@ async function addDbEntry({
                 continue;
 
             if (targetFieldSchema?.encrypted) {
-                value = encrypt(value, encryptionKey, encryptionSalt);
+                value = encrypt({
+                    data: value,
+                    encryptionKey,
+                    encryptionSalt,
+                });
                 console.log("DSQL: Encrypted value =>", value);
             }
 

package-shared/functions/backend/db/runQuery.d.ts

@@ -1,30 +0,0 @@
-export = runQuery;
-/** ****************************************************************************** */
-/** ****************************************************************************** */
-/** ****************************************************************************** */
-/** ****************************************************************************** */
-/** ****************************************************************************** */
-/** ****************************************************************************** */
-/**
- * Run DSQL users queries
- * ==============================================================================
- * @param {object} params - An object containing the function parameters.
- * @param {string} params.dbFullName - Database full name. Eg. "datasquire_user_2_test"
- * @param {string | any} params.query - Query string or object
- * @param {boolean} [params.readOnly] - Is this operation read only?
- * @param {boolean} [params.local] - Is this operation read only?
- * @param {import("../../../types").DSQL_DatabaseSchemaType} [params.dbSchema] - Database schema
- * @param {string[]} [params.queryValuesArray] - An optional array of query values if "?" is used in the query string
- * @param {string} [params.tableName] - Table Name
- *
- * @return {Promise<any>}
- */
-declare function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, local, }: {
-    dbFullName: string;
-    query: string | any;
-    readOnly?: boolean;
-    local?: boolean;
-    dbSchema?: import("../../../types").DSQL_DatabaseSchemaType;
-    queryValuesArray?: string[];
-    tableName?: string;
-}): Promise<any>;

package-shared/functions/backend/db/runQuery.js

@@ -38,7 +38,7 @@ const trimSql = require("../../../utils/trim-sql");
  * @param {boolean} [params.readOnly] - Is this operation read only?
  * @param {boolean} [params.local] - Is this operation read only?
  * @param {import("../../../types").DSQL_DatabaseSchemaType} [params.dbSchema] - Database schema
- * @param {string[]} [params.queryValuesArray] - An optional array of query values if "?" is used in the query string
+ * @param {(string | number)[]} [params.queryValuesArray] - An optional array of query values if "?" is used in the query string
  * @param {string} [params.tableName] - Table Name
  *
  * @return {Promise<any>}
@@ -120,14 +120,14 @@ async function runQuery({
             } else if (readOnly) {
                 result = await varReadOnlyDatabaseDbHandler({
                     queryString: formattedQuery,
-                    queryValuesArray,
+                    queryValuesArray: queryValuesArray?.map((vl) => String(vl)),
                     database: dbFullName,
                     tableSchema,
                 });
             } else {
                 result = await fullAccessDbHandler({
                     queryString: formattedQuery,
-                    queryValuesArray,
+                    queryValuesArray: queryValuesArray?.map((vl) => String(vl)),
                     database: dbFullName,
                     tableSchema,
                 });

package-shared/functions/backend/db/updateDbEntry.js

@@ -3,11 +3,11 @@
 /**
  * Imports: Handle imports
  */
-const encrypt = require("../encrypt");
 const sanitizeHtml = require("sanitize-html");
 const sanitizeHtmlOptions = require("../html/sanitizeHtmlOptions");
 const DB_HANDLER = require("../../../utils/backend/global-db/DB_HANDLER");
 const DSQL_USER_DB_HANDLER = require("../../../utils/backend/global-db/DSQL_USER_DB_HANDLER");
+const encrypt = require("../../dsql/encrypt");
 
 /**
  * Update DB Function
@@ -94,7 +94,11 @@ async function updateDbEntry({
             }
 
             if (targetFieldSchema?.encrypted) {
-                value = encrypt(value, encryptionKey, encryptionSalt);
+                value = encrypt({
+                    data: value,
+                    encryptionKey,
+                    encryptionSalt,
+                });
             }
 
             if (typeof value === "object") {