From c4a2ce4e78cf90fc371a62c394f9523b5d62c102 Mon Sep 17 00:00:00 2001
From: Rolf Bachmann <1196109+rolfbachmann@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:57:52 +0200
Subject: [PATCH 1/2] Add authentication support for ntfy

---
 server/notification-providers/ntfy.js | 11 +++++++++--
 src/components/notifications/Ntfy.vue | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 21f358f64..17d6d812a 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -8,12 +8,19 @@ class Ntfy extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
         try {
-            await axios.post(`${notification.ntfyserverurl}`, {
+            let headers = {};
+            if (notification.ntfyusername.length > 0) {
+                headers = {
+                    "Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
+                };
+            }
+            let data = {
                 "topic": notification.ntfytopic,
                 "message": msg,
                 "priority": notification.ntfyPriority || 4,
                 "title": "Uptime-Kuma",
-            });
+            };
+            await axios.post(`${notification.ntfyserverurl}`, data, { headers: headers });
 
             return okMsg;
 
diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index d9a83b499..a42dca302 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -11,7 +11,18 @@
             <input id="ntfy-server-url" v-model="$parent.notification.ntfyserverurl" type="text" class="form-control" required>
         </div>
     </div>
-
+    <div class="mb-3">
+        <label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
+        <div class="input-group mb-3">
+            <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
+        </div>
+    </div>
+    <div class="mb-3">
+        <label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
+        <div class="input-group mb-3">
+            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword"></HiddenInput>
+        </div>
+    </div>
     <div class="mb-3">
         <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
         <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
@@ -19,7 +30,12 @@
 </template>
 
 <script>
+import HiddenInput from "../HiddenInput.vue";
+
 export default {
+    components: {
+        HiddenInput,
+    },
     mounted() {
         if (typeof this.$parent.notification.ntfyPriority === "undefined") {
             this.$parent.notification.ntfyserverurl = "https://ntfy.sh";

From 7672057319c28ec2957622abbcb2559e3cf5abc6 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:51:29 +0800
Subject: [PATCH 2/2] [ntfy] Do not autofill

---
 src/components/notifications/Ntfy.vue | 14 +++++++-------
 src/languages/en.js                   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/notifications/Ntfy.vue b/src/components/notifications/Ntfy.vue
index a42dca302..ddcc39174 100644
--- a/src/components/notifications/Ntfy.vue
+++ b/src/components/notifications/Ntfy.vue
@@ -12,21 +12,21 @@
         </div>
     </div>
     <div class="mb-3">
-        <label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
+        <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
+        <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
+    </div>
+    <div class="mb-3">
+        <label for="ntfy-username" class="form-label">{{ $t("Username") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
             <input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control" required>
         </div>
     </div>
     <div class="mb-3">
-        <label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
+        <label for="ntfy-password" class="form-label">{{ $t("Password") }} ({{ $t("Optional") }})</label>
         <div class="input-group mb-3">
-            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword"></HiddenInput>
+            <HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword" autocomplete="new-password"></HiddenInput>
         </div>
     </div>
-    <div class="mb-3">
-        <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
-        <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
-    </div>
 </template>
 
 <script>
diff --git a/src/languages/en.js b/src/languages/en.js
index 7d980f631..00e9551f1 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -582,4 +582,5 @@ export default {
     goAlert: "GoAlert",
     backupOutdatedWarning: "Deprecated: Since a lot of features added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup.",
     backupRecommend: "Please backup the volume or the data folder (./data/) directly instead.",
+    "Optional": "Optional",
 };