flatten the options passed to send-files-stream. files/* code passes querystring options flatly and util/* code passes it under the 'qs' property, requiring this flattening. files/* should probably send options under 'qs'.

Author: JonKrone

src/util/fs-add.js

@@ -30,6 +30,6 @@ module.exports = (send) => {
       return callback(new Error('"path" must be a string'))
     }
 
-    sendOneFile(path, opts, callback)
+    sendOneFile(path, { qs: opts }, callback)
   })
 }

src/util/url-add.js

@@ -48,7 +48,7 @@ const requestWithRedirect = (url, opts, sendOneFile, callback) => {
       }
       requestWithRedirect(redirection, opts, sendOneFile, callback)
     } else {
-      sendOneFile(res, opts, callback)
+      sendOneFile(res, { qs: opts }, callback)
     }
   }).end()
 }

src/utils/send-files-stream.js

@@ -32,7 +32,7 @@ module.exports = (send, path) => {
     let ended = false
     let writing = false
 
-    options = options || {}
+    options = options ? Object.assign({}, options, options.qs) : {}
 
     const multipart = new Multipart()
 
@@ -43,7 +43,7 @@ module.exports = (send, path) => {
     retStream._write = (file, enc, _next) => {
       const next = once(_next)
       try {
-        const files = prepareFile(file, Object.assign({}, options, options.qs))
+        const files = prepareFile(file, options)
           .map((file) => Object.assign({headers: headers(file)}, file))
 
         writing = true