Merge pull request #5012 from Countly/SER-1167-update-for-proxy-config-in-countly-request

[SER-1167] update for proxy config in countly request

Author: kanwarujjaval

api/jobs/ping.js

@@ -4,8 +4,9 @@ const job = require('../parts/jobs/job.js'),
     log = require('../utils/log.js')('job:ping'),
     countlyConfig = require("../../frontend/express/config.js"),
     versionInfo = require('../../frontend/express/version.info'),
-    request = require('countly-request'),
-    plugins = require('../../plugins/pluginManager.js');
+    plugins = require('../../plugins/pluginManager.js'),
+    request = require('countly-request')(plugins.getConfig("security"));
+
 
 /** Class for the job of pinging servers **/
 class PingJob extends job.Job {

api/parts/mgmt/tracker.js

@@ -13,7 +13,6 @@ var tracker = {},
     countlyConfig = require("../../../frontend/express/config.js"),
     versionInfo = require('../../../frontend/express/version.info'),
     ip = require('./ip.js'),
-    request = require('countly-request'),
     cluster = require('cluster'),
     os = require('os'),
     fs = require('fs'),
@@ -23,6 +22,7 @@ var tracker = {},
     server = "e0693b48a5513cb60c112c21aede3cab809d52d0",
     url = "https://stats.count.ly",
     plugins = require('../../../plugins/pluginManager.js'),
+    request = require('countly-request')(plugins.getConfig("security")),
     offlineMode = plugins.getConfig("api").offline_mode,
     domain = plugins.getConfig("api").domain;
 

api/utils/countly-request/index.js

@@ -1,13 +1,13 @@
+/* eslint-disable require-jsdoc */
 /***
  * @module api/utils/countly-request
  */
 
 const got = require('got');
 const FormData = require('form-data');
-const plugins = require('../../../plugins/pluginManager.js');
 const {HttpsProxyAgent, HttpProxyAgent} = require('hpagent');
 
-var initParams = function(uri, options, callback) {
+var initParams = function(uri, options, callback, countlyConfig) {
 
     if (typeof options === 'function') {
         callback = options;
@@ -32,7 +32,7 @@ var initParams = function(uri, options, callback) {
 
     params.callback = callback || params.callback;
 
-    var config = plugins.getConfig("security");
+    var config = countlyConfig;
 
     if (config && config.proxy_hostname) {
         if (!params.options) {
@@ -150,39 +150,84 @@ var convertOptionsToGot = function(options) {
 };
 
 
-module.exports = function(uri, options, callback) {
+// Factory function to initialize with config
+module.exports = function(countlyConfig) {
+    // Return the request function
+    // eslint-disable-next-line require-jsdoc
+    function requestFunction(uri, options, callback) {
+        if (typeof uri === 'undefined') {
+            throw new Error('undefined is not a valid uri or options object.');
+        }
+
+        // Initialize params with the provided config
+        const params = initParams(uri, options, callback, countlyConfig);
 
-    if (typeof uri === 'undefined') {
-        throw new Error('undefined is not a valid uri or options object.');
+        // Request logic follows, unchanged from your provided code
+        if (params.options && (params.options.url || params.options.uri)) {
+            got(params.options)
+                .then(response => {
+                    params.callback(null, response, response.body);
+                })
+                .catch(error => {
+                    params.callback(error);
+                });
+        }
+        else {
+            got(params.uri, params.options)
+                .then(response => {
+                    params.callback(null, response, response.body);
+                })
+                .catch(error => {
+                    params.callback(error);
+                });
+        }
     }
 
+    // eslint-disable-next-line require-jsdoc
+    function post(uri, options, callback, config) {
+        var params = initParams(uri, options, callback, config);
+        if (params.options && (params.options.url || params.options.uri)) {
+            if (params.options.form && params.options.form.fileStream && params.options.form.fileField) {
+                // If options include a form, use uploadFormFile
+                const { url, form } = params.options;
+                uploadFormFile(url || params.options.uri, form, params.callback);
+            }
+            else {
+                // Make the request using got
+                got.post(params.options)
+                    .then(response => {
+                        // Call the callback with the response data
+                        params.callback(null, response, response.body);
+                    })
+                    .catch(error => {
+                        // Call the callback with the error
+                        params.callback(error);
+                    });
+            }
+        }
+        else {
+            // Make the request using got
+            got.post(params.uri, params.options)
+                .then(response => {
+                    params.callback(null, response, response.body);
+                })
+                .catch(error => {
+                    // Call the callback with the error
+                    params.callback(error);
+                });
+        }
+    }
 
-    const params = initParams(uri, options, callback);
 
-    if (params.options && (params.options.url || params.options.uri)) {
-        // Make the request using got
-        got(params.options)
-            .then(response => {
-                // Call the callback with the response data
-                params.callback(null, response, response.body);
-            })
-            .catch(error => {
-                // Call the callback with the error
-                params.callback(error);
-            });
-    }
-    else {
-        // Make the request using got
-        got(params.uri, params.options)
-            .then(response => {
-                params.callback(null, response, response.body);
-            })
-            .catch(error => {
-                // Call the callback with the error
-                params.callback(error);
-            });
+    function get(uri, options, callback, config) {
+        module.exports(uri, options, callback, config);
     }
 
+    requestFunction.post = post;
+    requestFunction.get = get;
+    requestFunction.convertOptionsToGot = convertOptionsToGot;
+
+    return requestFunction;
 
 };
 
@@ -211,44 +256,7 @@ async function uploadFormFile(url, fileData, callback) {
     }
 }
 
-// Add a post method to the request object
-module.exports.post = function(uri, options, callback) {
-    var params = initParams(uri, options, callback);
-    if (params.options && (params.options.url || params.options.uri)) {
-        if (params.options.form && params.options.form.fileStream && params.options.form.fileField) {
-            // If options include a form, use uploadFormFile
-            const { url, form } = params.options;
-            uploadFormFile(url || params.options.uri, form, params.callback);
-        }
-        else {
-            // Make the request using got
-            got.post(params.options)
-                .then(response => {
-                    // Call the callback with the response data
-                    params.callback(null, response, response.body);
-                })
-                .catch(error => {
-                    // Call the callback with the error
-                    params.callback(error);
-                });
-        }
-    }
-    else {
-        // Make the request using got
-        got.post(params.uri, params.options)
-            .then(response => {
-                params.callback(null, response, response.body);
-            })
-            .catch(error => {
-                // Call the callback with the error
-                params.callback(error);
-            });
-    }
-};
 
-//Add a get method to the request object
-module.exports.get = function(uri, options, callback) {
-    module.exports(uri, options, callback);
-};
+
 
 module.exports.convertOptionsToGot = convertOptionsToGot;

api/utils/requestProcessor.js

@@ -22,7 +22,7 @@ const validateUserForDataReadAPI = validateRead;
 const validateUserForDataWriteAPI = validateUserForWrite;
 const validateUserForGlobalAdmin = validateGlobalAdmin;
 const validateUserForMgmtReadAPI = validateUser;
-const request = require('countly-request');
+const request = require('countly-request')(plugins.getConfig("security"));
 const Handle = require('../../api/parts/jobs/index.js');
 
 var loaded_configs_time = 0;

bin/commands/scripts/api.js

@@ -1,4 +1,5 @@
-var request = require('countly-request');
+var pluginManager = require('../../../plugins/pluginManager.js');
+var request = require('countly-request')(pluginManager.getConfig("security"));
 var countlyConfig = require("../../../frontend/express/config.js");
 var myArgs = process.argv.slice(2);
 

bin/commands/scripts/update_translations.js

@@ -1,9 +1,10 @@
 var https = require("https");
-var request = require("countly-request");
+
 var fs = require('fs');
 var path = require("path");
 var dir = path.resolve(__dirname, '../../../');
 var manager = require('../../../plugins/pluginManager.js');
+var request = require("countly-request")(manager.getConfig("security"));
 
 var header = "# DO NOT EDIT THIS FILE AS IT WILL BE OVERRIDEN DURING TRANSLATION SYNC\n" +
              "# IF YOU WOULD LIKE TO HELP COUNTLY TO BE TRANSLATED INTO YOUR LANGUAGE\n" +

bin/scripts/continious-data-population.js

@@ -167,7 +167,7 @@ const ratingWidgetList = {}, npsWidgetList = {}, surveyWidgetList = {};
 
 
 const plugins = require('../../plugins/pluginManager.js'),
-    request = require('countly-request'),
+    request = require('countly-request')(plugins.getConfig("security")),
     Chance = require('../../plugins/populator/frontend/public/javascripts/chance.js');
 
 function writeMsg(msg) {

bin/scripts/delete_queried_user_script.js

@@ -26,7 +26,7 @@ var QUERY = {
     "hasInfo": { "$ne": true } // anonymous user
 };
 var pluginManager = require("./plugins/pluginManager.js");
-var request = require('countly-request');
+var request = require('countly-request')(pluginManager.getConfig("security"));
 var DB = 'countly';
 var COLLECTION_NAME = "app_users" + APP_ID; // do not change
 /**

bin/scripts/member-managament/delete_old_members.js

@@ -5,7 +5,7 @@ Script calls Countly API endpoint to trigger member deletion for members, which
 Query is editable to delete based on different criteria.
 */
 var pluginManager = require('./../../../plugins/pluginManager.js');
-var request = require('countly-request');
+var request = require('countly-request')(pluginManager.getConfig("security"));
 var Promise = require("bluebird");
 
 

frontend/express/app.js

@@ -30,7 +30,6 @@ var versionInfo = require('./version.info'),
     fs = require('fs'),
     path = require('path'),
     jimp = require('jimp'),
-    request = require('countly-request'),
     flash = require('connect-flash'),
     cookieParser = require('cookie-parser'),
     formidable = require('formidable'),
@@ -47,6 +46,7 @@ var versionInfo = require('./version.info'),
     common = require('../../api/utils/common.js'),
     preventBruteforce = require('./libs/preventBruteforce.js'),
     plugins = require('../../plugins/pluginManager.js'),
+    request = require('countly-request')(plugins.getConfig("security")),
     countlyConfig = require('./config', 'dont-enclose'),
     log = require('../../api/utils/log.js')('core:app'),
     url = require('url'),

frontend/express/libs/members.js

@@ -16,7 +16,7 @@ var { getUserApps } = require('./../../../api/utils/rights.js');
 var configs = require('./../config', 'dont-enclose');
 var countlyMail = require('./../../../api/parts/mgmt/mail.js');
 var countlyStats = require('./../../../api/parts/data/stats.js');
-var request = require('countly-request');
+var request = require('countly-request')(plugins.getConfig("security"));
 var url = require('url');
 var crypto = require('crypto');
 var argon2 = require('argon2');

plugins/alerts/api/parts/utils.js

@@ -1,5 +1,6 @@
 const mail = require("../../../../api/parts/mgmt/mail");
-const request = require('countly-request');
+const plugins = require('../../../../plugins/pluginManager.js');
+const request = require('countly-request')(plugins.getConfig("security"));
 const moment = require('moment-timezone');
 
 const common = require('../../../../api/utils/common.js');

plugins/data_migration/api/api.js

@@ -20,7 +20,7 @@ var Promise = require("bluebird");
 
 var authorize = require('../../../api/utils/authorizer.js'); //for token
 
-const request = require('countly-request');
+const request = require('countly-request')(plugins.getConfig("security"));
 const FEATURE_NAME = 'data_migration';
 /**
 *Function to delete all exported files in export folder

plugins/data_migration/api/data_migration_helper.js

@@ -9,7 +9,7 @@ var countlyFs = require('../../../api/utils/countlyFs.js');
 var cp = require('child_process'); //call process
 var spawn = cp.spawn; //for calling comannd line
 const os = require('os'); //hostname, eol
-const request = require('countly-request');
+const request = require('countly-request')(plugins.getConfig("security"));
 var common = require('../../../api/utils/common.js');
 
 module.exports = function(my_db) {

plugins/hooks/api/parts/effects/http.js

@@ -1,4 +1,5 @@
-const request = require("countly-request");
+const plugins = require("../../../../pluginManager.js");
+const request = require("countly-request")(plugins.getConfig("security"));
 const utils = require("../../utils");
 const common = require('../../../../../api/utils/common.js');
 const log = common.log("hooks:api:api_endpoint_trigger");

plugins/reports/api/reports.js

@@ -4,11 +4,11 @@ var reportsInstance = {},
     ejs = require("ejs"),
     fs = require('fs'),
     path = require('path'),
-    request = require('countly-request'),
+    plugins = require("../../pluginManager"),
+    request = require('countly-request')(plugins.getConfig("security")),
     crypto = require('crypto'),
     mail = require("../../../api/parts/mgmt/mail"),
     fetch = require("../../../api/parts/data/fetch"),
-    plugins = require("../../pluginManager"),
     countlyCommon = require('../../../api/lib/countly.common.js'),
     localize = require('../../../api/utils/localization.js'),
     common = require('../../../api/utils/common.js'),

plugins/server-stats/api/jobs/stats.js

@@ -6,7 +6,7 @@ const job = require('../../../../api/parts/jobs/job.js'),
     config = require("../../../../frontend/express/config.js"),
     pluginManager = require('../../../pluginManager.js'),
     moment = require('moment-timezone'),
-    request = require('countly-request');
+    request = require('countly-request')(pluginManager.getConfig("security"));
 
 const promisedLoadConfigs = function(db) {
     return new Promise((resolve) => {

plugins/server-stats/frontend/app.js

@@ -1,8 +1,8 @@
 var pluginExported = {};
 var versionInfo = require('../../../frontend/express/version.info');
-var request = require('countly-request');
 var moment = require('moment');
 const plugins = require('../../pluginManager.js');
+const request = require('countly-request')(plugins.getConfig("security"));
 const { getUserApps } = require('../../../api/utils/rights');
 
 (function(plugin) {

plugins/star-rating/mock.js

@@ -1,5 +1,5 @@
-
-const request = require("countly-request");
+const plugins = require("../../plugins/pluginManager");
+const request = require("countly-request")(plugins.getConfig("security"));
 const host = '128.199.239.207' ; //'localhost:3001';
 const appKey = 'b895ef5cca254395a1cc1f03b41bbc0ca7b6b52a';//'d4a4e3e1a4d241c2ea9d0c350bb86584c87a91cb';
 let times = 2000;

plugins/web/frontend/app.js

@@ -1,5 +1,6 @@
 var exported = {},
-    request = require("countly-request"),
+    plugins = require("../../pluginManager"),
+    request = require("countly-request")(plugins.getConfig("security")),
     countlyConfig = require("../../../frontend/express/config");
 
 (function(plugin) {

test/unit-tests/api.utils.countly-request.js

@@ -1,4 +1,6 @@
-var request = require('countly-request');
+
+var pluginManager = require('../../plugins/pluginManager');
+var request = require('countly-request')(pluginManager.getConfig("security"));
 var should = require('should');
 
 describe('Countly Request', () => {