Merge pull request #91 from navikt/dependabot/gradle/backend-81b60f703d

Bump the backend group across 1 directory with 5 updates

Author: blommish

http-client/build.gradle.kts

@@ -1,4 +1,4 @@
-val tokenSupportVersion = "5.0.20"
+val tokenSupportVersion = "5.0.24"
 val wiremockVersion = "3.0.1"
 val tilleggsstønaderKontrakterVersion = "2025.03.24-08.34.c5f84c4f3794"
 

http-client/main/no/nav/tilleggsstonader/libs/http/client/RetryOAuth2HttpClient.kt

@@ -1,22 +1,27 @@
 package no.nav.tilleggsstonader.libs.http.client
 
+import no.nav.security.token.support.client.core.OAuth2ClientException
+import no.nav.security.token.support.client.core.http.OAuth2HttpClient
 import no.nav.security.token.support.client.core.http.OAuth2HttpRequest
 import no.nav.security.token.support.client.core.oauth2.OAuth2AccessTokenResponse
 import no.nav.security.token.support.client.spring.oauth2.DefaultOAuth2HttpClient
+import no.nav.tilleggsstonader.libs.log.SecureLogger.secureLogger
 import org.apache.hc.core5.http.NoHttpResponseException
 import org.slf4j.LoggerFactory
 import org.springframework.core.NestedExceptionUtils
+import org.springframework.http.HttpHeaders
+import org.springframework.util.LinkedMultiValueMap
 import org.springframework.web.client.HttpServerErrorException
 import org.springframework.web.client.RestClient
+import org.springframework.web.client.body
 import java.net.SocketException
 import java.net.SocketTimeoutException
 
 class RetryOAuth2HttpClient(
-    restClient: RestClient,
+    private val restClient: RestClient,
     private val maxRetries: Int = 2,
-) : DefaultOAuth2HttpClient(restClient) {
+) : OAuth2HttpClient {
     private val logger = LoggerFactory.getLogger(javaClass)
-    private val secureLogger = LoggerFactory.getLogger("secureLogger")
 
     // ServiceUnavailable håndteres av apache http-client
     private val retryExceptions =
@@ -32,14 +37,32 @@ class RetryOAuth2HttpClient(
 
         while (true) {
             try {
-                val response = super.post(req)
-                return response
+                return postRequest(req)
             } catch (e: Exception) {
                 handleException(e, retries++, req)
             }
         }
     }
 
+    /**
+     * Kopi fra [DefaultOAuth2HttpClient]
+     */
+    private fun postRequest(req: OAuth2HttpRequest): OAuth2AccessTokenResponse =
+        restClient
+            .post()
+            .uri(req.tokenEndpointUrl)
+            .headers { it.addAll(headers(req)) }
+            .body(
+                LinkedMultiValueMap<String, String>().apply {
+                    setAll(req.formParameters)
+                },
+            ).retrieve()
+            .onStatus({ it.isError }) { _, response ->
+                throw OAuth2ClientException("Received ${response.statusCode} from ${req.tokenEndpointUrl}")
+            }.body<OAuth2AccessTokenResponse>() ?: throw OAuth2ClientException("No body in response from ${req.tokenEndpointUrl}")
+
+    private fun headers(req: OAuth2HttpRequest): HttpHeaders = HttpHeaders().apply { putAll(req.oAuth2HttpHeaders.headers) }
+
     private fun handleException(
         e: Exception,
         retries: Int,

kafka/main/no/nav/tilleggsstonader/libs/kafka/KafkaErrorHandler.kt

@@ -1,5 +1,6 @@
 package no.nav.tilleggsstonader.libs.kafka
 
+import no.nav.tilleggsstonader.libs.log.SecureLogger.secureLogger
 import org.apache.kafka.clients.consumer.Consumer
 import org.apache.kafka.clients.consumer.ConsumerRecord
 import org.slf4j.Logger
@@ -18,7 +19,6 @@ class KafkaErrorHandler(
     private val taskScheduler: TaskScheduler,
 ) : CommonContainerStoppingErrorHandler() {
     private val logger: Logger = LoggerFactory.getLogger(javaClass)
-    private val secureLogger: Logger = LoggerFactory.getLogger("secureLogger")
 
     private val counter = AtomicInteger(0)
     private val lastError = AtomicLong(0)

settings.gradle.kts

@@ -1,7 +1,7 @@
 rootProject.name = "tilleggsstonader-libs"
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 
 include("http-client")

sikkerhet/build.gradle.kts

@@ -1,4 +1,4 @@
-val tokenSupportVersion = "5.0.20"
+val tokenSupportVersion = "5.0.24"
 
 plugins {
     kotlin("plugin.spring") version "2.1.20"

unleash/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 dependencies {
     implementation("org.springframework.boot:spring-boot")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
-    api("io.getunleash:unleash-client-java:10.2.0")
+    api("io.getunleash:unleash-client-java:10.2.2")
 }
 
 tasks.sourcesJar {