From ea6646f055cb9f2a9c3c6ea0750cf96c6a9df52d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 3 Nov 2021 13:13:22 +0000
Subject: [PATCH] Fixing #3237 and #3235 - always apply headers on out going
 webhooks if they are specified and handle a range of response codes.

---
 .../src/automations/steps/outgoingWebhook.js  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/server/src/automations/steps/outgoingWebhook.js b/packages/server/src/automations/steps/outgoingWebhook.js
index 34299d23b6..f0637c3351 100644
--- a/packages/server/src/automations/steps/outgoingWebhook.js
+++ b/packages/server/src/automations/steps/outgoingWebhook.js
@@ -85,6 +85,18 @@ exports.run = async function ({ inputs }) {
   const request = {
     method: requestMethod,
   }
+  if (headers) {
+    try {
+      const customHeaders =
+        typeof headers === "string" ? JSON.parse(headers) : headers
+      request.headers = { ...request.headers, ...customHeaders }
+    } catch (err) {
+      return {
+        success: false,
+        response: "Unable to process headers, must be a JSON object.",
+      }
+    }
+  }
   if (
     requestBody &&
     requestBody.length !== 0 &&
@@ -95,21 +107,9 @@ exports.run = async function ({ inputs }) {
         ? requestBody
         : JSON.stringify(requestBody)
     request.headers = {
+      ...request.headers,
       "Content-Type": "application/json",
     }
-
-    if (headers) {
-      try {
-        const customHeaders =
-          typeof headers === "string" ? JSON.parse(headers) : headers
-        request.headers = { ...request.headers, ...customHeaders }
-      } catch (err) {
-        return {
-          success: false,
-          response: "Unable to process headers, must be a JSON object.",
-        }
-      }
-    }
   }
 
   try {
@@ -122,7 +122,7 @@ exports.run = async function ({ inputs }) {
     return {
       httpStatus: status,
       response: message,
-      success: status === 200,
+      success: status >= 200 && status <= 206,
     }
   } catch (err) {
     /* istanbul ignore next */