Merge pull request #576 from flovilmart/httpRequest-tests

improves coverage and API of httpRequest

src/httpRequest.js

@@ -1,6 +1,27 @@
 var request = require("request"),
   Parse = require('parse/node').Parse;
 
+var encodeBody = function(body, headers = {}) {
+  if (typeof body !== 'object') {
+    return body;
+  }
+  var contentTypeKeys = Object.keys(headers).filter((key) => {
+    return key.match(/content-type/i) != null;
+  });
+
+  if (contentTypeKeys.length == 1) {
+    var contentType = contentTypeKeys[0];
+    if (headers[contentType].match(/application\/json/i)) {
+      body = JSON.stringify(body);
+    } else if(headers[contentType].match(/application\/x-www-form-urlencoded/i)) {
+      body = Object.keys(body).map(function(key){
+        return `${key}=${encodeURIComponent(body[key])}`
+      }).join("&");
+    }
+  }
+  return body;
+}
+
 module.exports = function(options) {
   var promise = new Parse.Promise();
   var callbacks = {
@@ -9,13 +30,11 @@ module.exports = function(options) {
   };
   delete options.success;
   delete options.error;
-  if (options.uri && !options.url) {
-    options.uri = options.url;
-    delete options.url;
-  }
-  if (typeof options.body === 'object') {
-    options.body = JSON.stringify(options.body);
-  }
+  delete options.uri; // not supported
+  options.body = encodeBody(options.body, options.headers);
+  // set follow redirects to false by default
+  options.followRedirect = options.followRedirects == true;
+  
   request(options, (error, response, body) => {
     var httpResponse = {};
     httpResponse.status = response.statusCode;
@@ -29,15 +48,17 @@ module.exports = function(options) {
     // Consider <200 && >= 400 as errors 
     if (error || httpResponse.status <200 || httpResponse.status >=400) {
       if (callbacks.error) {
-        return callbacks.error(httpResponse);
+        callbacks.error(httpResponse);
       }
       return promise.reject(httpResponse);
     } else {
       if (callbacks.success) {
-        return callbacks.success(httpResponse);
+        callbacks.success(httpResponse);
       }
       return promise.resolve(httpResponse);
     }
   });
   return promise;
-};
+};
+
+module.exports.encodeBody = encodeBody;