Don't replace the internal config object

Author: Amir Tocker

lib/config.js

@@ -1,5 +1,13 @@
 "use strict";
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 /***
  * Assign a value to a nested object
  * @function putNestedValue
@@ -48,31 +56,44 @@ function putNestedValue(params, key, value) {
 
 module.exports = function (new_config, new_value) {
   if (cloudinary_config == null || new_config === true) {
+    if (cloudinary_config == null) {
+      cloudinary_config = {};
+    } else {
+      Object.keys(cloudinary_config).forEach(function (key) {
+        return delete cloudinary_config[key];
+      });
+    }
+
     var cloudinary_url = process.env.CLOUDINARY_URL;
 
     if (cloudinary_url != null) {
       var uri = url.parse(cloudinary_url, true);
-      cloudinary_config = {
+      var parsedConfig = {
         cloud_name: uri.host,
         api_key: uri.auth && uri.auth.split(":")[0],
         api_secret: uri.auth && uri.auth.split(":")[1],
         private_cdn: uri.pathname != null,
         secure_distribution: uri.pathname && uri.pathname.substring(1)
       };
+      Object.entries(parsedConfig).forEach(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            key = _ref2[0],
+            value = _ref2[1];
 
-      if (uri.query != null) {
-        for (var k in uri.query) {
-          var v = uri.query[k];
-
-          if (isNestedKey(k)) {
-            putNestedValue(cloudinary_config, k, v);
-          } else {
-            cloudinary_config[k] = v;
-          }
+        if (value !== undefined) {
+          cloudinary_config[key] = value;
         }
+      });
+
+      if (uri.query != null) {
+        Object.entries(uri.query).forEach(function (_ref3) {
+          var _ref4 = _slicedToArray(_ref3, 2),
+              key = _ref4[0],
+              value = _ref4[1];
+
+          return putNestedValue(cloudinary_config, key, value);
+        });
       }
-    } else {
-      cloudinary_config = {};
     }
   }
 

src/config.js

@@ -19,9 +19,7 @@ function isNestedKey(key) {
 }
 
 function putNestedValue(params, key, value) {
-  let chain = key.split(/[\[\]]+/).filter((i) => {
-    return i.length;
-  });
+  let chain = key.split(/[\[\]]+/).filter((i) => i.length);
   let outer = params;
   let lastKey = chain.pop();
   for (let j = 0; j < chain.length; j++) {
@@ -35,31 +33,35 @@ function putNestedValue(params, key, value) {
   }
   return outer[lastKey] = value;
 }
+
 module.exports = function(new_config, new_value) {
   if ((cloudinary_config == null) || new_config === true) {
+    if (cloudinary_config == null){
+      cloudinary_config = {};
+    } else {
+      Object.keys(cloudinary_config).forEach(key=> delete cloudinary_config[key]);
+    }
+
+
     let cloudinary_url = process.env.CLOUDINARY_URL;
     if (cloudinary_url != null) {
 
       let uri = url.parse(cloudinary_url, true);
-      cloudinary_config = {
+      let parsedConfig = {
         cloud_name: uri.host,
         api_key: uri.auth && uri.auth.split(":")[0],
         api_secret: uri.auth && uri.auth.split(":")[1],
         private_cdn: uri.pathname != null,
         secure_distribution: uri.pathname && uri.pathname.substring(1)
       };
-      if (uri.query != null) {
-        for (let k in uri.query) {
-          let v = uri.query[k];
-          if (isNestedKey(k)) {
-            putNestedValue(cloudinary_config, k, v);
-          } else {
-            cloudinary_config[k] = v;
-          }
+      Object.entries(parsedConfig).forEach(([key, value])=> {
+        if(value !== undefined) {
+          cloudinary_config[key] = value;
         }
+      });
+      if (uri.query != null) {
+        Object.entries(uri.query).forEach( ([key, value])=> putNestedValue(cloudinary_config, key, value));
       }
-    } else {
-      cloudinary_config = {};
     }
   }
   if (!isUndefined(new_value)) {