From 5d7b1bc786f49ceb645f5c115026ba44d55c80da Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Tue, 8 Mar 2016 15:27:12 +0000 Subject: [PATCH] Removed DELIVERY_CLIENT_USER_NAME and DELIVERY_CLIENT_SECRET from configs and auth module --- README.md | 2 -- app/authentication/auth.py | 5 ----- config.py | 2 -- environment_test.sh | 2 -- 4 files changed, 11 deletions(-) diff --git a/README.md b/README.md index dc7083458..5c6d177b4 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,6 @@ export ADMIN_CLIENT_SECRET='dev-notify-secret-key' export ADMIN_CLIENT_USER_NAME='dev-notify-admin' export AWS_REGION='eu-west-1' export DANGEROUS_SALT='dev-notify-salt' -export DELIVERY_CLIENT_USER_NAME='dev-notify-delivery' -export DELIVERY_CLIENT_SECRET='dev-notify-secret-key' export FIRETEXT_API_KEY=[contact team member for api key] export FIRETEXT_NUMBER="Firetext" export INVITATION_EMAIL_FROM='invites@notifications.service.gov.uk' diff --git a/app/authentication/auth.py b/app/authentication/auth.py index 2d326d15c..3f2901eba 100644 --- a/app/authentication/auth.py +++ b/app/authentication/auth.py @@ -61,11 +61,6 @@ def fetch_client(client): "client": client, "secret": [current_app.config.get('ADMIN_CLIENT_SECRET')] } - elif client == current_app.config.get('DELIVERY_CLIENT_USER_NAME'): - return { - "client": client, - "secret": [current_app.config.get('DELIVERY_CLIENT_SECRET')] - } else: return { "client": client, diff --git a/config.py b/config.py index 7237a2c07..fe8597a9f 100644 --- a/config.py +++ b/config.py @@ -9,8 +9,6 @@ class Config(object): ADMIN_CLIENT_SECRET = os.environ['ADMIN_CLIENT_SECRET'] AWS_REGION = os.environ['AWS_REGION'] DANGEROUS_SALT = os.environ['DANGEROUS_SALT'] - DELIVERY_CLIENT_USER_NAME = os.environ['DELIVERY_CLIENT_USER_NAME'] - DELIVERY_CLIENT_SECRET = os.environ['DELIVERY_CLIENT_SECRET'] INVITATION_EXPIRATION_DAYS = int(os.environ['INVITATION_EXPIRATION_DAYS']) INVITATION_EMAIL_FROM = os.environ['INVITATION_EMAIL_FROM'] NOTIFY_APP_NAME = 'api' diff --git a/environment_test.sh b/environment_test.sh index 73d03a94a..844dc4ef3 100644 --- a/environment_test.sh +++ b/environment_test.sh @@ -5,8 +5,6 @@ export ADMIN_CLIENT_USER_NAME='dev-notify-admin' export ADMIN_CLIENT_SECRET='dev-notify-secret-key' export AWS_REGION='eu-west-1' export DANGEROUS_SALT='dangerous-salt' -export DELIVERY_CLIENT_USER_NAME='dev-notify-delivery' -export DELIVERY_CLIENT_SECRET='dev-notify-secret-key' export INVITATION_EMAIL_FROM='invites' export INVITATION_EXPIRATION_DAYS=2 export NOTIFY_JOB_QUEUE='notify-jobs-queue-test'