Run all tests

Author: dannyv-cloudinary

lib-es5/api_client/execute_request.js

@@ -80,14 +80,14 @@ function execute_request(method, params, auth, api_url, callback) {
         _config$hide_sensitiv = _config.hide_sensitive,
         hide_sensitive = _config$hide_sensitiv === undefined ? false : _config$hide_sensitiv;
 
-    var sanitized_request_options = _extends({}, request_options);
+    var sanitizedOptions = _extends({}, request_options);
 
     if (hide_sensitive === true) {
-      if ("auth" in sanitized_request_options) {
-        delete sanitized_request_options.auth;
+      if ("auth" in sanitizedOptions) {
+        delete sanitizedOptions.auth;
       }
-      if ("Authorization" in sanitized_request_options.headers) {
-        delete sanitized_request_options.headers.Authorization;
+      if ("Authorization" in sanitizedOptions.headers) {
+        delete sanitizedOptions.headers.Authorization;
       }
     }
 
@@ -123,9 +123,8 @@ function execute_request(method, params, auth, api_url, callback) {
 
         if (result.error) {
           deferred.reject(Object.assign({
-            request_options: sanitized_request_options,
-            query_params,
-            hide_sensitive
+            request_options: sanitizedOptions,
+            query_params
           }, result));
         } else {
           deferred.resolve(result);
@@ -140,9 +139,8 @@ function execute_request(method, params, auth, api_url, callback) {
           error: {
             message: e,
             http_code: res.statusCode,
-            request_options: sanitized_request_options,
-            query_params,
-            hide_sensitive
+            request_options: sanitizedOptions,
+            query_params
           }
         };
         deferred.reject(err_obj.error);
@@ -155,9 +153,8 @@ function execute_request(method, params, auth, api_url, callback) {
         error: {
           message: "Server returned unexpected status code - " + res.statusCode,
           http_code: res.statusCode,
-          request_options: sanitized_request_options,
-          query_params,
-          hide_sensitive
+          request_options: sanitizedOptions,
+          query_params
         }
       };
       deferred.reject(err_obj.error);

lib/api_client/execute_request.js

@@ -67,11 +67,11 @@ function execute_request(method, params, auth, api_url, callback, options = {})
   }
   handle_response = function (res) {
     const {hide_sensitive = false} = config();
-    const sanitized_request_options = {...request_options};
+    const sanitizedOptions = {...request_options};
 
     if (hide_sensitive === true){
-      if ("auth" in sanitized_request_options) { delete sanitized_request_options.auth; }
-      if ("Authorization" in sanitized_request_options.headers) { delete sanitized_request_options.headers.Authorization; }
+      if ("auth" in sanitizedOptions) { delete sanitizedOptions.auth; }
+      if ("Authorization" in sanitizedOptions.headers) { delete sanitizedOptions.headers.Authorization; }
     }
 
     if (includes([200, 400, 401, 403, 404, 409, 420, 500], res.statusCode)) {
@@ -106,9 +106,8 @@ function execute_request(method, params, auth, api_url, callback, options = {})
 
         if (result.error) {
           deferred.reject(Object.assign({
-            request_options: sanitized_request_options,
-            query_params,
-            hide_sensitive
+            request_options: sanitizedOptions,
+            query_params
           }, result));
         } else {
           deferred.resolve(result);
@@ -123,9 +122,8 @@ function execute_request(method, params, auth, api_url, callback, options = {})
           error: {
             message: e,
             http_code: res.statusCode,
-            request_options: sanitized_request_options,
-            query_params,
-            hide_sensitive
+            request_options: sanitizedOptions,
+            query_params
           }
         };
         deferred.reject(err_obj.error);
@@ -138,9 +136,8 @@ function execute_request(method, params, auth, api_url, callback, options = {})
         error: {
           message: "Server returned unexpected status code - " + res.statusCode,
           http_code: res.statusCode,
-          request_options: sanitized_request_options,
-          query_params,
-          hide_sensitive
+          request_options: sanitizedOptions,
+          query_params
         }
       };
       deferred.reject(err_obj.error);

test/unit/config.spec.js

@@ -20,6 +20,11 @@ describe("config", function () {
     cloudinary.config(true);
   });
 
+  it("should not have a `hide_sensitive` property by default", function () {
+    const config = cloudinary.config();
+    expect(config).not.to.have.property("hide_sensitive");
+  });
+
   it("should support `hide_sensitive` config param", function () {
     const config = cloudinary.config({hide_sensitive: true});
     expect(config.hide_sensitive).to.eql(true)
@@ -38,7 +43,7 @@ describe("config", function () {
   it("should hide Authorization header upon error when `hide_sensitive` is true", async function () {
     try {
       cloudinary.config({hide_sensitive: true});
-      const result = await cloudinary.v2.api.resource("?", { oauth_token: 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI4' });
+      const result = await cloudinary.v2.api.resource("?", { oauth_token: 'irrelevant' });
       expect(result).fail();
     } catch (err) {
       expect(err.request_options.headers).not.to.have.property("Authorization");