rebase(bpdm) - Application YML's fixes

eclipse-tractusx · Dec 20, 2023 · 02494e3 · 02494e3
1 parent 1c0ee1c
commit 02494e3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/bpdm-bridge-dummy/src/main/resources/application-gate-auth.yml b/bpdm-bridge-dummy/src/main/resources/application-gate-auth.yml
@@ -34,7 +34,7 @@ spring:
         registration:
           gate-client:
             authorization-grant-type: client_credentials
-            client-id: ${bpdm.security.permission.client-id}
+            client-id: ${bpdm.security.client-id}
             client-secret: ${bpdm.security.credentials.secret}
             provider: gate-oauth2-provider
 

diff --git a/bpdm-bridge-dummy/src/main/resources/application-pool-auth.yml b/bpdm-bridge-dummy/src/main/resources/application-pool-auth.yml
@@ -29,10 +29,10 @@ spring:
       client:
         provider:
           pool-oauth2-provider:
-            issuer-uri: ${bpdm.security.permission.auth-server-url:http://localhost:8180}/realms/${bpdm.security.permission.realm:master}
+            issuer-uri: ${bpdm.security.auth-server-url:http://localhost:8180}/realms/${bpdm.security.realm:master}
         registration:
           pool-client:
             authorization-grant-type: client_credentials
-            client-id: ${bpdm.security.permission.client-id}
+            client-id: ${bpdm.security.client-id}
             client-secret: ${bpdm.security.credentials.secret}
             provider: pool-oauth2-provider
diff --git a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/config/SecurityConfig.kt b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/config/SecurityConfig.kt
@@ -54,7 +54,7 @@ class NoAuthenticationConfig {
 
 @EnableWebSecurity
 @ConditionalOnProperty(
-    value = ["bpdm.security.permission.enabled"],
+    value = ["bpdm.security.enabled"],
     havingValue = "true"
 )
 @Configuration

diff --git a/bpdm-gate/src/main/resources/application-auth.yml b/bpdm-gate/src/main/resources/application-auth.yml
@@ -48,8 +48,8 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          issuer-uri: ${bpdm.security.permission.auth-server-url}/realms/${bpdm.security.permission.realm}
-          jwk-set-uri: ${bpdm.security.permission.auth-server-url}/realms/${bpdm.security.permission.realm}/protocol/openid-connect/certs
+          issuer-uri: ${bpdm.security.auth-server-url}/realms/${bpdm.security.realm}
+          jwk-set-uri: ${bpdm.security.auth-server-url}/realms/${bpdm.security.realm}/protocol/openid-connect/certs
 
 #Springdoc configuration
 springdoc:

diff --git a/bpdm-gate/src/main/resources/application-orchestrator-auth.yml b/bpdm-gate/src/main/resources/application-orchestrator-auth.yml
@@ -30,10 +30,10 @@ spring:
       client:
         provider:
           orchestrator-oauth2-provider:
-            issuer-uri: ${bpdm.security.permission.auth-server-url:http://localhost:8180}/realms/${bpdm.security.permission.realm:master}
+            issuer-uri: ${bpdm.security.auth-server-url:http://localhost:8180}/realms/${bpdm.security.realm:master}
         registration: # Note that the oauth2-client-registration property is NOT the client id of the gate in keycloak
           orchestrator-client:
             authorization-grant-type: client_credentials
-            client-id: ${bpdm.security.permission.client-id}
+            client-id: ${bpdm.security.client-id}
             client-secret: ${bpdm.security.credentials.secret}
             provider: orchestrator-oauth2-provider
diff --git a/bpdm-pool/src/main/resources/application-orchestrator-auth.yml b/bpdm-pool/src/main/resources/application-orchestrator-auth.yml
@@ -28,10 +28,10 @@ spring:
       client:
         provider:
           orchestrator-oauth2-provider:
-            issuer-uri: ${bpdm.security.permission.auth-server-url:http://localhost:8180}/realms/${bpdm.security.permission.realm:master}
+            issuer-uri: ${bpdm.security.auth-server-url:http://localhost:8180}/realms/${bpdm.security.realm:master}
         registration: # Note that the oauth2-client-registration property is NOT the client id of the gate in keycloak
           gate-client:
             authorization-grant-type: client_credentials
-            client-id: ${bpdm.security.permission.client-id}
+            client-id: ${bpdm.security.client-id}
             client-secret: ${bpdm.security.credentials.secret}
             provider: orchestrator-oauth2-provider