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

Build the from address in the task instead of the rest call.

Browse Source
This commit is contained in:
Rebecca Law
2016-06-13 14:09:03 +01:00
parent ea80596e73
commit c9f1eb65a7
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/celery/tasks.py
View File

@@ -343,6 +343,9 @@ def send_email(service_id, notification_id, from_address, encrypted_notification
(provider.get_name(), str(reference), notification['to']), queue='research-mode' (provider.get_name(), str(reference), notification['to']), queue='research-mode'
) )
else: else:
# First step setting the from_address here rather than the method creating the task
from_address = '"{}" <{}@{}>'.format(service.name, service.email_from, current_app.config[
'NOTIFY_EMAIL_DOMAIN']) if from_address == "" else from_address
reference = provider.send_email( reference = provider.send_email(
from_address, from_address,
notification['to'], notification['to'],

2
app/notifications/rest.py
View File

@@ -387,7 +387,7 @@ def send_notification(notification_type):
send_email.apply_async(( send_email.apply_async((
service_id, service_id,
notification_id, notification_id,
'"{}" <{}@{}>'.format(service.name, service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']), '',
encryption.encrypt(notification), encryption.encrypt(notification),
datetime.utcnow().strftime(DATETIME_FORMAT) datetime.utcnow().strftime(DATETIME_FORMAT)
), queue='email') ), queue='email')

2
tests/app/notifications/test_rest.py
View File

@@ -946,7 +946,7 @@ def test_should_allow_valid_email_notification(notify_api, sample_email_template
app.celery.tasks.send_email.apply_async.assert_called_once_with( app.celery.tasks.send_email.apply_async.assert_called_once_with(
(str(sample_email_template.service_id), (str(sample_email_template.service_id),
notification_id, notification_id,
"\"Sample service\" <sample.service@test.notify.com>", "",
"something_encrypted", "something_encrypted",
"2016-01-01T11:09:00.061258"), "2016-01-01T11:09:00.061258"),
queue="email" queue="email"