205hlab-mirrors/dockhand
2
0
Fork 0
mirror of https://github.com/Finsys/dockhand.git synced 2026-06-17 19:09:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add Bearer token auth support to sendNtfy

Browse Source 
Enhanced the sendNtfy function to support Bearer token authentication in addition to Basic auth. Now, URLs in the format token@host/topic will use Bearer tokens, improving flexibility for different notification server setups.
This commit is contained in:
Florian Hoss
2026-01-29 20:58:03 +01:00
committed by Jarek Krochmalski
parent 133c9f1e8f
commit ef26d38fce
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/server/notifications.ts
+20 -8
View File
@@ -289,14 +289,26 @@ async function sendNtfy(appriseUrl: string, payload: NotificationPayload): Promi
const path = appriseUrl.replace(/^ntfys?:\/\//, '');
let url: string;
let auth: string | null = null;
let authHeader: string | null = null;
// Check for user:pass@host/topic format
const authMatch = path.match(/^([^:]+):([^@]+)@(.+)$/);
if (authMatch) {
const [, user, pass, hostAndTopic] = authMatch;
auth = Buffer.from(`${user}:${pass}`).toString('base64');
// Check for user:pass@host/topic format (Basic auth)
const basicMatch = path.match(/^([^:]+):([^@]+)@(.+)$/);
if (basicMatch) {
const [, user, pass, hostAndTopic] = basicMatch;
const basic = Buffer.from(`${user}:${pass}`).toString('base64');
authHeader = `Basic ${basic}`;
url = `${isSecure ? 'https' : 'http'}://${hostAndTopic}`;
} else if (path.includes('@') && path.includes('/')) {
// token@host/topic -> Bearer token auth
const tokenMatch = path.match(/^([^@]+)@(.+)$/);
if (tokenMatch) {
const [, token, hostAndTopic] = tokenMatch;
authHeader = `Bearer ${token}`;
url = `${isSecure ? 'https' : 'http'}://${hostAndTopic}`;
} else {
// Fallback to custom server without auth
url = `${isSecure ? 'https' : 'http'}://${path}`;
}
} else if (path.includes('/')) {
// Custom server without auth
url = `${isSecure ? 'https' : 'http'}://${path}`;
@@ -311,8 +323,8 @@ async function sendNtfy(appriseUrl: string, payload: NotificationPayload): Promi
'Tags': payload.type || 'info'
};
if (auth) {
headers['Authorization'] = `Basic ${auth}`;
if (authHeader) {
headers['Authorization'] = authHeader;
}
try {