From 1b8154a74b42860d6879ce0b81f1141a71e0cbb6 Mon Sep 17 00:00:00 2001
From: SaarLAN-Pissbeutel
 <183202051+SaarLAN-Pissbeutel@users.noreply.github.com>
Date: Tue, 30 Dec 2025 11:08:32 +0000
Subject: [PATCH 1/4] add access token for ntfy notifications

---
 .../components/create-notification-form.tsx        | 14 ++++++++++++++
 app/schemas/notifications.ts                       |  1 +
 app/server/modules/notifications/builders/ntfy.ts  |  7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/app/client/modules/notifications/components/create-notification-form.tsx b/app/client/modules/notifications/components/create-notification-form.tsx
index 01e8dc08..453ffaca 100644
--- a/app/client/modules/notifications/components/create-notification-form.tsx
+++ b/app/client/modules/notifications/components/create-notification-form.tsx
@@ -518,6 +518,20 @@ export const CreateNotificationForm = ({ onSubmit, mode = "create", initialValue
 								</FormItem>
 							)}
 						/>
+						<FormField
+							control={form.control}
+							name="accessToken"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Access token (Optional)</FormLabel>
+									<FormControl>
+										<SecretInput {...field} placeholder="••••••••" />
+									</FormControl>
+									<FormDescription>Access token for server authentication, if required.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
 						<FormField
 							control={form.control}
 							name="priority"
diff --git a/app/schemas/notifications.ts b/app/schemas/notifications.ts
index f9f5fcdc..04ebdfa3 100644
--- a/app/schemas/notifications.ts
+++ b/app/schemas/notifications.ts
@@ -55,6 +55,7 @@ export const ntfyNotificationConfigSchema = type({
 	priority: "'max' | 'high' | 'default' | 'low' | 'min'",
 	username: "string?",
 	password: "string?",
+	accessToken:"string?",
 });
 
 export const pushoverNotificationConfigSchema = type({
diff --git a/app/server/modules/notifications/builders/ntfy.ts b/app/server/modules/notifications/builders/ntfy.ts
index c3477ffa..ebc72aeb 100644
--- a/app/server/modules/notifications/builders/ntfy.ts
+++ b/app/server/modules/notifications/builders/ntfy.ts
@@ -10,6 +10,13 @@ export function buildNtfyShoutrrrUrl(config: Extract<NotificationConfig, { type:
 			? `${encodeURIComponent(config.username)}:${encodeURIComponent(config.password)}@`
 			: "";
 
+	const auth =
+		config.accessToken
+			? `:${encodeURIComponent(config.accessToken)}@`
+			: config.username && config.password
+				? `${encodeURIComponent(config.username)}:${encodeURIComponent(config.password)}@`
+				: "";
+
 	if (config.serverUrl) {
 		const url = new URL(config.serverUrl);
 		const hostname = url.hostname;

From 15fe9b25bd6b0a0a5773c6e186edd77098604b81 Mon Sep 17 00:00:00 2001
From: SaarLAN-Pissbeutel
 <183202051+SaarLAN-Pissbeutel@users.noreply.github.com>
Date: Tue, 30 Dec 2025 11:56:13 +0000
Subject: [PATCH 2/4] code cleanup

---
 app/server/modules/notifications/builders/ntfy.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/server/modules/notifications/builders/ntfy.ts b/app/server/modules/notifications/builders/ntfy.ts
index ebc72aeb..14ef9fbe 100644
--- a/app/server/modules/notifications/builders/ntfy.ts
+++ b/app/server/modules/notifications/builders/ntfy.ts
@@ -5,11 +5,6 @@ export function buildNtfyShoutrrrUrl(config: Extract<NotificationConfig, { type:
 
 	const params = new URLSearchParams();
 
-	const auth =
-		config.username && config.password
-			? `${encodeURIComponent(config.username)}:${encodeURIComponent(config.password)}@`
-			: "";
-
 	const auth =
 		config.accessToken
 			? `:${encodeURIComponent(config.accessToken)}@`

From a5242fa64a011b9e66656738f325f0b27674d0d5 Mon Sep 17 00:00:00 2001
From: SaarLAN-Pissbeutel
 <183202051+SaarLAN-Pissbeutel@users.noreply.github.com>
Date: Tue, 30 Dec 2025 13:06:11 +0100
Subject: [PATCH 3/4] code cleanup

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 app/schemas/notifications.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/schemas/notifications.ts b/app/schemas/notifications.ts
index 04ebdfa3..5094f655 100644
--- a/app/schemas/notifications.ts
+++ b/app/schemas/notifications.ts
@@ -55,7 +55,7 @@ export const ntfyNotificationConfigSchema = type({
 	priority: "'max' | 'high' | 'default' | 'low' | 'min'",
 	username: "string?",
 	password: "string?",
-	accessToken:"string?",
+	accessToken: "string?",
 });
 
 export const pushoverNotificationConfigSchema = type({

From d535f02536539c491c117edf82de62238f0b142f Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Fri, 2 Jan 2026 14:23:21 +0100
Subject: [PATCH 4/4] refactor: code readability

---
 .../components/create-notification-form.tsx      |  4 +++-
 .../modules/notifications/builders/ntfy.ts       | 16 ++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/client/modules/notifications/components/create-notification-form.tsx b/app/client/modules/notifications/components/create-notification-form.tsx
index 453ffaca..63697c13 100644
--- a/app/client/modules/notifications/components/create-notification-form.tsx
+++ b/app/client/modules/notifications/components/create-notification-form.tsx
@@ -527,7 +527,9 @@ export const CreateNotificationForm = ({ onSubmit, mode = "create", initialValue
 									<FormControl>
 										<SecretInput {...field} placeholder="••••••••" />
 									</FormControl>
-									<FormDescription>Access token for server authentication, if required.</FormDescription>
+									<FormDescription>
+										Access token for server authentication. Will take precedence over username/password if set.
+									</FormDescription>
 									<FormMessage />
 								</FormItem>
 							)}
diff --git a/app/server/modules/notifications/builders/ntfy.ts b/app/server/modules/notifications/builders/ntfy.ts
index 14ef9fbe..41120456 100644
--- a/app/server/modules/notifications/builders/ntfy.ts
+++ b/app/server/modules/notifications/builders/ntfy.ts
@@ -4,13 +4,17 @@ export function buildNtfyShoutrrrUrl(config: Extract<NotificationConfig, { type:
 	let shoutrrrUrl: string;
 
 	const params = new URLSearchParams();
+	const { username, password, accessToken } = config;
 
-	const auth =
-		config.accessToken
-			? `:${encodeURIComponent(config.accessToken)}@`
-			: config.username && config.password
-				? `${encodeURIComponent(config.username)}:${encodeURIComponent(config.password)}@`
-				: "";
+	let auth = "";
+
+	if (username && password) {
+		auth = `${encodeURIComponent(username)}:${encodeURIComponent(password)}@`;
+	}
+
+	if (accessToken) {
+		auth = `:${encodeURIComponent(accessToken)}@`;
+	}
 
 	if (config.serverUrl) {
 		const url = new URL(config.serverUrl);