Don't allow unsupported mixing of data types (#1113)

Closes #209
ladjs · Nov 19, 2016 · 2aea92a · 2aea92a
1 parent 0eb364f
commit 2aea92a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -671,6 +671,10 @@ Request.prototype.query = function(val){
  */
 
 Request.prototype.attach = function(field, file, options){
+  if (this._data) {
+    throw Error("superagent can't mix .send() and .attach()");
+  }
+
   this._getFormData().append(field, file, options || file.name);
   return this;
 };

diff --git a/lib/node/index.js b/lib/node/index.js
@@ -166,6 +166,10 @@ RequestBase(Request.prototype);
  */
 
 Request.prototype.attach = function(field, file, options){
+  if (this._data) {
+    throw Error("superagent can't mix .send() and .attach()");
+  }
+
   var o = options || {};
   if ('string' == typeof options) {
     o = { filename: options };