Add legacy octopush (Octopush-DM from 2011 to 2020 accounts) version

This commit is contained in:
DeeJayPee 2021-09-13 10:22:05 +02:00
parent 50175b733c
commit 29d0db805d
2 changed files with 55 additions and 19 deletions

View File

@ -9,27 +9,53 @@ class Octopush extends NotificationProvider {
let okMsg = "Sent Successfully. "; let okMsg = "Sent Successfully. ";
try { try {
let config = { // Default - V2
headers: { if (notification.octopushVersion == 2 || !notification.octopushVersion)
"api-key": notification.octopushAPIKey, {
"api-login": notification.octopushLogin, let config = {
"cache-control": "no-cache" headers: {
} "api-key": notification.octopushAPIKey,
}; "api-login": notification.octopushLogin,
let data = { "cache-control": "no-cache"
"recipients": [
{
"phone_number": notification.octopushPhoneNumber
} }
], };
//octopush not supporting non ascii char let data = {
"text": msg.replace(/[^\x00-\x7F]/g, ""), "recipients": [
"type": notification.octopushSMSType, {
"purpose": "alert", "phone_number": notification.octopushPhoneNumber
"sender": notification.octopushSenderName }
}; ],
//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 = {
"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, ""),
};
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 !');
await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config)
return okMsg; return okMsg;
} catch (error) { } catch (error) {
this.throwGeneralAxiosError(error); this.throwGeneralAxiosError(error);

View File

@ -244,6 +244,16 @@
</template> </template>
<template v-if="notification.type === 'octopush'"> <template v-if="notification.type === 'octopush'">
<div class="mb-3">
<label for="octopush-version" class="form-label">Octopush API Version</label>
<select id="octopush-version" v-model="notification.octopushVersion" class="form-select">
<option value="2">V2</option>
<option value="1">V1 (Legacy Octopush-DM)</option>
</select>
<div class="form-text">
Do you use the legacy version of Octopush (2011-2020) or the new version ?
</div>
</div>
<div class="mb-3"> <div class="mb-3">
<label for="octopush-key" class="form-label">API KEY</label> <label for="octopush-key" class="form-label">API KEY</label>
<HiddenInput id="octopush-key" v-model="notification.octopushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput> <HiddenInput id="octopush-key" v-model="notification.octopushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>