From 6db45a733183d96c411192bf1f91ef5e1ab22d17 Mon Sep 17 00:00:00 2001 From: Michael Olund Date: Fri, 30 Oct 2020 16:40:55 -0700 Subject: [PATCH] DIV-1225 - Reduced the complexity of unittest/dev combo --- edivorce/settings/openshift.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py index ece90ea5..5de823fb 100644 --- a/edivorce/settings/openshift.py +++ b/edivorce/settings/openshift.py @@ -49,20 +49,15 @@ DEPLOYMENT_TYPE = env('ENVIRONMENT_TYPE', 'unittest') PROXY_URL_PREFIX = os.getenv('PROXY_URL_PREFIX', '/divorce') PROXY_BASE_URL = os.getenv('PROXY_BASE_URL', 'https://justice.gov.bc.ca') -if DEPLOYMENT_TYPE in ['dev', 'unittest']: - DEBUG = True - EDIVORCE_KEYCLOAK_BASE_URL = 'https://dev.oidc.gov.bc.ca' - EFILING_HUB_API_BASE_URL = 'https://fla-nginx-proxy-qzaydf-dev.pathfinder.gov.bc.ca/api' - EFILING_HUB_KEYCLOAK_BASE_URL = 'https://dev.oidc.gov.bc.ca' - -if DEPLOYMENT_TYPE == 'unittest': - PROXY_URL_PREFIX = '' - if DEPLOYMENT_TYPE == 'dev': + DEBUG = True CSRF_COOKIE_AGE = None SESSION_COOKIE_AGE = 3600 REGISTER_BCEID_URL = 'https://www.test.bceid.ca/directories/bluepages/details.aspx?serviceID=5522' REGISTER_BCSC_URL = 'https://logontest7.gov.bc.ca/clp-cgi/fed/fedLaunch.cgi?partner=fed38&partnerList=fed38&flags=0001:0,7&TARGET=http://dev.justice.gov.bc.ca/divorce/oidc/authenticate' + EDIVORCE_KEYCLOAK_BASE_URL = 'https://dev.oidc.gov.bc.ca' + EFILING_HUB_API_BASE_URL = 'https://fla-nginx-proxy-qzaydf-dev.pathfinder.gov.bc.ca/api' + EFILING_HUB_KEYCLOAK_BASE_URL = 'https://dev.oidc.gov.bc.ca' if DEPLOYMENT_TYPE == 'test': REGISTER_BCEID_URL = 'https://www.test.bceid.ca/directories/bluepages/details.aspx?serviceID=5521' @@ -80,6 +75,12 @@ if DEPLOYMENT_TYPE == 'prod': # Google Tag Manager (Production) GTM_ID = 'GTM-W4Z2SPS' +if DEPLOYMENT_TYPE == 'unittest': + EDIVORCE_KEYCLOAK_BASE_URL = '' + EFILING_HUB_API_BASE_URL = '' + EFILING_HUB_KEYCLOAK_BASE_URL = '' + PROXY_URL_PREFIX = '' + # Keycloak OpenID Connect settings EDIVORCE_KEYCLOAK_CLIENT_ID = 'e-divorce-app' EDIVORCE_KEYCLOAK_REALM = 'tz0e228w'