darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-07 04:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #705 from alphagov/team-key-sends-to-whitelist

Browse Source 
Let team key send to whitelist
This commit is contained in:
Chris Hill-Scott
2016-10-10 10:59:06 +01:00
committed by GitHub
parent b9ac337c68 9bbd4713e4
commit 2451d8cac5
2 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/service/utils.py
View File

@@ -34,16 +34,16 @@ def service_allowed_to_send_to(recipient, service, key_type):
return True return True
team_members = itertools.chain.from_iterable( team_members = itertools.chain.from_iterable(
[user.mobile_number, user.email_address] for user in service.users) [user.mobile_number, user.email_address] for user in service.users
)
whitelist_members = [
member.recipient for member in service.whitelist
]
if key_type == KEY_TYPE_TEAM: if (
return allowed_to_send_to( (key_type == KEY_TYPE_NORMAL and service.restricted) or
recipient, (key_type == KEY_TYPE_TEAM)
team_members ):
)
if key_type == KEY_TYPE_NORMAL and service.restricted:
whitelist_members = [member.recipient for member in service.whitelist]
return allowed_to_send_to( return allowed_to_send_to(
recipient, recipient,
itertools.chain( itertools.chain(

74
tests/app/notifications/rest/test_send_notification.py
View File

@@ -768,27 +768,28 @@ def test_should_not_persist_notification_or_send_sms_if_simulated_number(
assert Notification.query.count() == 0 assert Notification.query.count() == 0
@pytest.mark.parametrize('notification_type,to, key_type', [ @pytest.mark.parametrize('key_type', [
('sms', '07827992635', KEY_TYPE_NORMAL), KEY_TYPE_NORMAL, KEY_TYPE_TEAM
('email', 'non_whitelist_recipient@mail.com', KEY_TYPE_NORMAL), ])
('sms', '07827992635', KEY_TYPE_TEAM), @pytest.mark.parametrize('notification_type, to, _create_sample_template', [
('email', 'non_whitelist_recipient@mail.com', KEY_TYPE_TEAM)]) ('sms', '07827992635', create_sample_template),
def test_should_not_send_notification_to_non_whitelist_recipient_in_trial_mode(client, ('email', 'non_whitelist_recipient@mail.com', create_sample_email_template)]
notify_db, )
notify_db_session, def test_should_not_send_notification_to_non_whitelist_recipient_in_trial_mode(
notification_type, client,
to, notify_db,
key_type, notify_db_session,
mocker): notification_type,
to,
_create_sample_template,
key_type,
mocker
):
service = create_sample_service(notify_db, notify_db_session, limit=2, restricted=True) service = create_sample_service(notify_db, notify_db_session, limit=2, restricted=True)
service_whitelist = create_sample_service_whitelist(notify_db, notify_db_session, service=service) service_whitelist = create_sample_service_whitelist(notify_db, notify_db_session, service=service)
apply_async = mocker.patch('app.celery.provider_tasks.deliver_{}.apply_async'.format(notification_type)) apply_async = mocker.patch('app.celery.provider_tasks.deliver_{}.apply_async'.format(notification_type))
if notification_type == 'sms': template = _create_sample_template(notify_db, notify_db_session, service=service)
template = create_sample_template(notify_db, notify_db_session, service=service)
elif notification_type == 'email':
template = create_sample_email_template(notify_db, notify_db_session, service=service)
assert service_whitelist.service_id == service.id assert service_whitelist.service_id == service.id
assert to not in [member.recipient for member in service.whitelist] assert to not in [member.recipient for member in service.whitelist]
@@ -819,23 +820,34 @@ def test_should_not_send_notification_to_non_whitelist_recipient_in_trial_mode(c
apply_async.assert_not_called() apply_async.assert_not_called()
@pytest.mark.parametrize('notification_type,to', [ @pytest.mark.parametrize('service_restricted', [
('sms', '07123123123'), True, False
('email', 'whitelist_recipient@mail.com')]) ])
def test_should_send_notification_to_whitelist_recipient_in_trial_mode_with_live_key(client, @pytest.mark.parametrize('key_type', [
notify_db, KEY_TYPE_NORMAL, KEY_TYPE_TEAM
notify_db_session, ])
notification_type, @pytest.mark.parametrize('notification_type, to, _create_sample_template', [
to, ('sms', '07123123123', create_sample_template),
mocker): ('email', 'whitelist_recipient@mail.com', create_sample_email_template)]
service = create_sample_service(notify_db, notify_db_session, limit=2, restricted=True) )
def test_should_send_notification_to_whitelist_recipient(
client,
notify_db,
notify_db_session,
notification_type,
to,
_create_sample_template,
key_type,
service_restricted,
mocker
):
service = create_sample_service(notify_db, notify_db_session, limit=2, restricted=service_restricted)
apply_async = mocker.patch('app.celery.provider_tasks.deliver_{}.apply_async'.format(notification_type)) apply_async = mocker.patch('app.celery.provider_tasks.deliver_{}.apply_async'.format(notification_type))
template = _create_sample_template(notify_db, notify_db_session, service=service)
if notification_type == 'sms': if notification_type == 'sms':
template = create_sample_template(notify_db, notify_db_session, service=service)
service_whitelist = create_sample_service_whitelist(notify_db, notify_db_session, service_whitelist = create_sample_service_whitelist(notify_db, notify_db_session,
service=service, mobile_number=to) service=service, mobile_number=to)
elif notification_type == 'email': elif notification_type == 'email':
template = create_sample_email_template(notify_db, notify_db_session, service=service)
service_whitelist = create_sample_service_whitelist(notify_db, notify_db_session, service_whitelist = create_sample_service_whitelist(notify_db, notify_db_session,
service=service, email_address=to) service=service, email_address=to)
@@ -849,8 +861,8 @@ def test_should_send_notification_to_whitelist_recipient_in_trial_mode_with_live
'template': str(template.id) 'template': str(template.id)
} }
sample_live_key = create_sample_api_key(notify_db, notify_db_session, service) sample_key = create_sample_api_key(notify_db, notify_db_session, service, key_type=key_type)
auth_header = create_jwt_token(secret=sample_live_key.unsigned_secret, client_id=str(sample_live_key.service_id)) auth_header = create_jwt_token(secret=sample_key.unsigned_secret, client_id=str(sample_key.service_id))
response = client.post( response = client.post(
path='/notifications/{}'.format(notification_type), path='/notifications/{}'.format(notification_type),