darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3179 from alphagov/add-international-firetext-api-key

Browse Source 
Add international API key for firetext
This commit is contained in:
Rebecca Law
2021-04-21 08:49:11 +01:00
committed by GitHub
parent 38af26cc78 f3fdd3b09b
commit fbd231cefd
9 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/clients/sms/firetext.py
View File

@@ -66,6 +66,7 @@ class FiretextClient(SmsClient):
super(SmsClient, self).__init__(*args, **kwargs)
self.current_app = current_app
self.api_key = current_app.config.get('FIRETEXT_API_KEY')
self.international_api_key = current_app.config.get('FIRETEXT_INTERNATIONAL_API_KEY')
self.from_number = current_app.config.get('FROM_NUMBER')
self.name = 'firetext'
self.url = current_app.config.get('FIRETEXT_URL')
@@ -91,10 +92,9 @@ class FiretextClient(SmsClient):
self.statsd_client.incr("clients.firetext.error")
self.current_app.logger.warning(log_message)
def send_sms(self, to, content, reference, sender=None):
def send_sms(self, to, content, reference, international, sender=None):
data = {
"apiKey": self.api_key,
"apiKey": self.international_api_key if international else self.api_key,
"from": self.from_number if sender is None else sender,
"to": to.replace('+', ''),
"message": content,

2
app/clients/sms/mmg.py
View File

@@ -97,7 +97,7 @@ class MMGClient(SmsClient):
def get_name(self):
return self.name
def send_sms(self, to, content, reference, multi=True, sender=None):
def send_sms(self, to, content, reference, international, multi=True, sender=None):
data = {
"reqType": "BULK",
"MSISDN": to,

1
app/config.py
View File

@@ -99,6 +99,7 @@ class Config(object):
# Firetext API Key
FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY")
FIRETEXT_INTERNATIONAL_API_KEY = os.getenv("FIRETEXT_INTERNATIONAL_API_KEY", "placeholder")
# Prefix to identify queues in SQS
NOTIFICATION_QUEUE_PREFIX = os.getenv('NOTIFICATION_QUEUE_PREFIX')

3
app/delivery/send_to_providers.py
View File

@@ -68,7 +68,8 @@ def send_sms_to_provider(notification):
to=notification.normalised_to,
content=str(template),
reference=str(notification.id),
sender=notification.reply_to_text
sender=notification.reply_to_text,
international=notification.international
)
except Exception as e:
notification.billable_units = template.fragment_count