From 246213ba5d0b17f43a0693f8353fdb289248bd86 Mon Sep 17 00:00:00 2001
From: ricardo <ricardoespinoza105@gmail.com>
Date: Fri, 20 Mar 2020 14:53:51 -0400
Subject: [PATCH] :zap: added support to binary data

---
 packages/nodes-base/nodes/Webhook.node.ts | 68 +++++++++++++++++------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/packages/nodes-base/nodes/Webhook.node.ts b/packages/nodes-base/nodes/Webhook.node.ts
index a05bf1cccc..3f5a3822a4 100644
--- a/packages/nodes-base/nodes/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook.node.ts
@@ -211,6 +211,28 @@ export class Webhook implements INodeType {
 				},
 				description: 'Name of the binary property to return',
 			},
+			{
+				displayName: 'Binary Data',
+				name: 'binaryData',
+				type: 'boolean',
+				default: false,
+				description: 'If the data to upload should be taken from binary field.',
+			},
+			{
+				displayName: 'Binary Property',
+				name: 'binaryPropertyName',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						binaryData: [
+							true,
+						],
+					},
+				},
+				description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+			},
 			{
 				displayName: 'Options',
 				name: 'options',
@@ -253,13 +275,6 @@ export class Webhook implements INodeType {
 						default: 'data',
 						description: 'Name of the property to return the data of instead of the whole JSON.',
 					},
-					{
-						displayName: 'Raw Body',
-						name: 'rawBody',
-						type: 'boolean',
-						default: false,
-						description: 'Raw body (binary)',
-					},
 				],
 			},
 		],
@@ -268,7 +283,7 @@ export class Webhook implements INodeType {
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const authentication = this.getNodeParameter('authentication', 0) as string;
-		const options = this.getNodeParameter('options', 0) as IDataObject;
+		const binaryData = this.getNodeParameter('binaryData', 0) as boolean;
 		const req = this.getRequestObject();
 		const resp = this.getResponseObject();
 		const headers = this.getHeaderData();
@@ -345,6 +360,34 @@ export class Webhook implements INodeType {
 			});
 		}
 
+		if (binaryData) {
+			return new Promise((resolve, reject) => {
+				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0) as string;
+				const data: Buffer[] = [];
+
+				req.on('data', (chunk) => {
+					data.push(chunk);
+				});
+
+				req.on('end', () => {
+					const returnData: IDataObject[] = [{}];
+					set(returnData[0], `binary[${binaryPropertyName}]`, {
+						data: Buffer.concat(data).toString('base64'),
+						mimeType: req.headers['content-type'],
+					});
+					return resolve({
+						workflowData: [
+							returnData as INodeExecutionData[],
+						],
+					});
+				});
+
+				req.on('error', (err) => {
+					throw new Error(err.message);
+				});
+			});
+		}
+
 		const response: INodeExecutionData = {
 			json: {
 				body: this.getBodyData(),
@@ -352,15 +395,6 @@ export class Webhook implements INodeType {
 				query: this.getQueryData(),
 			},
 		};
-		if (options.rawBody) {
-			response.binary = {
-				data: {
-					// @ts-ignore
-					data: req.rawBody.toString('base64'),
-					mimeType,
-				}
-			};
-		}
 
 		return {
 			workflowData: [