From b879428a0305c9bb4b84a51f6e068a43ea760c73 Mon Sep 17 00:00:00 2001
From: janhartje <jan@janhartje.com>
Date: Wed, 5 Oct 2022 17:48:07 +0200
Subject: [PATCH] feat(notification): add additional Header to webhook

---
 server/notification-providers/webhook.js | 11 ++++--
 src/components/notifications/Webhook.vue | 46 ++++++++++++++++++------
 src/languages/en.js                      |  2 ++
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/server/notification-providers/webhook.js b/server/notification-providers/webhook.js
index ca1c106a..347b6ec9 100644
--- a/server/notification-providers/webhook.js
+++ b/server/notification-providers/webhook.js
@@ -28,8 +28,15 @@ class Webhook extends NotificationProvider {
                 finalData = data;
             }
 
-            if (notification.webhookAuthorizationHeader) {
-                config.headers["Authorization"] = notification.webhookAuthorizationHeader;
+            if (notification.webhookAdditionalHeaders) {
+                try {
+                    config.headers = {
+                        ...config.headers,
+                        ...JSON.parse(notification.webhookAdditionalHeaders)
+                    };
+                } catch (err) {
+                    throw "Addional Headers is not a valid JSON";
+                }
             }
 
             await axios.post(notification.webhookURL, finalData, config);
diff --git a/src/components/notifications/Webhook.vue b/src/components/notifications/Webhook.vue
index 241ecd9a..1b85a540 100644
--- a/src/components/notifications/Webhook.vue
+++ b/src/components/notifications/Webhook.vue
@@ -12,7 +12,9 @@
     </div>
 
     <div class="mb-3">
-        <label for="webhook-content-type" class="form-label">{{ $t("Content Type") }}</label>
+        <label for="webhook-content-type" class="form-label">{{
+            $t("Content Type")
+        }}</label>
         <select
             id="webhook-content-type"
             v-model="$parent.notification.webhookContentType"
@@ -24,7 +26,7 @@
         </select>
 
         <div class="form-text">
-            <p>{{ $t("webhookJsonDesc", ["\"application/json\""]) }}</p>
+            <p>{{ $t("webhookJsonDesc", ['"application/json"']) }}</p>
             <i18n-t tag="p" keypath="webhookFormDataDesc">
                 <template #multipart>"multipart/form-data"</template>
                 <template #decodeFunction>
@@ -35,20 +37,42 @@
     </div>
 
     <div class="mb-3">
-        <label for="authorization-header" class="form-label">{{ $t("Authorization Header") }}</label>
-        <HiddenInput
-            id="authorization-header"
-            v-model="$parent.notification.webhookAuthorizationHeader"
-            autocomplete="one-time-code"
-        ></HiddenInput>
+        <i18n-t
+            tag="label"
+            class="form-label"
+            for="additionalHeaders"
+            keypath="webhookAdditionalHeadersTitle"
+        >
+        </i18n-t>
+        <textarea
+            id="additionalHeaders"
+            v-model="$parent.notification.webhookAdditionalHeaders"
+            class="form-control"
+            :placeholder="headersPlaceholder"
+        ></textarea>
+        <div class="form-text">
+            <i18n-t tag="p" keypath="webhookAdditionalHeadersDesc"> </i18n-t>
+        </div>
     </div>
 </template>
 
 <script>
-import HiddenInput from "../HiddenInput.vue";
 export default {
-    components: {
-        HiddenInput,
+    computed: {
+        headersPlaceholder() {
+            return this.$t("Example:", [
+                `
+{
+    "HeaderName": "HeaderValue"
+}`,
+            ]);
+        },
     },
 };
 </script>
+
+<style lang="scss" scoped>
+textarea {
+    min-height: 200px;
+}
+</style>
diff --git a/src/languages/en.js b/src/languages/en.js
index 4bf92e92..4c7338d2 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -206,6 +206,8 @@ export default {
     "Content Type": "Content Type",
     webhookJsonDesc: "{0} is good for any modern HTTP servers such as Express.js",
     webhookFormDataDesc: "{multipart} is good for PHP. The JSON will need to be parsed with {decodeFunction}",
+    webhookAdditionalHeadersTitle: "Additional Headers",
+    webhookAdditionalHeadersDesc: "Sets additional headers sent with the webhook.",
     smtp: "Email (SMTP)",
     secureOptionNone: "None / STARTTLS (25, 587)",
     secureOptionTLS: "TLS (465)",