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

Merge branch 'master' into add-view-activity-permission

Browse Source
This commit is contained in:
Rebecca Law
2016-03-30 09:34:36 +01:00
parent c7c845cea6 bc1aef5993
commit 4f9dd4863f
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/celery/tasks.py
View File

@@ -25,7 +25,7 @@ from sqlalchemy.exc import SQLAlchemyError
from app.aws import s3
from datetime import datetime
from utils.template import Template
from utils.recipients import RecipientCSV, format_phone_number, validate_phone_number
from utils.recipients import RecipientCSV, validate_and_format_phone_number
from app.validation import (allowed_send_to_email, allowed_send_to_number)
@@ -205,7 +205,7 @@ def send_sms(service_id, notification_id, encrypted_notification, created_at):
)
client.send_sms(
to=format_phone_number(validate_phone_number(notification['to'])),
to=validate_and_format_phone_number(notification['to']),
content=template.replaced,
reference=str(notification_id)
)
@@ -288,7 +288,7 @@ def send_sms_code(encrypted_verification):
verification_message = encryption.decrypt(encrypted_verification)
try:
firetext_client.send_sms(
format_phone_number(validate_phone_number(verification_message['to'])),
validate_and_format_phone_number(verification_message['to']),
verification_message['secret_code'],
'send-sms-code'
)

6
app/schemas.py
View File

@@ -7,7 +7,7 @@ from marshmallow_sqlalchemy import field_for
from utils.recipients import (
validate_email_address, InvalidEmailError,
validate_phone_number, InvalidPhoneError,
format_phone_number
validate_and_format_phone_number
)
@@ -132,9 +132,7 @@ class SmsNotificationSchema(NotificationSchema):
@post_load
def format_phone_number(self, item):
item['to'] = format_phone_number(validate_phone_number(
item['to'])
)
item['to'] = validate_and_format_phone_number(item['to'])
return item