zocrmsdkmiblu 0.2.4 → 0.2.6

package/lib/js/util.js

@@ -1,327 +1,268 @@
-
-function promiseResponse(request) {
-
-    var crmclient = require('./ZCRMRestClient');
-    var OAuth = require('./OAuth');
-
-    return new Promise(function (resolve, reject) {
-        var persistenceModule = require(crmclient.getPersistenceModule());
-        getAuthToken().then(resp=>{
-            makeapicall(request).then(function (response) {
-
-                try {
-                    var isExpire = JSON.parse(response.body);
-                    if (isExpire.code == 'INVALID_TOKEN') {
-                        //Update Token 
-
-                        getAuthToken(true).then(resp=>{
-                            makeapicall(request).then(function (response) {
-        
-                                resolve(response);
-    
-                            })
-                        })
-                    }else{
-                        resolve(response);
-                    }
-                } catch (error) {
-                    resolve(response);
-                }
-
-            })
-        })
-       
-    })
-}
-
-
-function makeapicall(request) {
-
-    return new Promise(function (resolve, reject) {
-
-        var crmclient = require('./ZCRMRestClient');
-        var httpclient = require('request');
-        var OAuth = require('./OAuth');
-        var persistenceModule = require(crmclient.getPersistenceModule());
-        var qs = require('querystring');
-
-        persistenceModule.getOAuthTokens(crmclient.getUserIdentifier()).then(function (result_obj) {
-            var access_token = result_obj.access_token;
-            var allrecords = request.all || null
-            var baseUrl = "https://" + crmclient.getAPIURL() + "/crm/" + crmclient.getVersion(allrecords) + "/" + request.url;
-            if (request.params) {
-                baseUrl = baseUrl + '?' + request.params;
-            }
-
-            var api_headers = {};
-            var encoding = "utf8";
-            var req_body = null;
-            var formData = null;
-
-            if (request.download_file) {
-                encoding = "binary";//No I18N
-            }
-
-            var form_Data = null;
-
-            if (request.x_file_content) {
-                var FormData = require('form-data');
-                form_Data = new FormData();
-                form_Data.append('file', request.x_file_content);//No I18N           
-                req_body = form_Data;
-                api_headers = form_Data.getHeaders();
-            }
-            else {
-                req_body = request.body || null;
-            }
-
-            if (request.headers) {
-                var header_keys = Object.keys(request.headers);
-                for (i in header_keys) {
-                    api_headers[header_keys[i]] = request.headers[header_keys[i]];
-                }
-            }
-
-            api_headers.Authorization = 'Zoho-oauthtoken ' + access_token;
-            api_headers["User-Agent"] = 'Zoho CRM Node SDK';
-
-           /*  console.log({
-
-                uri: baseUrl,
-                method: request.type,
-                headers: api_headers,
-                body: req_body,
-                encoding: encoding
-
-            },crmclient.getVersion(allrecords)); */
-            httpclient({
-
-                uri: baseUrl,
-                method: request.type,
-                headers: api_headers,
-                body: req_body,
-                encoding: encoding
-
-            }, function (error, response, body) {
-
-                if (error) {
-                    resolve(error);
-                }
-                else if (response.statusCode == 204) {
-
-                    var respObj = {
-                        "message": "no data", //No I18N
-                        "status_code": "204" //No I18N
-                    }
-                    resolve(JSON.stringify(respObj));
-
-                } else {
-                    if (request.download_file) {
-
-                        var filename;
-                        var disposition = response.headers["content-disposition"];//No I18N
-                        if (disposition && disposition.indexOf('attachment') !== -1) {
-                            var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
-                            var matches = filenameRegex.exec(disposition);
-                            if (matches != null && matches[1]) {
-                                filename = matches[1].replace(/['"]/g, '');
-                                filename = filename.replace('UTF-8', '');
-                            }
-                        }
-                        response.filename = filename;
-                        resolve(response);
-                    }
-                    else {
-                        resolve(response);
-                    }
-                }
-            });
-        })
-    })
-}
-function getAuthToken(isInvalid) {
-
-    var crmclient = require('./ZCRMRestClient');
-    var OAuth = require('./OAuth');
-
-    
-    return new Promise(function (resolve, reject) {
-
-        var persistenceModule = require(crmclient.getPersistenceModule());
-
-        persistenceModule.getOAuthTokens(crmclient.getUserIdentifier()).then(function (response) {
-
-            var date = new Date();
-            var current_time = date.getTime();
-            var access_token = response.access_token;
-            var expires_in = response.expires_in;
-            var refresh_token = response.refresh_token;
-            var result_obj = (response);
-
-            if ((current_time > expires_in) || isInvalid) {
-                if(isInvalid)console.info("==============  REGENERATE TOKEN BY INVALID =============");
-                if(!isInvalid)console.info("==============   REGENERATE TOKEN BY TIME  =============");
-
-                var config = crmclient.getConfig_refresh(refresh_token)
-                new OAuth(config, 'refresh_access_token');
-                var url = OAuth.constructurl('generate_token');
-                OAuth.generateTokens(url).then(function (response) {
-
-                    result_obj = crmclient.parseAndConstructObject(response);
-
-                    persistenceModule.updateOAuthTokens(result_obj).then(function (response) {
-                        resolve(result_obj);
-                    });
-                })
-            }
-            
-
-            else {
-                //console.info("==============  TOKEN NO EXPIRADO  =============")
-                resolve(result_obj);
-            }
-        })
-    })
-}
-
-function createParams(parameters) {
-
-    var params, key;
-    for (key in parameters) {
-        if (parameters.hasOwnProperty(key)) {
-            if (params) {
-                params = params + key + '=' + parameters[key] + '&';
-            }
-            else {
-                params = key + '=' + parameters[key] + '&';
-            }
-        }
-    }
-
-    return params;
-}
-
-function constructRequestDetails(input, url, type, isModuleParam) {
-
-    var requestDetails = {};
-
-    requestDetails.type = type;
-
-    if (input != undefined) {
-        if (input.id) {
-            url = url.replace("{id}", input.id);
-        }
-        else {
-            url = url.replace("/{id}", "");
-        }
-        if (input.api_name) {
-
-            url = url.replace("{api_name}", input.api_name);
-
-
-            var params = {};
-            if (input.params) {
-
-                params = input.params;
-            }
-            params.auth_type = "apikey";
-            input.params = params;
-        }
-        else {
-
-            url = url.replace("/{api_name}", "");
-
-        }
-        if (input.params) {
-            requestDetails.params = createParams(input.params) + (input.module && isModuleParam ? "module=" + input.module : "");//No I18N
-        }
-        if (!requestDetails.params && isModuleParam) {
-            requestDetails.params = "module=" + input.module;//No I18N
-        }
-        if (input.body && (type == HTTP_METHODS.POST || type == HTTP_METHODS.PUT)) {
-            requestDetails.body = JSON.stringify(input.body);
-        }
-        if (input.x_file_content) {
-            requestDetails.x_file_content = input.x_file_content;
-        }
-        if (input.download_file) {
-            requestDetails.download_file = input.download_file;
-        }
-        if (input.headers) {
-
-            requestDetails.headers = input.headers;
-        }
-    }
-
-    requestDetails.url = url;
-
-    return requestDetails;
-
-
-}
-function convertToCOQLQuery(inputText, fields, module,page,per_page) {
-    const conditions = inputText.split(/\b(and|or)\b/i);
-
-    const queryParts = [];
-    let operator = 'AND'; // Operador predeterminado
-    const operatorsWithGrouping = ['equals', 'starts_with', 'in', '>='];
-    let currentEqualsLikeGroup = [];
-    let currentBetweenGroup = [];
-
-    conditions.forEach(condition => {
-        const cleanCondition = condition.trim();
-        if (cleanCondition.match(/^(and|or)$/i)) {
-            operator = cleanCondition.toLowerCase();
-        } else {
-            const [field, op, value] = cleanCondition
-                .replace(/\(|\)/g, '')  // Eliminar paréntesis
-                .split(':');
-
-            if (op === 'between') {
-                const [start, end] = value.split(',');
-                currentBetweenGroup.push(`${field} between '${start}' and '${end}'`);
-            }
-            else if (op === 'in') {
-                const elements = value.split(',');
-                currentEqualsLikeGroup.push(`${field} in (${elements.map(el => `'${el.trim()}'`).join(', ')})`);
-            }
-            else if (op === 'is not null') {
-
-                currentBetweenGroup.push(`(${field} is not null)`);
-            }
-            else if (operatorsWithGrouping.includes(op)) {
-                currentEqualsLikeGroup.push(`(${field} ${op === 'equals' ? '=' : op} '${value}')`);
-            } else {
-                queryParts.push(currentEqualsLikeGroup.join(` ${operator} `));
-                currentEqualsLikeGroup = [];
-            }
-        }
-    });
-    if (currentEqualsLikeGroup.length > 0) {
-        queryParts.push(`(${currentEqualsLikeGroup.join(` ${operator} `)})`);
-    }
-    if (currentBetweenGroup.length > 0) {
-        queryParts.push(`(${currentBetweenGroup.join(` AND `)})`);
-    }
-
-    const finalQuery = `SELECT ${fields} FROM ${module} WHERE ${queryParts.join(` ${operator} `)} LIMIT ${[page*per_page,per_page]}`;
-   
-    return finalQuery;
-}
-function calculateLimit(pageNumber, resultsPerPage) {
-    if (pageNumber < 0) {
-      throw new Error('El número de página debe ser mayor o igual a 0.');
-    }
-    
-    const lowerLimit = pageNumber * resultsPerPage;
-    const upperLimit = (pageNumber + 1) * resultsPerPage;
-  
-    return [pageNumber, resultsPerPage];
-}
-module.exports = {
-
-    constructRequestDetails: constructRequestDetails,
-    promiseResponse: promiseResponse,
-    getAuthToken: getAuthToken,
-    convertToCOQLQuery: convertToCOQLQuery
+
+function promiseResponse(request) {
+
+    var crmclient = require('./ZCRMRestClient');
+    var OAuth = require('./OAuth');
+
+    return new Promise(function (resolve, reject) {
+        var persistenceModule = require(crmclient.getPersistenceModule());
+        getAuthToken().then(resp=>{
+            makeapicall(request).then(function (response) {
+
+                try {
+                    var isExpire = JSON.parse(response.body);
+                    if (isExpire.code == 'INVALID_TOKEN') {
+                        //Update Token 
+
+                        getAuthToken(true).then(resp=>{
+                            makeapicall(request).then(function (response) {
+        
+                                resolve(response);
+    
+                            })
+                        })
+                    }else{
+                        resolve(response);
+                    }
+                } catch (error) {
+                    resolve(response);
+                }
+
+            })
+        })
+       
+    })
+}
+
+
+function makeapicall(request) {
+
+    return new Promise(function (resolve, reject) {
+
+        var crmclient = require('./ZCRMRestClient');
+        var httpclient = require('request');
+        var OAuth = require('./OAuth');
+        var persistenceModule = require(crmclient.getPersistenceModule());
+        var qs = require('querystring');
+
+        persistenceModule.getOAuthTokens(crmclient.getUserIdentifier()).then(function (result_obj) {
+            var access_token = result_obj.access_token;
+            var allrecords = request.all || null
+            var baseUrl = "https://" + crmclient.getAPIURL() + "/crm/" + crmclient.getVersion(allrecords) + "/" + request.url;
+            if (request.params) {
+                baseUrl = baseUrl + '?' + request.params;
+            }
+
+            var api_headers = {};
+            var encoding = "utf8";
+            var req_body = null;
+            var formData = null;
+
+            if (request.download_file) {
+                encoding = "binary";//No I18N
+            }
+
+            var form_Data = null;
+
+            if (request.x_file_content) {
+                var FormData = require('form-data');
+                form_Data = new FormData();
+                form_Data.append('file', request.x_file_content);//No I18N           
+                req_body = form_Data;
+                api_headers = form_Data.getHeaders();
+            }
+            else {
+                req_body = request.body || null;
+            }
+
+            if (request.headers) {
+                var header_keys = Object.keys(request.headers);
+                for (i in header_keys) {
+                    api_headers[header_keys[i]] = request.headers[header_keys[i]];
+                }
+            }
+
+            api_headers.Authorization = 'Zoho-oauthtoken ' + access_token;
+            api_headers["User-Agent"] = 'Zoho CRM Node SDK';
+
+           /*  console.log({
+
+                uri: baseUrl,
+                method: request.type,
+                headers: api_headers,
+                body: req_body,
+                encoding: encoding
+
+            },crmclient.getVersion(allrecords)); */
+            httpclient({
+
+                uri: baseUrl,
+                method: request.type,
+                headers: api_headers,
+                body: req_body,
+                encoding: encoding
+
+            }, function (error, response, body) {
+
+                if (error) {
+                    resolve(error);
+                }
+                else if (response.statusCode == 204) {
+
+                    var respObj = {
+                        "message": "no data", //No I18N
+                        "status_code": "204" //No I18N
+                    }
+                    resolve(JSON.stringify(respObj));
+
+                } else {
+                    if (request.download_file) {
+
+                        var filename;
+                        var disposition = response.headers["content-disposition"];//No I18N
+                        if (disposition && disposition.indexOf('attachment') !== -1) {
+                            var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
+                            var matches = filenameRegex.exec(disposition);
+                            if (matches != null && matches[1]) {
+                                filename = matches[1].replace(/['"]/g, '');
+                                filename = filename.replace('UTF-8', '');
+                            }
+                        }
+                        response.filename = filename;
+                        resolve(response);
+                    }
+                    else {
+                        resolve(response);
+                    }
+                }
+            });
+        })
+    })
+}
+function getAuthToken(isInvalid) {
+
+    var crmclient = require('./ZCRMRestClient');
+    var OAuth = require('./OAuth');
+
+    
+    return new Promise(function (resolve, reject) {
+
+        var persistenceModule = require(crmclient.getPersistenceModule());
+
+        persistenceModule.getOAuthTokens(crmclient.getUserIdentifier()).then(function (response) {
+
+            var date = new Date();
+            var current_time = date.getTime();
+            var access_token = response.access_token;
+            var expires_in = response.expires_in;
+            var refresh_token = response.refresh_token;
+            var result_obj = (response);
+
+            if ((current_time > expires_in) || isInvalid) {
+                if(isInvalid)console.info("==============  REGENERATE TOKEN BY INVALID =============");
+                if(!isInvalid)console.info("==============   REGENERATE TOKEN BY TIME  =============");
+
+                var config = crmclient.getConfig_refresh(refresh_token)
+                new OAuth(config, 'refresh_access_token');
+                var url = OAuth.constructurl('generate_token');
+                OAuth.generateTokens(url).then(function (response) {
+
+                    result_obj = crmclient.parseAndConstructObject(response);
+
+                    persistenceModule.updateOAuthTokens(result_obj).then(function (response) {
+                        resolve(result_obj);
+                    });
+                })
+            }
+            
+
+            else {
+                //console.info("==============  TOKEN NO EXPIRADO  =============")
+                resolve(result_obj);
+            }
+        })
+    })
+}
+
+function createParams(parameters) {
+
+    var params, key;
+    for (key in parameters) {
+        if (parameters.hasOwnProperty(key)) {
+            if (params) {
+                params = params + key + '=' + parameters[key] + '&';
+            }
+            else {
+                params = key + '=' + parameters[key] + '&';
+            }
+        }
+    }
+
+    return params;
+}
+
+function constructRequestDetails(input, url, type, isModuleParam) {
+
+    var requestDetails = {};
+
+    requestDetails.type = type;
+
+    if (input != undefined) {
+        if (input.id) {
+            url = url.replace("{id}", input.id);
+        }
+        else {
+            url = url.replace("/{id}", "");
+        }
+        if (input.api_name) {
+
+            url = url.replace("{api_name}", input.api_name);
+
+
+            var params = {};
+            if (input.params) {
+
+                params = input.params;
+            }
+            params.auth_type = "apikey";
+            input.params = params;
+        }
+        else {
+
+            url = url.replace("/{api_name}", "");
+
+        }
+        if (input.params) {
+            requestDetails.params = createParams(input.params) + (input.module && isModuleParam ? "module=" + input.module : "");//No I18N
+        }
+        if (!requestDetails.params && isModuleParam) {
+            requestDetails.params = "module=" + input.module;//No I18N
+        }
+        if (input.body && (type == HTTP_METHODS.POST || type == HTTP_METHODS.PUT)) {
+            requestDetails.body = JSON.stringify(input.body);
+        }
+        if (input.x_file_content) {
+            requestDetails.x_file_content = input.x_file_content;
+        }
+        if (input.download_file) {
+            requestDetails.download_file = input.download_file;
+        }
+        if (input.headers) {
+
+            requestDetails.headers = input.headers;
+        }
+    }
+
+    requestDetails.url = url;
+
+    return requestDetails;
+
+
+}
+
+module.exports = {
+
+    constructRequestDetails: constructRequestDetails,
+    promiseResponse: promiseResponse,
+    getAuthToken: getAuthToken
 }

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "zocrmsdkmiblu",
-  "version": "0.2.4",
-  "author": "IT Team",
-  "license": "MIT",
-  "dependencies": {
-    "fs": "0.0.1-security",
-    "mysql": "^2.18.1",
-    "properties-reader": "0.0.16",
-    "querystring": "^0.2.0",
-    "request": "^2.88.2",
-    "typescript": "^5.0.4"
-  },
-  "description": "Node SDK for Zoho CRM BY JB",
-  "keywords": [
-    "zoho crm",
-    "sdk zoho"
-  ],
-  "main": "lib/js/ZCRMRestClient",
-  "scripts": {
-    "test": "mocha --timeout 5000 test/dev.test.js"
-  },
-  "devDependencies": {
-    "@types/node": "^20.1.2",
-    "@types/request": "^2.48.8",
-    "mocha": "^10.2.0"
-  }
-}
+{
+  "name": "zocrmsdkmiblu",
+  "version": "0.2.6",
+  "author": "Julio Bodero",
+  "license": "MIT",
+  "dependencies": {
+    "fs": "0.0.1-security",
+    "mysql": "^2.18.1",
+    "properties-reader": "0.0.16",
+    "querystring": "^0.2.0",
+    "request": "^2.88.2",
+    "typescript": "^5.0.4"
+  },
+  "description": "Node SDK for Zoho CRM BY JB",
+  "keywords": [
+    "zoho crm",
+    "sdk zoho"
+  ],
+  "main": "lib/js/ZCRMRestClient",
+  "scripts": {
+    "test": "mocha --timeout 5000 test/dev.test.js"
+  },
+  "devDependencies": {
+    "@types/node": "^20.1.2",
+    "@types/request": "^2.48.8",
+    "mocha": "^10.2.0"
+  }
+}