E - Oppdaterer tokenSupportVersion til 4.0.5

navikt · Jan 12, 2024 · d4fa974 · d4fa974
1 parent 480a3c8
commit d4fa974
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 		springKafkaVersion = '3.1.1'
 		cxfVersion = '3.4.2'
 		jacksonModuleKotlinVersion = '2.16.1'
-		tokenSupportVersion = '3.2.0'
+		tokenSupportVersion = '4.0.5'
 	}
 }
 

diff --git a/src/main/kotlin/no/nav/eessi/pensjon/config/PDLConfiguration.kt b/src/main/kotlin/no/nav/eessi/pensjon/config/PDLConfiguration.kt
@@ -26,7 +26,7 @@ class PDLConfiguration(
     override fun callBack(): PdlToken {
         val clientProperties =  Optional.ofNullable(clientConfigurationProperties.registration["pdl-credentials"]).orElseThrow { RuntimeException("could not find oauth2 client config for pdl-credentials") }
         val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-        val token = response.accessToken
+        val token = response?.accessToken!!
         return PdlTokenImp(token)
     }
 

diff --git a/src/main/kotlin/no/nav/eessi/pensjon/config/RestTemplateConfig.kt b/src/main/kotlin/no/nav/eessi/pensjon/config/RestTemplateConfig.kt
@@ -25,6 +25,8 @@ import org.springframework.http.client.ClientHttpRequestInterceptor
 import org.springframework.http.client.SimpleClientHttpRequestFactory
 import org.springframework.web.client.DefaultResponseErrorHandler
 import org.springframework.web.client.RestTemplate
+import java.net.URLDecoder
+import java.nio.charset.StandardCharsets
 
 
 @Configuration
@@ -109,7 +111,7 @@ class RestTemplateConfig(
     private fun onBehalfOfBearerTokenInterceptor(clientId: String): ClientHttpRequestInterceptor {
         logger.info("init onBehalfOfBearerTokenInterceptor: $clientId")
         return ClientHttpRequestInterceptor { request: HttpRequest, body: ByteArray?, execution: ClientHttpRequestExecution ->
-            val navidentTokenFromUI = getToken(tokenValidationContextHolder).tokenAsString
+            val navidentTokenFromUI = URLDecoder.decode(getToken(tokenValidationContextHolder)?.encodedToken, StandardCharsets.UTF_8)
 
             logger.info("NAVIdent: ${getClaims(tokenValidationContextHolder).get("NAVident")?.toString()}")
 
@@ -136,7 +138,7 @@ class RestTemplateConfig(
     ): ClientHttpRequestInterceptor {
         return ClientHttpRequestInterceptor { request: HttpRequest, body: ByteArray?, execution: ClientHttpRequestExecution ->
             val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-            request.headers.setBearerAuth(response.accessToken)
+            request.headers.setBearerAuth(response?.accessToken!!)
             /*
             val tokenChunks = response.accessToken.split(".")
             val tokenBody =  tokenChunks[1]

diff --git a/src/main/kotlin/no/nav/eessi/pensjon/config/TokenUtils.kt b/src/main/kotlin/no/nav/eessi/pensjon/config/TokenUtils.kt
@@ -7,7 +7,7 @@ import java.util.*
 
 
  fun getClaims(tokenValidationContextHolder: TokenValidationContextHolder): JwtTokenClaims {
-    val context = tokenValidationContextHolder.tokenValidationContext
+    val context = tokenValidationContextHolder.getTokenValidationContext()
     if(context.issuers.isEmpty())
         throw RuntimeException("No issuer found in context")
 
@@ -25,8 +25,8 @@ import java.util.*
 
 }
 
- fun getToken(tokenValidationContextHolder: TokenValidationContextHolder): JwtToken {
-    val context = tokenValidationContextHolder.tokenValidationContext
+ fun getToken(tokenValidationContextHolder: TokenValidationContextHolder): JwtToken? {
+    val context = tokenValidationContextHolder.getTokenValidationContext()
     if(context.issuers.isEmpty())
         throw RuntimeException("No issuer found in context")
     val issuer = context.issuers.first()