mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-09-09 02:42:07 +00:00
Merge pull request #2905 from Sharknoon/ntfy-bearer-authorization
Added option for notification provider ntfy to use access tokens
This commit is contained in:
commit
f75cf3a186
@ -10,10 +10,14 @@ class Ntfy extends NotificationProvider {
|
|||||||
let okMsg = "Sent Successfully.";
|
let okMsg = "Sent Successfully.";
|
||||||
try {
|
try {
|
||||||
let headers = {};
|
let headers = {};
|
||||||
if (notification.ntfyusername) {
|
if (notification.ntfyAuthenticationMethod === "usernamePassword") {
|
||||||
headers = {
|
headers = {
|
||||||
"Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
|
"Authorization": "Basic " + Buffer.from(notification.ntfyusername + ":" + notification.ntfypassword).toString("base64"),
|
||||||
};
|
};
|
||||||
|
} else if (notification.ntfyAuthenticationMethod === "accessToken") {
|
||||||
|
headers = {
|
||||||
|
"Authorization": "Bearer " + notification.ntfyaccesstoken,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
// If heartbeatJSON is null, assume non monitoring notification (Certificate warning) or testing.
|
// If heartbeatJSON is null, assume non monitoring notification (Certificate warning) or testing.
|
||||||
if (heartbeatJSON == null) {
|
if (heartbeatJSON == null) {
|
||||||
|
@ -16,17 +16,29 @@
|
|||||||
<input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
|
<input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label for="ntfy-username" class="form-label">{{ $t("Username") }} ({{ $t("Optional") }})</label>
|
<label for="authentication-method" class="form-label">{{ $t("ntfyAuthenticationMethod") }}</label>
|
||||||
|
<select id="authentication-method" v-model="$parent.notification.ntfyAuthenticationMethod" class="form-select">
|
||||||
|
<option v-for="(name, type) in authenticationMethods" :key="type" :value="type">{{ name }}</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div v-if="$parent.notification.ntfyAuthenticationMethod === 'usernamePassword'" class="mb-3">
|
||||||
|
<label for="ntfy-username" class="form-label">{{ $t("Username") }}</label>
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
<input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control">
|
<input id="ntfy-username" v-model="$parent.notification.ntfyusername" type="text" class="form-control">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-3">
|
<div v-if="$parent.notification.ntfyAuthenticationMethod === 'usernamePassword'" class="mb-3">
|
||||||
<label for="ntfy-password" class="form-label">{{ $t("Password") }} ({{ $t("Optional") }})</label>
|
<label for="ntfy-password" class="form-label">{{ $t("Password") }}</label>
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
<HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword" autocomplete="new-password"></HiddenInput>
|
<HiddenInput id="ntfy-password" v-model="$parent.notification.ntfypassword" autocomplete="new-password"></HiddenInput>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="$parent.notification.ntfyAuthenticationMethod === 'accessToken'" class="mb-3">
|
||||||
|
<label for="ntfy-access-token" class="form-label">{{ $t("Access Token") }}</label>
|
||||||
|
<div class="input-group mb-3">
|
||||||
|
<HiddenInput id="ntfy-access-token" v-model="$parent.notification.ntfyaccesstoken"></HiddenInput>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label for="ntfy-icon" class="form-label">{{ $t("IconUrl") }}</label>
|
<label for="ntfy-icon" class="form-label">{{ $t("IconUrl") }}</label>
|
||||||
<input id="ntfy-icon" v-model="$parent.notification.ntfyIcon" type="text" class="form-control">
|
<input id="ntfy-icon" v-model="$parent.notification.ntfyIcon" type="text" class="form-control">
|
||||||
@ -40,11 +52,29 @@ export default {
|
|||||||
components: {
|
components: {
|
||||||
HiddenInput,
|
HiddenInput,
|
||||||
},
|
},
|
||||||
|
computed: {
|
||||||
|
authenticationMethods() {
|
||||||
|
return {
|
||||||
|
none: this.$t("None"),
|
||||||
|
usernamePassword: this.$t("ntfyUsernameAndPassword"),
|
||||||
|
accessToken: this.$t("Access Token")
|
||||||
|
};
|
||||||
|
}
|
||||||
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
if (typeof this.$parent.notification.ntfyPriority === "undefined") {
|
if (typeof this.$parent.notification.ntfyPriority === "undefined") {
|
||||||
this.$parent.notification.ntfyserverurl = "https://ntfy.sh";
|
this.$parent.notification.ntfyserverurl = "https://ntfy.sh";
|
||||||
this.$parent.notification.ntfyPriority = 5;
|
this.$parent.notification.ntfyPriority = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handling notifications that added before 1.22.0
|
||||||
|
if (typeof this.$parent.notification.ntfyAuthenticationMethod === "undefined") {
|
||||||
|
if (!this.$parent.notification.ntfyusername) {
|
||||||
|
this.$parent.notification.ntfyAuthenticationMethod = "none";
|
||||||
|
} else {
|
||||||
|
this.$parent.notification.ntfyAuthenticationMethod = "usernamePassword";
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
@ -736,6 +736,8 @@
|
|||||||
"lunaseaTarget": "Ziel",
|
"lunaseaTarget": "Ziel",
|
||||||
"lunaseaDeviceID": "Geräte-ID",
|
"lunaseaDeviceID": "Geräte-ID",
|
||||||
"lunaseaUserID": "Benutzer-ID",
|
"lunaseaUserID": "Benutzer-ID",
|
||||||
|
"ntfyAuthenticationMethod": "Authentifizierungsmethode",
|
||||||
|
"ntfyUsernameAndPassword": "Benutzername und Passwort",
|
||||||
"twilioAccountSID": "Account SID",
|
"twilioAccountSID": "Account SID",
|
||||||
"twilioFromNumber": "Absender",
|
"twilioFromNumber": "Absender",
|
||||||
"twilioToNumber": "Empfänger",
|
"twilioToNumber": "Empfänger",
|
||||||
|
@ -739,6 +739,8 @@
|
|||||||
"lunaseaDeviceID": "Geräte-ID",
|
"lunaseaDeviceID": "Geräte-ID",
|
||||||
"lunaseaTarget": "Ziel",
|
"lunaseaTarget": "Ziel",
|
||||||
"lunaseaUserID": "Benutzer-ID",
|
"lunaseaUserID": "Benutzer-ID",
|
||||||
|
"ntfyAuthenticationMethod": "Authentifizierungsmethode",
|
||||||
|
"ntfyUsernameAndPassword": "Benutzername und Passwort",
|
||||||
"twilioAccountSID": "Account SID",
|
"twilioAccountSID": "Account SID",
|
||||||
"twilioFromNumber": "Absender",
|
"twilioFromNumber": "Absender",
|
||||||
"twilioToNumber": "Empfänger",
|
"twilioToNumber": "Empfänger",
|
||||||
|
@ -714,6 +714,8 @@
|
|||||||
"lunaseaTarget": "Target",
|
"lunaseaTarget": "Target",
|
||||||
"lunaseaDeviceID": "Device ID",
|
"lunaseaDeviceID": "Device ID",
|
||||||
"lunaseaUserID": "User ID",
|
"lunaseaUserID": "User ID",
|
||||||
|
"ntfyAuthenticationMethod": "Authentication Method",
|
||||||
|
"ntfyUsernameAndPassword": "Username and Password",
|
||||||
"twilioAccountSID": "Account SID",
|
"twilioAccountSID": "Account SID",
|
||||||
"twilioAuthToken": "Auth Token",
|
"twilioAuthToken": "Auth Token",
|
||||||
"twilioFromNumber": "From Number",
|
"twilioFromNumber": "From Number",
|
||||||
|
Loading…
Reference in New Issue
Block a user