From 46fc44a2ca882e66a70cd64b21996170a9a0cf02 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Fri, 30 Oct 2020 15:53:27 -0700
Subject: [PATCH] DIV-1225 - Fixed some issues with renamed settings

---
 .env.example                                   |  7 ++++---
 edivorce/apps/core/utils/efiling_submission.py |  6 +++---
 edivorce/settings/base.py                      |  6 +++---
 edivorce/settings/local.py                     | 12 +++++++-----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.env.example b/.env.example
index a7a11a40..2886c136 100644
--- a/.env.example
+++ b/.env.example
@@ -1,5 +1,6 @@
 DEBUG=True
 TEMPLATE_DEBUG=True
+DJANGO_SECRET_KEY=
 DATABASE_ENGINE=django.db.backends.sqlite3
 DATABASE_NAME=db.sqlite3
 DATABASE_USER=
@@ -19,9 +20,9 @@ REDIS_DB=
 REDIS_PASSWORD=
 
 # eFiling Hub settings
-EDIVORCE_KEYCLOAK_BASE_URL=''
-EFILING_HUB_REALM=''
-EFILING_HUB_CLIENT_ID=''
+EFILING_HUB_KEYCLOAK_BASE_URL=''
+EFILING_HUB_KEYCLOAK_REALM=''
+EFILING_HUB_KEYCLOAK_CLIENT_ID=''
 EFILING_HUB_KEYCLOAK_SECRET=''
 EFILING_HUB_API_BASE_URL=''
 
diff --git a/edivorce/apps/core/utils/efiling_submission.py b/edivorce/apps/core/utils/efiling_submission.py
index 6cf2bdc9..dfc8a14b 100644
--- a/edivorce/apps/core/utils/efiling_submission.py
+++ b/edivorce/apps/core/utils/efiling_submission.py
@@ -14,10 +14,10 @@ logger = logging.getLogger(__name__)
 class EFilingSubmission:
 
     def __init__(self, initial_filing):
-        self.client_id = settings.EFILING_HUB_CLIENT_ID
+        self.client_id = settings.EFILING_HUB_KEYCLOAK_CLIENT_ID
         self.client_secret = settings.EFILING_HUB_KEYCLOAK_SECRET
-        self.token_base_url = settings.EFILING_HUB_TOKEN_BASE_URL
-        self.token_realm = settings.EFILING_HUB_REALM
+        self.token_base_url = settings.EFILING_HUB_KEYCLOAK_BASE_URL
+        self.token_realm = settings.EFILING_HUB_KEYCLOAK_REALM
         self.api_base_url = settings.EFILING_HUB_API_BASE_URL
 
         self.submission_id = None
diff --git a/edivorce/settings/base.py b/edivorce/settings/base.py
index d67c16d7..2b15563f 100644
--- a/edivorce/settings/base.py
+++ b/edivorce/settings/base.py
@@ -184,9 +184,9 @@ SECURE_BROWSER_XSS_FILTER = True
 
 # eFiling Hub settings
 EFILING_HUB_ENABLED = False
-EFILING_HUB_TOKEN_BASE_URL = env('EFILING_HUB_TOKEN_BASE_URL', '')
-EFILING_HUB_REALM = env('EFILING_HUB_REALM', '')
-EFILING_HUB_CLIENT_ID = env('EFILING_HUB_CLIENT_ID', '')
+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', '')
 
diff --git a/edivorce/settings/local.py b/edivorce/settings/local.py
index c1639d71..812711f2 100644
--- a/edivorce/settings/local.py
+++ b/edivorce/settings/local.py
@@ -42,11 +42,13 @@ REDIS_PASSWORD = env('REDIS_PASSWORD', '')
 
 # Keycloak OpenID Connect settings
 # Provided by mozilla-django-oidc
-OIDC_OP_JWKS_ENDPOINT = 'http://localhost:8081/auth/realms/justice/protocol/openid-connect/certs'
-OIDC_OP_AUTHORIZATION_ENDPOINT = 'http://localhost:8081/auth/realms/justice/protocol/openid-connect/auth'
-OIDC_OP_TOKEN_ENDPOINT = 'http://localhost:8081/auth/realms/justice/protocol/openid-connect/token'
-OIDC_OP_USER_ENDPOINT = 'http://localhost:8081/auth/realms/justice/protocol/openid-connect/userinfo'
-KEYCLOAK_LOGOUT = 'http://localhost:8081/auth/realms/justice/protocol/openid-connect/logout'
+EDIVORCE_KEYCLOAK_BASE_URL = 'http://localhost:8081'
+EDIVORCE_KEYCLOAK_REALM = 'justice'
+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-app'
 LOGIN_REDIRECT_URL = '/signin'