From d44a0b72bb1668a236151a00f81124c15d7e9f22 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 16 Sep 2016 08:45:48 +0100 Subject: [PATCH] Rewrite authentication error messages more English --- app/authentication/auth.py | 4 ++-- tests/app/authentication/test_authentication.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/authentication/auth.py b/app/authentication/auth.py index d7f842aab..5e8cb2d4e 100644 --- a/app/authentication/auth.py +++ b/app/authentication/auth.py @@ -46,7 +46,7 @@ def requires_auth(): continue if api_key.expiry_date: - raise AuthError("Invalid token: revoked", 403) + raise AuthError("Invalid token: API key revoked", 403) _request_ctx_stack.top.api_user = api_key return @@ -57,7 +57,7 @@ def requires_auth(): raise AuthError("Invalid token: service not found", 403) if not api_keys: - raise AuthError("Invalid token: no api keys for service", 403) + raise AuthError("Invalid token: service has no API keys", 403) else: raise AuthError("Invalid token: signature", 403) diff --git a/tests/app/authentication/test_authentication.py b/tests/app/authentication/test_authentication.py index 7fdc1b922..057760585 100644 --- a/tests/app/authentication/test_authentication.py +++ b/tests/app/authentication/test_authentication.py @@ -169,7 +169,7 @@ def test_authentication_returns_token_expired_when_service_uses_expired_key_and_ headers={'Authorization': 'Bearer {}'.format(token)}) assert response.status_code == 403 data = json.loads(response.get_data()) - assert data['message'] == {"token": ['Invalid token: revoked']} + assert data['message'] == {"token": ['Invalid token: API key revoked']} def test_authentication_returns_error_when_admin_client_has_no_secrets(notify_api, @@ -230,7 +230,7 @@ def test_authentication_returns_error_when_service_has_no_secrets(notify_api, headers={'Authorization': 'Bearer {}'.format(token)}) assert response.status_code == 403 error_message = json.loads(response.get_data()) - assert error_message['message'] == {'token': ['Invalid token: no api keys for service']} + assert error_message['message'] == {'token': ['Invalid token: service has no API keys']} def test_should_attach_the_current_api_key_to_current_app(notify_api, sample_service, sample_api_key):