From 95dba6dcaf3eca33cc727b91ee7545d3c33a3a1b Mon Sep 17 00:00:00 2001 From: Jan Hartje Date: Mon, 18 Jul 2022 16:04:18 +0000 Subject: [PATCH 002/140] feat(notification): add Authorization Header option to frontend --- src/components/notifications/Webhook.vue | 42 +++++++++++++++++++----- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/src/components/notifications/Webhook.vue b/src/components/notifications/Webhook.vue index 84ad0a6c8..241ecd9a5 100644 --- a/src/components/notifications/Webhook.vue +++ b/src/components/notifications/Webhook.vue @@ -1,18 +1,26 @@ + + From af07c7f050b1458b5b6b4cc36c7613f53e28b276 Mon Sep 17 00:00:00 2001 From: Jan Hartje Date: Mon, 18 Jul 2022 16:04:27 +0000 Subject: [PATCH 003/140] feat(notification): add Authorization Header option to backend --- server/notification-providers/webhook.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/server/notification-providers/webhook.js b/server/notification-providers/webhook.js index d4933cf02..ca1c106a1 100644 --- a/server/notification-providers/webhook.js +++ b/server/notification-providers/webhook.js @@ -16,20 +16,22 @@ class Webhook extends NotificationProvider { msg, }; let finalData; - let config = {}; + let config = { + headers: {} + }; if (notification.webhookContentType === "form-data") { finalData = new FormData(); finalData.append("data", JSON.stringify(data)); - - config = { - headers: finalData.getHeaders(), - }; - + config.headers = finalData.getHeaders(); } else { finalData = data; } + if (notification.webhookAuthorizationHeader) { + config.headers["Authorization"] = notification.webhookAuthorizationHeader; + } + await axios.post(notification.webhookURL, finalData, config); return okMsg; From 314ae38f91dcb4702c5e2628ffac7e56230b014c Mon Sep 17 00:00:00 2001 From: Matthew Nickson Date: Sat, 1 Oct 2022 21:35:33 +0100 Subject: [PATCH 004/140] Changed name of SQL Server to avoid confusion It appears that SQL Server causes some confusion among users as they believe that it means any SQL database, not the Microsoft product SQL Server. To avoid this issue, the display value has been changed to Microsoft SQL Server. No backend changes have been made and it is still stored as sqlserver in the database. This is only a frontent change. Signed-off-by: Matthew Nickson --- src/pages/EditMonitor.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 99cbeb95f..947ff15ec 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -46,7 +46,7 @@ MQTT