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 branch 'master' into email-templates

Browse Source
This commit is contained in:
Martyn Inglis
2016-02-22 13:12:41 +00:00
parent 886b206d63 00bd4da0f0
commit 2c51535b7e
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/celery/tasks.py
View File

@@ -46,9 +46,9 @@ def send_sms_code(encrypted_verification):
def send_email_code(encrypted_verification_message): def send_email_code(encrypted_verification_message):
verification_message = encryption.decrypt(encrypted_verification_message) verification_message = encryption.decrypt(encrypted_verification_message)
try: try:
aws_ses_client.send_email(verification_message['from_address'], aws_ses_client.send_email(current_app.config['VERIFY_CODE_FROM_EMAIL_ADDRESS'],
verification_message['to_address'], verification_message['to'],
verification_message['subject'], "Verification code",
verification_message['body']) verification_message['secret_code'])
except AwsSesClientException as e: except AwsSesClientException as e:
current_app.logger.error(e) current_app.logger.error(e)

15
tests/app/celery/test_tasks.py
View File

@@ -1,5 +1,6 @@
import uuid import uuid
import pytest import pytest
from flask import current_app
from app.celery.tasks import (send_sms, send_sms_code, send_email_code) from app.celery.tasks import (send_sms, send_sms_code, send_email_code)
from app import (firetext_client, aws_ses_client, encryption) from app import (firetext_client, aws_ses_client, encryption)
from app.clients.sms.firetext import FiretextClientException from app.clients.sms.firetext import FiretextClientException
@@ -98,17 +99,15 @@ def test_should_throw_firetext_client_exception(mocker):
def test_should_send_email_code(mocker): def test_should_send_email_code(mocker):
verification = {'to_address': 'someone@it.gov.uk', verification = {'to': 'someone@it.gov.uk',
'from_address': 'no-reply@notify.gov.uk', 'secret_code': 11111}
'subject': 'Verification code',
'body': 11111}
encrypted_verification = encryption.encrypt(verification) encrypted_verification = encryption.encrypt(verification)
mocker.patch('app.aws_ses_client.send_email') mocker.patch('app.aws_ses_client.send_email')
send_email_code(encrypted_verification) send_email_code(encrypted_verification)
aws_ses_client.send_email.assert_called_once_with(verification['from_address'], aws_ses_client.send_email.assert_called_once_with(current_app.config['VERIFY_CODE_FROM_EMAIL_ADDRESS'],
verification['to_address'], verification['to'],
verification['subject'], "Verification code",
verification['body']) verification['secret_code'])