diff --git a/app/notifications/rest.py b/app/notifications/rest.py index 102a0ecd1..61bd66574 100644 --- a/app/notifications/rest.py +++ b/app/notifications/rest.py @@ -270,11 +270,15 @@ def send_notification(notification_type): [user.mobile_number, user.email_address] for user in service.users ) ): - raise InvalidRequest( - {'to': [( + if (api_user.key_type == KEY_TYPE_TEAM): + message = 'Can’t send to this recipient using a team-only API key' + else: + message = ( 'Can’t send to this recipient when service is in trial mode ' '– see https://www.notifications.service.gov.uk/trial-mode' - )]}, + ) + raise InvalidRequest( + {'to': [message]}, status_code=400 ) diff --git a/tests/app/notifications/rest/test_send_notification.py b/tests/app/notifications/rest/test_send_notification.py index a4a1c23dd..47626ee85 100644 --- a/tests/app/notifications/rest/test_send_notification.py +++ b/tests/app/notifications/rest/test_send_notification.py @@ -704,10 +704,9 @@ def test_should_not_send_email_if_team_api_key_and_not_a_service_user(notify_api app.celery.tasks.send_email.apply_async.assert_not_called() assert response.status_code == 400 - assert [( - 'Can’t send to this recipient when service is in trial mode – see ' - 'https://www.notifications.service.gov.uk/trial-mode' - )] == json_resp['message']['to'] + assert [ + 'Can’t send to this recipient using a team-only API key' + ] == json_resp['message']['to'] def test_should_not_send_sms_if_team_api_key_and_not_a_service_user(notify_api, sample_template, mocker): @@ -730,10 +729,9 @@ def test_should_not_send_sms_if_team_api_key_and_not_a_service_user(notify_api, app.celery.tasks.send_sms.apply_async.assert_not_called() assert response.status_code == 400 - assert [( - 'Can’t send to this recipient when service is in trial mode – see ' - 'https://www.notifications.service.gov.uk/trial-mode' - )] == json_resp['message']['to'] + assert [ + 'Can’t send to this recipient using a team-only API key' + ] == json_resp['message']['to'] def test_should_send_email_if_team_api_key_and_a_service_user(notify_api, sample_email_template, mocker):