Fix 701 (#704)

* Fix for #701 * Add biocache-config fix from helm branch * Trying to fix newline
AtlasOfLivingAustralia · Nov 17, 2023 · 0b2a2d3 · 0b2a2d3
1 parent 80f563b
commit 0b2a2d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/ansible/roles/biocache3-properties/templates/biocache-config.properties b/ansible/roles/biocache3-properties/templates/biocache-config.properties
@@ -487,9 +487,9 @@ security.apikey.userdetails.serviceUrl={{ apikey_userdetails_url }}
 
 #websevice jwt
 webservice.jwt={{ webservice_jwt | default('false') }}
-webservice.jwt-scopes={{ webservice_jwt_scopes | default('') }}
-webservice.client-id={{ webservice_clientId | default('') }}
-webservice.client-secret={{ webservice_secert | default('') }}
+webservice.jwt-scopes = {{ (biocache_jwt_scopes | default(webservice_jwt_scopes)) | default('') }}
+webservice.client-id = {{ (biocache_client_id | default(webservice_clientId)) | default('') }}
+webservice.client-secret = {{ (biocache_client_secret | default(webservice_secert)) | default('') }}
 webservices.cache-tokens=false
 
 

diff --git a/ansible/roles/image-service/templates/config/image-service-config.yml b/ansible/roles/image-service/templates/config/image-service-config.yml
@@ -35,10 +35,8 @@ security:
 {% endif %}
   jwt:
     discoveryUri: {{ discoveryUri | default('') }}
-{% if jwt_client_id is defined %}
-    client-id: {{ jwt_client_id }}
-    secret: {{ jwt_secret }}
-{% endif %}
+    client-id: {{ (images_client_id | default(jwt_client_id) | default(clientId)) | default('') }}
+    secret: {{ (images_client_secret | default(jwt_secret) | default(secret)) | default('') }}
     allowed-scopes: {{ jwt_scopes | default('users/read') }}
     role-claims: {{ security_jwt_roleClaims | default('role') }}
     roles-from-access-token: {{ security_jwt_rolesFromAccessToken | default('false')}}

diff --git a/ansible/roles/species-list/templates/specieslist-webapp-config.properties b/ansible/roles/species-list/templates/specieslist-webapp-config.properties
@@ -133,10 +133,12 @@ security.apikey.check.serviceUrl={{ specieslist_apikey_check_url | default('http
 #websevice jwt
 webservice.jwt={{ webservice_jwt | default('false') }}
 webservice.jwt-scopes={{ webservice_jwt_scopes | default('') }}
-webservice.client-id={{ service_client_id }}
-webservice.client-secret={{ service_secret }}
+webservice.client-id={{ (lists_client_id | default(service_client_id)) | default('') }}
+webservice.client-secret={{ (lists_client_secret | default(service_secret)) | default('') }}
+
+# For backward compatibility:
+userDetails.url={{ userdetails_url | default('https://auth.ala.org.au/userdetails/') }}
 
-#userDetails.url={{ userdetails_url | default('https://auth.ala.org.au/userdetails/') }}
 userdetails.web.url={{ userdetails_web_url | default('https://auth.ala.org.au/userdetails/') }}
 userdetails.api.url={{ userdetails_api_url | default('https://api.ala.org.au/userdetails/') }}