darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Respect template’s redaction preference

Browse Source 
If a template has the `redact_personalisation` flag set, then this
commit removes the personalisation from the notification before
rehydrating the template.

We’re doing this because we have a need to not show things like one time
passwords or two factor codes when we show the content of messages.

By passing through empty personalisation, and the `redact_missing` flag,
the `Template` instance will make use of the work done in:
- [x] https://github.com/alphagov/notifications-utils/pull/171
This commit is contained in:
Chris Hill-Scott
2017-06-24 17:29:28 +01:00
parent 1d65c19c4e
commit bc880017e5
6 changed files with 129 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/conftest.py
View File

@@ -1079,7 +1079,13 @@ def mock_get_jobs(mocker, api_user_active):
@pytest.fixture(scope='function')
def mock_get_notifications(mocker, api_user_active):
def mock_get_notifications(
mocker,
api_user_active,
template_content=None,
personalisation=None,
redact_personalisation=False,
):
def _get_notifications(
service_id,
job_id=None,
@@ -1096,17 +1102,28 @@ def mock_get_notifications(mocker, api_user_active):
job = None
if job_id is not None:
job = job_json(service_id, api_user_active, job_id=job_id)
if template_type:
template = template_json(service_id, id_=str(generate_uuid()), type_=template_type[0])
template = template_json(
service_id,
id_=str(generate_uuid()),
type_=template_type[0],
content=template_content,
redact_personalisation=redact_personalisation,
)
else:
template = template_json(service_id, id_=str(generate_uuid()))
template = template_json(
service_id,
id_=str(generate_uuid()),
content=template_content,
redact_personalisation=redact_personalisation,
)
return notification_json(
service_id,
template=template,
rows=rows,
job=job
job=job,
personalisation=personalisation,
)
return mocker.patch(
@@ -1636,7 +1653,12 @@ def mock_reset_failed_login_count(mocker):
@pytest.fixture
def mock_get_notification(mocker, fake_uuid, notification_status='delivered'):
def mock_get_notification(
mocker,
fake_uuid,
notification_status='delivered',
redact_personalisation=False,
):
def _get_notification(
service_id,
notification_id,
@@ -1654,7 +1676,12 @@ def mock_get_notification(mocker, fake_uuid, notification_status='delivered'):
'email_address': 'test@user.gov.uk'
}
noti['personalisation'] = {'name': 'Jo'}
noti['template'] = template_json(service_id, str(generate_uuid()), content='hello ((name))')
noti['template'] = template_json(
service_id,
str(generate_uuid()),
content='hello ((name))',
redact_personalisation=redact_personalisation,
)
return noti
return mocker.patch(