drapcode-utility 2.5.5 → 2.5.7

package/build/utils/rest-client.js

@@ -330,15 +330,31 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
                 values.push(fileData);
             });
         }
-        const { mysqlDbHostUrl, mysqlDbUser, mysqlDbPassword, mysqlDbName, mysqlDbPort } = extDbSetting || {};
+        const { mysqlDbHostUrl, mysqlDbUser, mysqlDbPassword, mysqlDbName, mysqlDbPort, mysqlDbSslEnabled, mysqlDbSslCa, mysqlDbSslCert, mysqlDbSslKey } = extDbSetting || {};
         const mysqlDBConfig = {
             host: mysqlDbHostUrl,
             user: mysqlDbUser,
             password: mysqlDbPassword,
             database: mysqlDbName,
             port: mysqlDbPort,
+            sslEnabled: mysqlDbSslEnabled,
+            sslCa: '',
+            sslCert: '',
+            sslKey: ''
         };
+        if (mysqlDbSslEnabled) {
+            if (mysqlDbSslCa) {
+                mysqlDBConfig.sslCa = mysqlDbSslCa;
+            }
+            if (mysqlDbSslCert) {
+                mysqlDBConfig.sslCert = mysqlDbSslCert;
+            }
+            if (mysqlDbSslKey) {
+                mysqlDBConfig.sslKey = mysqlDbSslKey;
+            }
+        }
         console.log(`==> Final MySQL projectID: ${projectId} ~ data:>> `, data, " ~ query type :>> ", operation, " ~ finalSql:>> ", finalSql, " ~ values:>> ", values);
+        console.log("🚀 ~ makeMySqlCall ~ process.env.MYSQL_SSL_CERT_PATH:", process.env.MYSQL_SSL_CERT_PATH);
         const connection = await (0, util_1.createMySqlConnection)(mysqlDBConfig);
         try {
             const [rows] = await connection.execute(finalSql, values);

package/build/utils/util.d.ts

@@ -99,7 +99,7 @@ export declare const average: (formatType: string, { numbers }: any) => string;
 export declare const multiply: (formatType: string, { numbers }: any) => string;
 export declare const divide: (formatType: string, { number1, number2 }: any) => string;
 export declare const evaluateExpression: (expression: string, data: any, user: any, formatType: string, envConstants: any) => string;
-export declare const evaluateCurrency: (formatType: string, subject: number | string | any, currency: string, position: string, maxFraction: number) => string;
+export declare const evaluateCurrency: (formatType: string, subject: number | string | any, currency: string, position: string, maxFraction: number, user?: any, tenant?: any) => string;
 export declare const evaluateJSLogic: (expression: string, data: any, user: any, envConstants: any) => any;
 export declare const formatDate: (formatType: string, datentime: any, timezone: string, unixType: any, offset?: boolean) => string;
 export declare const dateDifference: (formatType: string, datentime1: any, datentime2: any, timezone: string) => string;
@@ -180,4 +180,5 @@ export declare const getTotalRecords: (connection: any, sqlQuery: string, sqlPar
  */
 export declare const getLastUpdatedId: (connection: any, sqlParams: any[]) => Promise<number | null>;
 export declare const masking: (subject: string | number, visibleCharCount?: number | string, maskPosition?: "START" | "END" | "MIDDLE", maskCharacter?: string) => string;
+export declare const getArgsFromKey: (key: any, field: any, loggedInUserData: any, projectConstant: any | undefined, envConstants: any, collectionConstant: any | undefined, browserStorageData: any) => string;
 export {};

package/build/utils/util.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.multiply = exports.average = exports.substraction = exports.addition = exports.validateNumbers = exports.checkAndConvertNumber = exports.evaluateCustomSentence = exports.strJoin = exports.markdownToHtml = exports.substr = exports.truncate = exports.titleCase = exports.trim = exports.slugify = exports.upperCase = exports.lowerCase = exports.capitalize = exports.replaceUnderscoreWithSlash = exports.replaceSlashWithUnderscore = exports.toggleConsoleLogs = exports.validateUrl = exports.validateData = exports.fillDefaultValues = exports.replaceValueFromSource = exports.processFieldsInclude = exports.removeMongoDbId = exports.replaceTransferObjectValueIntoExpression = exports.unflattenObject = exports.parseValueFromData = exports.parseJsonString = exports.replaceDataValueIntoExpression = exports.formatCustomCSSClasses = exports.validateAlphanumericString = exports.convertItemToArray = exports.arraysEqual = exports.checkAndCompareValue = exports.restructureData = exports.formatCollectionAndFieldName = exports.cleanCollectionAndFieldName = exports.getSpecialCharectorReplacedExpression = exports.validateUuidString = exports.validateEmail = exports.dynamicSort = exports.isObject = exports.isEmptyObject = exports.isEmpty = exports.clearSpaceAndReformat = exports.camelize = exports.validateString = exports.nonFindQuery = void 0;
-exports.masking = exports.getLastUpdatedId = exports.getTotalRecords = exports.buildLimitOffsetClause = exports.buildOrderByClause = exports.buildWhereClause = exports.createMySqlConnection = exports.getAwsSignature = exports.replaceValuesFromRequestMapping = exports.replaceValuesFromObjArr = exports.checkFieldValueType = exports.getPrimaryFieldNameOfDataSource = exports.getFieldSchemaForDataSourcePrimaryId = exports.getMappingObjKey = exports.getItemDataForArrayFields = exports.getFileObjectList = exports.getFindQuery = exports.mergeObjects = exports.dateDifference = exports.formatDate = exports.evaluateJSLogic = exports.evaluateCurrency = exports.evaluateExpression = exports.divide = void 0;
+exports.getArgsFromKey = exports.masking = exports.getLastUpdatedId = exports.getTotalRecords = exports.buildLimitOffsetClause = exports.buildOrderByClause = exports.buildWhereClause = exports.createMySqlConnection = exports.getAwsSignature = exports.replaceValuesFromRequestMapping = exports.replaceValuesFromObjArr = exports.checkFieldValueType = exports.getPrimaryFieldNameOfDataSource = exports.getFieldSchemaForDataSourcePrimaryId = exports.getMappingObjKey = exports.getItemDataForArrayFields = exports.getFileObjectList = exports.getFindQuery = exports.mergeObjects = exports.dateDifference = exports.formatDate = exports.evaluateJSLogic = exports.evaluateCurrency = exports.evaluateExpression = exports.divide = void 0;
 const drapcode_constant_1 = require("drapcode-constant");
 const lodash_1 = __importDefault(require("lodash"));
 const showdown_1 = __importDefault(require("showdown"));
@@ -17,6 +17,7 @@ const moment_1 = __importDefault(require("moment"));
 const mime_types_1 = __importDefault(require("mime-types"));
 const uuid_2 = require("uuid");
 const aws4_1 = require("aws4");
+const fs_1 = __importDefault(require("fs"));
 const mysql = require("mysql2/promise");
 exports.nonFindQuery = ["COUNT", "SUM", "AVG", "MIN", "MAX"];
 // Constants
@@ -302,7 +303,18 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
     console.log("1 replaceDataValueIntoExpression");
     contentList?.forEach((prop) => {
         const needle = `{{${prop}}}`;
+        prop = voca_1.default.trim(prop);
         let dataOfItem = "";
+        const isDynamicField = [
+            "RF::",
+            "PC::",
+            "CC::",
+            "current_user_reference_field.",
+            "createdBy.",
+            "environment_variable.",
+            "current_session.",
+            "form_data_session.",
+        ].some((str) => prop.includes(str));
         if (prop.includes("current_user") && user) {
             prop = prop.replace("current_user.", "");
             if (Object.keys(user).length > 0) {
@@ -327,20 +339,6 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
                 dataOfItem = (0, exports.parseValueFromData)(subTenant, prop);
             }
         }
-        else if (prop.includes("current_session")) {
-            prop = prop.replace("current_session.", "");
-            if (Object.keys(sessionValue).length > 0) {
-                //Session will contain multi level data
-                dataOfItem = lodash_1.default.get(sessionValue, prop);
-            }
-        }
-        else if (prop.includes("form_data_session")) {
-            prop = prop.replace("form_data_session.", "");
-            if (Object.keys(sessionFormValue).length > 0) {
-                //Form Session will contain multi level data
-                dataOfItem = lodash_1.default.get(sessionFormValue, prop);
-            }
-        }
         else if (prop.includes("SESSION_STORAGE")) {
             prop = prop.replace("SESSION_STORAGE.", "");
             if (Object.keys(sessionValue).length > 0) {
@@ -362,12 +360,14 @@ const replaceDataValueIntoExpression = (expression, data, user, tenant, userSett
                 dataOfItem = lodash_1.default.get(cookiesValue, prop);
             }
         }
-        else if (prop.includes("environment_variable")) {
-            prop = prop.replace("environment_variable.", "");
-            if (Object.keys(envConstants).length > 0) {
-                const selectedConstant = envConstants.find((constant) => constant.name === prop);
-                dataOfItem = selectedConstant ? selectedConstant.value : "";
-            }
+        else if (isDynamicField) {
+            dataOfItem = (0, exports.getArgsFromKey)(prop, data, user, {}, envConstants, {}, {
+                sessionValue,
+                sessionFormValue,
+                sessionStorageData: sessionValue,
+                localStorageData: localStorageValue,
+                cookiesData: cookiesValue,
+            });
         }
         else {
             if (Object.keys(data).length > 0) {
@@ -1010,7 +1010,7 @@ const evaluateExpression = function (expression, data, user, formatType, envCons
     }
 };
 exports.evaluateExpression = evaluateExpression;
-const evaluateCurrency = function (formatType, subject, currency, position, maxFraction) {
+const evaluateCurrency = function (formatType, subject, currency, position, maxFraction, user = {}, tenant = {}) {
     try {
         if (!subject)
             subject = 0;
@@ -1023,6 +1023,14 @@ const evaluateCurrency = function (formatType, subject, currency, position, maxF
         }).format(digit);
         if (currency === "NONE")
             return `${subject}`;
+        if (currency.startsWith("current_user.")) {
+            currency = currency.replace("current_user.", "");
+            currency = (0, exports.parseValueFromData)(user, currency);
+        }
+        else if (currency.startsWith("current_tenant.")) {
+            currency = currency.replace("current_tenant.", "");
+            currency = (0, exports.parseValueFromData)(tenant, currency);
+        }
         switch (position) {
             case "FRONT":
                 return `${currency}${subject}`;
@@ -1268,14 +1276,41 @@ exports.getAwsSignature = getAwsSignature;
  */
 const createMySqlConnection = async (config) => {
     try {
-        const { host, user, password, database, port } = config || {};
-        const connection = await mysql.createConnection({
-            host: host,
-            user: user,
-            password: password,
-            database: database,
-            port: port,
-        });
+        const { host, user, password, database, port, sslEnabled, sslCa, sslCert, sslKey } = config || {};
+        console.log("🚀 ~ createMySqlConnection ~ sslEnabled:", sslEnabled);
+        console.log("🚀 ~ createMySqlConnection ~ process.env.MYSQL_SSL_CERT_PATH:", process.env.MYSQL_SSL_CERT_PATH);
+        const sslCertsPath = process.env.MYSQL_SSL_CERT_PATH || './';
+        console.log("🚀 ~ createMySqlConnection ~ sslCertsPath:", sslCertsPath);
+        let connection = null;
+        if (sslEnabled) {
+            const connectionOptions = {
+                host,
+                user,
+                password,
+                database,
+                port,
+                ssl: {}
+            };
+            if (sslCa) {
+                connectionOptions.ssl.ca = fs_1.default.readFileSync(`${sslCertsPath}${sslCa}`);
+            }
+            if (sslCert) {
+                connectionOptions.ssl.cert = fs_1.default.readFileSync(`${sslCertsPath}${sslCert}`);
+            }
+            if (sslKey) {
+                connectionOptions.ssl.key = fs_1.default.readFileSync(`${sslCertsPath}${sslKey}`);
+            }
+            connection = await mysql.createConnection(connectionOptions);
+        }
+        else {
+            connection = await mysql.createConnection({
+                host,
+                user,
+                password,
+                database,
+                port,
+            });
+        }
         const [rows] = await connection.execute("select ?+? as sum", [2, 2]);
         console.log("==> MySQL createMySqlConnection ~ Testing connection...", rows);
         return connection;
@@ -1370,3 +1405,66 @@ const masking = (subject, visibleCharCount = 2, maskPosition = "END", maskCharac
     }
 };
 exports.masking = masking;
+const getArgsFromKey = (key, field, loggedInUserData, projectConstant = {}, envConstants, collectionConstant = {}, browserStorageData) => {
+    const { sessionValue, sessionFormValue, sessionStorageData, localStorageData, cookiesData, } = browserStorageData || {};
+    let value = "";
+    if (key.includes("current_user.")) {
+        const userKey = key.split(".")[1];
+        value = (0, exports.parseValueFromData)(loggedInUserData, userKey);
+    }
+    else if (key.includes("current_user_reference_field.")) {
+        const [userRefFieldName, newKey] = key
+            .replace("current_user_reference_field.", "")
+            .split(".");
+        const userRefField = loggedInUserData?.[userRefFieldName];
+        value = userRefField ? userRefField[0]?.[newKey] : "";
+    }
+    else if (key.includes("createdBy.")) {
+        const newKey = key.split(".")[1];
+        const createdBy = field?.createdBy;
+        value = createdBy[0]?.[newKey];
+    }
+    else if (key.includes("environment_variable.")) {
+        const envConstantName = key.split("environment_variable.")[1];
+        value = envConstants.find((constant) => constant.name === envConstantName).value;
+    }
+    else if (key.includes("RF::")) {
+        const refName = key.replace("RF::", "");
+        value = (0, exports.parseValueFromData)(field, refName);
+    }
+    else if (key.includes("PC::")) {
+        const projectConstantName = key.split("PC::")[1];
+        const projectConst = projectConstant.find((constant) => constant.name === projectConstantName);
+        value = projectConst?.value;
+    }
+    else if (key.includes("CC::")) {
+        const collectionConstantName = key.split("CC::")[1];
+        const collectionConst = collectionConstant.find((constant) => constant.name === collectionConstantName);
+        value = collectionConst?.value;
+    }
+    else if (key.includes("current_session.")) {
+        const sessionKey = key.replace("current_session.", "");
+        value = (0, exports.parseValueFromData)(sessionValue, sessionKey);
+    }
+    else if (key.includes("form_data_session.")) {
+        const sessionKey = key.replace("form_data_session.", "");
+        value = (0, exports.parseValueFromData)(sessionFormValue, sessionKey);
+    }
+    else if (key.includes("SESSION_STORAGE.")) {
+        const sessionKey = key.replace("SESSION_STORAGE.", "");
+        value = (0, exports.parseValueFromData)(sessionStorageData, sessionKey);
+    }
+    else if (key.includes("LOCAL_STORAGE.")) {
+        const sessionKey = key.replace("LOCAL_STORAGE.", "");
+        value = (0, exports.parseValueFromData)(localStorageData, sessionKey);
+    }
+    else if (key.includes("COOKIES.")) {
+        const sessionKey = key.replace("COOKIES.", "");
+        value = (0, exports.parseValueFromData)(cookiesData, sessionKey);
+    }
+    else {
+        value = "";
+    }
+    return value;
+};
+exports.getArgsFromKey = getArgsFromKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "description": "DrapCode Utility",
   "main": "build/index.js",
   "types": "build/index.d.ts",