rejectUnauthorized option is fixed

Author: Umit Coskun Aydinoglu

api/utils/countly-request/index.js

@@ -42,41 +42,62 @@ var convertOptionsToGot = function(options) {
 
     var requestOptions = {};
 
-    //define for got and request differences
+    // Define for got and request differences
     var keyMap = {
         "qs": "searchParams",
-        "strictSSL": "rejectUnauthorized",
+        "strictSSL": "https.rejectUnauthorized",
         "gzip": "decompress",
         "jar": "cookieJar",
         "baseUrl": "prefixUrl",
         "uri": "url"
     };
 
+    // Helper function to assign value to nested keys
+    function assignDeep(obj, keyPath, value) {
+        var keys = keyPath.split('.');
+        var lastKey = keys.pop();
+        var nestedObj = obj;
+
+        keys.forEach(function(key) {
+            if (!nestedObj[key] || typeof nestedObj[key] !== 'object') {
+                nestedObj[key] = {};
+            }
+            nestedObj = nestedObj[key];
+        });
+
+        nestedObj[lastKey] = value;
+    }
+
     for (let key in options) {
         if (!Object.prototype.hasOwnProperty.call(requestOptions, key) && keyMap[key]) {
-            requestOptions[keyMap[key]] = options[key];
-        }
-        else {
+            var mappedKey = keyMap[key];
+            if (mappedKey.includes('.')) {
+                assignDeep(requestOptions, mappedKey, options[key]);
+            } else {
+                requestOptions[mappedKey] = options[key];
+            }
+        } else {
             requestOptions[key] = options[key];
         }
     }
 
-    //backward compatability. in got json is not boolean. it is the object.
-    //request body and json are mutally exclusive. if request.json and body exists one of them must be deleted
+    // Backward compatibility: in got, json is not a boolean, it is an object.
+    // Request body and json are mutually exclusive.
+    // If request.json and body exist, one of them must be deleted.
     if (requestOptions.json && typeof requestOptions.json === 'boolean' && requestOptions.body) {
         requestOptions.json = requestOptions.body;
-        delete requestOptions.json;
+        delete requestOptions.body;
     }
 
     if (requestOptions.prefixUrl && options.uri && requestOptions.url) {
         requestOptions.uri = options.uri;
         delete requestOptions.url;
-
     }
 
     return requestOptions;
 };
 
+
 module.exports = function(uri, options, callback) {
 
     if (typeof uri === 'undefined') {
@@ -144,4 +165,6 @@ module.exports.post = function(uri, options, callback) {
 //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/countly-request/test/countly-request.test.js

@@ -0,0 +1,70 @@
+var request = require('../index.js');
+var should = require('should');
+
+describe('Countly Request', () => {
+
+  it('Make sure options converted correctly', () => {
+    const optionsWithoutBaseURL ={
+      "qs": "searchParams",
+      "strictSSL": true ,
+      "gzip":  true,
+      "jar": "cookieJar",
+      //"baseUrl": "prefixUrl",
+      "uri": "url"
+    };
+
+    const expectedOptionsWithoutBaseURL = {
+      "searchParams": "searchParams",
+      "https": {
+        "rejectUnauthorized": true
+      },
+      "decompress": true,
+      "cookieJar": "cookieJar",
+      //"prefixUrl": "prefixUrl",
+      "url": "url"
+    };
+
+    const optionsWithBaseURL ={
+      "qs": "searchParams",
+      "strictSSL": true ,
+      "gzip":  true,
+      "jar": "cookieJar",
+      "baseUrl": "prefixUrl",
+      "uri": "url"
+    };
+
+    const expetedOptionsWithBaseURL ={
+      "searchParams": "searchParams",
+      "https": {
+        "rejectUnauthorized": true
+      },
+      "decompress": true,
+      "cookieJar": "cookieJar",
+      "prefixUrl": "prefixUrl",
+      "uri": "url"
+    };
+
+
+    request.convertOptionsToGot(optionsWithoutBaseURL).should.be.eql(expectedOptionsWithoutBaseURL);
+    request.convertOptionsToGot(optionsWithBaseURL).should.be.eql(expetedOptionsWithBaseURL);
+  });
+
+
+  it('Make get request', () => {
+    request.get('https://count.ly', {strictSSL:true}, function(err, res/*, body*/) {
+      should.not.exist(err);
+      should.exist(res);
+    
+    });
+    
+  });
+
+  it('Make post request', () => {
+    request.post('https://countly',function(err, res/*, body*/) {
+      should.not.exist(err);
+      should.exist(res);
+    
+    });
+  });
+
+});