superagent 3.4.3 → 3.4.4

package/History.md

@@ -1,3 +1,10 @@
+# 3.4.3 (2017-02-14)
+
+ * Fixed being able to define own parsers when their mime type starts with `text/` (Damien Clark)
+ * `withCredentials(false)` (Andy Woods)
+ * Use `formData.on` instead of `.once` (Kornel Lesiński)
+ * Ignore `attach("file",null)` (Kornel Lesiński)
+
 # 3.4.1 (2017-01-29)
 
  * Allow `retry()` and `retry(0)` (Alexander Pope)

package/lib/client.js

@@ -12,7 +12,7 @@ if (typeof window !== 'undefined') { // Browser window
   root = this;
 }
 
-var Emitter = require('emitter');
+var Emitter = require('component-emitter');
 var RequestBase = require('./request-base');
 var isObject = require('./is-object');
 var isFunction = require('./is-function');
@@ -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;
 };

package/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);    
+  }
 };
 
 /**
@@ -822,7 +834,7 @@ Request.prototype._end = function() {
         var form = new formidable.IncomingForm();
         parser = form.parse.bind(form);
         buffer = true;
-      } else if (isImage(mime)) {
+      } else if (isImageOrVideo(mime)) {
         parser = exports.parse.image;
         buffer = true; // For backwards-compatibility buffering default is ad-hoc MIME-dependent
       } else if (exports.parse[mime]) {
@@ -1008,19 +1020,10 @@ function isText(mime) {
     || 'x-www-form-urlencoded' == subtype;
 }
 
-/**
- * Check if `mime` is image
- *
- * @param {String} mime
- * @return {Boolean}
- * @api public
- */
-
-function isImage(mime) {
-  var parts = mime.split('/');
-  var type = parts[0];
+function isImageOrVideo(mime) {
+  var type = mime.split('/')[0];
 
-  return 'image' == type;
+  return 'image' == type || 'video' == type;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superagent",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "scripts": {
     "prepublish": "make all",
@@ -52,7 +52,6 @@
   },
   "browser": {
     "./lib/node/index.js": "./lib/client.js",
-    "emitter": "component-emitter",
     "./test/support/server.js": "./test/support/blank.js"
   },
   "component": {

package/superagent.js

@@ -1023,7 +1023,7 @@ if (typeof window !== 'undefined') { // Browser window
   root = this;
 }
 
-var Emitter = require('emitter');
+var Emitter = require('component-emitter');
 var RequestBase = require('./request-base');
 var isObject = require('./is-object');
 var isFunction = require('./is-function');
@@ -1512,13 +1512,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',
@@ -1534,6 +1537,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;
 };
@@ -1934,5 +1941,5 @@ request.put = function(url, data, fn){
   return req;
 };
 
-},{"./is-function":1,"./is-object":2,"./request-base":3,"./response-base":4,"./should-retry":5,"emitter":7}]},{},[8])(8)
+},{"./is-function":1,"./is-object":2,"./request-base":3,"./response-base":4,"./should-retry":5,"component-emitter":7}]},{},[8])(8)
 });