darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-19 05:58:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename ADMIN_CLIENT_USER_NAME to say CLIENT_ID

Browse Source 
"user name" implies we're doing basic auth, which we're not. We
should use the standard terminology for bearer tokens.
This commit is contained in:
Ben Thorner
2021-07-29 12:18:10 +01:00
parent 323feedb1f
commit 3e32fc99b8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/authentication/auth.py
View File

@@ -61,7 +61,7 @@ def requires_no_auth():
def requires_admin_auth(): def requires_admin_auth():
requires_internal_auth(current_app.config.get('ADMIN_CLIENT_USER_NAME')) requires_internal_auth(current_app.config.get('ADMIN_CLIENT_ID'))
def requires_internal_auth(expected_client_id): def requires_internal_auth(expected_client_id):

6
app/config.py
View File

@@ -88,10 +88,10 @@ class Config(object):
API_INTERNAL_SECRETS = json.loads(os.environ.get('API_INTERNAL_SECRETS', '[]')) API_INTERNAL_SECRETS = json.loads(os.environ.get('API_INTERNAL_SECRETS', '[]'))
# secrets that internal apps, such as the admin app or document download, must use to authenticate with the API # secrets that internal apps, such as the admin app or document download, must use to authenticate with the API
ADMIN_CLIENT_USER_NAME = 'notify-admin' ADMIN_CLIENT_ID = 'notify-admin'
INTERNAL_CLIENT_API_KEYS = { INTERNAL_CLIENT_API_KEYS = {
ADMIN_CLIENT_USER_NAME: API_INTERNAL_SECRETS ADMIN_CLIENT_ID: API_INTERNAL_SECRETS
} }
# encyption secret/salt # encyption secret/salt
@@ -406,7 +406,7 @@ class Development(Config):
LETTER_SANITISE_BUCKET_NAME = 'development-letters-sanitise' LETTER_SANITISE_BUCKET_NAME = 'development-letters-sanitise'
INTERNAL_CLIENT_API_KEYS = { INTERNAL_CLIENT_API_KEYS = {
Config.ADMIN_CLIENT_USER_NAME: ['dev-notify-secret-key'] Config.ADMIN_CLIENT_ID: ['dev-notify-secret-key']
} }
SECRET_KEY = 'dev-notify-secret-key' SECRET_KEY = 'dev-notify-secret-key'

2
tests/__init__.py
View File

@@ -27,7 +27,7 @@ def create_authorization_header(service_id=None, key_type=KEY_TYPE_NORMAL):
secret = api_key.secret secret = api_key.secret
else: else:
client_id = current_app.config['ADMIN_CLIENT_USER_NAME'] client_id = current_app.config['ADMIN_CLIENT_ID']
secret = current_app.config['INTERNAL_CLIENT_API_KEYS'][client_id][0] secret = current_app.config['INTERNAL_CLIENT_API_KEYS'][client_id][0]
token = create_jwt_token(secret=secret, client_id=client_id) token = create_jwt_token(secret=secret, client_id=client_id)

6
tests/app/authentication/test_authentication.py
View File

@@ -61,7 +61,7 @@ def service_jwt_token(sample_api_key, service_jwt_secret):
) )
def test_requires_auth_should_allow_valid_token_for_request_with_path_params_for_public_url( def test_requires_auth_should_allow_valid_token_for_request(
client, client,
service_jwt_token, service_jwt_token,
): ):
@@ -69,8 +69,8 @@ def test_requires_auth_should_allow_valid_token_for_request_with_path_params_for
assert response.status_code == 200 assert response.status_code == 200
def test_requires_admin_auth_should_allow_valid_token_for_request_with_path_params(client): def test_requires_admin_auth_should_allow_valid_token_for_request(client):
admin_jwt_client_id = current_app.config['ADMIN_CLIENT_USER_NAME'] admin_jwt_client_id = current_app.config['ADMIN_CLIENT_ID']
admin_jwt_secret = current_app.config['INTERNAL_CLIENT_API_KEYS'][admin_jwt_client_id][0] admin_jwt_secret = current_app.config['INTERNAL_CLIENT_API_KEYS'][admin_jwt_client_id][0]
admin_jwt_token = create_jwt_token(admin_jwt_secret, admin_jwt_client_id) admin_jwt_token = create_jwt_token(admin_jwt_secret, admin_jwt_client_id)