Merge pull request ladjs#1177 from elisherer/master

Add bearer token support
teamwire · Feb 16, 2017 · 4723176 · 4723176
2 parents e46f890 + 9a250ad
commit 4723176
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -501,13 +501,16 @@ Request.prototype.accept = function(type){
  * Set Authorization field value with `user` and `pass`.
  *
  * @param {String} user
- * @param {String} pass
- * @param {Object} options with 'type' property 'auto' or 'basic' (default 'basic')
+ * @param {String} [pass] optional in case of using 'bearer' as type
+ * @param {Object} options with 'type' property 'auto', 'basic' or 'bearer' (default 'basic')
  * @return {Request} for chaining
  * @api public
  */
 
 Request.prototype.auth = function(user, pass, options){
+  if (typeof pass === 'object' && pass !== null) { // pass is optional and can substitute for options
+    options = pass;
+  }
   if (!options) {
     options = {
       type: 'function' === typeof btoa ? 'basic' : 'auto',
@@ -523,6 +526,10 @@ Request.prototype.auth = function(user, pass, options){
       this.username = user;
       this.password = pass;
     break;
+
+    case 'bearer': // usage would be .auth(accessToken, { type: 'bearer' })
+      this.set('Authorization', 'Bearer ' + user);
+    break;  
   }
   return this;
 };

diff --git a/lib/node/index.js b/lib/node/index.js
@@ -468,18 +468,30 @@ Request.prototype._redirect = function(res){
  *   .auth('tobi', 'learnboost')
  *   .auth('tobi:learnboost')
  *   .auth('tobi')
+ *   .auth(accessToken, { type: 'bearer' })
  *
  * @param {String} user
- * @param {String} pass
+ * @param {String} [pass]
+ * @param {Object} [options] options with authorization type 'basic' or 'bearer' ('basic' is default)
  * @return {Request} for chaining
  * @api public
  */
 
-Request.prototype.auth = function(user, pass){
+Request.prototype.auth = function(user, pass, options){
   if (1 === arguments.length) pass = '';
-  if (!~user.indexOf(':')) user = user + ':';
-  var str = new Buffer(user + pass).toString('base64');
-  return this.set('Authorization', 'Basic ' + str);
+  if (2 === arguments.length && typeof pass === 'object') options = pass;
+  if (!options) {
+    options = { type: 'basic' };
+  }
+  switch (options.type) {
+    case 'bearer':
+      return this.set('Authorization', 'Bearer ' + user);    
+
+    default: // 'basic'
+      if (!~user.indexOf(':')) user = user + ':';
+      var str = new Buffer(user + pass).toString('base64');
+      return this.set('Authorization', 'Basic ' + str);    
+  }
 };
 
 /**