diff --git a/tests/__init__.py b/tests/__init__.py index 5406083c9..35ef509b6 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -8,32 +8,35 @@ from app.dao.services_dao import dao_fetch_service_by_id from app.models import KEY_TYPE_NORMAL, ApiKey -def create_authorization_header(service_id=None, key_type=KEY_TYPE_NORMAL): - if service_id: - client_id = str(service_id) - secrets = ApiKey.query.filter_by(service_id=service_id, key_type=key_type).all() - if secrets: - secret = secrets[0].secret - else: - service = dao_fetch_service_by_id(service_id) - data = { - 'service': service, - 'name': uuid.uuid4(), - 'created_by': service.created_by, - 'key_type': key_type - } - api_key = ApiKey(**data) - save_model_api_key(api_key) - secret = api_key.secret +def create_service_authorization_header(service_id, key_type=KEY_TYPE_NORMAL): + client_id = str(service_id) + secrets = ApiKey.query.filter_by(service_id=service_id, key_type=key_type).all() + if secrets: + secret = secrets[0].secret else: - client_id = current_app.config['ADMIN_CLIENT_ID'] - secret = current_app.config['INTERNAL_CLIENT_API_KEYS'][client_id][0] + service = dao_fetch_service_by_id(service_id) + data = { + 'service': service, + 'name': uuid.uuid4(), + 'created_by': service.created_by, + 'key_type': key_type + } + api_key = ApiKey(**data) + save_model_api_key(api_key) + secret = api_key.secret token = create_jwt_token(secret=secret, client_id=client_id) return 'Authorization', 'Bearer {}'.format(token) +def create_admin_authorization_header(): + client_id = current_app.config['ADMIN_CLIENT_ID'] + secret = current_app.config['INTERNAL_CLIENT_API_KEYS'][client_id][0] + token = create_jwt_token(secret=secret, client_id=client_id) + return 'Authorization', 'Bearer {}'.format(token) + + def unwrap_function(fn): """ Given a function, returns its undecorated original. diff --git a/tests/app/billing/test_billing.py b/tests/app/billing/test_billing.py index 517e62f60..b1c5b7ee5 100644 --- a/tests/app/billing/test_billing.py +++ b/tests/app/billing/test_billing.py @@ -12,7 +12,7 @@ from app.dao.date_util import ( get_month_start_and_end_date_in_utc, ) from app.models import FactBilling -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import ( create_annual_billing, create_ft_billing, @@ -37,7 +37,7 @@ def test_create_update_free_sms_fragment_limit_invalid_schema(client, sample_ser response = client.post('service/{}/billing/free-sms-fragment-limit'.format(sample_service.id), data={}, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) json_resp = json.loads(response.get_data(as_text=True)) assert response.status_code == 400 @@ -103,7 +103,7 @@ def test_get_free_sms_fragment_limit( create_annual_billing(service_id=sample_service.id, free_sms_fragment_limit=11000, financial_year_start=2021) response_get = client.get( 'service/{}/billing/free-sms-fragment-limit'.format(sample_service.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) json_resp = json.loads(response_get.get_data(as_text=True)) assert response_get.status_code == 200 @@ -117,7 +117,7 @@ def test_get_free_sms_fragment_limit_current_year_creates_new_row_if_annual_bill ): response_get = client.get( 'service/{}/billing/free-sms-fragment-limit'.format(sample_service.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) json_resp = json.loads(response_get.get_data(as_text=True)) assert response_get.status_code == 200 @@ -146,7 +146,7 @@ def test_get_yearly_usage_by_monthly_from_ft_billing_populates_deltas(client, no assert FactBilling.query.count() == 0 response = client.get('service/{}/billing/ft-monthly-usage?year=2018'.format(service.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 200 assert len(json.loads(response.get_data(as_text=True))) == 1 @@ -178,7 +178,7 @@ def test_get_yearly_usage_by_monthly_from_ft_billing(client, notify_db_session): postage='second') response = client.get('service/{}/billing/ft-monthly-usage?year=2016'.format(service.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) json_resp = json.loads(response.get_data(as_text=True)) ft_letters = [x for x in json_resp if x['notification_type'] == 'letter'] @@ -235,7 +235,7 @@ def set_up_yearly_data(): def test_get_yearly_billing_usage_summary_from_ft_billing_returns_400_if_missing_year(client, sample_service): response = client.get( '/service/{}/billing/ft-yearly-usage-summary'.format(sample_service.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert response.status_code == 400 assert json.loads(response.get_data(as_text=True)) == { @@ -248,7 +248,7 @@ def test_get_yearly_billing_usage_summary_from_ft_billing_returns_empty_list_if_ ): response = client.get( '/service/{}/billing/ft-yearly-usage-summary?year=2016'.format(sample_service.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == [] @@ -258,7 +258,7 @@ def test_get_yearly_billing_usage_summary_from_ft_billing(client, notify_db_sess service = set_up_yearly_data() response = client.get('/service/{}/billing/ft-yearly-usage-summary?year=2016'.format(service.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert response.status_code == 200 json_response = json.loads(response.get_data(as_text=True)) @@ -280,7 +280,7 @@ def test_get_yearly_billing_usage_summary_from_ft_billing(client, notify_db_sess def test_get_yearly_usage_by_monthly_from_ft_billing_all_cases(client, notify_db_session): service = set_up_data_for_all_cases() response = client.get('service/{}/billing/ft-monthly-usage?year=2018'.format(service.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 200 json_response = json.loads(response.get_data(as_text=True)) @@ -319,7 +319,7 @@ def test_get_yearly_usage_by_monthly_from_ft_billing_all_cases(client, notify_db def test_get_yearly_billing_usage_summary_from_ft_billing_all_cases(client, notify_db_session): service = set_up_data_for_all_cases() response = client.get('/service/{}/billing/ft-yearly-usage-summary?year=2018'.format(service.id), - headers=[create_authorization_header()]) + headers=[create_admin_authorization_header()]) assert response.status_code == 200 json_response = json.loads(response.get_data(as_text=True)) diff --git a/tests/app/complaint/test_complaint_rest.py b/tests/app/complaint/test_complaint_rest.py index c2ad3cbb4..ea44ca636 100644 --- a/tests/app/complaint/test_complaint_rest.py +++ b/tests/app/complaint/test_complaint_rest.py @@ -4,7 +4,7 @@ from datetime import date from flask import url_for from freezegun import freeze_time -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import ( create_complaint, create_notification, @@ -20,7 +20,7 @@ def test_get_all_complaints_returns_complaints_for_multiple_services(client, not complaint_1 = create_complaint() # default service complaint_2 = create_complaint(service=service, notification=notification) - response = client.get('/complaint', headers=[create_authorization_header()]) + response = client.get('/complaint', headers=[create_admin_authorization_header()]) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True))['complaints'] == [ @@ -28,7 +28,7 @@ def test_get_all_complaints_returns_complaints_for_multiple_services(client, not def test_get_all_complaints_returns_empty_complaints_list(client): - response = client.get('/complaint', headers=[create_authorization_header()]) + response = client.get('/complaint', headers=[create_admin_authorization_header()]) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True))['complaints'] == [] @@ -43,7 +43,10 @@ def test_get_all_complaints_returns_pagination_links(mocker, client, notify_db_s create_complaint(service=service_1) create_complaint(service=service_2) - response = client.get(url_for('complaint.get_all_complaints', page=2), headers=[create_authorization_header()]) + response = client.get( + url_for('complaint.get_all_complaints', page=2), + headers=[create_admin_authorization_header()] + ) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True))['links'] == { @@ -58,7 +61,7 @@ def test_get_complaint_with_start_and_end_date_passes_these_to_dao_function(mock dao_mock = mocker.patch('app.complaint.complaint_rest.fetch_count_of_complaints', return_value=3) response = client.get( url_for('complaint.get_complaint_count', start_date=start_date, end_date=end_date), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) dao_mock.assert_called_once_with(start_date=start_date, end_date=end_date) @@ -69,7 +72,7 @@ def test_get_complaint_with_start_and_end_date_passes_these_to_dao_function(mock @freeze_time("2018-06-01 11:00:00") def test_get_complaint_sets_start_and_end_date_to_today_if_not_specified(mocker, client): dao_mock = mocker.patch('app.complaint.complaint_rest.fetch_count_of_complaints', return_value=5) - response = client.get(url_for('complaint.get_complaint_count'), headers=[create_authorization_header()]) + response = client.get(url_for('complaint.get_complaint_count'), headers=[create_admin_authorization_header()]) dao_mock.assert_called_once_with(start_date=date.today(), end_date=date.today()) assert response.status_code == 200 @@ -80,7 +83,7 @@ def test_get_complaint_with_invalid_data_returns_400_status_code(client): start_date = '1234-56-78' response = client.get( url_for('complaint.get_complaint_count', start_date=start_date), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert response.status_code == 400 diff --git a/tests/app/conftest.py b/tests/app/conftest.py index a11bb694e..bc2038886 100644 --- a/tests/app/conftest.py +++ b/tests/app/conftest.py @@ -50,7 +50,7 @@ from app.models import ( Template, TemplateHistory, ) -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import ( create_api_key, create_inbound_number, @@ -936,7 +936,7 @@ def admin_request(client): def get(endpoint, _expected_status=200, **endpoint_kwargs): resp = client.get( url_for(endpoint, **(endpoint_kwargs or {})), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) json_resp = resp.json assert resp.status_code == _expected_status @@ -947,7 +947,7 @@ def admin_request(client): resp = client.post( url_for(endpoint, **(endpoint_kwargs or {})), data=json.dumps(_data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) if resp.get_data(): json_resp = resp.json @@ -960,7 +960,7 @@ def admin_request(client): def delete(endpoint, _expected_status=204, **endpoint_kwargs): resp = client.delete( url_for(endpoint, **(endpoint_kwargs or {})), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) if resp.get_data(): json_resp = resp.json diff --git a/tests/app/events/test_rest.py b/tests/app/events/test_rest.py index dcb6be114..9ea31a6f3 100644 --- a/tests/app/events/test_rest.py +++ b/tests/app/events/test_rest.py @@ -1,6 +1,6 @@ import json -from tests import create_authorization_header +from tests import create_admin_authorization_header def test_create_event(notify_api): @@ -11,7 +11,7 @@ def test_create_event(notify_api): 'data': {'something': 'random', 'in_fact': 'could be anything'} } path = '/events' - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( path, diff --git a/tests/app/job/test_rest.py b/tests/app/job/test_rest.py index f9adb40ac..ff04c5696 100644 --- a/tests/app/job/test_rest.py +++ b/tests/app/job/test_rest.py @@ -10,7 +10,7 @@ from freezegun import freeze_time import app.celery.tasks from app.dao.templates_dao import dao_update_template from app.models import JOB_STATUS_PENDING, JOB_STATUS_TYPES -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import ( create_ft_notification_status, create_job, @@ -24,7 +24,7 @@ from tests.conftest import set_config def test_get_job_with_invalid_service_id_returns404(client, sample_service): path = '/service/{}/job'.format(sample_service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(path, headers=[auth_header]) assert response.status_code == 200 resp_json = json.loads(response.get_data(as_text=True)) @@ -34,7 +34,7 @@ def test_get_job_with_invalid_service_id_returns404(client, sample_service): def test_get_job_with_invalid_job_id_returns404(client, sample_template): service_id = sample_template.service.id path = '/service/{}/job/{}'.format(service_id, "bad-id") - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(path, headers=[auth_header]) assert response.status_code == 404 resp_json = json.loads(response.get_data(as_text=True)) @@ -45,7 +45,7 @@ def test_get_job_with_invalid_job_id_returns404(client, sample_template): def test_get_job_with_unknown_id_returns404(client, sample_template, fake_uuid): service_id = sample_template.service.id path = '/service/{}/job/{}'.format(service_id, fake_uuid) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(path, headers=[auth_header]) assert response.status_code == 404 resp_json = json.loads(response.get_data(as_text=True)) @@ -59,7 +59,7 @@ def test_cancel_job(client, sample_scheduled_job): job_id = str(sample_scheduled_job.id) service_id = sample_scheduled_job.service.id path = '/service/{}/job/{}/cancel'.format(service_id, job_id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(path, headers=[auth_header]) assert response.status_code == 200 resp_json = json.loads(response.get_data(as_text=True)) @@ -72,7 +72,7 @@ def test_cant_cancel_normal_job(client, sample_job, mocker): service_id = sample_job.service.id mock_update = mocker.patch('app.dao.jobs_dao.dao_update_job') path = '/service/{}/job/{}/cancel'.format(service_id, job_id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(path, headers=[auth_header]) assert response.status_code == 404 assert mock_update.call_count == 0 @@ -144,7 +144,7 @@ def test_create_unscheduled_job(client, sample_template, mocker, fake_uuid): 'created_by': str(sample_template.created_by.id), } path = '/service/{}/job'.format(sample_template.service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( @@ -185,7 +185,7 @@ def test_create_unscheduled_job_with_sender_id_in_metadata(client, sample_templa 'created_by': str(sample_template.created_by.id), } path = '/service/{}/job'.format(sample_template.service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( @@ -217,7 +217,7 @@ def test_create_scheduled_job(client, sample_template, mocker, fake_uuid): 'scheduled_for': scheduled_date, } path = '/service/{}/job'.format(sample_template.service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( @@ -265,7 +265,7 @@ def test_create_job_with_contact_list_id( response = client.post( f'/service/{sample_template.service_id}/job', data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) resp_json = response.get_json() assert response.status_code == 201 assert resp_json['data']['contact_list_id'] == str(contact_list.id) @@ -275,7 +275,7 @@ def test_create_job_with_contact_list_id( def test_create_job_returns_403_if_service_is_not_active(client, fake_uuid, sample_service, mocker): sample_service.active = False mock_job_dao = mocker.patch("app.dao.jobs_dao.dao_create_job") - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post('/service/{}/job'.format(sample_service.id), data="", headers=[('Content-Type', 'application/json'), auth_header]) @@ -299,7 +299,7 @@ def test_create_job_returns_400_if_file_is_invalid( extra_metadata, ): mock_job_dao = mocker.patch("app.dao.jobs_dao.dao_create_job") - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() metadata = dict( template_id=str(sample_template.id), original_file_name='thisisatest.csv', @@ -334,7 +334,7 @@ def test_create_job_returns_403_if_letter_template_type_and_service_in_trial( 'created_by': str(sample_trial_letter_template.created_by.id), } mock_job_dao = mocker.patch("app.dao.jobs_dao.dao_create_job") - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post('/service/{}/job'.format(sample_trial_letter_template.service.id), data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) @@ -362,7 +362,7 @@ def test_should_not_create_scheduled_job_more_then_96_hours_in_the_future(client 'scheduled_for': scheduled_date, } path = '/service/{}/job'.format(sample_template.service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( @@ -395,7 +395,7 @@ def test_should_not_create_scheduled_job_in_the_past(client, sample_template, mo 'scheduled_for': scheduled_date } path = '/service/{}/job'.format(sample_template.service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( @@ -419,7 +419,7 @@ def test_create_job_returns_400_if_missing_id(client, sample_template, mocker): }) data = {} path = '/service/{}/job'.format(sample_template.service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( path, @@ -444,7 +444,7 @@ def test_create_job_returns_400_if_missing_data(client, sample_template, mocker, 'valid': 'True', } path = '/service/{}/job'.format(sample_template.service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( path, @@ -469,7 +469,7 @@ def test_create_job_returns_404_if_template_does_not_exist(client, sample_servic 'id': fake_uuid, } path = '/service/{}/job'.format(sample_service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( path, @@ -492,7 +492,7 @@ def test_create_job_returns_404_if_missing_service(client, sample_template, mock random_id = str(uuid.uuid4()) data = {} path = '/service/{}/job'.format(random_id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( path, @@ -519,7 +519,7 @@ def test_create_job_returns_400_if_archived_template(client, sample_template, mo 'valid': 'True', } path = '/service/{}/job'.format(sample_template.service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] response = client.post( path, diff --git a/tests/app/letter_branding/test_letter_branding_rest.py b/tests/app/letter_branding/test_letter_branding_rest.py index 73d75b549..2b957aa85 100644 --- a/tests/app/letter_branding/test_letter_branding_rest.py +++ b/tests/app/letter_branding/test_letter_branding_rest.py @@ -2,7 +2,7 @@ import json import uuid from app.models import LetterBranding -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import create_letter_branding @@ -11,7 +11,7 @@ def test_get_all_letter_brands(client, notify_db_session): test_branding = create_letter_branding( name='test branding', filename='test-branding', ) - response = client.get('/letter-branding', headers=[create_authorization_header()]) + response = client.get('/letter-branding', headers=[create_admin_authorization_header()]) assert response.status_code == 200 json_response = json.loads(response.get_data(as_text=True)) assert len(json_response) == 2 @@ -29,14 +29,14 @@ def test_get_letter_branding_by_id(client, notify_db_session): create_letter_branding( name='test domain', filename='test-domain' ) - response = client.get('/letter-branding/{}'.format(hm_gov.id), headers=[create_authorization_header()]) + response = client.get('/letter-branding/{}'.format(hm_gov.id), headers=[create_admin_authorization_header()]) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == hm_gov.serialize() def test_get_letter_branding_by_id_returns_404_if_does_not_exist(client, notify_db_session): - response = client.get('/letter-branding/{}'.format(uuid.uuid4()), headers=[create_authorization_header()]) + response = client.get('/letter-branding/{}'.format(uuid.uuid4()), headers=[create_admin_authorization_header()]) assert response.status_code == 404 @@ -49,7 +49,7 @@ def test_create_letter_branding(client, notify_db_session): response = client.post( '/letter-branding', data=json.dumps(form), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], ) assert response.status_code == 201 @@ -71,7 +71,7 @@ def test_update_letter_branding_returns_400_when_integrity_error_is_thrown( response = client.post( '/letter-branding/{}'.format(brand_to_update.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps(form) ) diff --git a/tests/app/notifications/rest/test_send_notification.py b/tests/app/notifications/rest/test_send_notification.py index dff771abc..ff2076119 100644 --- a/tests/app/notifications/rest/test_send_notification.py +++ b/tests/app/notifications/rest/test_send_notification.py @@ -29,7 +29,7 @@ from app.models import ( ) from app.service.send_notification import send_one_off_notification from app.v2.errors import RateLimitError -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import ( create_api_key, create_notification, @@ -48,7 +48,7 @@ def test_create_notification_should_reject_if_missing_required_fields(notify_api with notify_api.test_client() as client: mocked = mocker.patch('app.celery.provider_tasks.deliver_{}.apply_async'.format(template_type)) data = {} - auth_header = create_authorization_header(service_id=sample_api_key.service_id) + auth_header = create_service_authorization_header(service_id=sample_api_key.service_id) response = client.post( path='/notifications/{}'.format(template_type), @@ -72,7 +72,7 @@ def test_should_reject_bad_phone_numbers(notify_api, sample_template, mocker): 'to': 'invalid', 'template': sample_template.id } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/notifications/sms', @@ -99,7 +99,7 @@ def test_send_notification_invalid_template_id(notify_api, sample_template, mock 'to': to, 'template': fake_uuid } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/notifications/{}'.format(template_type), @@ -126,7 +126,9 @@ def test_send_notification_with_placeholders_replaced(notify_api, sample_email_t 'name': 'Jo' } } - auth_header = create_authorization_header(service_id=sample_email_template_with_placeholders.service.id) + auth_header = create_service_authorization_header( + service_id=sample_email_template_with_placeholders.service.id + ) response = client.post( path='/notifications/email', @@ -196,7 +198,7 @@ def test_send_notification_with_placeholders_replaced_with_unusual_types( ), headers=[ ('Content-Type', 'application/json'), - create_authorization_header(service_id=sample_email_template_with_placeholders.service.id) + create_service_authorization_header(service_id=sample_email_template_with_placeholders.service.id) ] ) @@ -215,7 +217,7 @@ def test_should_not_send_notification_for_archived_template(notify_api, sample_t 'to': '+447700900855', 'template': sample_template.id }) - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) resp = client.post( path='/notifications/sms', @@ -246,7 +248,7 @@ def test_should_not_send_notification_if_restricted_and_not_a_service_user(notif 'template': template.id } - auth_header = create_authorization_header(service_id=template.service_id) + auth_header = create_service_authorization_header(service_id=template.service_id) response = client.post( path='/notifications/{}'.format(template_type), @@ -284,7 +286,7 @@ def test_should_send_notification_if_restricted_and_a_service_user(notify_api, 'template': template.id } - auth_header = create_authorization_header(service_id=template.service_id) + auth_header = create_service_authorization_header(service_id=template.service_id) response = client.post( path='/notifications/{}'.format(template_type), @@ -315,7 +317,7 @@ def test_should_not_allow_template_from_another_service(notify_api, 'template': service_2_templates[0].id } - auth_header = create_authorization_header(service_id=service_1.id) + auth_header = create_service_authorization_header(service_id=service_1.id) response = client.post( path='/notifications/{}'.format(template_type), @@ -340,7 +342,7 @@ def test_should_allow_valid_sms_notification(notify_api, sample_template, mocker 'template': str(sample_template.id) } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/notifications/sms', @@ -367,7 +369,7 @@ def test_should_reject_email_notification_with_bad_email(notify_api, sample_emai 'to': to_address, 'template': str(sample_email_template.service_id) } - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.post( path='/notifications/email', @@ -392,7 +394,7 @@ def test_should_allow_valid_email_notification(notify_api, sample_email_template 'template': str(sample_email_template.id) } - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.post( path='/notifications/email', @@ -434,7 +436,7 @@ def test_should_allow_api_call_if_under_day_limit_regardless_of_type( 'template': str(sms_template.id) } - auth_header = create_authorization_header(service_id=service.id) + auth_header = create_service_authorization_header(service_id=service.id) response = client.post( path='/notifications/sms', @@ -455,7 +457,7 @@ def test_should_not_return_html_in_body(notify_api, sample_service, mocker): 'template': str(email_template.id) } - auth_header = create_authorization_header(service_id=email_template.service_id) + auth_header = create_service_authorization_header(service_id=email_template.service_id) response = client.post( path='/notifications/email', data=json.dumps(data), @@ -473,7 +475,9 @@ def test_should_not_send_email_if_team_api_key_and_not_a_service_user(notify_api 'template': str(sample_email_template.id), } - auth_header = create_authorization_header(service_id=sample_email_template.service_id, key_type=KEY_TYPE_TEAM) + auth_header = create_service_authorization_header( + service_id=sample_email_template.service_id, key_type=KEY_TYPE_TEAM + ) response = client.post( path='/notifications/email', @@ -499,7 +503,7 @@ def test_should_not_send_sms_if_team_api_key_and_not_a_service_user(notify_api, 'template': str(sample_template.id), } - auth_header = create_authorization_header(service_id=sample_template.service_id, key_type=KEY_TYPE_TEAM) + auth_header = create_service_authorization_header(service_id=sample_template.service_id, key_type=KEY_TYPE_TEAM) response = client.post( path='/notifications/sms', @@ -523,7 +527,9 @@ def test_should_send_email_if_team_api_key_and_a_service_user(client, sample_ema 'to': sample_email_template.service.created_by.email_address, 'template': sample_email_template.id } - auth_header = create_authorization_header(service_id=sample_email_template.service_id, key_type=KEY_TYPE_TEAM) + auth_header = create_service_authorization_header( + service_id=sample_email_template.service_id, key_type=KEY_TYPE_TEAM + ) response = client.post( path='/notifications/email', @@ -739,7 +745,7 @@ def test_should_not_persist_notification_or_send_email_if_simulated_email( 'template': sample_email_template.id } - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.post( path='/notifications/email', @@ -768,7 +774,7 @@ def test_should_not_persist_notification_or_send_sms_if_simulated_number( 'template': sample_template.id } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/notifications/sms', @@ -903,7 +909,7 @@ def test_should_error_if_notification_type_does_not_match_template_type( 'to': to, 'template': template.id } - auth_header = create_authorization_header(service_id=template.service_id) + auth_header = create_service_authorization_header(service_id=template.service_id) response = client.post("/notifications/{}".format(notification_type), data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) @@ -979,7 +985,7 @@ def test_send_notification_uses_priority_queue_when_template_is_marked_as_priori 'template': str(sample.id) } - auth_header = create_authorization_header(service_id=sample.service_id) + auth_header = create_service_authorization_header(service_id=sample.service_id) response = client.post( path='/notifications/{}'.format(notification_type), @@ -1017,7 +1023,7 @@ def test_returns_a_429_limit_exceeded_if_rate_limit_exceeded( 'template': str(sample.id) } - auth_header = create_authorization_header(service_id=sample.service_id) + auth_header = create_service_authorization_header(service_id=sample.service_id) response = client.post( path='/notifications/{}'.format(notification_type), @@ -1042,7 +1048,7 @@ def test_should_allow_store_original_number_on_sms_notification(client, sample_t 'template': str(sample_template.id) } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/notifications/sms', @@ -1070,7 +1076,7 @@ def test_should_not_allow_sending_to_international_number_without_international_ 'template': str(sample_template.id) } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/notifications/sms', @@ -1097,7 +1103,7 @@ def test_should_allow_sending_to_crown_dependency_number_without_international_p 'template': str(template.id) } - auth_header = create_authorization_header(service_id=service.id) + auth_header = create_service_authorization_header(service_id=service.id) response = client.post( path='/notifications/sms', @@ -1118,7 +1124,7 @@ def test_should_allow_sending_to_international_number_with_international_permiss 'template': str(template.id) } - auth_header = create_authorization_header(service_id=sample_service_full_permissions.id) + auth_header = create_service_authorization_header(service_id=sample_service_full_permissions.id) response = client.post( path='/notifications/sms', @@ -1140,7 +1146,7 @@ def test_should_not_allow_sms_notifications_if_service_permission_not_set( 'template': str(sample_template_without_sms_permission.id) } - auth_header = create_authorization_header(service_id=sample_template_without_sms_permission.service_id) + auth_header = create_service_authorization_header(service_id=sample_template_without_sms_permission.service_id) response = client.post( path='/notifications/sms', @@ -1167,7 +1173,7 @@ def test_should_not_allow_email_notifications_if_service_permission_not_set( 'template': str(sample_template_without_email_permission.id) } - auth_header = create_authorization_header(service_id=sample_template_without_email_permission.service_id) + auth_header = create_service_authorization_header(service_id=sample_template_without_email_permission.service_id) response = client.post( path='/notifications/email', @@ -1187,7 +1193,7 @@ def test_should_not_allow_email_notifications_if_service_permission_not_set( [("letter", "letter notification type is not supported, please use the latest version of the client"), ("apple", "apple notification type is not supported")]) def test_should_throw_exception_if_notification_type_is_invalid(client, sample_service, notification_type, err_msg): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path='/notifications/{}'.format(notification_type), data={}, @@ -1217,7 +1223,7 @@ def test_post_notification_should_set_reply_to_text(client, sample_service, mock response = client.post("/notifications/{}".format(notification_type), data=json.dumps(data), headers=[('Content-Type', 'application/json'), - create_authorization_header(service_id=sample_service.id)] + create_service_authorization_header(service_id=sample_service.id)] ) assert response.status_code == 201 notifications = Notification.query.all() diff --git a/tests/app/notifications/test_rest.py b/tests/app/notifications/test_rest.py index e92ee8f55..ef76607d0 100644 --- a/tests/app/notifications/test_rest.py +++ b/tests/app/notifications/test_rest.py @@ -9,7 +9,7 @@ from app.dao.api_key_dao import save_model_api_key from app.dao.notifications_dao import dao_update_notification from app.dao.templates_dao import dao_update_template from app.models import KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST, ApiKey -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import create_api_key, create_notification @@ -28,7 +28,7 @@ def test_get_notification_by_id( if type == 'letter': notification_to_get = sample_letter_notification - auth_header = create_authorization_header(service_id=notification_to_get.service_id) + auth_header = create_service_authorization_header(service_id=notification_to_get.service_id) response = client.get( '/notifications/{}'.format(notification_to_get.id), headers=[auth_header]) @@ -55,7 +55,7 @@ def test_get_notification_by_invalid_id(client, sample_notification, sample_emai notification_to_get = sample_email_notification if type == 'sms': notification_to_get = sample_notification - auth_header = create_authorization_header(service_id=notification_to_get.service_id) + auth_header = create_service_authorization_header(service_id=notification_to_get.service_id) response = client.get( '/notifications/{}'.format(id), @@ -65,7 +65,7 @@ def test_get_notification_by_invalid_id(client, sample_notification, sample_emai def test_get_notifications_empty_result(client, sample_api_key): - auth_header = create_authorization_header(service_id=sample_api_key.service_id) + auth_header = create_service_authorization_header(service_id=sample_api_key.service_id) response = client.get( path='/notifications/{}'.format(uuid.uuid4()), @@ -133,7 +133,7 @@ def test_get_notification_from_different_api_key_of_same_type_succeeds(client, s def test_get_all_notifications(client, sample_notification): - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( '/notifications', @@ -299,7 +299,7 @@ def test_get_all_notifications_newest_first(client, sample_email_template): notification_2 = create_notification(template=sample_email_template) notification_3 = create_notification(template=sample_email_template) - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications', @@ -314,7 +314,7 @@ def test_get_all_notifications_newest_first(client, sample_email_template): def test_should_reject_invalid_page_param(client, sample_email_template): - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?page=invalid', @@ -331,7 +331,7 @@ def test_valid_page_size_param(notify_api, sample_email_template): create_notification(sample_email_template) create_notification(sample_email_template) with notify_api.test_client() as client: - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?page=1&page_size=1', @@ -348,7 +348,7 @@ def test_invalid_page_size_param(client, sample_email_template): create_notification(sample_email_template) create_notification(sample_email_template) - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?page=1&page_size=invalid', @@ -370,7 +370,7 @@ def test_should_return_pagination_links(client, sample_email_template): notification_2 = create_notification(sample_email_template) create_notification(sample_email_template) - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?page=2', @@ -389,7 +389,7 @@ def test_should_return_pagination_links(client, sample_email_template): def test_get_all_notifications_returns_empty_list(client, sample_api_key): - auth_header = create_authorization_header(service_id=sample_api_key.service.id) + auth_header = create_service_authorization_header(service_id=sample_api_key.service.id) response = client.get( '/notifications', @@ -404,7 +404,7 @@ def test_filter_by_template_type(client, sample_template, sample_email_template) create_notification(sample_template) create_notification(sample_email_template) - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?template_type=sms', @@ -422,7 +422,7 @@ def test_filter_by_multiple_template_types(client, create_notification(sample_template) create_notification(sample_email_template) - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?template_type=sms&template_type=email', @@ -438,7 +438,7 @@ def test_filter_by_status(client, sample_email_template): create_notification(sample_email_template, status="delivered") create_notification(sample_email_template) - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?status=delivered', @@ -454,7 +454,7 @@ def test_filter_by_multiple_statuses(client, sample_email_template): create_notification(sample_email_template, status="delivered") create_notification(sample_email_template, status='sending') - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?status=delivered&status=sending', @@ -472,7 +472,7 @@ def test_filter_by_status_and_template_type(client, sample_template, sample_emai create_notification(sample_email_template) create_notification(sample_email_template, status="delivered") - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.get( '/notifications?template_type=email&status=delivered', @@ -489,7 +489,7 @@ def test_get_notification_by_id_returns_merged_template_content(client, sample_t sample_notification = create_notification(sample_template_with_placeholders, personalisation={"name": "world"}) - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( '/notifications/{}'.format(sample_notification.id), @@ -510,7 +510,7 @@ def test_get_notification_by_id_returns_merged_template_content_for_email( sample_email_template_with_placeholders, personalisation={"name": "world"} ) - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( '/notifications/{}'.format(sample_notification.id), @@ -530,7 +530,7 @@ def test_get_notifications_for_service_returns_merged_template_content(client, s with freeze_time('2001-01-01T12:00:01'): create_notification(sample_template_with_placeholders, personalisation={"name": "merged with second"}) - auth_header = create_authorization_header(service_id=sample_template_with_placeholders.service_id) + auth_header = create_service_authorization_header(service_id=sample_template_with_placeholders.service_id) response = client.get( path='/notifications', @@ -554,7 +554,7 @@ def test_get_notification_selects_correct_template_for_personalisation(client, create_notification(sample_template, personalisation={"name": "foo"}) - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.get(path='/notifications', headers=[auth_header]) diff --git a/tests/app/organisation/test_invite_rest.py b/tests/app/organisation/test_invite_rest.py index b057272eb..905fa016f 100644 --- a/tests/app/organisation/test_invite_rest.py +++ b/tests/app/organisation/test_invite_rest.py @@ -6,7 +6,7 @@ from freezegun import freeze_time from notifications_utils.url_safe_token import generate_token from app.models import INVITE_PENDING, Notification -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import create_invited_org_user @@ -192,7 +192,7 @@ def test_validate_invitation_token_returns_200_when_token_valid(client, sample_i current_app.config['DANGEROUS_SALT']) url = endpoint_format_str.format(token) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url, headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 200 @@ -205,7 +205,7 @@ def test_validate_invitation_token_for_expired_token_returns_400(client): token = generate_token(str(uuid.uuid4()), current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT']) url = '/invite/organisation/{}'.format(token) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url, headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 400 @@ -220,7 +220,7 @@ def test_validate_invitation_token_returns_400_when_invited_user_does_not_exist( token = generate_token(str(uuid.uuid4()), current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT']) url = '/invite/organisation/{}'.format(token) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url, headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 404 @@ -237,7 +237,7 @@ def test_validate_invitation_token_returns_400_when_token_is_malformed(client): )[:-2] url = '/invite/organisation/{}'.format(token) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url, headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 400 diff --git a/tests/app/provider_details/test_rest.py b/tests/app/provider_details/test_rest.py index a9847f6f3..79606b7c0 100644 --- a/tests/app/provider_details/test_rest.py +++ b/tests/app/provider_details/test_rest.py @@ -3,7 +3,7 @@ from flask import json from freezegun import freeze_time from app.models import ProviderDetails, ProviderDetailsHistory -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import create_ft_billing @@ -17,13 +17,13 @@ def test_get_provider_details_returns_all_providers(admin_request, notify_db_ses def test_get_provider_details_by_id(client, notify_db): response = client.get( '/provider-details', - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) json_resp = json.loads(response.get_data(as_text=True))['provider_details'] provider_resp = client.get( '/provider-details/{}'.format(json_resp[0]['id']), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) provider = json.loads(provider_resp.get_data(as_text=True))['provider_details'] @@ -36,7 +36,7 @@ def test_get_provider_contains_correct_fields(client, sample_template): response = client.get( '/provider-details', - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) json_resp = json.loads(response.get_data(as_text=True))['provider_details'] allowed_keys = { @@ -54,7 +54,7 @@ def test_should_be_able_to_update_priority(client, restore_provider_details): update_resp = client.post( '/provider-details/{}'.format(provider.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps({ 'priority': 5 }) @@ -71,7 +71,7 @@ def test_should_be_able_to_update_status(client, restore_provider_details): update_resp_1 = client.post( '/provider-details/{}'.format(provider.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps({ 'active': False }) @@ -93,7 +93,7 @@ def test_should_not_be_able_to_update_disallowed_fields(client, restore_provider resp = client.post( '/provider-details/{}'.format(provider.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps({field: value}) ) resp_json = json.loads(resp.get_data(as_text=True)) @@ -107,7 +107,7 @@ def test_get_provider_versions_contains_correct_fields(client, notify_db): provider = ProviderDetailsHistory.query.first() response = client.get( '/provider-details/{}/versions'.format(provider.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) json_resp = json.loads(response.get_data(as_text=True))['data'] allowed_keys = { @@ -123,7 +123,7 @@ def test_update_provider_should_store_user_id(client, restore_provider_details, update_resp_1 = client.post( '/provider-details/{}'.format(provider.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps({ 'created_by': sample_user.id, 'active': False diff --git a/tests/app/public_contracts/test_GET_notification.py b/tests/app/public_contracts/test_GET_notification.py index ccb27f4d7..65450710a 100644 --- a/tests/app/public_contracts/test_GET_notification.py +++ b/tests/app/public_contracts/test_GET_notification.py @@ -4,7 +4,7 @@ from app.v2.notifications.notification_schemas import ( get_notification_response, get_notifications_response, ) -from tests import create_authorization_header +from tests import create_service_authorization_header from . import return_json_from_response, validate, validate_v0 @@ -16,7 +16,7 @@ def _get_notification(client, notification, url): created_by=notification.service.created_by, key_type=KEY_TYPE_NORMAL )) - auth_header = create_authorization_header(service_id=notification.service_id) + auth_header = create_service_authorization_header(service_id=notification.service_id) return client.get(url, headers=[auth_header]) diff --git a/tests/app/public_contracts/test_POST_notification.py b/tests/app/public_contracts/test_POST_notification.py index 6e5621740..2396359a5 100644 --- a/tests/app/public_contracts/test_POST_notification.py +++ b/tests/app/public_contracts/test_POST_notification.py @@ -1,6 +1,6 @@ from flask import json -from tests import create_authorization_header +from tests import create_service_authorization_header from . import return_json_from_response, validate_v0 @@ -11,7 +11,7 @@ def _post_notification(client, template, url, to): 'template': str(template.id) } - auth_header = create_authorization_header(service_id=template.service_id) + auth_header = create_service_authorization_header(service_id=template.service_id) return client.post( path=url, diff --git a/tests/app/service/test_api_key_endpoints.py b/tests/app/service/test_api_key_endpoints.py index c89d47829..3e7980306 100644 --- a/tests/app/service/test_api_key_endpoints.py +++ b/tests/app/service/test_api_key_endpoints.py @@ -4,7 +4,7 @@ from flask import url_for from app.dao.api_key_dao import expire_api_key from app.models import KEY_TYPE_NORMAL, ApiKey -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import create_api_key, create_service, create_user @@ -16,7 +16,7 @@ def test_api_key_should_create_new_api_key_for_service(notify_api, sample_servic 'created_by': str(sample_service.created_by.id), 'key_type': KEY_TYPE_NORMAL } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(url_for('service.create_api_key', service_id=sample_service.id), data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) @@ -32,7 +32,7 @@ def test_api_key_should_return_error_when_service_does_not_exist(notify_api, sam with notify_api.test_client() as client: import uuid missing_service_id = uuid.uuid4() - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(url_for('service.create_api_key', service_id=missing_service_id), headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 404 @@ -44,7 +44,7 @@ def test_create_api_key_without_key_type_rejects(notify_api, sample_service): 'name': 'some secret name', 'created_by': str(sample_service.created_by.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(url_for('service.create_api_key', service_id=sample_service.id), data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) @@ -58,7 +58,7 @@ def test_revoke_should_expire_api_key_for_service(notify_api, sample_api_key): with notify_api.test_request_context(): with notify_api.test_client() as client: assert ApiKey.query.count() == 1 - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(url_for('service.revoke_api_key', service_id=sample_api_key.service_id, api_key_id=sample_api_key.id), @@ -77,7 +77,7 @@ def test_api_key_should_create_multiple_new_api_key_for_service(notify_api, samp 'created_by': str(sample_service.created_by.id), 'key_type': KEY_TYPE_NORMAL } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(url_for('service.create_api_key', service_id=sample_service.id), data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) @@ -85,7 +85,7 @@ def test_api_key_should_create_multiple_new_api_key_for_service(notify_api, samp assert ApiKey.query.count() == 1 data['name'] = 'another secret name' - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response2 = client.post(url_for('service.create_api_key', service_id=sample_service.id), data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) @@ -110,7 +110,7 @@ def test_get_api_keys_should_return_all_keys_for_service(notify_api, sample_api_ assert ApiKey.query.count() == 4 - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url_for('service.get_api_keys', service_id=sample_api_key.service_id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -122,7 +122,7 @@ def test_get_api_keys_should_return_all_keys_for_service(notify_api, sample_api_ def test_get_api_keys_should_return_one_key_for_service(notify_api, sample_api_key): with notify_api.test_request_context(): with notify_api.test_client() as client: - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url_for('service.get_api_keys', service_id=sample_api_key.service_id, key_id=sample_api_key.id), diff --git a/tests/app/service/test_archived_service.py b/tests/app/service/test_archived_service.py index 19fe479c1..b6d18dce6 100644 --- a/tests/app/service/test_archived_service.py +++ b/tests/app/service/test_archived_service.py @@ -9,24 +9,24 @@ from app.dao.api_key_dao import expire_api_key from app.dao.services_dao import dao_archive_service, dao_fetch_service_by_id from app.dao.templates_dao import dao_update_template from app.models import Service -from tests import create_authorization_header, unwrap_function +from tests import create_admin_authorization_header, unwrap_function from tests.app.db import create_api_key, create_template def test_archive_only_allows_post(client, notify_db_session): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get('/service/{}/archive'.format(uuid.uuid4()), headers=[auth_header]) assert response.status_code == 405 def test_archive_service_errors_with_bad_service_id(client, notify_db_session): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post('/service/{}/archive'.format(uuid.uuid4()), headers=[auth_header]) assert response.status_code == 404 def test_deactivating_inactive_service_does_nothing(client, sample_service): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() sample_service.active = False response = client.post('/service/{}/archive'.format(sample_service.id), headers=[auth_header]) assert response.status_code == 204 @@ -42,7 +42,7 @@ def archived_service(client, notify_db, sample_service): notify_db.session.commit() - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post('/service/{}/archive'.format(sample_service.id), headers=[auth_header]) assert response.status_code == 204 assert response.data == b'' @@ -51,7 +51,7 @@ def archived_service(client, notify_db, sample_service): @freeze_time('2018-07-07 12:00:00') def test_deactivating_service_changes_name_and_email(client, sample_service): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() client.post('/service/{}/archive'.format(sample_service.id), headers=[auth_header]) archived_service = dao_fetch_service_by_id(sample_service.id) @@ -98,7 +98,7 @@ def archived_service_with_deleted_stuff(client, sample_service): dao_update_template(template) with freeze_time('2002-02-02'): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post('/service/{}/archive'.format(sample_service.id), headers=[auth_header]) assert response.status_code == 204 diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index f93a5ecc3..9d0c64696 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -45,7 +45,7 @@ from app.models import ( ServiceSmsSender, User, ) -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import ( create_annual_billing, create_api_key, @@ -76,7 +76,7 @@ def test_get_service_list(client, service_factory): service_factory.get('one') service_factory.get('two') service_factory.get('three') - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( '/service', headers=[auth_header] @@ -95,7 +95,7 @@ def test_get_service_list_with_only_active_flag(client, service_factory): inactive.active = False - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( '/service?only_active=True', headers=[auth_header] @@ -359,7 +359,7 @@ def test_get_service_by_id_should_404_if_no_service(admin_request, notify_db_ses def test_get_service_by_id_and_user(client, sample_service, sample_user): sample_service.reply_to_email = 'something@service.com' create_reply_to_email(service=sample_service, email_address='new@service.com') - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get( '/service/{}?user_id={}'.format(sample_service.id, sample_user.id), headers=[auth_header] @@ -374,7 +374,7 @@ def test_get_service_by_id_should_404_if_no_service_for_user(notify_api, sample_ with notify_api.test_request_context(): with notify_api.test_client() as client: service_id = str(uuid.uuid4()) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get( '/service/{}?user_id={}'.format(service_id, sample_user.id), headers=[auth_header] @@ -570,7 +570,7 @@ def test_should_not_create_service_with_missing_user_id_field(notify_api, fake_u 'active': False, 'created_by': str(fake_uuid) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( '/service', @@ -593,7 +593,7 @@ def test_should_error_if_created_by_missing(notify_api, sample_user): 'active': False, 'user_id': str(sample_user.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( '/service', @@ -620,7 +620,7 @@ def test_should_not_create_service_with_missing_if_user_id_is_not_in_database(no 'active': False, 'created_by': str(fake_uuid) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( '/service', @@ -638,7 +638,7 @@ def test_should_not_create_service_if_missing_data(notify_api, sample_user): data = { 'user_id': str(sample_user.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( '/service', @@ -666,7 +666,7 @@ def test_should_not_create_service_with_duplicate_name(notify_api, 'email_from': 'sample.service2', 'created_by': str(sample_user.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( '/service', @@ -693,7 +693,7 @@ def test_create_service_should_throw_duplicate_key_constraint_for_existing_email 'email_from': 'first.service', 'created_by': str(sample_user.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( '/service', @@ -719,7 +719,7 @@ def test_update_service(client, notify_db, sample_service): 'organisation_type': 'school_or_college', } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}'.format(sample_service.id), @@ -742,7 +742,7 @@ def test_cant_update_service_org_type_to_random_value(client, sample_service): 'organisation_type': 'foo', } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}'.format(sample_service.id), @@ -758,7 +758,7 @@ def test_update_service_letter_branding(client, notify_db, sample_service): 'letter_branding': str(letter_branding.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}'.format(sample_service.id), @@ -777,7 +777,7 @@ def test_update_service_remove_letter_branding(client, notify_db, sample_service 'letter_branding': str(letter_branding.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() client.post( '/service/{}'.format(sample_service.id), @@ -828,7 +828,7 @@ def test_update_service_change_email_branding(admin_request, notify_db, sample_s def test_update_service_flags(client, sample_service): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get( '/service/{}'.format(sample_service.id), headers=[auth_header] @@ -843,7 +843,7 @@ def test_update_service_flags(client, sample_service): 'permissions': [LETTER_TYPE, INTERNATIONAL_SMS_TYPE] } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}'.format(sample_service.id), @@ -915,7 +915,7 @@ def service_with_no_permissions(notify_db, notify_db_session): def test_update_service_flags_with_service_without_default_service_permissions(client, service_with_no_permissions): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() data = { 'permissions': [LETTER_TYPE, INTERNATIONAL_SMS_TYPE], } @@ -932,7 +932,7 @@ def test_update_service_flags_with_service_without_default_service_permissions(c def test_update_service_flags_will_remove_service_permissions(client, notify_db, notify_db_session): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() service = create_service(service_permissions=[SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE]) @@ -957,7 +957,7 @@ def test_update_service_flags_will_remove_service_permissions(client, notify_db, def test_update_permissions_will_override_permission_flags(client, service_with_no_permissions): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() data = { 'permissions': [LETTER_TYPE, INTERNATIONAL_SMS_TYPE] @@ -975,7 +975,7 @@ def test_update_permissions_will_override_permission_flags(client, service_with_ def test_update_service_permissions_will_add_service_permissions(client, sample_service): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() data = { 'permissions': [EMAIL_TYPE, SMS_TYPE, LETTER_TYPE] @@ -1005,7 +1005,7 @@ def test_update_service_permissions_will_add_service_permissions(client, sample_ ] ) def test_add_service_permission_will_add_permission(client, service_with_no_permissions, permission_to_add): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() data = { 'permissions': [permission_to_add] @@ -1024,7 +1024,7 @@ def test_add_service_permission_will_add_permission(client, service_with_no_perm def test_update_permissions_with_an_invalid_permission_will_raise_error(client, sample_service): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() invalid_permission = 'invalid_permission' data = { @@ -1044,7 +1044,7 @@ def test_update_permissions_with_an_invalid_permission_will_raise_error(client, def test_update_permissions_with_duplicate_permissions_will_raise_error(client, sample_service): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() data = { 'permissions': [EMAIL_TYPE, SMS_TYPE, LETTER_TYPE, LETTER_TYPE] @@ -1065,7 +1065,7 @@ def test_update_permissions_with_duplicate_permissions_will_raise_error(client, def test_update_service_research_mode_throws_validation_error(notify_api, sample_service): with notify_api.test_request_context(): with notify_api.test_client() as client: - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get( '/service/{}'.format(sample_service.id), headers=[auth_header] @@ -1079,7 +1079,7 @@ def test_update_service_research_mode_throws_validation_error(notify_api, sample 'research_mode': "dedede" } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}'.format(sample_service.id), @@ -1108,7 +1108,7 @@ def test_should_not_update_service_with_duplicate_name(notify_api, 'created_by': str(service.created_by.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}'.format(sample_service.id), @@ -1140,7 +1140,7 @@ def test_should_not_update_service_with_duplicate_email_from(notify_api, 'created_by': str(service.created_by.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}'.format(sample_service.id), @@ -1165,7 +1165,7 @@ def test_update_service_should_404_if_id_is_invalid(notify_api): missing_service_id = uuid.uuid4() - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}'.format(missing_service_id), @@ -1179,7 +1179,7 @@ def test_get_users_by_service(notify_api, sample_service): with notify_api.test_request_context(): with notify_api.test_client() as client: user_on_service = sample_service.users[0] - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get( '/service/{}/users'.format(sample_service.id), @@ -1199,7 +1199,7 @@ def test_get_users_for_service_returns_empty_list_if_no_users_associated_with_se with notify_api.test_request_context(): with notify_api.test_client() as client: dao_remove_user_from_service(sample_service, sample_service.users[0]) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( '/service/{}/users'.format(sample_service.id), @@ -1214,7 +1214,7 @@ def test_get_users_for_service_returns_404_when_service_does_not_exist(notify_ap with notify_api.test_request_context(): with notify_api.test_client() as client: service_id = uuid.uuid4() - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( '/service/{}/users'.format(service_id), @@ -1242,7 +1242,7 @@ def test_default_permissions_are_added_for_user_service(notify_api, 'email_from': 'created.service', 'created_by': str(sample_user.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( '/service', @@ -1254,14 +1254,14 @@ def test_default_permissions_are_added_for_user_service(notify_api, assert json_resp['data']['name'] == 'created service' assert json_resp['data']['email_from'] == 'created.service' - auth_header_fetch = create_authorization_header() + auth_header_fetch = create_admin_authorization_header() resp = client.get( '/service/{}?user_id={}'.format(json_resp['data']['id'], sample_user.id), headers=[auth_header_fetch] ) assert resp.status_code == 200 - header = create_authorization_header() + header = create_admin_authorization_header() response = client.get( url_for('user.get_user', user_id=sample_user.id), headers=[header]) @@ -1283,7 +1283,7 @@ def test_add_existing_user_to_another_service_with_all_permissions( with notify_api.test_client() as client: # check which users part of service user_already_in_service = sample_service.users[0] - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get( '/service/{}/users'.format(sample_service.id), @@ -1319,7 +1319,7 @@ def test_add_existing_user_to_another_service_with_all_permissions( "folder_permissions": [] } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/users/{}'.format(sample_service.id, user_to_add.id), @@ -1330,7 +1330,7 @@ def test_add_existing_user_to_another_service_with_all_permissions( assert resp.status_code == 201 # check new user added to service - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get( '/service/{}'.format(sample_service.id), @@ -1340,7 +1340,7 @@ def test_add_existing_user_to_another_service_with_all_permissions( json_resp = resp.json # check user has all permissions - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get(url_for('user.get_user', user_id=user_to_add.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -1377,7 +1377,7 @@ def test_add_existing_user_to_another_service_with_send_permissions(notify_api, "folder_permissions": [] } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/users/{}'.format(sample_service.id, user_to_add.id), @@ -1388,7 +1388,7 @@ def test_add_existing_user_to_another_service_with_send_permissions(notify_api, assert resp.status_code == 201 # check user has send permissions - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get(url_for('user.get_user', user_id=user_to_add.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -1424,7 +1424,7 @@ def test_add_existing_user_to_another_service_with_manage_permissions(notify_api ] } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/users/{}'.format(sample_service.id, user_to_add.id), @@ -1435,7 +1435,7 @@ def test_add_existing_user_to_another_service_with_manage_permissions(notify_api assert resp.status_code == 201 # check user has send permissions - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get(url_for('user.get_user', user_id=user_to_add.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -1471,7 +1471,7 @@ def test_add_existing_user_to_another_service_with_folder_permissions(notify_api "folder_permissions": [str(folder_1.id), str(folder_2.id)] } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/users/{}'.format(sample_service.id, user_to_add.id), @@ -1506,7 +1506,7 @@ def test_add_existing_user_to_another_service_with_manage_api_keys(notify_api, data = {"permissions": [{"permission": "manage_api_keys"}]} - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/users/{}'.format(sample_service.id, user_to_add.id), @@ -1517,7 +1517,7 @@ def test_add_existing_user_to_another_service_with_manage_api_keys(notify_api, assert resp.status_code == 201 # check user has send permissions - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get(url_for('user.get_user', user_id=user_to_add.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -1546,7 +1546,7 @@ def test_add_existing_user_to_non_existing_service_returns404(notify_api, incorrect_id = uuid.uuid4() data = {'permissions': ['send_messages', 'manage_service', 'manage_api_keys']} - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/users/{}'.format(incorrect_id, user_to_add.id), @@ -1568,7 +1568,7 @@ def test_add_existing_user_of_service_to_service_returns400(notify_api, notify_d existing_user_id = sample_service.users[0].id data = {'permissions': ['send_messages', 'manage_service', 'manage_api_keys']} - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/users/{}'.format(sample_service.id, existing_user_id), @@ -1590,7 +1590,7 @@ def test_add_unknown_user_to_service_returns404(notify_api, notify_db, notify_db incorrect_id = 9876 data = {'permissions': ['send_messages', 'manage_service', 'manage_api_keys']} - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/users/{}'.format(sample_service.id, incorrect_id), @@ -1623,7 +1623,7 @@ def test_remove_user_from_service( 'service.remove_user_from_service', service_id=str(service.id), user_id=str(second_user.id)) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.delete( endpoint, headers=[('Content-Type', 'application/json'), auth_header]) @@ -1638,7 +1638,7 @@ def test_remove_non_existant_user_from_service( 'service.remove_user_from_service', service_id=str(sample_user_service_permission.service.id), user_id=str(second_user.id)) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.delete( endpoint, headers=[('Content-Type', 'application/json'), auth_header]) @@ -1655,7 +1655,7 @@ def test_cannot_remove_only_user_from_service(notify_api, 'service.remove_user_from_service', service_id=str(sample_user_service_permission.service.id), user_id=str(sample_user_service_permission.user.id)) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.delete( endpoint, headers=[('Content-Type', 'application/json'), auth_header]) @@ -1669,7 +1669,7 @@ def test_cannot_remove_only_user_from_service(notify_api, def test_get_service_and_api_key_history(notify_api, sample_service, sample_api_key): with notify_api.test_request_context(): with notify_api.test_client() as client: - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( path='/service/{}/history'.format(sample_service.id), headers=[auth_header] @@ -1696,7 +1696,7 @@ def test_get_all_notifications_for_service_in_order(notify_api, notify_db_sessio notification_2 = create_notification(service_1_template) notification_3 = create_notification(service_1_template) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( path='/service/{}/notifications'.format(service_1.id), @@ -1712,7 +1712,7 @@ def test_get_all_notifications_for_service_in_order(notify_api, notify_db_sessio def test_get_all_notifications_for_service_formatted_for_csv(client, sample_template): notification = create_notification(template=sample_template) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( path='/service/{}/notifications?format_for_csv=True'.format(sample_template.service_id), @@ -1732,7 +1732,7 @@ def test_get_notification_for_service_without_uuid(client, notify_db, notify_db_ service_1 = create_service(service_name="1", email_from='1') response = client.get( path='/service/{}/notifications/{}'.format(service_1.id, 'foo'), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert response.status_code == 404 @@ -1755,7 +1755,7 @@ def test_get_notification_for_service(client, notify_db_session): for notification in service_1_notifications: response = client.get( path='/service/{}/notifications/{}'.format(service_1.id, notification.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) resp = json.loads(response.get_data(as_text=True)) assert str(resp['id']) == str(notification.id) @@ -1763,7 +1763,7 @@ def test_get_notification_for_service(client, notify_db_session): service_2_response = client.get( path='/service/{}/notifications/{}'.format(service_2.id, notification.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert service_2_response.status_code == 404 service_2_response = json.loads(service_2_response.get_data(as_text=True)) @@ -1824,7 +1824,7 @@ def test_get_all_notifications_for_service_including_ones_made_by_jobs( # notification from_test_api_key create_notification(sample_template, key_type=KEY_TYPE_TEST) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( path='/service/{}/notifications?include_from_test_key={}'.format( @@ -1903,7 +1903,7 @@ def test_prefixing_messages_based_on_prefix_sms( 'service.get_service_by_id', service_id=service.id ), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) service = json.loads(result.get_data(as_text=True))['data'] assert service['prefix_sms'] == should_prefix @@ -1953,7 +1953,7 @@ def test_get_detailed_service(sample_template, notify_api, sample_service, today create_notification(template=sample_template, status='created') resp = client.get( '/service/{}?detailed=True&today_only={}'.format(sample_service.id, today_only), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert resp.status_code == 200 @@ -1972,7 +1972,7 @@ def test_get_services_with_detailed_flag(client, sample_template): ] resp = client.get( '/service?detailed=True', - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert resp.status_code == 200 @@ -1997,7 +1997,7 @@ def test_get_services_with_detailed_flag_excluding_from_test_key(notify_api, sam with notify_api.test_request_context(), notify_api.test_client() as client: resp = client.get( '/service?detailed=True&include_from_test_key=False', - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert resp.status_code == 200 @@ -2014,7 +2014,7 @@ def test_get_services_with_detailed_flag_accepts_date_range(client, mocker): mock_get_detailed_services = mocker.patch('app.service.rest.get_detailed_services', return_value={}) resp = client.get( url_for('service.get_services', detailed=True, start_date='2001-01-01', end_date='2002-02-02'), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) mock_get_detailed_services.assert_called_once_with( @@ -2031,7 +2031,7 @@ def test_get_services_with_detailed_flag_defaults_to_today(client, mocker): mock_get_detailed_services = mocker.patch('app.service.rest.get_detailed_services', return_value={}) resp = client.get( url_for('service.get_services', detailed=True), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) mock_get_detailed_services.assert_called_once_with( @@ -2165,7 +2165,7 @@ def test_search_for_notification_by_to_field(client, sample_template, sample_ema response = client.get( '/service/{}/notifications?to={}&template_type={}'.format(notification1.service_id, 'jack@gmail.com', 'email'), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] @@ -2182,7 +2182,7 @@ def test_search_for_notification_by_to_field_return_empty_list_if_there_is_no_ma response = client.get( '/service/{}/notifications?to={}&template_type={}'.format(notification1.service_id, '+447700900800', 'sms'), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] @@ -2199,7 +2199,7 @@ def test_search_for_notification_by_to_field_return_multiple_matches(client, sam response = client.get( '/service/{}/notifications?to={}&template_type={}'.format(notification1.service_id, '+447700900855', 'sms'), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] notification_ids = [notification['id'] for notification in notifications] @@ -2221,7 +2221,7 @@ def test_search_for_notification_by_to_field_returns_next_link_if_more_than_50( response = client.get( '/service/{}/notifications?to={}&template_type={}'.format(sample_template.service_id, '+447700900855', 'sms'), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert response.status_code == 200 response_json = json.loads(response.get_data(as_text=True)) @@ -2246,7 +2246,7 @@ def test_search_for_notification_by_to_field_for_letter( '/service/{}/notifications?to={}&template_type={}'.format( sample_letter_template.service_id, 'A. Name', 'letter', ), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] @@ -2264,7 +2264,7 @@ def test_update_service_calls_send_notification_as_service_becomes_live(notify_d "restricted": False } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( 'service/{}'.format(restricted_service.id), data=json.dumps(data), @@ -2291,7 +2291,7 @@ def test_update_service_does_not_call_send_notification_for_live_service(sample_ "restricted": True } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( 'service/{}'.format(sample_service.id), data=json.dumps(data), @@ -2310,7 +2310,7 @@ def test_update_service_does_not_call_send_notification_when_restricted_not_chan "name": 'Name of service' } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( 'service/{}'.format(sample_service.id), data=json.dumps(data), @@ -2331,7 +2331,7 @@ def test_search_for_notification_by_to_field_filters_by_status(client, sample_te '/service/{}/notifications?to={}&status={}&template_type={}'.format( notification1.service_id, '+447700900855', 'delivered', 'sms' ), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] notification_ids = [notification['id'] for notification in notifications] @@ -2357,7 +2357,7 @@ def test_search_for_notification_by_to_field_filters_by_statuses(client, sample_ '/service/{}/notifications?to={}&status={}&status={}&template_type={}'.format( notification1.service_id, '+447700900855', 'delivered', 'sending', 'sms' ), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] notification_ids = [notification['id'] for notification in notifications] @@ -2383,7 +2383,7 @@ def test_search_for_notification_by_to_field_returns_content( '/service/{}/notifications?to={}&template_type={}'.format( sample_template_with_placeholders.service_id, '+447700900855', 'sms' ), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] assert response.status_code == 200 @@ -2430,7 +2430,7 @@ def test_create_pdf_letter(mocker, sample_service_full_permissions, client, fake response = client.post( url_for('service.create_pdf_letter', service_id=sample_service_full_permissions.id), data=data, - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) json_resp = json.loads(response.get_data(as_text=True)) @@ -2464,7 +2464,7 @@ def test_create_pdf_letter_validates_against_json_schema( response = client.post( url_for('service.create_pdf_letter', service_id=sample_service_full_permissions.id), data=json.dumps(post_data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) json_resp = json.loads(response.get_data(as_text=True)) @@ -2559,7 +2559,7 @@ def test_search_for_notification_by_to_field_returns_personlisation( '/service/{}/notifications?to={}&template_type={}'.format( sample_template_with_placeholders.service_id, '+447700900855', 'sms' ), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] @@ -2582,7 +2582,7 @@ def test_search_for_notification_by_to_field_returns_notifications_by_type( sms_notification.service_id, '0770', 'sms' ), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) notifications = json.loads(response.get_data(as_text=True))['notifications'] @@ -2686,7 +2686,7 @@ def test_is_service_name_unique_returns_400_when_name_does_not_exist(admin_reque def test_get_email_reply_to_addresses_when_there_are_no_reply_to_email_addresses(client, sample_service): response = client.get('/service/{}/email-reply-to'.format(sample_service.id), - headers=[create_authorization_header()]) + headers=[create_admin_authorization_header()]) assert json.loads(response.get_data(as_text=True)) == [] assert response.status_code == 200 @@ -2697,7 +2697,7 @@ def test_get_email_reply_to_addresses_with_one_email_address(client, notify_db, create_reply_to_email(service, 'test@mail.com') response = client.get('/service/{}/email-reply-to'.format(service.id), - headers=[create_authorization_header()]) + headers=[create_admin_authorization_header()]) json_response = json.loads(response.get_data(as_text=True)) assert len(json_response) == 1 @@ -2714,7 +2714,7 @@ def test_get_email_reply_to_addresses_with_multiple_email_addresses(client, noti reply_to_b = create_reply_to_email(service, 'test_b@mail.com', False) response = client.get('/service/{}/email-reply-to'.format(service.id), - headers=[create_authorization_header()]) + headers=[create_admin_authorization_header()]) json_response = json.loads(response.get_data(as_text=True)) assert len(json_response) == 2 @@ -2928,7 +2928,7 @@ def test_get_email_reply_to_address(client, notify_db, notify_db_session): reply_to = create_reply_to_email(service, 'test_a@mail.com') response = client.get('/service/{}/email-reply-to/{}'.format(service.id, reply_to.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == reply_to.serialize() @@ -2936,7 +2936,7 @@ def test_get_email_reply_to_address(client, notify_db, notify_db_session): def test_get_letter_contacts_when_there_are_no_letter_contacts(client, sample_service): response = client.get('/service/{}/letter-contact'.format(sample_service.id), - headers=[create_authorization_header()]) + headers=[create_admin_authorization_header()]) assert json.loads(response.get_data(as_text=True)) == [] assert response.status_code == 200 @@ -2947,7 +2947,7 @@ def test_get_letter_contacts_with_one_letter_contact(client, notify_db, notify_d create_letter_contact(service, 'Aberdeen, AB23 1XH') response = client.get('/service/{}/letter-contact'.format(service.id), - headers=[create_authorization_header()]) + headers=[create_admin_authorization_header()]) json_response = json.loads(response.get_data(as_text=True)) assert len(json_response) == 1 @@ -2964,7 +2964,7 @@ def test_get_letter_contacts_with_multiple_letter_contacts(client, notify_db, no letter_contact_b = create_letter_contact(service, 'London, E1 8QS', False) response = client.get('/service/{}/letter-contact'.format(service.id), - headers=[create_authorization_header()]) + headers=[create_admin_authorization_header()]) json_response = json.loads(response.get_data(as_text=True)) assert len(json_response) == 2 @@ -2990,7 +2990,7 @@ def test_get_letter_contact_by_id(client, notify_db, notify_db_session): letter_contact = create_letter_contact(service, 'London, E1 8QS') response = client.get('/service/{}/letter-contact/{}'.format(service.id, letter_contact.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == letter_contact.serialize() @@ -3000,7 +3000,7 @@ def test_get_letter_contact_return_404_when_invalid_contact_id(client, notify_db service = create_service() response = client.get('/service/{}/letter-contact/{}'.format(service.id, '93d59f88-4aa1-453c-9900-f61e2fc8a2de'), - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 404 @@ -3009,7 +3009,7 @@ def test_add_service_contact_block(client, sample_service): data = json.dumps({"contact_block": "London, E1 8QS", "is_default": True}) response = client.post('/service/{}/letter-contact'.format(sample_service.id), data=data, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 201 json_resp = json.loads(response.get_data(as_text=True)) @@ -3022,12 +3022,12 @@ def test_add_service_letter_contact_can_add_multiple_addresses(client, sample_se first = json.dumps({"contact_block": "London, E1 8QS", "is_default": True}) client.post('/service/{}/letter-contact'.format(sample_service.id), data=first, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) second = json.dumps({"contact_block": "Aberdeen, AB23 1XH", "is_default": True}) response = client.post('/service/{}/letter-contact'.format(sample_service.id), data=second, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 201 json_resp = json.loads(response.get_data(as_text=True)) results = ServiceLetterContact.query.all() @@ -3042,14 +3042,14 @@ def test_add_service_letter_contact_block_fine_if_no_default(client, sample_serv data = json.dumps({"contact_block": "London, E1 8QS", "is_default": False}) response = client.post('/service/{}/letter-contact'.format(sample_service.id), data=data, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 201 def test_add_service_letter_contact_block_404s_when_invalid_service_id(client, notify_db, notify_db_session): response = client.post('/service/{}/letter-contact'.format(uuid.uuid4()), data={}, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 404 result = json.loads(response.get_data(as_text=True)) @@ -3062,7 +3062,7 @@ def test_update_service_letter_contact(client, sample_service): data = json.dumps({"contact_block": "London, E1 8QS", "is_default": True}) response = client.post('/service/{}/letter-contact/{}'.format(sample_service.id, original_letter_contact.id), data=data, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 200 json_resp = json.loads(response.get_data(as_text=True)) @@ -3076,14 +3076,14 @@ def test_update_service_letter_contact_returns_200_when_no_default(client, sampl data = json.dumps({"contact_block": "London, E1 8QS", "is_default": False}) response = client.post('/service/{}/letter-contact/{}'.format(sample_service.id, original_reply_to.id), data=data, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 200 def test_update_service_letter_contact_returns_404_when_invalid_service_id(client, notify_db, notify_db_session): response = client.post('/service/{}/letter-contact/{}'.format(uuid.uuid4(), uuid.uuid4()), data={}, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert response.status_code == 404 result = json.loads(response.get_data(as_text=True)) @@ -3128,7 +3128,7 @@ def test_add_service_sms_sender_can_add_multiple_senders(client, notify_db_sessi } response = client.post('/service/{}/sms-sender'.format(service.id), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 201 resp_json = json.loads(response.get_data(as_text=True)) @@ -3150,7 +3150,7 @@ def test_add_service_sms_sender_when_it_is_an_inbound_number_updates_the_only_ex } response = client.post('/service/{}/sms-sender'.format(service.id), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 201 updated_number = InboundNumber.query.get(inbound_number.id) @@ -3176,7 +3176,7 @@ def test_add_service_sms_sender_when_it_is_an_inbound_number_inserts_new_sms_sen } response = client.post('/service/{}/sms-sender'.format(service.id), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 201 updated_number = InboundNumber.query.get(inbound_number.id) @@ -3198,7 +3198,7 @@ def test_add_service_sms_sender_switches_default(client, notify_db_session): } response = client.post('/service/{}/sms-sender'.format(service.id), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 201 resp_json = json.loads(response.get_data(as_text=True)) @@ -3216,7 +3216,7 @@ def test_add_service_sms_sender_return_404_when_service_does_not_exist(client): } response = client.post('/service/{}/sms-sender'.format(uuid.uuid4()), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 404 result = json.loads(response.get_data(as_text=True)) @@ -3233,7 +3233,7 @@ def test_update_service_sms_sender(client, notify_db_session): } response = client.post('/service/{}/sms-sender/{}'.format(service.id, service_sms_sender.id), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 200 resp_json = json.loads(response.get_data(as_text=True)) @@ -3251,7 +3251,7 @@ def test_update_service_sms_sender_switches_default(client, notify_db_session): } response = client.post('/service/{}/sms-sender/{}'.format(service.id, service_sms_sender.id), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 200 resp_json = json.loads(response.get_data(as_text=True)) @@ -3276,7 +3276,7 @@ def test_update_service_sms_sender_does_not_allow_sender_update_for_inbound_numb } response = client.post('/service/{}/sms-sender/{}'.format(service.id, service_sms_sender.id), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 400 @@ -3288,7 +3288,7 @@ def test_update_service_sms_sender_return_404_when_service_does_not_exist(client } response = client.post('/service/{}/sms-sender/{}'.format(uuid.uuid4(), uuid.uuid4()), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 404 result = json.loads(response.get_data(as_text=True)) @@ -3330,7 +3330,7 @@ def test_get_service_sms_sender_by_id(client, notify_db_session): sms_sender='1235', is_default=False) response = client.get('/service/{}/sms-sender/{}'.format(service_sms_sender.service_id, service_sms_sender.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == service_sms_sender.serialize() @@ -3341,7 +3341,7 @@ def test_get_service_sms_sender_by_id_returns_404_when_service_does_not_exist(cl sms_sender='1235', is_default=False) response = client.get('/service/{}/sms-sender/{}'.format(uuid.uuid4(), service_sms_sender.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 404 @@ -3349,7 +3349,7 @@ def test_get_service_sms_sender_by_id_returns_404_when_service_does_not_exist(cl def test_get_service_sms_sender_by_id_returns_404_when_sms_sender_does_not_exist(client, notify_db_session): service = create_service() response = client.get('/service/{}/sms-sender/{}'.format(service.id, uuid.uuid4()), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 404 @@ -3359,7 +3359,7 @@ def test_get_service_sms_senders_for_service(client, notify_db_session): sms_sender='second', is_default=False) response = client.get('/service/{}/sms-sender'.format(service_sms_sender.service_id), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 200 json_resp = json.loads(response.get_data(as_text=True)) @@ -3372,7 +3372,7 @@ def test_get_service_sms_senders_for_service(client, notify_db_session): def test_get_service_sms_senders_for_service_returns_empty_list_when_service_does_not_exist(client): response = client.get('/service/{}/sms-sender'.format(uuid.uuid4()), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == [] diff --git a/tests/app/service/test_service_data_retention_rest.py b/tests/app/service/test_service_data_retention_rest.py index dbd7fe196..97fbdfd91 100644 --- a/tests/app/service/test_service_data_retention_rest.py +++ b/tests/app/service/test_service_data_retention_rest.py @@ -2,7 +2,7 @@ import json import uuid from app.models import ServiceDataRetention -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import create_service_data_retention @@ -15,7 +15,7 @@ def test_get_service_data_retention(client, sample_service): response = client.get( '/service/{}/data-retention'.format(str(sample_service.id)), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], ) assert response.status_code == 200 @@ -29,7 +29,7 @@ def test_get_service_data_retention(client, sample_service): def test_get_service_data_retention_returns_empty_list(client, sample_service): response = client.get( '/service/{}/data-retention'.format(str(sample_service.id)), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], ) assert response.status_code == 200 assert len(json.loads(response.get_data(as_text=True))) == 0 @@ -38,7 +38,7 @@ def test_get_service_data_retention_returns_empty_list(client, sample_service): def test_get_data_retention_for_service_notification_type(client, sample_service): data_retention = create_service_data_retention(service=sample_service) response = client.get('/service/{}/data-retention/notification-type/{}'.format(sample_service.id, 'sms'), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], ) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == data_retention.serialize() @@ -52,7 +52,7 @@ def test_get_service_data_retention_by_id(client, sample_service): days_of_retention=30) response = client.get( '/service/{}/data-retention/{}'.format(str(sample_service.id), sms_data_retention.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], ) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == sms_data_retention.serialize() @@ -61,7 +61,7 @@ def test_get_service_data_retention_by_id(client, sample_service): def test_get_service_data_retention_by_id_returns_none_when_no_data_retention_exists(client, sample_service): response = client.get( '/service/{}/data-retention/{}'.format(str(sample_service.id), uuid.uuid4()), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], ) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == {} @@ -74,7 +74,7 @@ def test_create_service_data_retention(client, sample_service): } response = client.post( '/service/{}/data-retention'.format(str(sample_service.id)), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps(data) ) @@ -93,7 +93,7 @@ def test_create_service_data_retention_returns_400_when_notification_type_is_inv } response = client.post( '/service/{}/data-retention'.format(str(uuid.uuid4())), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps(data) ) json_resp = json.loads(response.get_data(as_text=True)) @@ -112,7 +112,7 @@ def test_create_service_data_retention_returns_400_when_data_retention_for_notif } response = client.post( '/service/{}/data-retention'.format(str(uuid.uuid4())), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps(data) ) @@ -129,7 +129,7 @@ def test_modify_service_data_retention(client, sample_service): } response = client.post( '/service/{}/data-retention/{}'.format(sample_service.id, data_retention.id), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps(data) ) assert response.status_code == 204 @@ -142,7 +142,7 @@ def test_modify_service_data_retention_returns_400_when_data_retention_does_not_ } response = client.post( '/service/{}/data-retention/{}'.format(sample_service.id, uuid.uuid4()), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps(data) ) @@ -155,7 +155,7 @@ def test_modify_service_data_retention_returns_400_when_data_is_invalid(client): } response = client.post( '/service/{}/data-retention/{}'.format(uuid.uuid4(), uuid.uuid4()), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps(data) ) assert response.status_code == 400 diff --git a/tests/app/service/test_service_guest_list.py b/tests/app/service/test_service_guest_list.py index 54af1ebaa..344777d26 100644 --- a/tests/app/service/test_service_guest_list.py +++ b/tests/app/service/test_service_guest_list.py @@ -5,13 +5,13 @@ from app.dao.service_guest_list_dao import ( dao_add_and_commit_guest_list_contacts, ) from app.models import EMAIL_TYPE, MOBILE_TYPE, ServiceGuestList -from tests import create_authorization_header +from tests import create_admin_authorization_header def test_get_guest_list_returns_data(client, sample_service_guest_list): service_id = sample_service_guest_list.service_id - response = client.get(f'service/{service_id}/guest-list', headers=[create_authorization_header()]) + response = client.get(f'service/{service_id}/guest-list', headers=[create_admin_authorization_header()]) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == { 'email_addresses': [sample_service_guest_list.recipient], @@ -26,7 +26,9 @@ def test_get_guest_list_separates_emails_and_phones(client, sample_service): ServiceGuestList.from_string(sample_service.id, MOBILE_TYPE, '+1800-555-555'), ]) - response = client.get('service/{}/guest-list'.format(sample_service.id), headers=[create_authorization_header()]) + response = client.get( + 'service/{}/guest-list'.format(sample_service.id), headers=[create_admin_authorization_header()] + ) assert response.status_code == 200 json_resp = json.loads(response.get_data(as_text=True)) assert json_resp['email_addresses'] == ['service@example.com'] @@ -36,7 +38,7 @@ def test_get_guest_list_separates_emails_and_phones(client, sample_service): def test_get_guest_list_404s_with_unknown_service_id(client): path = 'service/{}/guest-list'.format(uuid.uuid4()) - response = client.get(path, headers=[create_authorization_header()]) + response = client.get(path, headers=[create_admin_authorization_header()]) assert response.status_code == 404 json_resp = json.loads(response.get_data(as_text=True)) assert json_resp['result'] == 'error' @@ -46,7 +48,7 @@ def test_get_guest_list_404s_with_unknown_service_id(client): def test_get_guest_list_returns_no_data(client, sample_service): path = 'service/{}/guest-list'.format(sample_service.id) - response = client.get(path, headers=[create_authorization_header()]) + response = client.get(path, headers=[create_admin_authorization_header()]) assert response.status_code == 200 assert json.loads(response.get_data(as_text=True)) == {'email_addresses': [], 'phone_numbers': []} @@ -61,7 +63,7 @@ def test_update_guest_list_replaces_old_guest_list(client, sample_service_guest_ response = client.put( f'service/{sample_service_guest_list.service_id}/guest-list', data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 204 @@ -81,7 +83,7 @@ def test_update_guest_list_doesnt_remove_old_guest_list_if_error(client, sample_ response = client.put( 'service/{}/guest-list'.format(sample_service_guest_list.service_id), data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header()] + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()] ) assert response.status_code == 400 diff --git a/tests/app/service/test_suspend_resume_service.py b/tests/app/service/test_suspend_resume_service.py index c66b8b6e0..1ab69833c 100644 --- a/tests/app/service/test_suspend_resume_service.py +++ b/tests/app/service/test_suspend_resume_service.py @@ -5,12 +5,12 @@ import pytest from freezegun import freeze_time from app.models import Service -from tests import create_authorization_header +from tests import create_admin_authorization_header @pytest.mark.parametrize("endpoint", ["suspend", "resume"]) def test_only_allows_post(client, endpoint): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get("/service/{}/{}".format(uuid.uuid4(), endpoint), headers=[auth_header]) assert response.status_code == 405 @@ -18,7 +18,7 @@ def test_only_allows_post(client, endpoint): @pytest.mark.parametrize("endpoint", ["suspend", "resume"]) def test_returns_404_when_service_does_not_exist(client, endpoint): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post("/service/{}/{}".format(uuid.uuid4(), endpoint), headers=[auth_header]) assert response.status_code == 404 @@ -28,7 +28,7 @@ def test_returns_404_when_service_does_not_exist(client, endpoint): def test_has_not_effect_when_service_is_already_that_state(client, sample_service, action, active, mocker): mocked = mocker.patch("app.service.rest.dao_{}_service".format(action)) sample_service.active = active - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post("/service/{}/{}".format(sample_service.id, action), headers=[auth_header]) assert response.status_code == 204 @@ -38,7 +38,7 @@ def test_has_not_effect_when_service_is_already_that_state(client, sample_servic @freeze_time('2001-01-01T23:59:00') def test_suspending_service_revokes_api_keys(client, sample_service, sample_api_key): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post("/service/{}/suspend".format(sample_service.id), headers=[auth_header]) assert response.status_code == 204 @@ -47,11 +47,11 @@ def test_suspending_service_revokes_api_keys(client, sample_service, sample_api_ def test_resume_service_leaves_api_keys_revokes(client, sample_service, sample_api_key): with freeze_time('2001-10-22T11:59:00'): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() client.post("/service/{}/suspend".format(sample_service.id), headers=[auth_header]) with freeze_time('2001-10-22T13:59:00'): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post("/service/{}/resume".format(sample_service.id), headers=[auth_header]) assert response.status_code == 204 @@ -61,7 +61,7 @@ def test_resume_service_leaves_api_keys_revokes(client, sample_service, sample_a @pytest.mark.parametrize("action, original_state", [("suspend", True), ("resume", False)]) def test_service_history_is_created(client, sample_service, action, original_state): sample_service.active = original_state - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post("/service/{}/{}".format(sample_service.id, action), headers=[auth_header]) ServiceHistory = Service.get_history_model() diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py index f7c939ae3..bcb268d5e 100644 --- a/tests/app/service_invite/test_service_invite_rest.py +++ b/tests/app/service_invite/test_service_invite_rest.py @@ -7,7 +7,7 @@ from freezegun import freeze_time from notifications_utils.url_safe_token import generate_token from app.models import EMAIL_AUTH_TYPE, SMS_AUTH_TYPE, Notification -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import create_invited_user @@ -163,7 +163,7 @@ def test_create_invited_user_invalid_email(client, sample_service, mocker, fake_ data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/invite'.format(sample_service.id), @@ -187,7 +187,7 @@ def test_get_all_invited_users_by_service(client, notify_db, notify_db_session, url = '/service/{}/invite'.format(sample_service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( url, @@ -208,7 +208,7 @@ def test_get_all_invited_users_by_service(client, notify_db, notify_db_session, def test_get_invited_users_by_service_with_no_invites(client, notify_db, notify_db_session, sample_service): url = '/service/{}/invite'.format(sample_service.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( url, @@ -245,7 +245,7 @@ def test_get_invited_user_by_service_when_user_does_not_belong_to_the_service( def test_update_invited_user_set_status_to_cancelled(client, sample_invited_user): data = {'status': 'cancelled'} url = '/service/{0}/invite/{1}'.format(sample_invited_user.service_id, sample_invited_user.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(url, data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) @@ -258,7 +258,7 @@ def test_update_invited_user_set_status_to_cancelled(client, sample_invited_user def test_update_invited_user_for_wrong_service_returns_404(client, sample_invited_user, fake_uuid): data = {'status': 'cancelled'} url = '/service/{0}/invite/{1}'.format(fake_uuid, sample_invited_user.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(url, data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 404 @@ -269,7 +269,7 @@ def test_update_invited_user_for_wrong_service_returns_404(client, sample_invite def test_update_invited_user_for_invalid_data_returns_400(client, sample_invited_user): data = {'status': 'garbage'} url = '/service/{0}/invite/{1}'.format(sample_invited_user.service_id, sample_invited_user.id) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post(url, data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 400 @@ -283,7 +283,7 @@ def test_validate_invitation_token_returns_200_when_token_valid(client, sample_i token = generate_token(str(sample_invited_user.id), current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT']) url = endpoint_format_str.format(token) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url, headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 200 @@ -302,7 +302,7 @@ def test_validate_invitation_token_for_expired_token_returns_400(client): token = generate_token(str(uuid.uuid4()), current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT']) url = '/invite/service/{}'.format(token) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url, headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 400 @@ -317,7 +317,7 @@ def test_validate_invitation_token_returns_400_when_invited_user_does_not_exist( token = generate_token(str(uuid.uuid4()), current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT']) url = '/invite/service/{}'.format(token) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url, headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 404 @@ -334,7 +334,7 @@ def test_validate_invitation_token_returns_400_when_token_is_malformed(client): )[:-2] url = '/invite/service/{}'.format(token) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get(url, headers=[('Content-Type', 'application/json'), auth_header]) assert response.status_code == 400 diff --git a/tests/app/template/test_rest.py b/tests/app/template/test_rest.py index afa900484..4536ca497 100644 --- a/tests/app/template/test_rest.py +++ b/tests/app/template/test_rest.py @@ -26,7 +26,7 @@ from app.models import ( Template, TemplateHistory, ) -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import ( create_letter_contact, create_notification, @@ -59,7 +59,7 @@ def test_should_create_a_new_template_for_a_service( if template_type == LETTER_TYPE: data.update({'postage': 'first'}) data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(service.id), @@ -105,7 +105,7 @@ def test_create_a_new_template_for_a_service_adds_folder_relationship( 'parent_folder_id': str(parent_folder.id) } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(sample_service.id), @@ -134,7 +134,7 @@ def test_create_a_new_template_for_a_service_adds_postage_for_letters_only( data["subject"] = "Hi, I have good news" data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(sample_service.id), @@ -161,7 +161,7 @@ def test_create_template_should_return_400_if_folder_is_for_a_different_service( 'parent_folder_id': str(parent_folder.id) } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(sample_service.id), @@ -184,7 +184,7 @@ def test_create_template_should_return_400_if_folder_does_not_exist( 'parent_folder_id': str(uuid.uuid4()) } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(sample_service.id), @@ -204,7 +204,7 @@ def test_should_raise_error_if_service_does_not_exist_on_create(client, sample_u 'created_by': str(sample_user.id) } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(fake_uuid), @@ -237,7 +237,7 @@ def test_should_raise_error_on_create_if_no_permission( data.update({'subject': subject}) data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(service.id), @@ -271,7 +271,7 @@ def test_should_be_error_on_update_if_no_permission( } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() update_response = client.post( '/service/{}/template/{}'.format( @@ -295,7 +295,7 @@ def test_should_error_if_created_by_missing(client, sample_user, sample_service) 'service': service_id } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(service_id), @@ -313,7 +313,7 @@ def test_should_be_error_if_service_does_not_exist_on_update(client, fake_uuid): 'name': 'my template' } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template/{}'.format(fake_uuid, fake_uuid), @@ -336,7 +336,7 @@ def test_must_have_a_subject_on_an_email_or_letter_template(client, sample_user, 'created_by': str(sample_user.id) } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(sample_service.id), @@ -362,7 +362,7 @@ def test_update_should_update_a_template(client, sample_user): 'postage': 'first' } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() update_response = client.post( '/service/{}/template/{}'.format(service.id, template.id), @@ -399,7 +399,7 @@ def test_should_be_able_to_archive_template(client, sample_template): json_data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/template/{}'.format(sample_template.service.id, sample_template.id), @@ -423,7 +423,7 @@ def test_should_be_able_to_archive_template_should_remove_template_folders( client.post( f'/service/{sample_service.id}/template/{template.id}', - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=json.dumps(data) ) @@ -441,7 +441,7 @@ def test_get_precompiled_template_for_service( response = client.get( '/service/{}/template/precompiled'.format(sample_service.id), - headers=[create_authorization_header()], + headers=[create_admin_authorization_header()], ) assert response.status_code == 200 assert len(sample_service.templates) == 1 @@ -465,7 +465,7 @@ def test_get_precompiled_template_for_service_when_service_has_existing_precompi response = client.get( '/service/{}/template/precompiled'.format(sample_service.id), - headers=[create_authorization_header()], + headers=[create_admin_authorization_header()], ) assert response.status_code == 200 @@ -495,13 +495,13 @@ def test_should_be_able_to_get_all_templates_for_a_service(client, sample_user, 'created_by': str(sample_user.id) } data_2 = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() client.post( '/service/{}/template'.format(sample_service.id), headers=[('Content-Type', 'application/json'), auth_header], data=data_1 ) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() client.post( '/service/{}/template'.format(sample_service.id), @@ -509,7 +509,7 @@ def test_should_be_able_to_get_all_templates_for_a_service(client, sample_user, data=data_2 ) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( '/service/{}/template'.format(sample_service.id), @@ -648,7 +648,7 @@ def test_should_get_a_single_template( response = client.get( '/service/{}/template/{}'.format(sample_service.id, template.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) data = json.loads(response.get_data(as_text=True))['data'] @@ -709,7 +709,7 @@ def test_should_preview_a_single_template( response = client.get( path.format(sample_service.id, template.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) content = json.loads(response.get_data(as_text=True)) @@ -725,7 +725,7 @@ def test_should_preview_a_single_template( def test_should_return_empty_array_if_no_templates_for_service(client, sample_service): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( '/service/{}/template'.format(sample_service.id), @@ -739,7 +739,7 @@ def test_should_return_empty_array_if_no_templates_for_service(client, sample_se def test_should_return_404_if_no_templates_for_service_with_id(client, sample_service, fake_uuid): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.get( '/service/{}/template/{}'.format(sample_service.id, fake_uuid), @@ -772,7 +772,7 @@ def test_create_400_for_over_limit_content( 'created_by': str(sample_service.created_by.id) } data = json.dumps(data) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( '/service/{}/template'.format(sample_service.id), @@ -792,7 +792,7 @@ def test_update_400_for_over_limit_content(client, notify_api, sample_user, samp SMS_CHAR_COUNT_LIMIT + 1)), 'created_by': str(sample_user.id) }) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( '/service/{}/template/{}'.format(sample_template.service.id, sample_template.id), headers=[('Content-Type', 'application/json'), auth_header], @@ -813,7 +813,7 @@ def test_should_return_all_template_versions_for_service_and_template_id(client, sample_template.content = original_content + '2' dao_update_template(sample_template) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.get('/service/{}/template/{}/versions'.format(sample_template.service_id, sample_template.id), headers=[('Content-Type', 'application/json'), auth_header]) assert resp.status_code == 200 @@ -830,7 +830,7 @@ def test_should_return_all_template_versions_for_service_and_template_id(client, def test_update_does_not_create_new_version_when_there_is_no_change(client, sample_template): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() data = { 'template_type': sample_template.template_type, 'content': sample_template.content, @@ -845,7 +845,7 @@ def test_update_does_not_create_new_version_when_there_is_no_change(client, samp def test_update_set_process_type_on_template(client, sample_template): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() data = { 'process_type': 'priority' } @@ -949,7 +949,7 @@ def test_create_template_validates_against_json_schema( (None, None) ]) def test_get_template_reply_to(client, sample_service, template_default, service_default): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() if service_default: create_letter_contact( service=sample_service, contact_block=service_default, is_default=True @@ -973,7 +973,7 @@ def test_get_template_reply_to(client, sample_service, template_default, service def test_update_template_reply_to(client, sample_letter_template): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() letter_contact = create_letter_contact(sample_letter_template.service, "Edinburgh, ED1 1AA") data = { 'reply_to': str(letter_contact.id), @@ -992,7 +992,7 @@ def test_update_template_reply_to(client, sample_letter_template): def test_update_template_reply_to_set_to_blank(client, notify_db_session): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() service = create_service(service_permissions=['letter']) letter_contact = create_letter_contact(service, "Edinburgh, ED1 1AA") template = create_template(service=service, template_type='letter', reply_to=letter_contact.id) @@ -1027,7 +1027,7 @@ def test_update_template_validates_postage(admin_request, sample_service_full_pe def test_update_template_with_foreign_service_reply_to(client, sample_letter_template): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() service2 = create_service(service_name='test service', email_from='test@example.com', service_permissions=['letter']) diff --git a/tests/app/template/test_rest_history.py b/tests/app/template/test_rest_history.py index 90d52ed01..47d7d5ac5 100644 --- a/tests/app/template/test_rest_history.py +++ b/tests/app/template/test_rest_history.py @@ -4,14 +4,14 @@ from datetime import date, datetime from flask import url_for from app.dao.templates_dao import dao_update_template -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import create_letter_contact def test_template_history_version(notify_api, sample_user, sample_template): with notify_api.test_request_context(): with notify_api.test_client() as client: - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() endpoint = url_for( 'template.get_template_version', service_id=sample_template.service.id, @@ -38,7 +38,7 @@ def test_previous_template_history_version(notify_api, sample_template): dao_update_template(sample_template) with notify_api.test_request_context(): with notify_api.test_client() as client: - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() endpoint = url_for( 'template.get_template_version', service_id=sample_template.service.id, @@ -59,7 +59,7 @@ def test_previous_template_history_version(notify_api, sample_template): def test_404_missing_template_version(notify_api, sample_template): with notify_api.test_request_context(): with notify_api.test_client() as client: - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() endpoint = url_for( 'template.get_template_version', service_id=sample_template.service.id, @@ -82,7 +82,7 @@ def test_all_versions_of_template(notify_api, sample_template): dao_update_template(sample_template) sample_template.content = newest_content dao_update_template(sample_template) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() endpoint = url_for( 'template.get_template_versions', service_id=sample_template.service.id, @@ -102,7 +102,7 @@ def test_all_versions_of_template(notify_api, sample_template): def test_update_template_reply_to_updates_history(client, sample_letter_template): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() letter_contact = create_letter_contact(sample_letter_template.service, "Edinburgh, ED1 1AA") sample_letter_template.reply_to = letter_contact.id diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py index 96f6401a8..038dd7ff2 100644 --- a/tests/app/user/test_rest.py +++ b/tests/app/user/test_rest.py @@ -21,7 +21,7 @@ from app.models import ( Permission, User, ) -from tests import create_authorization_header +from tests import create_admin_authorization_header from tests.app.db import ( create_organisation, create_service, @@ -115,7 +115,7 @@ def test_post_user(client, notify_db, notify_db_session): "permissions": {}, "auth_type": EMAIL_AUTH_TYPE } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( url_for('user.create_user'), @@ -160,7 +160,7 @@ def test_post_user_missing_attribute_email(client, notify_db, notify_db_session) "failed_login_count": 0, "permissions": {} } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( url_for('user.create_user'), @@ -186,7 +186,7 @@ def test_create_user_missing_attribute_password(client, notify_db, notify_db_ses "failed_login_count": 0, "permissions": {} } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( url_for('user.create_user'), @@ -257,7 +257,7 @@ def test_post_user_attribute(client, sample_user, user_attribute, user_value): update_dict = { user_attribute: user_value } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( @@ -301,7 +301,7 @@ def test_post_user_attribute_with_updated_by( user_attribute: user_value, 'updated_by': str(updater.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] mock_persist_notification = mocker.patch('app.user.rest.persist_notification') mocker.patch('app.user.rest.send_notification_to_queue') @@ -327,7 +327,7 @@ def test_post_user_attribute_with_updated_by_sends_notification_to_international 'mobile_number': '+601117224412', 'updated_by': str(updater.id) } - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] mocker.patch('app.user.rest.send_notification_to_queue') resp = client.post( @@ -346,7 +346,7 @@ def test_archive_user(mocker, client, sample_user): response = client.post( url_for('user.archive_user', user_id=sample_user.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert response.status_code == 204 @@ -358,7 +358,7 @@ def test_archive_user_when_user_does_not_exist_gives_404(mocker, client, fake_uu response = client.post( url_for('user.archive_user', user_id=fake_uuid), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) assert response.status_code == 404 @@ -370,7 +370,7 @@ def test_archive_user_when_user_cannot_be_archived(mocker, client, sample_user): response = client.post( url_for('user.archive_user', user_id=sample_user.id), - headers=[create_authorization_header()] + headers=[create_admin_authorization_header()] ) json_resp = json.loads(response.get_data(as_text=True)) @@ -382,7 +382,7 @@ def test_archive_user_when_user_cannot_be_archived(mocker, client, sample_user): def test_get_user_by_email(client, sample_service): sample_user = sample_service.users[0] - header = create_authorization_header() + header = create_admin_authorization_header() url = url_for('user.get_by_email', email=sample_user.email_address) resp = client.get(url, headers=[header]) assert resp.status_code == 200 @@ -400,7 +400,7 @@ def test_get_user_by_email(client, sample_service): def test_get_user_by_email_not_found_returns_404(client, sample_user): - header = create_authorization_header() + header = create_admin_authorization_header() url = url_for('user.get_by_email', email='no_user@digital.gov.uk') resp = client.get(url, headers=[header]) assert resp.status_code == 404 @@ -410,7 +410,7 @@ def test_get_user_by_email_not_found_returns_404(client, sample_user): def test_get_user_by_email_bad_url_returns_404(client, sample_user): - header = create_authorization_header() + header = create_admin_authorization_header() url = '/user/email' resp = client.get(url, headers=[header]) assert resp.status_code == 400 @@ -458,7 +458,7 @@ def test_fetch_user_by_email_without_email_returns_400(admin_request, notify_db_ def test_get_user_with_permissions(client, sample_user_service_permission): - header = create_authorization_header() + header = create_admin_authorization_header() response = client.get(url_for('user.get_user', user_id=str(sample_user_service_permission.user.id)), headers=[header]) assert response.status_code == 200 @@ -468,7 +468,7 @@ def test_get_user_with_permissions(client, sample_user_service_permission): def test_set_user_permissions(client, sample_user, sample_service): data = json.dumps({'permissions': [{'permission': MANAGE_SETTINGS}]}) - header = create_authorization_header() + header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), header] response = client.post( url_for( @@ -487,7 +487,7 @@ def test_set_user_permissions(client, sample_user, sample_service): def test_set_user_permissions_multiple(client, sample_user, sample_service): data = json.dumps({'permissions': [{'permission': MANAGE_SETTINGS}, {'permission': MANAGE_TEMPLATES}]}) - header = create_authorization_header() + header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), header] response = client.post( url_for( @@ -510,7 +510,7 @@ def test_set_user_permissions_multiple(client, sample_user, sample_service): def test_set_user_permissions_remove_old(client, sample_user, sample_service): data = json.dumps({'permissions': [{'permission': MANAGE_SETTINGS}]}) - header = create_authorization_header() + header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), header] response = client.post( url_for( @@ -536,7 +536,7 @@ def test_set_user_folder_permissions(client, sample_user, sample_service): 'user.set_permissions', user_id=str(sample_user.id), service_id=str(sample_service.id)), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=data) assert response.status_code == 204 @@ -559,7 +559,7 @@ def test_set_user_folder_permissions_when_user_does_not_belong_to_service(client 'user.set_permissions', user_id=str(sample_user.id), service_id=str(service.id)), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=data) assert response.status_code == 404 @@ -591,7 +591,7 @@ def test_set_user_folder_permissions_does_not_affect_permissions_for_other_servi 'user.set_permissions', user_id=str(sample_user.id), service_id=str(sample_service.id)), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=data) assert response.status_code == 204 @@ -616,7 +616,7 @@ def test_update_user_folder_permissions(client, sample_user, sample_service): 'user.set_permissions', user_id=str(sample_user.id), service_id=str(sample_service.id)), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=data) assert response.status_code == 204 @@ -640,7 +640,7 @@ def test_remove_user_folder_permissions(client, sample_user, sample_service): 'user.set_permissions', user_id=str(sample_user.id), service_id=str(sample_service.id)), - headers=[('Content-Type', 'application/json'), create_authorization_header()], + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()], data=data) assert response.status_code == 204 @@ -654,7 +654,7 @@ def test_send_user_reset_password_should_send_reset_password_link(client, password_reset_email_template): mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') data = json.dumps({'email': sample_user.email_address}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() notify_service = password_reset_email_template.service resp = client.post( url_for('user.send_user_reset_password'), @@ -673,7 +673,7 @@ def test_send_user_reset_password_reset_password_link_contains_redirect_link_if_ ): mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') data = json.dumps({'email': sample_user.email_address, "next": "blob"}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( url_for('user.send_user_reset_password'), data=data, @@ -688,7 +688,7 @@ def test_send_user_reset_password_reset_password_link_contains_redirect_link_if_ def test_send_user_reset_password_should_return_400_when_email_is_missing(client, mocker): mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') data = json.dumps({}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_user_reset_password'), @@ -704,7 +704,7 @@ def test_send_user_reset_password_should_return_400_when_user_doesnot_exist(clie mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') bad_email_address = 'bad@email.gov.uk' data = json.dumps({'email': bad_email_address}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_user_reset_password'), @@ -720,7 +720,7 @@ def test_send_user_reset_password_should_return_400_when_data_is_not_email_addre mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') bad_email_address = 'bad.email.gov.uk' data = json.dumps({'email': bad_email_address}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_user_reset_password'), @@ -734,7 +734,7 @@ def test_send_user_reset_password_should_return_400_when_data_is_not_email_addre def test_send_already_registered_email(client, sample_user, already_registered_template, mocker): data = json.dumps({'email': sample_user.email_address}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') notify_service = already_registered_template.service @@ -751,7 +751,7 @@ def test_send_already_registered_email(client, sample_user, already_registered_t def test_send_already_registered_email_returns_400_when_data_is_missing(client, sample_user): data = json.dumps({}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_already_registered_email', user_id=str(sample_user.id)), @@ -765,7 +765,7 @@ def test_send_user_confirm_new_email_returns_204(client, sample_user, change_ema mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') new_email = 'new_address@dig.gov.uk' data = json.dumps({'email': new_email}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() notify_service = change_email_confirmation_template.service resp = client.post(url_for('user.send_user_confirm_new_email', user_id=str(sample_user.id)), @@ -782,7 +782,7 @@ def test_send_user_confirm_new_email_returns_204(client, sample_user, change_ema def test_send_user_confirm_new_email_returns_400_when_email_missing(client, sample_user, mocker): mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') data = json.dumps({}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post(url_for('user.send_user_confirm_new_email', user_id=str(sample_user.id)), data=data, headers=[('Content-Type', 'application/json'), auth_header]) @@ -807,7 +807,7 @@ def test_update_user_password_saves_correctly(client, sample_service, data, emai sample_user = sample_service.users[0] sample_user.email_access_validated_at = datetime(2020, 2, 13, 12, 0) new_password = '1234567890' - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( url_for('user.update_password', user_id=sample_user.id), @@ -819,7 +819,7 @@ def test_update_user_password_saves_correctly(client, sample_service, data, emai json_resp = json.loads(resp.get_data(as_text=True)) assert json_resp['data']['password_changed_at'] is not None data = {'password': new_password} - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() headers = [('Content-Type', 'application/json'), auth_header] resp = client.post( url_for('user.verify_user_password', user_id=str(sample_user.id)), @@ -1071,7 +1071,7 @@ def test_find_users_by_email_finds_user_by_partial_email(notify_db, client): create_user(email='findel.mestro@foo.com') create_user(email='me.ignorra@foo.com') data = json.dumps({"email": "findel"}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( url_for("user.find_users_by_email"), @@ -1089,7 +1089,7 @@ def test_find_users_by_email_finds_user_by_full_email(notify_db, client): create_user(email='findel.mestro@foo.com') create_user(email='me.ignorra@foo.com') data = json.dumps({"email": "findel.mestro@foo.com"}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( url_for("user.find_users_by_email"), @@ -1107,7 +1107,7 @@ def test_find_users_by_email_handles_no_results(notify_db, client): create_user(email='findel.mestro@foo.com') create_user(email='me.ignorra@foo.com') data = json.dumps({"email": "rogue"}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( url_for("user.find_users_by_email"), @@ -1123,7 +1123,7 @@ def test_find_users_by_email_handles_no_results(notify_db, client): def test_search_for_users_by_email_handles_incorrect_data_format(notify_db, client): create_user(email='findel.mestro@foo.com') data = json.dumps({"email": 1}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() response = client.post( url_for("user.find_users_by_email"), diff --git a/tests/app/user/test_rest_verify.py b/tests/app/user/test_rest_verify.py index 53e4480ea..8268d0c36 100644 --- a/tests/app/user/test_rest_verify.py +++ b/tests/app/user/test_rest_verify.py @@ -18,7 +18,7 @@ from app.models import ( User, VerifyCode, ) -from tests import create_authorization_header +from tests import create_admin_authorization_header @freeze_time('2016-01-01T12:00:00') @@ -29,7 +29,7 @@ def test_user_verify_sms_code(client, sample_sms_code): data = json.dumps({ 'code_type': sample_sms_code.code_type, 'code': sample_sms_code.txt_code}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.verify_user_code', user_id=sample_sms_code.user.id), data=data, @@ -45,7 +45,7 @@ def test_user_verify_code_missing_code(client, sample_sms_code): assert not VerifyCode.query.first().code_used data = json.dumps({'code_type': sample_sms_code.code_type}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.verify_user_code', user_id=sample_sms_code.user.id), data=data, @@ -61,7 +61,7 @@ def test_user_verify_code_bad_code_and_increments_failed_login_count(client, data = json.dumps({ 'code_type': sample_sms_code.code_type, 'code': "blah"}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.verify_user_code', user_id=sample_sms_code.user.id), data=data, @@ -101,7 +101,7 @@ def test_user_verify_password(client, sample_user): yesterday = datetime.utcnow() - timedelta(days=1) sample_user.logged_in_at = yesterday data = json.dumps({'password': 'password'}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.verify_user_password', user_id=sample_user.id), data=data, @@ -113,7 +113,7 @@ def test_user_verify_password(client, sample_user): def test_user_verify_password_invalid_password(client, sample_user): data = json.dumps({'password': 'bad password'}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() assert sample_user.failed_login_count == 0 @@ -130,7 +130,7 @@ def test_user_verify_password_invalid_password(client, def test_user_verify_password_valid_password_resets_failed_logins(client, sample_user): data = json.dumps({'password': 'bad password'}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() assert sample_user.failed_login_count == 0 @@ -145,7 +145,7 @@ def test_user_verify_password_valid_password_resets_failed_logins(client, assert sample_user.failed_login_count == 1 data = json.dumps({'password': 'password'}) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.verify_user_password', user_id=sample_user.id), data=data, @@ -157,7 +157,7 @@ def test_user_verify_password_valid_password_resets_failed_logins(client, def test_user_verify_password_missing_password(client, sample_user): - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.verify_user_password', user_id=sample_user.id), data=json.dumps({'bingo': 'bongo'}), @@ -182,7 +182,7 @@ def test_send_user_sms_code(client, notify_service.research_mode = True dao_update_service(notify_service) - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() mocked = mocker.patch('app.user.rest.create_secret_code', return_value='11111') mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async') @@ -218,7 +218,7 @@ def test_send_user_code_for_sms_with_optional_to_field(client, to_number = '+447119876757' mocked = mocker.patch('app.user.rest.create_secret_code', return_value='11111') mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async') - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_user_2fa_code', code_type='sms', user_id=sample_user.id), @@ -237,7 +237,7 @@ def test_send_user_code_for_sms_with_optional_to_field(client, def test_send_sms_code_returns_404_for_bad_input_data(client): uuid_ = uuid.uuid4() - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_user_2fa_code', code_type='sms', user_id=uuid_), data=json.dumps({}), @@ -258,7 +258,7 @@ def test_send_sms_code_returns_204_when_too_many_codes_already_created(client, s db.session.add(verify_code) db.session.commit() assert VerifyCode.query.count() == 10 - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_user_2fa_code', code_type='sms', user_id=sample_user.id), data=json.dumps({}), @@ -272,7 +272,7 @@ def test_send_new_user_email_verification(client, mocker, email_verification_template): mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_new_user_email_verification', user_id=str(sample_user.id)), data=json.dumps({}), @@ -291,7 +291,7 @@ def test_send_email_verification_returns_404_for_bad_input_data(client, notify_d """ mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') uuid_ = uuid.uuid4() - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() resp = client.post( url_for('user.send_new_user_email_verification', user_id=uuid_), data=json.dumps({}), @@ -309,7 +309,7 @@ def test_user_verify_user_code_returns_404_when_code_is_right_but_user_account_i resp = client.post( url_for('user.verify_user_code', user_id=sample_sms_code.user.id), data=data, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert resp.status_code == 404 assert sample_sms_code.user.failed_login_count == 10 assert not sample_sms_code.code_used @@ -323,7 +323,7 @@ def test_user_verify_user_code_valid_code_resets_failed_login_count(client, samp resp = client.post( url_for('user.verify_user_code', user_id=sample_sms_code.user.id), data=data, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert resp.status_code == 204 assert sample_sms_code.user.failed_login_count == 0 assert sample_sms_code.code_used @@ -333,7 +333,7 @@ def test_user_reset_failed_login_count_returns_200(client, sample_user): sample_user.failed_login_count = 1 resp = client.post(url_for("user.user_reset_failed_login_count", user_id=sample_user.id), data={}, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert resp.status_code == 200 assert sample_user.failed_login_count == 0 @@ -341,7 +341,7 @@ def test_user_reset_failed_login_count_returns_200(client, sample_user): def test_reset_failed_login_count_returns_404_when_user_does_not_exist(client): resp = client.post(url_for("user.user_reset_failed_login_count", user_id=uuid.uuid4()), data={}, - headers=[('Content-Type', 'application/json'), create_authorization_header()]) + headers=[('Content-Type', 'application/json'), create_admin_authorization_header()]) assert resp.status_code == 404 @@ -480,7 +480,7 @@ def test_send_user_2fa_code_sends_from_number_for_international_numbers( client, sample_user, mocker, sms_code_template ): sample_user.mobile_number = "601117224412" - auth_header = create_authorization_header() + auth_header = create_admin_authorization_header() mocker.patch('app.user.rest.create_secret_code', return_value='11111') mocker.patch('app.user.rest.send_notification_to_queue') diff --git a/tests/app/v2/broadcast/test_post_broadcast.py b/tests/app/v2/broadcast/test_post_broadcast.py index fc824f946..0fd8de0c2 100644 --- a/tests/app/v2/broadcast/test_post_broadcast.py +++ b/tests/app/v2/broadcast/test_post_broadcast.py @@ -6,7 +6,7 @@ from flask import json from app.dao.broadcast_message_dao import ( dao_get_broadcast_message_by_id_and_service_id, ) -from tests import create_authorization_header +from tests import create_service_authorization_header from . import sample_cap_xml_documents @@ -15,7 +15,7 @@ def test_broadcast_for_service_without_permission_returns_400( client, sample_service, ): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path='/v2/broadcast', data='', @@ -32,7 +32,7 @@ def test_valid_post_broadcast_returns_201( client, sample_broadcast_service, ): - auth_header = create_authorization_header(service_id=sample_broadcast_service.id) + auth_header = create_service_authorization_header(service_id=sample_broadcast_service.id) response = client.post( path='/v2/broadcast', @@ -71,7 +71,7 @@ def test_valid_post_cap_xml_broadcast_returns_201( client, sample_broadcast_service, ): - auth_header = create_authorization_header(service_id=sample_broadcast_service.id) + auth_header = create_service_authorization_header(service_id=sample_broadcast_service.id) response = client.post( path='/v2/broadcast', @@ -121,7 +121,7 @@ def test_valid_post_cap_xml_broadcast_sets_stubbed_to_true_for_training_mode_ser training_mode_service ): sample_broadcast_service.restricted = training_mode_service - auth_header = create_authorization_header(service_id=sample_broadcast_service.id) + auth_header = create_service_authorization_header(service_id=sample_broadcast_service.id) response = client.post( path='/v2/broadcast', @@ -147,7 +147,7 @@ def test_invalid_post_cap_xml_broadcast_returns_400( sample_broadcast_service, xml_document, ): - auth_header = create_authorization_header(service_id=sample_broadcast_service.id) + auth_header = create_service_authorization_header(service_id=sample_broadcast_service.id) response = client.post( path='/v2/broadcast', @@ -179,7 +179,7 @@ def test_unsupported_message_types_400( xml_document, expected_error_message, ): - auth_header = create_authorization_header(service_id=sample_broadcast_service.id) + auth_header = create_service_authorization_header(service_id=sample_broadcast_service.id) response = client.post( path='/v2/broadcast', @@ -211,7 +211,7 @@ def test_content_too_long_returns_400( xml_document, expected_error, ): - auth_header = create_authorization_header(service_id=sample_broadcast_service.id) + auth_header = create_service_authorization_header(service_id=sample_broadcast_service.id) response = client.post( path='/v2/broadcast', data=xml_document, diff --git a/tests/app/v2/inbound_sms/test_get_inbound_sms.py b/tests/app/v2/inbound_sms/test_get_inbound_sms.py index fdede69cf..25c80c33b 100644 --- a/tests/app/v2/inbound_sms/test_get_inbound_sms.py +++ b/tests/app/v2/inbound_sms/test_get_inbound_sms.py @@ -1,6 +1,6 @@ from flask import json, url_for -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import ( create_inbound_sms, create_service_callback_api, @@ -18,7 +18,7 @@ def test_get_inbound_sms_returns_200( create_inbound_sms(service=sample_service, user_number='07700900113') ] - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get( path='/v2/received-text-messages', headers=[('Content-Type', 'application/json'), auth_header]) @@ -47,7 +47,7 @@ def test_get_inbound_sms_returns_200_when_service_has_callbacks( url="https://inbound.example.com", ) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get( path='/v2/received-text-messages', headers=[('Content-Type', 'application/json'), auth_header], @@ -69,7 +69,7 @@ def test_get_inbound_sms_generate_page_links(client, sample_service, mocker): reversed_inbound_sms = sorted(all_inbound_sms, key=lambda sms: sms.created_at, reverse=True) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get( url_for('v2_inbound_sms.get_inbound_sms'), headers=[('Content-Type', 'application/json'), auth_header]) @@ -102,7 +102,7 @@ def test_get_next_inbound_sms_will_get_correct_inbound_sms_list(client, sample_s ] reversed_inbound_sms = sorted(all_inbound_sms, key=lambda sms: sms.created_at, reverse=True) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get( path=url_for('v2_inbound_sms.get_inbound_sms', older_than=reversed_inbound_sms[1].id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -129,7 +129,7 @@ def test_get_next_inbound_sms_at_end_will_return_empty_inbound_sms_list(client, {"API_PAGE_SIZE": 1} ) - auth_header = create_authorization_header(service_id=inbound_sms.service.id) + auth_header = create_service_authorization_header(service_id=inbound_sms.service.id) response = client.get( path=url_for('v2_inbound_sms.get_inbound_sms', older_than=inbound_sms.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -148,7 +148,7 @@ def test_get_next_inbound_sms_at_end_will_return_empty_inbound_sms_list(client, def test_get_inbound_sms_for_no_inbound_sms_returns_empty_list( client, sample_service ): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get( path='/v2/received-text-messages', headers=[('Content-Type', 'application/json'), auth_header]) @@ -164,7 +164,7 @@ def test_get_inbound_sms_for_no_inbound_sms_returns_empty_list( def test_get_inbound_sms_with_invalid_query_string_returns_400(client, sample_service): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get( path='/v2/received-text-messages?user_number=447700900000', headers=[('Content-Type', 'application/json'), auth_header]) diff --git a/tests/app/v2/inbound_sms/test_inbound_sms_schemas.py b/tests/app/v2/inbound_sms/test_inbound_sms_schemas.py index 95c710137..09d5a1bbd 100644 --- a/tests/app/v2/inbound_sms/test_inbound_sms_schemas.py +++ b/tests/app/v2/inbound_sms/test_inbound_sms_schemas.py @@ -8,7 +8,7 @@ from app.v2.inbound_sms.inbound_sms_schemas import ( get_inbound_sms_response, get_inbound_sms_single_response, ) -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import create_inbound_sms valid_inbound_sms = { @@ -49,7 +49,7 @@ def test_get_inbound_sms_contract(client, sample_service): ] reversed_inbound_sms = sorted(all_inbound_sms, key=lambda sms: sms.created_at, reverse=True) - auth_header = create_authorization_header(service_id=all_inbound_sms[0].service_id) + auth_header = create_service_authorization_header(service_id=all_inbound_sms[0].service_id) response = client.get('/v2/received-text-messages', headers=[auth_header]) response_json = json.loads(response.get_data(as_text=True)) diff --git a/tests/app/v2/notifications/test_get_notifications.py b/tests/app/v2/notifications/test_get_notifications.py index cf1dc0f9a..898c93740 100644 --- a/tests/app/v2/notifications/test_get_notifications.py +++ b/tests/app/v2/notifications/test_get_notifications.py @@ -4,7 +4,7 @@ import pytest from flask import json, url_for from app.utils import DATETIME_FORMAT -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import create_notification, create_template @@ -31,7 +31,7 @@ def test_get_notification_by_id_returns_200( scheduled_for="2017-06-12 15:15" ) - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( path='/v2/notifications/{}'.format(sample_notification.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -83,7 +83,7 @@ def test_get_notification_by_id_with_placeholders_returns_200( personalisation={"name": "Bob"} ) - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( path='/v2/notifications/{}'.format(sample_notification.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -131,7 +131,7 @@ def test_get_notification_by_reference_returns_200(client, sample_template): sample_notification_with_reference = create_notification(template=sample_template, client_reference='some-client-reference') - auth_header = create_authorization_header(service_id=sample_notification_with_reference.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification_with_reference.service_id) response = client.get( path='/v2/notifications?reference={}'.format(sample_notification_with_reference.client_reference), headers=[('Content-Type', 'application/json'), auth_header]) @@ -154,7 +154,7 @@ def test_get_notification_by_id_returns_created_by_name_if_notification_created_ sms_notification = create_notification(template=sample_template) sms_notification.created_by_id = sample_user.id - auth_header = create_authorization_header(service_id=sms_notification.service_id) + auth_header = create_service_authorization_header(service_id=sms_notification.service_id) response = client.get( path=url_for('v2_notifications.get_notification_by_id', notification_id=sms_notification.id), headers=[('Content-Type', 'application/json'), auth_header] @@ -165,7 +165,7 @@ def test_get_notification_by_id_returns_created_by_name_if_notification_created_ def test_get_notification_by_reference_nonexistent_reference_returns_no_notifications(client, sample_service): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get( path='/v2/notifications?reference={}'.format('nonexistent-reference'), headers=[('Content-Type', 'application/json'), auth_header]) @@ -178,7 +178,7 @@ def test_get_notification_by_reference_nonexistent_reference_returns_no_notifica def test_get_notification_by_id_nonexistent_id(client, sample_notification): - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( path='/v2/notifications/dd4b8b9d-d414-4a83-9256-580046bf18f9', headers=[('Content-Type', 'application/json'), auth_header]) @@ -200,7 +200,7 @@ def test_get_notification_by_id_nonexistent_id(client, sample_notification): @pytest.mark.parametrize("id", ["1234-badly-formatted-id-7890", "0"]) def test_get_notification_by_id_invalid_id(client, sample_notification, id): - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( path='/v2/notifications/{}'.format(id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -233,7 +233,7 @@ def test_get_notification_adds_delivery_estimate_for_letters( sample_letter_notification.created_at = datetime.date(2000, created_at_month, 1) sample_letter_notification.postage = postage - auth_header = create_authorization_header(service_id=sample_letter_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_letter_notification.service_id) response = client.get( path='/v2/notifications/{}'.format(sample_letter_notification.id), headers=[('Content-Type', 'application/json'), auth_header] @@ -250,7 +250,7 @@ def test_get_notification_doesnt_have_delivery_estimate_for_non_letters(client, template = create_template(service=sample_service, template_type=template_type) mocked_notification = create_notification(template=template) - auth_header = create_authorization_header(service_id=mocked_notification.service_id) + auth_header = create_service_authorization_header(service_id=mocked_notification.service_id) response = client.get( path='/v2/notifications/{}'.format(mocked_notification.id), headers=[('Content-Type', 'application/json'), auth_header] @@ -264,7 +264,7 @@ def test_get_all_notifications_except_job_notifications_returns_200(client, samp notifications = [create_notification(template=sample_template) for _ in range(2)] notification = notifications[-1] - auth_header = create_authorization_header(service_id=notification.service_id) + auth_header = create_service_authorization_header(service_id=notification.service_id) response = client.get( path='/v2/notifications', headers=[('Content-Type', 'application/json'), auth_header]) @@ -298,7 +298,7 @@ def test_get_all_notifications_with_include_jobs_arg_returns_200( ] notification = notifications[-1] - auth_header = create_authorization_header(service_id=notification.service_id) + auth_header = create_service_authorization_header(service_id=notification.service_id) response = client.get( path='/v2/notifications?include_jobs=true', headers=[('Content-Type', 'application/json'), auth_header]) @@ -318,7 +318,7 @@ def test_get_all_notifications_with_include_jobs_arg_returns_200( def test_get_all_notifications_no_notifications_if_no_notifications(client, sample_service): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get( path='/v2/notifications', headers=[('Content-Type', 'application/json'), auth_header]) @@ -339,7 +339,7 @@ def test_get_all_notifications_filter_by_template_type(client, sample_service): notification = create_notification(template=email_template, to_field="don.draper@scdp.biz") create_notification(template=sms_template) - auth_header = create_authorization_header(service_id=notification.service_id) + auth_header = create_service_authorization_header(service_id=notification.service_id) response = client.get( path='/v2/notifications?template_type=email', headers=[('Content-Type', 'application/json'), auth_header]) @@ -364,7 +364,7 @@ def test_get_all_notifications_filter_by_template_type(client, sample_service): def test_get_all_notifications_filter_by_template_type_invalid_template_type(client, sample_notification): - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( path='/v2/notifications?template_type=orange', headers=[('Content-Type', 'application/json'), auth_header]) @@ -383,7 +383,7 @@ def test_get_all_notifications_filter_by_single_status(client, sample_template): notification = create_notification(template=sample_template, status="pending") create_notification(template=sample_template) - auth_header = create_authorization_header(service_id=notification.service_id) + auth_header = create_service_authorization_header(service_id=notification.service_id) response = client.get( path='/v2/notifications?status=pending', headers=[('Content-Type', 'application/json'), auth_header]) @@ -401,7 +401,7 @@ def test_get_all_notifications_filter_by_single_status(client, sample_template): def test_get_all_notifications_filter_by_status_invalid_status(client, sample_notification): - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( path='/v2/notifications?status=elephant', headers=[('Content-Type', 'application/json'), auth_header]) @@ -425,7 +425,7 @@ def test_get_all_notifications_filter_by_multiple_statuses(client, sample_templa ] failed_notification = create_notification(template=sample_template, status="permanent-failure") - auth_header = create_authorization_header(service_id=notifications[0].service_id) + auth_header = create_service_authorization_header(service_id=notifications[0].service_id) response = client.get( path='/v2/notifications?status=created&status=pending&status=sending', headers=[('Content-Type', 'application/json'), auth_header]) @@ -452,7 +452,7 @@ def test_get_all_notifications_filter_by_failed_status(client, sample_template): for _status in ["technical-failure", "temporary-failure", "permanent-failure"] ] - auth_header = create_authorization_header(service_id=created_notification.service_id) + auth_header = create_service_authorization_header(service_id=created_notification.service_id) response = client.get( path='/v2/notifications?status=failed', headers=[('Content-Type', 'application/json'), auth_header]) @@ -476,7 +476,7 @@ def test_get_all_notifications_filter_by_id(client, sample_template): older_notification = create_notification(template=sample_template) newer_notification = create_notification(template=sample_template) - auth_header = create_authorization_header(service_id=newer_notification.service_id) + auth_header = create_service_authorization_header(service_id=newer_notification.service_id) response = client.get( path='/v2/notifications?older_than={}'.format(newer_notification.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -493,7 +493,7 @@ def test_get_all_notifications_filter_by_id(client, sample_template): def test_get_all_notifications_filter_by_id_invalid_id(client, sample_notification): - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( path='/v2/notifications?older_than=1234-badly-formatted-id-7890', headers=[('Content-Type', 'application/json'), auth_header]) @@ -508,7 +508,7 @@ def test_get_all_notifications_filter_by_id_invalid_id(client, sample_notificati def test_get_all_notifications_filter_by_id_no_notifications_if_nonexistent_id(client, sample_template): notification = create_notification(template=sample_template) - auth_header = create_authorization_header(service_id=notification.service_id) + auth_header = create_service_authorization_header(service_id=notification.service_id) response = client.get( path='/v2/notifications?older_than=dd4b8b9d-d414-4a83-9256-580046bf18f9', headers=[('Content-Type', 'application/json'), auth_header]) @@ -526,7 +526,7 @@ def test_get_all_notifications_filter_by_id_no_notifications_if_nonexistent_id(c def test_get_all_notifications_filter_by_id_no_notifications_if_last_notification(client, sample_template): notification = create_notification(template=sample_template) - auth_header = create_authorization_header(service_id=notification.service_id) + auth_header = create_service_authorization_header(service_id=notification.service_id) response = client.get( path='/v2/notifications?older_than={}'.format(notification.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -557,7 +557,7 @@ def test_get_all_notifications_filter_multiple_query_parameters(client, sample_e # this notification was created too recently create_notification(template=sample_email_template, status="pending") - auth_header = create_authorization_header(service_id=newer_notification.service_id) + auth_header = create_service_authorization_header(service_id=newer_notification.service_id) response = client.get( path='/v2/notifications?status=pending&template_type=email&older_than={}'.format(newer_notification.id), headers=[('Content-Type', 'application/json'), auth_header]) @@ -587,7 +587,7 @@ def test_get_all_notifications_renames_letter_statuses( sample_notification, sample_email_notification, ): - auth_header = create_authorization_header(service_id=sample_letter_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_letter_notification.service_id) response = client.get( path=url_for('v2_notifications.get_notifications'), headers=[('Content-Type', 'application/json'), auth_header] @@ -618,7 +618,7 @@ def test_get_notifications_renames_letter_statuses(client, sample_letter_templat status=db_status, personalisation={'address_line_1': 'Mr Foo', 'address_line_2': '1 Bar Street', 'postcode': 'N1'} ) - auth_header = create_authorization_header(service_id=letter_noti.service_id) + auth_header = create_service_authorization_header(service_id=letter_noti.service_id) response = client.get( path=url_for('v2_notifications.get_notification_by_id', notification_id=letter_noti.id), headers=[('Content-Type', 'application/json'), auth_header] @@ -643,7 +643,7 @@ def test_get_pdf_for_notification_returns_pdf_content( ) sample_letter_notification.status = 'created' - auth_header = create_authorization_header(service_id=sample_letter_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_letter_notification.service_id) response = client.get( path=url_for('v2_notifications.get_pdf_for_notification', notification_id=sample_letter_notification.id), headers=[('Content-Type', 'application/json'), auth_header] @@ -666,7 +666,7 @@ def test_get_pdf_for_notification_returns_400_if_pdf_not_found( ) sample_letter_notification.status = 'created' - auth_header = create_authorization_header(service_id=sample_letter_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_letter_notification.service_id) response = client.get( path=url_for('v2_notifications.get_pdf_for_notification', notification_id=sample_letter_notification.id), headers=[('Content-Type', 'application/json'), auth_header] @@ -700,7 +700,7 @@ def test_get_pdf_for_notification_only_returns_pdf_content_if_right_status( ) sample_letter_notification.status = status - auth_header = create_authorization_header(service_id=sample_letter_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_letter_notification.service_id) response = client.get( path=url_for('v2_notifications.get_pdf_for_notification', notification_id=sample_letter_notification.id), headers=[('Content-Type', 'application/json'), auth_header] @@ -715,7 +715,7 @@ def test_get_pdf_for_notification_only_returns_pdf_content_if_right_status( def test_get_pdf_for_notification_fails_for_non_letters(client, sample_notification): - auth_header = create_authorization_header(service_id=sample_notification.service_id) + auth_header = create_service_authorization_header(service_id=sample_notification.service_id) response = client.get( path=url_for('v2_notifications.get_pdf_for_notification', notification_id=sample_notification.id), headers=[('Content-Type', 'application/json'), auth_header] diff --git a/tests/app/v2/notifications/test_post_letter_notifications.py b/tests/app/v2/notifications/test_post_letter_notifications.py index fb37b28be..c09b9f834 100644 --- a/tests/app/v2/notifications/test_post_letter_notifications.py +++ b/tests/app/v2/notifications/test_post_letter_notifications.py @@ -26,7 +26,7 @@ from app.notifications.process_letter_notifications import ( from app.schema_validation import validate from app.v2.errors import RateLimitError from app.v2.notifications.notification_schemas import post_letter_response -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import create_letter_contact, create_service, create_template from tests.conftest import set_config_values @@ -47,7 +47,7 @@ def letter_request(client, data, service_id, key_type=KEY_TYPE_NORMAL, _expected data=json.dumps(data), headers=[ ('Content-Type', 'application/json'), - create_authorization_header(service_id=service_id, key_type=key_type) + create_service_authorization_header(service_id=service_id, key_type=key_type) ] ) json_resp = json.loads(resp.get_data(as_text=True)) @@ -626,7 +626,7 @@ def test_post_precompiled_letter_with_invalid_base64(client, notify_user, mocker "reference": "letter-reference", "content": "hi" } - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path="v2/notifications/letter", data=json.dumps(data), @@ -656,7 +656,7 @@ def test_post_precompiled_letter_notification_returns_201( } if notification_postage: data["postage"] = notification_postage - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path="v2/notifications/letter", data=json.dumps(data), @@ -689,7 +689,7 @@ def test_post_precompiled_letter_notification_if_s3_upload_fails_notification_is "content": "bGV0dGVyLWNvbnRlbnQ=" } - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) with pytest.raises(expected_exception=Exception): client.post( path="v2/notifications/letter", @@ -708,7 +708,7 @@ def test_post_letter_notification_throws_error_for_invalid_postage(client, notif "content": "bGV0dGVyLWNvbnRlbnQ=", "postage": "space unicorn" } - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path="v2/notifications/letter", data=json.dumps(data), @@ -725,7 +725,7 @@ def test_post_letter_notification_throws_error_for_invalid_postage(client, notif ['application/json', 'application/text']) def test_post_letter_notification_when_payload_is_invalid_json_returns_400( client, sample_service, content_type): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) payload_not_json = { "template_id": "dont-convert-to-json", } diff --git a/tests/app/v2/notifications/test_post_notifications.py b/tests/app/v2/notifications/test_post_notifications.py index 7b13fe828..dde524dea 100644 --- a/tests/app/v2/notifications/test_post_notifications.py +++ b/tests/app/v2/notifications/test_post_notifications.py @@ -21,7 +21,7 @@ from app.v2.notifications.notification_schemas import ( post_email_response, post_sms_response, ) -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import ( create_api_key, create_reply_to_email, @@ -43,7 +43,7 @@ def test_post_sms_notification_returns_201(client, sample_template_with_placehol } if reference: data.update({"reference": reference}) - auth_header = create_authorization_header(service_id=sample_template_with_placeholders.service_id) + auth_header = create_service_authorization_header(service_id=sample_template_with_placeholders.service_id) response = client.post( path='/v2/notifications/sms', @@ -83,7 +83,7 @@ def test_post_sms_notification_uses_inbound_number_as_sender(client, notify_db_s 'template_id': str(template.id), 'personalisation': {' Name': 'Jo'} } - auth_header = create_authorization_header(service_id=service.id) + auth_header = create_service_authorization_header(service_id=service.id) response = client.post( path='/v2/notifications/sms', @@ -111,7 +111,7 @@ def test_post_sms_notification_uses_inbound_number_reply_to_as_sender(client, no 'template_id': str(template.id), 'personalisation': {' Name': 'Jo'} } - auth_header = create_authorization_header(service_id=service.id) + auth_header = create_service_authorization_header(service_id=service.id) response = client.post( path='/v2/notifications/sms', @@ -140,7 +140,7 @@ def test_post_sms_notification_returns_201_with_sms_sender_id( 'personalisation': {' Name': 'Jo'}, 'sms_sender_id': str(sms_sender.id) } - auth_header = create_authorization_header(service_id=sample_template_with_placeholders.service_id) + auth_header = create_service_authorization_header(service_id=sample_template_with_placeholders.service_id) response = client.post( path='/v2/notifications/sms', @@ -167,7 +167,7 @@ def test_post_sms_notification_uses_sms_sender_id_reply_to( 'personalisation': {' Name': 'Jo'}, 'sms_sender_id': str(sms_sender.id) } - auth_header = create_authorization_header(service_id=sample_template_with_placeholders.service_id) + auth_header = create_service_authorization_header(service_id=sample_template_with_placeholders.service_id) response = client.post( path='/v2/notifications/sms', @@ -193,7 +193,7 @@ def test_notification_reply_to_text_is_original_value_if_sender_is_changed_after 'template_id': str(sample_template.id), 'sms_sender_id': str(sms_sender.id) } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/v2/notifications/sms', @@ -225,7 +225,7 @@ def test_should_cache_template_lookups_in_memory(mocker, client, sample_template } for _ in range(5): - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) client.post( path='/v2/notifications/sms', data=json.dumps(data), @@ -258,7 +258,7 @@ def test_should_cache_template_and_service_in_redis(mocker, client, sample_templ 'template_id': str(sample_template.id), } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) client.post( path='/v2/notifications/sms', data=json.dumps(data), @@ -316,7 +316,7 @@ def test_should_return_template_if_found_in_redis(mocker, client, sample_templat 'template_id': str(sample_template.id), } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/v2/notifications/sms', data=json.dumps(data), @@ -337,7 +337,7 @@ def test_post_notification_returns_400_and_missing_template(client, sample_servi key_send_to: send_to, 'template_id': str(uuid.uuid4()) } - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path='/v2/notifications/{}'.format(notification_type), @@ -387,7 +387,7 @@ def test_notification_returns_400_and_for_schema_problems(client, sample_templat key_send_to: send_to, 'template': str(sample_template.id) } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path='/v2/notifications/{}'.format(notification_type), @@ -417,7 +417,7 @@ def test_post_email_notification_returns_201(client, sample_email_template_with_ } if reference: data.update({"reference": reference}) - auth_header = create_authorization_header(service_id=sample_email_template_with_placeholders.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template_with_placeholders.service_id) response = client.post( path="v2/notifications/email", data=json.dumps(data), @@ -477,7 +477,7 @@ def test_should_not_persist_or_send_notification_if_simulated_recipient( 'template_id': str(sample_email_template.id) } - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.post( path='/v2/notifications/{}'.format(notification_type), @@ -515,7 +515,7 @@ def test_send_notification_uses_priority_queue_when_template_is_marked_as_priori 'template_id': str(sample.id) } - auth_header = create_authorization_header(service_id=sample.service_id) + auth_header = create_service_authorization_header(service_id=sample.service_id) response = client.post( path='/v2/notifications/{}'.format(notification_type), @@ -552,7 +552,7 @@ def test_returns_a_429_limit_exceeded_if_rate_limit_exceeded( 'template_id': str(sample.id) } - auth_header = create_authorization_header(service_id=sample.service_id) + auth_header = create_service_authorization_header(service_id=sample.service_id) response = client.post( path='/v2/notifications/{}'.format(notification_type), @@ -582,7 +582,7 @@ def test_post_sms_notification_returns_400_if_not_allowed_to_send_int_sms( 'phone_number': '20-12-1234-1234', 'template_id': template.id } - auth_header = create_authorization_header(service_id=service.id) + auth_header = create_service_authorization_header(service_id=service.id) response = client.post( path='/v2/notifications/sms', @@ -612,7 +612,7 @@ def test_post_sms_notification_with_archived_reply_to_id_returns_400(client, sam "template_id": sample_template.id, 'sms_sender_id': archived_sender.id } - auth_header = create_authorization_header(service_id=sample_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_template.service_id) response = client.post( path="v2/notifications/sms", data=json.dumps(data), @@ -636,7 +636,7 @@ def test_post_sms_notification_returns_400_if_not_allowed_to_send_notification( label: recipient, 'template_id': sample_template_without_permission.id } - auth_header = create_authorization_header(service_id=sample_template_without_permission.service.id) + auth_header = create_service_authorization_header(service_id=sample_template_without_permission.service.id) response = client.post( path='/v2/notifications/{}'.format(sample_template_without_permission.template_type), @@ -665,7 +665,7 @@ def test_post_sms_notification_returns_400_if_number_not_in_guest_list( "phone_number": '+327700900855', "template_id": template.id, } - auth_header = create_authorization_header(service_id=service.id, key_type='team') + auth_header = create_service_authorization_header(service_id=service.id, key_type='team') response = client.post( path='/v2/notifications/sms', @@ -692,7 +692,7 @@ def test_post_sms_notification_returns_201_if_allowed_to_send_int_sms( 'phone_number': '20-12-1234-1234', 'template_id': sample_template.id } - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path='/v2/notifications/sms', @@ -711,7 +711,7 @@ def test_post_sms_should_persist_supplied_sms_number(client, sample_template_wit 'personalisation': {' Name': 'Jo'} } - auth_header = create_authorization_header(service_id=sample_template_with_placeholders.service_id) + auth_header = create_service_authorization_header(service_id=sample_template_with_placeholders.service_id) response = client.post( path='/v2/notifications/sms', @@ -728,7 +728,7 @@ def test_post_sms_should_persist_supplied_sms_number(client, sample_template_wit def test_post_notification_raises_bad_request_if_not_valid_notification_type(client, sample_service): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( '/v2/notifications/foo', data='{}', @@ -763,7 +763,7 @@ def test_post_notification_with_wrong_type_of_sender( 'template_id': str(template.id), form_label: fake_uuid } - auth_header = create_authorization_header(service_id=template.service_id) + auth_header = create_service_authorization_header(service_id=template.service_id) response = client.post( path='/v2/notifications/{}'.format(notification_type), @@ -784,7 +784,7 @@ def test_post_email_notification_with_valid_reply_to_id_returns_201(client, samp "template_id": sample_email_template.id, 'email_reply_to_id': reply_to_email.id } - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.post( path="v2/notifications/email", data=json.dumps(data), @@ -807,7 +807,7 @@ def test_post_email_notification_with_invalid_reply_to_id_returns_400(client, sa "template_id": sample_email_template.id, 'email_reply_to_id': fake_uuid } - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.post( path="v2/notifications/email", data=json.dumps(data), @@ -831,7 +831,7 @@ def test_post_email_notification_with_archived_reply_to_id_returns_400(client, s "template_id": sample_email_template.id, 'email_reply_to_id': archived_reply_to.id } - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.post( path="v2/notifications/email", data=json.dumps(data), @@ -874,7 +874,7 @@ def test_post_notification_with_document_upload(client, notify_db_session, mocke } } - auth_header = create_authorization_header(service_id=service.id) + auth_header = create_service_authorization_header(service_id=service.id) response = client.post( path="v2/notifications/email", data=json.dumps(data), @@ -919,7 +919,7 @@ def test_post_notification_with_document_upload_simulated(client, notify_db_sess "personalisation": {"document": {"file": "abababab"}} } - auth_header = create_authorization_header(service_id=service.id) + auth_header = create_service_authorization_header(service_id=service.id) response = client.post( path="v2/notifications/email", data=json.dumps(data), @@ -950,7 +950,7 @@ def test_post_notification_without_document_upload_permission(client, notify_db_ "personalisation": {"document": {"file": "abababab"}} } - auth_header = create_authorization_header(service_id=service.id) + auth_header = create_service_authorization_header(service_id=service.id) response = client.post( path="v2/notifications/email", data=json.dumps(data), @@ -960,7 +960,7 @@ def test_post_notification_without_document_upload_permission(client, notify_db_ def test_post_notification_returns_400_when_get_json_throws_exception(client, sample_email_template): - auth_header = create_authorization_header(service_id=sample_email_template.service_id) + auth_header = create_service_authorization_header(service_id=sample_email_template.service_id) response = client.post( path="v2/notifications/email", data="[", @@ -976,7 +976,7 @@ def test_post_notification_returns_400_when_get_json_throws_exception(client, sa ) def test_post_notification_when_payload_is_invalid_json_returns_400( client, sample_service, notification_type, content_type): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) payload_not_json = { "template_id": "dont-convert-to-json", } @@ -997,7 +997,7 @@ def test_post_notification_returns_201_when_content_type_is_missing_but_payload_ client, sample_service, notification_type, mocker): template = create_template(service=sample_service, template_type=notification_type) mocker.patch('app.celery.provider_tasks.deliver_{}.apply_async'.format(notification_type)) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) valid_json = { "template_id": str(template.id), @@ -1016,7 +1016,7 @@ def test_post_notification_returns_201_when_content_type_is_missing_but_payload_ @pytest.mark.parametrize('notification_type', ['email', 'sms']) def test_post_email_notification_when_data_is_empty_returns_400(client, sample_service, notification_type): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) data = None response = client.post( path='/v2/notifications/{}'.format(notification_type), @@ -1054,7 +1054,7 @@ def test_post_notifications_saves_email_or_sms_to_queue(client, notify_db_sessio response = client.post( path=f'/v2/notifications/{notification_type}', data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header(service_id=service.id)] + headers=[('Content-Type', 'application/json'), create_service_authorization_header(service_id=service.id)] ) json_resp = response.get_json() @@ -1096,7 +1096,7 @@ def test_post_notifications_saves_email_or_sms_normally_if_saving_to_queue_fails response = client.post( path=f'/v2/notifications/{notification_type}', data=json.dumps(data), - headers=[('Content-Type', 'application/json'), create_authorization_header(service_id=service.id)] + headers=[('Content-Type', 'application/json'), create_service_authorization_header(service_id=service.id)] ) json_resp = response.get_json() @@ -1134,7 +1134,7 @@ def test_post_notifications_doesnt_use_save_queue_for_test_notifications( path=f'/v2/notifications/{notification_type}', data=json.dumps(data), headers=[('Content-Type', 'application/json'), - create_authorization_header(service_id=service.id, key_type='test')] + create_service_authorization_header(service_id=service.id, key_type='test')] ) json_resp = response.get_json() @@ -1169,7 +1169,7 @@ def test_post_notification_does_not_use_save_queue_for_letters(client, sample_le path='/v2/notifications/letter', data=json.dumps(data), headers=[('Content-Type', 'application/json'), - create_authorization_header(service_id=sample_letter_template.service_id)] + create_service_authorization_header(service_id=sample_letter_template.service_id)] ) assert response.status_code == 201 json_resp = response.get_json() diff --git a/tests/app/v2/template/test_get_template.py b/tests/app/v2/template/test_get_template.py index a3c8a711e..4dbee4e81 100644 --- a/tests/app/v2/template/test_get_template.py +++ b/tests/app/v2/template/test_get_template.py @@ -3,7 +3,7 @@ from flask import json from app.models import EMAIL_TYPE, LETTER_TYPE, SMS_TYPE, TEMPLATE_TYPES from app.utils import DATETIME_FORMAT -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import create_letter_contact, create_template valid_version_params = [None, 1] @@ -24,7 +24,7 @@ def test_get_template_by_id_returns_200( letter_contact_block_id = letter_contact_block.id template = create_template(sample_service, template_type=tmp_type, contact_block_id=(letter_contact_block_id)) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) version_path = '/version/{}'.format(version) if version else '' @@ -94,7 +94,7 @@ def test_get_template_by_id_returns_placeholders( expected_personalisation, ): template = create_template(sample_service, **create_template_args) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) version_path = '/version/{}'.format(version) if version else '' @@ -122,7 +122,7 @@ def test_get_letter_template_by_id_returns_placeholders( content="((letter_content))", reply_to=contact_block.id, ) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) version_path = '/version/{}'.format(version) if version else '' @@ -144,7 +144,7 @@ def test_get_letter_template_by_id_returns_placeholders( def test_get_template_with_non_existent_template_id_returns_404(client, fake_uuid, sample_service): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get(path='/v2/template/{}'.format(fake_uuid), headers=[('Content-Type', 'application/json'), auth_header]) @@ -169,7 +169,7 @@ def test_get_template_with_non_existent_template_id_returns_404(client, fake_uui def test_get_template_with_non_existent_version_returns_404(client, sample_service, tmp_type): template = create_template(sample_service, template_type=tmp_type) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) invalid_version = template.version + 1 diff --git a/tests/app/v2/template/test_post_template.py b/tests/app/v2/template/test_post_template.py index 229192a73..271ec9792 100644 --- a/tests/app/v2/template/test_post_template.py +++ b/tests/app/v2/template/test_post_template.py @@ -2,7 +2,7 @@ import pytest from flask import json from app.models import EMAIL_TYPE, LETTER_TYPE, TEMPLATE_TYPES -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import create_template valid_personalisation = { @@ -83,7 +83,7 @@ def test_valid_post_template_returns_200( subject=subject, content=content) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path='/v2/template/{}/preview'.format(template.id), @@ -128,7 +128,7 @@ def test_email_and_letter_templates_not_rendered_into_content( ), ) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path='/v2/template/{}/preview'.format(template.id), @@ -149,7 +149,7 @@ def test_invalid_post_template_returns_400(client, sample_service, tmp_type): template_type=tmp_type, content='Dear ((Name)), Hello ((Missing)). Yours Truly, The Government.') - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path='/v2/template/{}/preview'.format(template.id), @@ -165,7 +165,7 @@ def test_invalid_post_template_returns_400(client, sample_service, tmp_type): def test_post_template_with_non_existent_template_id_returns_404(client, fake_uuid, sample_service): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.post( path='/v2/template/{}/preview'.format(fake_uuid), @@ -193,7 +193,7 @@ def test_post_template_returns_200_without_personalisation(client, sample_templa path='/v2/template/{}/preview'.format(sample_template.id), data=None, headers=[('Content-Type', 'application/json'), - create_authorization_header(service_id=sample_template.service_id)] + create_service_authorization_header(service_id=sample_template.service_id)] ) assert response.status_code == 200 @@ -202,7 +202,7 @@ def test_post_template_returns_200_without_personalisation_and_missing_content_h response = client.post( path='/v2/template/{}/preview'.format(sample_template.id), data=None, - headers=[create_authorization_header(service_id=sample_template.service_id)] + headers=[create_service_authorization_header(service_id=sample_template.service_id)] ) assert response.status_code == 200 @@ -213,7 +213,7 @@ def test_post_template_returns_200_without_personalisation_as_valid_json_and_mis response = client.post( path='/v2/template/{}/preview'.format(sample_template.id), data=json.dumps(None), - headers=[create_authorization_header(service_id=sample_template.service_id)] + headers=[create_service_authorization_header(service_id=sample_template.service_id)] ) assert response.status_code == 200 @@ -222,6 +222,6 @@ def test_post_template_returns_200_with_valid_json_and_missing_content_header(cl response = client.post( path='/v2/template/{}/preview'.format(sample_template.id), data=json.dumps(valid_personalisation), - headers=[create_authorization_header(service_id=sample_template.service_id)] + headers=[create_service_authorization_header(service_id=sample_template.service_id)] ) assert response.status_code == 200 diff --git a/tests/app/v2/templates/test_get_templates.py b/tests/app/v2/templates/test_get_templates.py index 37a0062bc..77687f084 100644 --- a/tests/app/v2/templates/test_get_templates.py +++ b/tests/app/v2/templates/test_get_templates.py @@ -4,7 +4,7 @@ import pytest from flask import json from app.models import EMAIL_TYPE, TEMPLATE_TYPES -from tests import create_authorization_header +from tests import create_service_authorization_header from tests.app.db import create_template @@ -19,7 +19,7 @@ def test_get_all_templates_returns_200(client, sample_service): for name, tmp_type in product(('A', 'B', 'C'), TEMPLATE_TYPES) ] - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get(path='/v2/templates', headers=[('Content-Type', 'application/json'), auth_header]) @@ -51,7 +51,7 @@ def test_get_all_templates_for_valid_type_returns_200(client, sample_service, tm for i in range(3) ] - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get(path='/v2/templates?type={}'.format(tmp_type), headers=[('Content-Type', 'application/json'), auth_header]) @@ -83,7 +83,7 @@ def test_get_correct_num_templates_for_valid_type_returns_200(client, sample_ser if other_type != tmp_type: templates.append(create_template(sample_service, template_type=other_type)) - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) response = client.get(path='/v2/templates?type={}'.format(tmp_type), headers=[('Content-Type', 'application/json'), auth_header]) @@ -96,7 +96,7 @@ def test_get_correct_num_templates_for_valid_type_returns_200(client, sample_ser def test_get_all_templates_for_invalid_type_returns_400(client, sample_service): - auth_header = create_authorization_header(service_id=sample_service.id) + auth_header = create_service_authorization_header(service_id=sample_service.id) invalid_type = 'coconut'