From a9bf3d022661f0a3ee9c4980dd1437bb3aa84499 Mon Sep 17 00:00:00 2001
From: Nick Kasten <kastentx@gmail.com>
Date: Tue, 5 Mar 2019 09:55:21 -0600
Subject: [PATCH 1/3] add multipart/form-data support to http request node

---
 nodes/core/io/21-httprequest.html | 13 +++++++++-
 nodes/core/io/21-httprequest.js   | 40 ++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/nodes/core/io/21-httprequest.html b/nodes/core/io/21-httprequest.html
index f3c4c0228..42c0cbc34 100644
--- a/nodes/core/io/21-httprequest.html
+++ b/nodes/core/io/21-httprequest.html
@@ -129,7 +129,18 @@
     <p>If <code>msg.payload</code> is an Object, the node will automatically set the content type
     of the request to <code>application/json</code> and encode the body as such.</p>
     <p>To encode the request as form data, <code>msg.headers["content-type"]</code> should be set to <code>application/x-www-form-urlencoded</code>.</p>
-
+    <p>For form-based file uploads, some services require that <code>msg.headers["content-type"]</code> be set to <code>multipart/form-data</code>.
+    To construct <code>msg.payload</code> for this type of request, use the following structure and substitue the <code>KEY</code>, <code>DATA</code>, and <code>FILENAME</code> 
+    values for your own.
+<pre><code>req.formData = { 
+    KEY: { 
+        value: DATA, 
+        options: { 
+            filename: ‘FILENAME’ 
+        } 
+    } 
+}
+</code></pre>
 </script>
 
 <script type="text/javascript">
diff --git a/nodes/core/io/21-httprequest.js b/nodes/core/io/21-httprequest.js
index 4ddb1d3b9..c22232de3 100644
--- a/nodes/core/io/21-httprequest.js
+++ b/nodes/core/io/21-httprequest.js
@@ -78,6 +78,7 @@ module.exports = function(RED) {
             }
             var opts = {};
             opts.url = url;
+            opts.formData = {};
             opts.timeout = node.reqTimeout;
             opts.method = method;
             opts.headers = {};
@@ -144,28 +145,33 @@ module.exports = function(RED) {
             var payload = null;
 
             if (method !== 'GET' && method !== 'HEAD' && typeof msg.payload !== "undefined") {
-                if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
-                    payload = msg.payload;
-                } else if (typeof msg.payload == "number") {
-                    payload = msg.payload+"";
+                if (opts.headers['content-type'] == 'multipart/form-data' && typeof payload === "object") {
+                    opts.formData = msg.payload;
                 } else {
-                    if (opts.headers['content-type'] == 'application/x-www-form-urlencoded') {
-                        payload = querystring.stringify(msg.payload);
+                    if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
+                        payload = msg.payload;
+                    } else if (typeof msg.payload == "number") {
+                        payload = msg.payload+"";
                     } else {
-                        payload = JSON.stringify(msg.payload);
-                        if (opts.headers['content-type'] == null) {
-                            opts.headers[ctSet] = "application/json";
+                        if (opts.headers['content-type'] == 'application/x-www-form-urlencoded') {
+                            payload = querystring.stringify(msg.payload);
+                        } else {
+                            payload = JSON.stringify(msg.payload);
+                            if (opts.headers['content-type'] == null) {
+                                opts.headers[ctSet] = "application/json";
+                            }
                         }
                     }
-                }
-                if (opts.headers['content-length'] == null) {
-                    if (Buffer.isBuffer(payload)) {
-                        opts.headers[clSet] = payload.length;
-                    } else {
-                        opts.headers[clSet] = Buffer.byteLength(payload);
+                    if (opts.headers['content-length'] == null) {
+                        if (Buffer.isBuffer(payload)) {
+                            opts.headers[clSet] = payload.length;
+                        } else {
+                            opts.headers[clSet] = Buffer.byteLength(payload);
+                        }
                     }
-                }
-                opts.body = payload;
+                    opts.body = payload;
+            }
+
             }
             // revert to user supplied Capitalisation if needed.
             if (opts.headers.hasOwnProperty('content-type') && (ctSet !== 'content-type')) {

From 7063a88513b1ce977c70915f8ac5128c141f79df Mon Sep 17 00:00:00 2001
From: Nick Kasten <kastentx@gmail.com>
Date: Tue, 5 Mar 2019 10:31:25 -0600
Subject: [PATCH 2/3] improved info panel UI

---
 nodes/core/io/21-httprequest.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nodes/core/io/21-httprequest.html b/nodes/core/io/21-httprequest.html
index 42c0cbc34..c71562b78 100644
--- a/nodes/core/io/21-httprequest.html
+++ b/nodes/core/io/21-httprequest.html
@@ -132,7 +132,9 @@
     <p>For form-based file uploads, some services require that <code>msg.headers["content-type"]</code> be set to <code>multipart/form-data</code>.
     To construct <code>msg.payload</code> for this type of request, use the following structure and substitue the <code>KEY</code>, <code>DATA</code>, and <code>FILENAME</code> 
     values for your own.
-<pre><code>req.formData = { 
+<pre><code>msg.headers = {'content-type':'multipart/form-data'}
+
+msg.payload = { 
     KEY: { 
         value: DATA, 
         options: { 

From e55481a4540165686d2c41a75f9be0ce6bb231e1 Mon Sep 17 00:00:00 2001
From: Nick Kasten <kastentx@gmail.com>
Date: Tue, 5 Mar 2019 11:12:59 -0600
Subject: [PATCH 3/3] conditional formData assignment only

---
 nodes/core/io/21-httprequest.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nodes/core/io/21-httprequest.js b/nodes/core/io/21-httprequest.js
index c22232de3..15c821e71 100644
--- a/nodes/core/io/21-httprequest.js
+++ b/nodes/core/io/21-httprequest.js
@@ -78,7 +78,6 @@ module.exports = function(RED) {
             }
             var opts = {};
             opts.url = url;
-            opts.formData = {};
             opts.timeout = node.reqTimeout;
             opts.method = method;
             opts.headers = {};
@@ -170,8 +169,7 @@ module.exports = function(RED) {
                         }
                     }
                     opts.body = payload;
-            }
-
+                }
             }
             // revert to user supplied Capitalisation if needed.
             if (opts.headers.hasOwnProperty('content-type') && (ctSet !== 'content-type')) {