Merge pull request #321 from xenit-eu/renovate/com.contentgrid.thunx-thunx-bom-0.x

Update dependency com.contentgrid.thunx:thunx-bom to v0.11.1

Author: NielsCW

build.gradle

@@ -4,7 +4,7 @@ plugins {
 	id 'java'
 	id 'java-test-fixtures'
 	id 'jacoco'
-	id 'org.springframework.boot' version '3.3.3'
+	id 'org.springframework.boot' version '3.4.2'
 	id 'io.spring.dependency-management' version '1.1.7'
 	id 'org.sonarqube' version '6.0.1.5171'
 	id "be.vbgn.ci-detect" version "0.5.0"
@@ -61,7 +61,7 @@ tasks.register("runtimeBootRun",  BootRun.class) {
 }
 
 dependencies {
-	implementation platform('org.springframework.cloud:spring-cloud-dependencies:2023.0.3')
+	implementation platform('org.springframework.cloud:spring-cloud-dependencies:2024.0.0')
 	implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
@@ -74,7 +74,7 @@ dependencies {
 
 	implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
 
-	implementation platform('com.contentgrid.thunx:thunx-bom:0.11.0')
+	implementation platform('com.contentgrid.thunx:thunx-bom:0.11.1')
 	implementation 'com.contentgrid.thunx:thunx-gateway-spring-boot-starter'
 	implementation 'com.contentgrid.thunx:thunx-encoding-json'
 
@@ -124,7 +124,7 @@ dependencies {
 	testFixturesApi platform('com.contentgrid.configuration:contentgrid-configuration-bom:0.1.2')
 	testFixturesApi 'com.contentgrid.configuration:contentgrid-configuration-contentgrid-apps'
 
-	testFixturesImplementation platform('org.springframework.cloud:spring-cloud-dependencies:2023.0.3')
+	testFixturesImplementation platform('org.springframework.cloud:spring-cloud-dependencies:2024.0.0')
 	testFixturesImplementation 'io.projectreactor:reactor-test'
 	testFixturesImplementation 'com.fasterxml.jackson.core:jackson-databind'
 	testFixturesImplementation 'org.springframework.security:spring-security-core'

src/main/java/com/contentgrid/gateway/runtime/security/jwt/issuer/RuntimeJwtClaimsResolver.java

@@ -5,19 +5,21 @@
 import com.contentgrid.gateway.runtime.web.ContentGridAppRequestWebFilter;
 import com.contentgrid.gateway.security.authority.AuthenticationDetails;
 import com.contentgrid.gateway.security.jwt.issuer.JwtClaimsResolver;
-import com.contentgrid.thunx.encoding.json.ExpressionJsonConverter;
+import com.contentgrid.thunx.encoding.ThunkExpressionEncoder;
+import com.contentgrid.thunx.encoding.json.JsonThunkExpressionCoder;
 import com.contentgrid.thunx.predicates.model.ThunkExpression;
 import com.contentgrid.thunx.spring.security.ReactivePolicyAuthorizationManager;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.JWTClaimsSet.Builder;
+import java.nio.charset.StandardCharsets;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 @RequiredArgsConstructor
 public class RuntimeJwtClaimsResolver implements JwtClaimsResolver {
-    private static final ExpressionJsonConverter thunxExpressionConverter = new ExpressionJsonConverter();
+    private static final ThunkExpressionEncoder thunxExpressionEncoder = new JsonThunkExpressionCoder();
 
     @Override
     public Mono<JWTClaimsSet> resolveAdditionalClaims(ServerWebExchange exchange, AuthenticationDetails authenticationDetails) {
@@ -28,7 +30,7 @@ public Mono<JWTClaimsSet> resolveAdditionalClaims(ServerWebExchange exchange, Au
         var jwtClaimsBuilder = new Builder();
 
         if(abacPolicyPredicate != null) {
-            jwtClaimsBuilder.claim("x-abac-context", thunxExpressionConverter.encode(abacPolicyPredicate));
+            jwtClaimsBuilder.claim("x-abac-context", new String(thunxExpressionEncoder.encode(abacPolicyPredicate), StandardCharsets.UTF_8));
         }
 
         return Mono.just(