Merge pull request #155 from mons54/master

fix body request [issue #133]

Author: jcenturion

src/vendor/client-oauth2/client-oauth2.js

@@ -259,6 +259,20 @@
     return headers;
   }
 
+  /**
+   * Retrieve body request with valid format depending content type
+   *
+   * @param {Mixed} data
+   * @param {String} contentType
+   * @return {Mixed}
+   */
+  function getBodyRequest(data, contentType) {
+    if (contentType === 'application/x-www-form-urlencoded' && typeof data === 'object') {
+      return uriEncode(data);
+    }
+    return data;
+  }
+
   /**
    * Sanitize the scopes option to be a string.
    *
@@ -356,6 +370,7 @@
     ClientOAuth2.prototype.request = function (options, done) {
       var xhr     = new root.XMLHttpRequest();
       var headers = options.headers || {};
+      var body = getBodyRequest(options.data, options.contentType);
 
       // Open the request to the url and method.
       xhr.open(options.method, options.url);
@@ -381,7 +396,7 @@
       });
 
       // Make the request with the body.
-      xhr.send(options.body);
+      xhr.send(body);
     };
   } else {
     var url   = require('url');
@@ -531,7 +546,7 @@
         'Content-Type':  'application/x-www-form-urlencoded',
         'Authorization': 'Basic ' + authorization
       },
-      body: uriEncode({
+      data: uriEncode({
         refresh_token: this.refreshToken,
         grant_type:    'refresh_token'
       })
@@ -593,7 +608,7 @@
         'Content-Type':  'application/x-www-form-urlencoded',
         'Authorization': 'Basic ' + authorization
       },
-      body: uriEncode({
+      data: uriEncode({
         scope:      sanitizeScope(options.scopes),
         username:   username,
         password:   password,
@@ -743,7 +758,7 @@
         'Content-Type':  'application/x-www-form-urlencoded',
         'Authorization': 'Basic ' + authorization
       },
-      body: uriEncode({
+      data: uriEncode({
         scope:      sanitizeScope(options.scopes),
         grant_type: 'client_credentials'
       })
@@ -855,7 +870,7 @@
         'Accept':       'application/json, application/x-www-form-urlencoded',
         'Content-Type': 'application/x-www-form-urlencoded'
       },
-      body: uriEncode({
+      data: uriEncode({
         code:          query.code,
         grant_type:    'authorization_code',
         redirect_uri:  options.redirectUri,