[settings] setting to control protocol for internal localhost calls

Author: ar2rsawseen

api/jobs/ping.js

@@ -15,7 +15,7 @@ class PingJob extends job.Job {
      * @param {done} done callback
      */
     run(db, done) {
-        request({strictSSL: false, uri: "http://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + "/configs"}, function() {});
+        request({strictSSL: false, uri: (process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + "/configs"}, function() {});
         var countlyConfigOrig = JSON.parse(JSON.stringify(countlyConfig));
         var url = "https://count.ly/configurations/ce/tracking";
         if (versionInfo.type !== "777a2bf527a18e0fffe22fb5b3e322e68d9c07a6") {

api/utils/render.js

@@ -92,7 +92,7 @@ exports.renderView = function(options, cb) {
                     log.d("Headless chrome page failed request", request.failure().errorText, request.url());
                 });
 
-                var host = "http://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + countlyConfig.path;
+                var host = (process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + countlyConfig.path;
 
                 if (options.host) {
                     host = options.host + countlyConfig.path;

api/utils/taskmanager.js

@@ -80,7 +80,7 @@ taskmanager.longtask = function(options) {
             delete json.api_key;
 
             options.request = {
-                uri: "http://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + options.params.fullPath,
+                uri: (process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + options.params.fullPath,
                 method: 'POST',
                 json: json
             };
@@ -500,7 +500,7 @@ taskmanager.checkIfRunning = function(options, callback) {
         //delete jquery param to prevent caching
         delete json._;
         query.request = {
-            uri: "http://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + options.params.fullPath,
+            uri: (process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + options.params.fullPath,
             method: 'POST',
             json: json
         };

bin/commands/scripts/api.js

@@ -18,12 +18,12 @@ function output(err, body, pretty) {
 }
 
 if (myArgs[0] == "pretty") {
-    request({strictSSL: false, uri: 'http://localhost' + (countlyConfig.path || "") + myArgs[1]}, function(error, response, body) {
+    request({strictSSL: false, uri: (process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + myArgs[1]}, function(error, response, body) {
         output(error, body, true);
     });
 }
 else {
-    request({strictSSL: false, uri: 'http://localhost' + myArgs[0]}, function(error, response, body) {
+    request({strictSSL: false, uri: (process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + myArgs[0]}, function(error, response, body) {
         output(error, body);
     });
 }

plugins/systemlogs/scripts/export.js

@@ -41,7 +41,7 @@ else {
                         output.push(moment.unix(doc.ts).format("YYYY/MM/DD HH:mm:ss"));
                         output.push(doc.user_id + (doc.u ? " (" + doc.u + ")" : ""));
                         output.push(doc.ip);
-                        output.push(doc.app_id || plugins.getConfig("api").domain || "localhost");
+                        output.push(doc.app_id || plugins.getConfig("api").domain || process.env.COUNTLY_CONFIG_HOSTNAME || "localhost");
                         if (loginActions.indexOf(doc.a) !== -1) {
                             console.log("Time stamp | User ID | Login device IP or Hostname | Application/Service/Server Name | Result");
                             output.push(properties["systemlogs.action." + doc.a] || doc.a);

plugins/web/frontend/app.js

@@ -18,7 +18,7 @@ var exported = {},
         }
         app.get(countlyConfig.path + '/pixel.png', function(req, res) {
             if (req.query.app_key) {
-                var options = {uri: "http://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + "/i", method: "POST", timeout: 4E3, json: {}, strictSSL: false};
+                var options = {uri: (process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "") + "/i", method: "POST", timeout: 4E3, json: {}, strictSSL: false};
                 if (req && req.headers && req.headers['user-agent']) {
                     options.headers = {'user-agent': req.headers['user-agent']};
                 }

test/testUtils.js

@@ -34,7 +34,7 @@ var testUtils = function testUtils() {
     };
     var RE = /^-{0,1}\d*\.{0,1}\d+$/;
 
-    this.url = "http://localhost" + (countlyConfig.path || "");
+    this.url = (process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost") + (countlyConfig.path || "");
     this.name = "Test Test";
     this.username = "test";
     this.password = "Test1test$";