From 90191ece0fdeac143cba9fec617b7990c6229f93 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Fri, 30 Oct 2020 16:03:13 -0700
Subject: [PATCH] DIV-1225 - Refactored some duplicate settings lines

---
 edivorce/settings/base.py      |  2 +-
 edivorce/settings/openshift.py | 27 ++++++++-------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/edivorce/settings/base.py b/edivorce/settings/base.py
index 2b15563f..675f1332 100644
--- a/edivorce/settings/base.py
+++ b/edivorce/settings/base.py
@@ -184,11 +184,11 @@ SECURE_BROWSER_XSS_FILTER = True
 
 # eFiling Hub settings
 EFILING_HUB_ENABLED = False
+EFILING_HUB_API_BASE_URL = env('EFILING_HUB_API_BASE_URL', '')
 EFILING_HUB_KEYCLOAK_BASE_URL = env('EFILING_HUB_KEYCLOAK_BASE_URL', '')
 EFILING_HUB_KEYCLOAK_REALM = env('EFILING_HUB_KEYCLOAK_REALM', '')
 EFILING_HUB_KEYCLOAK_CLIENT_ID = env('EFILING_HUB_KEYCLOAK_CLIENT_ID', '')
 EFILING_HUB_KEYCLOAK_SECRET = env('EFILING_HUB_KEYCLOAK_SECRET', '')
-EFILING_HUB_API_BASE_URL = env('EFILING_HUB_API_BASE_URL', '')
 
 EFILING_BCEID = env('EFILING_BCEID', '', subcast=str)
 
diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py
index f75b86ba..dafdc112 100644
--- a/edivorce/settings/openshift.py
+++ b/edivorce/settings/openshift.py
@@ -53,12 +53,9 @@ if DEPLOYMENT_TYPE in ['dev', 'unittest']:
     DEBUG = True
     # Keycloak OpenID Connect settings
     EDIVORCE_KEYCLOAK_BASE_URL = 'https://dev.oidc.gov.bc.ca'
-    EDIVORCE_KEYCLOAK_REALM = 'tz0e228w'
-    EDIVORCE_KEYCLOAK_CLIENT_ID = 'e-divorce-app'
     # EFiling Hub Settings
-    EFILING_HUB_KEYCLOAK_CLIENT_ID = 'e-divorce'
-    EFILING_HUB_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 = ''
@@ -74,38 +71,36 @@ if DEPLOYMENT_TYPE == 'test':
     REGISTER_BCSC_URL = 'https://logontest7.gov.bc.ca/clp-cgi/fed/fedLaunch.cgi?partner=fed38&partnerList=fed38&flags=0001:0,7&TARGET=http://test.justice.gov.bc.ca/divorce/oidc/authenticate'
     # Keycloak OpenID Connect settings
     EDIVORCE_KEYCLOAK_BASE_URL = 'https://test.oidc.gov.bc.ca'
-    EDIVORCE_KEYCLOAK_REALM = 'tz0e228w'
-    EDIVORCE_KEYCLOAK_CLIENT_ID = 'e-divorce-app'
     # EFiling Hub Settings
-    EFILING_HUB_KEYCLOAK_CLIENT_ID = 'e-divorce'
-    EFILING_HUB_KEYCLOAK_BASE_URL = 'https://sso-test.pathfinder.gov.bc.ca'
     EFILING_HUB_API_BASE_URL = 'https://efiling-api-nginx-proxy-qzaydf-test.pathfinder.gov.bc.ca/api'
+    EFILING_HUB_KEYCLOAK_BASE_URL = 'https://sso-test.pathfinder.gov.bc.ca'
 
 if DEPLOYMENT_TYPE == 'prod':
     REGISTER_BCEID_URL = 'https://www.bceid.ca/directories/bluepages/details.aspx?serviceID=5203'
     REGISTER_BCSC_URL = 'https://logon7.gov.bc.ca/clp-cgi/fed/fedLaunch.cgi?partner=fed49&partnerList=fed49&flags=0001:0,8&TARGET=http://justice.gov.bc.ca/divorce/oidc/authenticate'
     # Keycloak OpenID Connect settings
     EDIVORCE_KEYCLOAK_BASE_URL = 'https://oidc.gov.bc.ca'
-    EDIVORCE_KEYCLOAK_REALM = 'tz0e228w'
-    EDIVORCE_KEYCLOAK_CLIENT_ID = 'e-divorce-app'
     # EFiling Hub Settings
-    EFILING_HUB_KEYCLOAK_CLIENT_ID = 'e-divorce'
-    EFILING_HUB_KEYCLOAK_BASE_URL = 'https://oidc.gov.bc.ca'
     EFILING_HUB_API_BASE_URL = 'https://to-be-filled-in-later'
-
+    EFILING_HUB_KEYCLOAK_BASE_URL = 'https://oidc.gov.bc.ca'
     # Google Tag Manager (Production)
     GTM_ID = 'GTM-W4Z2SPS'
 
 # Keycloak OpenID Connect settings
+EDIVORCE_KEYCLOAK_CLIENT_ID = 'e-divorce-app'
+EDIVORCE_KEYCLOAK_REALM = 'tz0e228w'
 KEYCLOAK_LOGOUT = f'{EDIVORCE_KEYCLOAK_BASE_URL}/auth/realms/{EDIVORCE_KEYCLOAK_REALM}/protocol/openid-connect/logout'
 OIDC_OP_JWKS_ENDPOINT = f'{EDIVORCE_KEYCLOAK_BASE_URL}/auth/realms/{EDIVORCE_KEYCLOAK_REALM}/protocol/openid-connect/certs'
 OIDC_OP_AUTHORIZATION_ENDPOINT = f'{EDIVORCE_KEYCLOAK_BASE_URL}/auth/realms/{EDIVORCE_KEYCLOAK_REALM}/protocol/openid-connect/auth'
 OIDC_OP_TOKEN_ENDPOINT = f'{EDIVORCE_KEYCLOAK_BASE_URL}/auth/realms/{EDIVORCE_KEYCLOAK_REALM}/protocol/openid-connect/token'
 OIDC_OP_USER_ENDPOINT = f'{EDIVORCE_KEYCLOAK_BASE_URL}/auth/realms/{EDIVORCE_KEYCLOAK_REALM}/protocol/openid-connect/userinfo'
 OIDC_RP_CLIENT_ID = EDIVORCE_KEYCLOAK_CLIENT_ID
+LOGIN_REDIRECT_URL = PROXY_URL_PREFIX + '/signin'
 
 # EFiling Hub Settings
+EFILING_HUB_ENABLED = True
 EFILING_HUB_KEYCLOAK_REALM = EDIVORCE_KEYCLOAK_REALM
+EFILING_HUB_KEYCLOAK_CLIENT_ID = 'e-divorce'
 
 # Internal Relative Urls
 FORCE_SCRIPT_NAME = PROXY_URL_PREFIX + '/'
@@ -135,12 +130,6 @@ REDIS_PORT = 6379
 REDIS_DB = ''
 REDIS_PASSWORD = os.getenv('REDIS_PASSWORD', '')
 
-# Keycloak OpenID Connect settings
-LOGIN_REDIRECT_URL = PROXY_URL_PREFIX + '/signin'
-
-# Enable Efiling Hub
-EFILING_HUB_ENABLED = True
-
 # Enable virtual swearing
 VIRTUAL_SWEARING_ENABLED = False