diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js index 228e1b2a7..9d77d50c7 100644 --- a/server/notification-providers/octopush.js +++ b/server/notification-providers/octopush.js @@ -9,52 +9,50 @@ class Octopush extends NotificationProvider { let okMsg = "Sent Successfully. "; try { - // Default - V2 - if (notification.octopushVersion == 2 || !notification.octopushVersion) - { - let config = { + // Default - V2 + if (notification.octopushVersion == 2 || !notification.octopushVersion) { + let config = { headers: { - "api-key": notification.octopushAPIKey, - "api-login": notification.octopushLogin, - "cache-control": "no-cache" + "api-key": notification.octopushAPIKey, + "api-login": notification.octopushLogin, + "cache-control": "no-cache" } - }; - let data = { + }; + let data = { "recipients": [ - { + { "phone_number": notification.octopushPhoneNumber - } + } ], //octopush not supporting non ascii char "text": msg.replace(/[^\x00-\x7F]/g, ""), "type": notification.octopushSMSType, "purpose": "alert", "sender": notification.octopushSenderName - }; - await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config) - } - else if (notification.octopushVersion == 1) - { - let data = { + }; + await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config) + } else if (notification.octopushVersion == 1) { + let data = { "user_login": notification.octopushDMLogin, - "api_key": notification.octopushDMAPIKey, - "sms_recipients" : notification.octopushDMPhoneNumber, - "sms_sender": notification.octopushDMSenderName, - "sms_type": (notification.octopushDMSMSType == 'sms_premium')?'FR':'XXX', - "transactional": '1', - //octopush not supporting non ascii char - "sms_text": msg.replace(/[^\x00-\x7F]/g, ""), - }; + "api_key": notification.octopushDMAPIKey, + "sms_recipients": notification.octopushDMPhoneNumber, + "sms_sender": notification.octopushDMSenderName, + "sms_type": (notification.octopushDMSMSType == "sms_premium") ? "FR" : "XXX", + "transactional": "1", + //octopush not supporting non ascii char + "sms_text": msg.replace(/[^\x00-\x7F]/g, ""), + }; - let config = { - headers: { - "cache-control": "no-cache" - }, - params: data - }; - await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config) - } else - throw new Error('Unknown Octopush version !'); + let config = { + headers: { + "cache-control": "no-cache" + }, + params: data + }; + await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config) + } else { + throw new Error("Unknown Octopush version!"); + } return okMsg; } catch (error) { diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue index 107656001..f988ee208 100644 --- a/src/components/NotificationDialog.vue +++ b/src/components/NotificationDialog.vue @@ -244,16 +244,16 @@