From ed93aae1c2109c5b14061c567598d62a3bcb67e0 Mon Sep 17 00:00:00 2001
From: Alexandre Gagner <contact@alexandre-gagner.fr>
Date: Thu, 12 Aug 2021 00:15:53 +0200
Subject: [PATCH 1/2] add octopush notification service

---
 server/notification.js                | 27 ++++++++++++++++++++++
 src/components/NotificationDialog.vue | 32 +++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/server/notification.js b/server/notification.js
index 05dae8ad1..1f13ad496 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -193,6 +193,33 @@ class Notification {
                 console.log(error)
                 return false;
             }
+        } else if (notification.type === "octopush") {
+            try {
+                let config = {
+                    headers: {
+                        'api-key': notification.octopushAPIKey,
+                        'api-login': notification.octopushLogin,
+                        'cache-control': 'no-cache'
+                    }
+                };
+                let data = {
+                    "recipients": [
+                        {
+                            "phone_number": notification.octopushPhoneNumber
+                        }
+                    ],
+                    "text": msg,
+                    "type": notification.octopushSMSType,
+                    "purpose": "alert",
+                    "sender": notification.octopushSenderName
+                };
+
+                await axios.post(`https://api.octopush.com/v1/public/sms-campaign/send`, data, config)
+                return true;
+            } catch (error) {
+                console.log(error)
+                return false;
+            }
         } else if (notification.type === "slack") {
             try {
                 if (heartbeatJSON == null) {
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 6c481681d..a3e72da07 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -22,6 +22,7 @@
                                 <option value="slack">Slack</option>
                                 <option value="pushover">Pushover</option>
                                 <option value="pushy">Pushy</option>
+                                <option value="octopush">Octopush</option>
                                 <option value="lunasea">LunaSea</option>
                                 <option value="apprise">Apprise (Support 50+ Notification services)</option>
                             </select>
@@ -252,6 +253,37 @@
                             </p>
                         </template>
 
+                        <template v-if="notification.type === 'octopush'">
+                            <div class="mb-3">
+                                <label for="octopush-key" class="form-label">API KEY</label>
+                                <input id="octopush-key" v-model="notification.octopushAPIKey" type="text" class="form-control" required>
+                                <label for="octopush-login" class="form-label">API LOGIN</label>
+                                <input id="octopush-login" v-model="notification.octopushLogin" type="text" class="form-control" required>
+                            </div>
+                            <div class="mb-3">
+                                <label for="octopush-type-sms" class="form-label">SMS Type</label>
+                                <select id="octopush-type-sms" v-model="notification.octopushSMSType" class="form-select">
+                                    <option value="sms_premium">Premium (Fast - recommended for alerting)</option>
+                                    <option value="sms_low_cost">Low Cost (Slow, sometimes blocked by operator)</option>
+                                </select>
+                                <div class="form-text">
+                                    Check octopush prices <a href="https://octopush.com/tarifs-sms-international/" target="_blank">https://octopush.com/tarifs-sms-international/</a>.
+                                </div>
+                            </div>
+                            <div class="mb-3">
+                                <label for="octopush-phone-number" class="form-label">Phone number (intl format, eg : +33612345678) </label>
+                                <input id="octopush-phone-number" v-model="notification.octopushPhoneNumber" type="text" class="form-control" required>
+                            </div>
+                            <div class="mb-3">
+                                <label for="octopush-sender-name" class="form-label">SMS Sender Name : 3-11 alphanumeric characters and space (a-zA-Z0-9)</label>
+                                <input id="octopush-sender-name" v-model="notification.octopushSenderName" type="text" minlength="3" maxlength="11" class="form-control">
+                            </div>
+
+                            <p style="margin-top: 8px;">
+                                More info on: <a href="https://octopush.com/api-sms-documentation/envoi-de-sms/" target="_blank">https://octopush.com/api-sms-documentation/envoi-de-sms/</a>
+                            </p>
+                        </template>
+
                         <template v-if="notification.type === 'pushover'">
                             <div class="mb-3">
                                 <label for="pushover-user" class="form-label">User Key<span style="color:red;"><sup>*</sup></span></label>

From eb34dc6cc24e5946d6b36d99dd8710a0c4a673c3 Mon Sep 17 00:00:00 2001
From: Alexandre Gagner <contact@alexandre-gagner.fr>
Date: Thu, 12 Aug 2021 00:58:51 +0200
Subject: [PATCH 2/2] Update notification.js

Fix remove non ascii char from msg
---
 server/notification.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/notification.js b/server/notification.js
index 1f13ad496..56838513e 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -208,7 +208,8 @@ class Notification {
                             "phone_number": notification.octopushPhoneNumber
                         }
                     ],
-                    "text": msg,
+                    //octopush not supporting non ascii char
+                    "text": msg.replace(/[^\x00-\x7F]/g, ""),
                     "type": notification.octopushSMSType,
                     "purpose": "alert",
                     "sender": notification.octopushSenderName