Merge pull request #741 from catenax-ng/fix/gate/owner-property-nullable

fix(Gate): empty owner BPNL leading to forbidden errors
eclipse-tractusx · Feb 7, 2024 · 52a27e1 · 52a27e1
2 parents 57d994c + 1f03b37
commit 52a27e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/...c/main/kotlin/org/eclipse/tractusx/bpdm/common/config/CustomJwtAuthenticationConverter.kt b/...c/main/kotlin/org/eclipse/tractusx/bpdm/common/config/CustomJwtAuthenticationConverter.kt
@@ -52,7 +52,7 @@ import java.util.stream.Collectors
  * }
  *
  */
-class CustomJwtAuthenticationConverter(private val resourceId: String, private val requiredBpn: String? = null) : Converter<Jwt, AbstractAuthenticationToken> {
+class CustomJwtAuthenticationConverter(private val resourceId: String, private val requiredBpn: String = "") : Converter<Jwt, AbstractAuthenticationToken> {
     private val defaultGrantedAuthoritiesConverter = JwtGrantedAuthoritiesConverter()
 
     override fun convert(source: Jwt): AbstractAuthenticationToken {
@@ -63,8 +63,8 @@ class CustomJwtAuthenticationConverter(private val resourceId: String, private v
 
     @Suppress("UNCHECKED_CAST")
     companion object {
-        private fun extractResourceRoles(jwt: Jwt, resourceId: String, requiredBpn: String? = null): Collection<GrantedAuthority> {
-            if (requiredBpn != null && requiredBpn != jwt.claims["bpn"]) {
+        private fun extractResourceRoles(jwt: Jwt, resourceId: String, requiredBpn: String = ""): Collection<GrantedAuthority> {
+            if (requiredBpn.isNotBlank() && requiredBpn != jwt.claims["bpn"]) {
                 return emptyList()
             }
 

diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/config/BpnConfigProperties.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/config/BpnConfigProperties.kt
@@ -27,5 +27,5 @@ data class BpnConfigProperties(
     val agencyName: String = "Catena-X",
     var name: String = "Business Partner Number",
     val id: String = "CX_BPN",
-    val ownerBpnL: String? = null
+    val ownerBpnL: String = ""
 )
diff --git a/bpdm-gate/src/main/resources/application.yml b/bpdm-gate/src/main/resources/application.yml
@@ -31,7 +31,8 @@ bpdm:
         agency-name: Catena-X
         id: CX_BPN
         name: Business Partner Number
-        owner-bpn-l: '# Insert owner BPNL here'
+        # Insert owner BPNL here
+        owner-bpn-l:
     api:
         upsert-limit: 100