tier config updates

ministryofjustice · Nov 30, 2023 · 074396d · 074396d
1 parent d08fa57
commit 074396d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/projects/refer-and-monitor-and-delius/src/main/resources/application.yml b/projects/refer-and-monitor-and-delius/src/main/resources/application.yml
@@ -31,6 +31,8 @@ spring:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
 
+springdoc.default-produces-media-type: application/json
+
 delius.db.username: ReferAndMonitorAndDelius # Should match value in [deploy/database/access.yml].
 
 management:

diff --git a/projects/tier-to-delius/deploy/values.yaml b/projects/tier-to-delius/deploy/values.yaml
@@ -15,8 +15,8 @@ generic-service:
     common:
       SPRING_DATASOURCE_URL: DB_URL
     tier-to-delius-client-credentials:
-      SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_TIER-TO-DELIUS_CLIENT-ID: CLIENT_ID
-      SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_TIER-TO-DELIUS_CLIENT-SECRET: CLIENT_SECRET
+      OAUTH2_CLIENT-ID: CLIENT_ID
+      OAUTH2_CLIENT-SECRET: CLIENT_SECRET
     tier-to-delius-database:
       SPRING_DATASOURCE_USERNAME: DB_USERNAME
       SPRING_DATASOURCE_PASSWORD: DB_PASSWORD

diff --git a/projects/tier-to-delius/src/main/resources/application.yml b/projects/tier-to-delius/src/main/resources/application.yml
@@ -21,8 +21,8 @@ spring:
       default:
         provider: hmpps-auth
         authorization-grant-type: client_credentials
-        client-id: tier-to-delius
-        client-secret: tier-to-delius
+        client-id: ${oauth2.client-id}
+        client-secret: ${oauth2.client-secret}
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token