Merge pull request #532 from navikt/new_token_validation

New token validation
navikt · Nov 7, 2024 · 80dfa4a · 80dfa4a
2 parents d7d362c + ece708d
commit 80dfa4a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ val exposedVersion = "0.45.0"
 val h2Version = "2.3.232"
 val pamGeographyVersion = "2.9"
 val tokenValidationVersion = "1.3.0"
-val tokenSupportVersion = "4.1.7"
+val tokenSupportVersion = "5.0.10"
 val oidcSupportVersion = "0.2.18"
 val logstashVersion = "8.0"
 val pdfboxVersion = "3.0.3"
@@ -34,7 +34,7 @@ repositories {
 plugins {
     val kotlinVersion = "2.0.21"
     id("org.jetbrains.kotlin.jvm") version kotlinVersion
-    id("org.springframework.boot") version "3.2.5"
+    id("org.springframework.boot") version "3.3.5"
     id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
     kotlin("plugin.jpa") version kotlinVersion
     idea
@@ -59,6 +59,7 @@ dependencies {
 
     implementation("org.flywaydb:flyway-core")
     implementation("com.zaxxer:HikariCP")
+    implementation("org.flywaydb:flyway-database-postgresql")
     implementation("org.postgresql:postgresql")
 
     implementation("io.github.resilience4j:resilience4j-retry:$resilience4jVersion")

diff --git a/src/main/kotlin/no/nav/klage/util/TokenUtil.kt b/src/main/kotlin/no/nav/klage/util/TokenUtil.kt
@@ -57,33 +57,33 @@ class TokenUtil(
     fun getOnBehalfOfTokenWithPdlScope(): String {
         val clientProperties = clientConfigurationProperties.registration["pdl-onbehalfof"]!!
         val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-        return response.accessToken!!
+        return response.access_token!!
     }
 
     fun getAppAccessTokenWithPdlScope(): String {
         val clientProperties = clientConfigurationProperties.registration["pdl-maskintilmaskin"]!!
         val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-        return response.accessToken!!
+        return response.access_token!!
     }
 
     fun getOnBehalfOfTokenWithSafselvbetjeningScope(): String {
         val clientProperties = clientConfigurationProperties.registration["safselvbetjening-onbehalfof"]!!
         val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-        return response.accessToken!!
+        return response.access_token!!
     }
 
     fun getAppAccessTokenWithKlageFileApiScope(): String {
         val clientProperties = clientConfigurationProperties.registration["klage-file-api-maskintilmaskin"]!!
         val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-        return response.accessToken!!
+        return response.access_token!!
     }
 
     fun getSelvbetjeningExpiry(): Long? = ctxHolder.getTokenValidationContext().getClaims(oldIssuer).expirationTime?.time
 
     fun getAppAccessTokenWithKlageFSSProxyScope(): String {
         val clientProperties = clientConfigurationProperties.registration["klage-fss-proxy-maskintilmaskin"]!!
         val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-        return response.accessToken!!
+        return response.access_token!!
     }
 
     fun getExpiryFromIdPortenToken(token: String): Long {

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -61,5 +61,4 @@
     <logger name="org.hibernate.SQL_SLOW" level="debug"/>
 
     <logger name="no.nav.klage" level="debug"/>
-
 </configuration>