Merge pull request #1901 from navikt/send-token-til-kodeverk

ramnav990 · web-flow · commit d4edb866ce90 · 2024-09-13T11:02:53.000Z
Send token til kodeverk
diff --git a/.nais/dev.yaml b/.nais/dev.yaml
@@ -140,6 +140,8 @@ spec:
       value: "team-rocket.institusjon-opphold-hendelser-q2"
     - name: KODEVERK_URL
       value: "https://kodeverk-api.nav.no"
+    - name: KODEVERK_CLIENT_ID
+      value: "api://dev-gcp.team-rocket.kodeverk-api"
     - name: STS_URL
       value: "http://security-token-service.default.svc.nais.local"
     - name: GANDALF_URL
diff --git a/.nais/prod.yaml b/.nais/prod.yaml
@@ -140,6 +140,8 @@ spec:
       value: "team-rocket.institusjon-opphold-hendelser"
     - name: KODEVERK_URL
       value: "https://kodeverk-api.nav.no"
+    - name: KODEVERK_CLIENT_ID
+      value: "api://prod-gcp.team-rocket.kodeverk-api"
     - name: STS_URL
       value: "http://security-token-service.default.svc.nais.local"
     - name: GANDALF_URL
diff --git a/client/src/main/kotlin/no/nav/su/se/bakover/client/ProdClientsBuilder.kt b/client/src/main/kotlin/no/nav/su/se/bakover/client/ProdClientsBuilder.kt
@@ -50,8 +50,10 @@ data class ProdClientsBuilder(
             wellknownUrl = azureConfig.wellKnownUrl,
         )
         val kodeverk = KodeverkHttpClient(
-            baseUrl = clientsConfig.kodeverkUrl,
+            baseUrl = clientsConfig.kodeverkConfig.url,
             consumerId = SU_SE_BAKOVER_CONSUMER_ID,
+            kodeverkClientId = clientsConfig.kodeverkConfig.clientId,
+            azureAd = oAuth,
         )
         val tokenOppslag = StsClient(
             baseUrl = clientsConfig.stsUrl,
diff --git a/client/src/main/kotlin/no/nav/su/se/bakover/client/StubClientsBuilder.kt b/client/src/main/kotlin/no/nav/su/se/bakover/client/StubClientsBuilder.kt
@@ -19,7 +19,6 @@ import no.nav.su.se.bakover.client.stubs.oppgave.OppgaveClientStub
 import no.nav.su.se.bakover.client.stubs.pdf.PdfGeneratorStub
 import no.nav.su.se.bakover.client.stubs.person.IdentClientStub
 import no.nav.su.se.bakover.client.stubs.person.PersonOppslagStub
-import no.nav.su.se.bakover.common.SU_SE_BAKOVER_CONSUMER_ID
 import no.nav.su.se.bakover.common.domain.auth.TokenOppslag
 import no.nav.su.se.bakover.common.domain.kafka.KafkaPublisher
 import no.nav.su.se.bakover.common.infrastructure.auth.TokenOppslagStub
@@ -52,12 +51,13 @@ class StubClientsBuilder(
     private val log = LoggerFactory.getLogger(this::class.java)
 
     override fun build(applicationConfig: ApplicationConfig): Clients {
+        val oauth = AzureClient(
+            applicationConfig.azure.clientId,
+            applicationConfig.azure.clientSecret,
+            applicationConfig.azure.wellKnownUrl,
+        )
         return Clients(
-            oauth = AzureClient(
-                applicationConfig.azure.clientId,
-                applicationConfig.azure.clientSecret,
-                applicationConfig.azure.wellKnownUrl,
-            ),
+            oauth = oauth,
             personOppslag = PersonOppslagStub().also { log.warn("********** Using stub for ${PersonOppslag::class.java} **********") },
             tokenOppslag = if (applicationConfig.frikort.useStubForSts) {
                 TokenOppslagStub.also { log.warn("********** Using stub for ${TokenOppslag::class.java} **********") }
@@ -79,7 +79,7 @@ class StubClientsBuilder(
                 ).also { log.warn("********** Using stubs for ${JournalførClients::class.java} **********") }
             },
             oppgaveClient = OppgaveClientStub.also { log.warn("********** Using stub for ${OppgaveClient::class.java} **********") },
-            kodeverk = KodeverkHttpClient(applicationConfig.clientsConfig.kodeverkUrl, SU_SE_BAKOVER_CONSUMER_ID),
+            kodeverk = KodeverkHttpClient("mocked", "mocked", oauth, "mocked"),
             simuleringClient = SimuleringStub(
                 clock = clock,
                 utbetalingerKjørtTilOgMed = { LocalDate.now(clock) },
diff --git a/client/src/main/kotlin/no/nav/su/se/bakover/client/kodeverk/Kodeverk.kt b/client/src/main/kotlin/no/nav/su/se/bakover/client/kodeverk/Kodeverk.kt
@@ -1,11 +1,12 @@
 package no.nav.su.se.bakover.client.kodeverk
 
 import arrow.core.Either
+import no.nav.su.se.bakover.common.infrastructure.token.JwtToken
 
 interface Kodeverk {
-    fun hentPoststed(postnummer: String): Either<CouldNotGetKode, String?>
+    fun hentPoststed(postnummer: String, token: JwtToken): Either<CouldNotGetKode, String?>
 
-    fun hentKommunenavn(kommunenummer: String): Either<CouldNotGetKode, String?>
+    fun hentKommunenavn(kommunenummer: String, token: JwtToken): Either<CouldNotGetKode, String?>
 
     data object CouldNotGetKode
 }
diff --git a/client/src/main/kotlin/no/nav/su/se/bakover/client/kodeverk/KodeverkHttpClient.kt b/client/src/main/kotlin/no/nav/su/se/bakover/client/kodeverk/KodeverkHttpClient.kt
@@ -6,8 +6,10 @@ import arrow.core.left
 import arrow.core.right
 import com.github.kittinunf.fuel.httpGet
 import no.nav.su.se.bakover.client.kodeverk.Kodeverk.CouldNotGetKode
+import no.nav.su.se.bakover.common.auth.AzureAd
 import no.nav.su.se.bakover.common.deserialize
 import no.nav.su.se.bakover.common.infrastructure.correlation.getOrCreateCorrelationIdFromThreadLocal
+import no.nav.su.se.bakover.common.infrastructure.token.JwtToken
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
@@ -19,23 +21,30 @@ internal const val KODEVERK_KOMMUNENAVN_PATH = "/api/v1/kodeverk/Kommuner/koder/
  * Swagger: https://kodeverk.dev.intern.nav.no/swagger-ui/index.html#/kodeverk/betydning
  * Eksternt repo: https://github.com/navikt/felleskodeverk
  */
-class KodeverkHttpClient(val baseUrl: String, private val consumerId: String) : Kodeverk {
+class KodeverkHttpClient(
+    val baseUrl: String,
+    private val consumerId: String,
+    private val azureAd: AzureAd,
+    private val kodeverkClientId: String,
+) : Kodeverk {
 
     private val log: Logger = LoggerFactory.getLogger(this::class.java)
 
-    override fun hentPoststed(postnummer: String): Either<CouldNotGetKode, String?> {
-        return hentKodebetydning(KODEVERK_POSTSTED_PATH, postnummer)
+    override fun hentPoststed(postnummer: String, token: JwtToken): Either<CouldNotGetKode, String?> {
+        return hentKodebetydning(KODEVERK_POSTSTED_PATH, postnummer, token)
     }
 
-    override fun hentKommunenavn(kommunenummer: String): Either<CouldNotGetKode, String?> {
-        return hentKodebetydning(KODEVERK_KOMMUNENAVN_PATH, kommunenummer)
+    override fun hentKommunenavn(kommunenummer: String, token: JwtToken): Either<CouldNotGetKode, String?> {
+        return hentKodebetydning(KODEVERK_KOMMUNENAVN_PATH, kommunenummer, token)
     }
 
-    private fun hentKodebetydning(path: String, value: String): Either<CouldNotGetKode, String?> {
+    private fun hentKodebetydning(path: String, value: String, token: JwtToken): Either<CouldNotGetKode, String?> {
+        val bearerToken = token.toBearerToken()
         val (_, response, result) = "$baseUrl$path".httpGet()
             .header("Content-Type", "application/json")
             .header("Nav-Call-Id", getOrCreateCorrelationIdFromThreadLocal())
             .header("Nav-Consumer-Id", consumerId)
+            .header("Authorization", "Bearer $bearerToken")
             .apply {
                 parameters = listOf("ekskluderUgyldige" to "true", "spraak" to "nb")
             }
@@ -63,6 +72,11 @@ class KodeverkHttpClient(val baseUrl: String, private val consumerId: String) :
         )
     }
 
+    private fun JwtToken.toBearerToken(): String = when (this) {
+        is JwtToken.BrukerToken -> azureAd.onBehalfOfToken(this.value, kodeverkClientId)
+        is JwtToken.SystemToken -> azureAd.getSystemToken(kodeverkClientId)
+    }
+
     data class KodeverkResponse(
         val betydninger: Map<String, List<Betydning>>,
     )
diff --git a/client/src/main/kotlin/no/nav/su/se/bakover/client/person/PersonClient.kt b/client/src/main/kotlin/no/nav/su/se/bakover/client/person/PersonClient.kt
@@ -71,13 +71,13 @@ internal class PersonClient(
     ): Either<KunneIkkeHentePerson, Person> {
         val brukerToken = hentBrukerToken()
         return personCache.getOrAdd(Pair(fnr, brukerToken)) {
-            pdlClient.person(fnr, brukerToken).map { toPerson(it) }
+            pdlClient.person(fnr, brukerToken).map { toPerson(it, brukerToken) }
         }
     }
 
     override fun personMedSystembruker(fnr: Fnr): Either<KunneIkkeHentePerson, Person> {
         return personCache.getOrAdd(Pair(fnr, JwtToken.SystemToken)) {
-            pdlClient.personForSystembruker(fnr).map { toPerson(it) }
+            pdlClient.personForSystembruker(fnr).map { toPerson(it, JwtToken.SystemToken) }
         }
     }
 
@@ -94,11 +94,11 @@ internal class PersonClient(
     override fun sjekkTilgangTilPerson(fnr: Fnr): Either<KunneIkkeHentePerson, Unit> {
         val brukerToken = hentBrukerToken()
         return personCache.getOrAdd(Pair(fnr, brukerToken)) {
-            pdlClient.person(fnr, brukerToken).map { toPerson(it) }
+            pdlClient.person(fnr, brukerToken).map { toPerson(it, brukerToken) }
         }.map { }
     }
 
-    private fun toPerson(pdlData: PdlData) = Person(
+    private fun toPerson(pdlData: PdlData, token: JwtToken) = Person(
         ident = Ident(pdlData.ident.fnr, pdlData.ident.aktørId),
         navn = pdlData.navn.let {
             Person.Navn(
@@ -112,11 +112,11 @@ internal class PersonClient(
             Person.Adresse(
                 adresselinje = it.adresselinje,
                 poststed = it.postnummer?.let { postnummer ->
-                    toPoststed(postnummer)
+                    toPoststed(postnummer, token)
                 },
                 bruksenhet = it.bruksenhet,
                 kommune = it.kommunenummer?.let { kommunenummer ->
-                    toKommune(kommunenummer)
+                    toKommune(kommunenummer, token)
                 },
                 landkode = it.landkode,
                 adressetype = it.adressetype,
@@ -145,14 +145,14 @@ internal class PersonClient(
         dødsdato = pdlData.dødsdato,
     )
 
-    private fun toPoststed(postnummer: String) = Person.Poststed(
+    private fun toPoststed(postnummer: String, token: JwtToken) = Person.Poststed(
         postnummer = postnummer,
-        poststed = config.kodeverk.hentPoststed(postnummer).getOrNull(),
+        poststed = config.kodeverk.hentPoststed(postnummer, token).getOrNull(),
     )
 
-    private fun toKommune(kommunenummer: String) = Person.Kommune(
+    private fun toKommune(kommunenummer: String, token: JwtToken) = Person.Kommune(
         kommunenummer = kommunenummer,
-        kommunenavn = config.kodeverk.hentKommunenavn(kommunenummer).getOrNull(),
+        kommunenavn = config.kodeverk.hentKommunenavn(kommunenummer, token).getOrNull(),
     )
 
     private fun kontaktinfo(fnr: Fnr): Person.Kontaktinfo? {
diff --git a/client/src/test/kotlin/no/nav/su/se/bakover/client/kodeverk/KodeverkHttpClientTest.kt b/client/src/test/kotlin/no/nav/su/se/bakover/client/kodeverk/KodeverkHttpClientTest.kt
@@ -5,11 +5,15 @@ import arrow.core.right
 import com.github.tomakehurst.wiremock.client.WireMock
 import io.kotest.matchers.shouldBe
 import no.nav.su.se.bakover.client.kodeverk.Kodeverk.CouldNotGetKode
+import no.nav.su.se.bakover.client.stubs.azure.AzureClientStub
+import no.nav.su.se.bakover.common.infrastructure.token.JwtToken
 import no.nav.su.se.bakover.test.wiremock.startedWireMockServerWithCorrelationId
 import org.junit.jupiter.api.Test
 
 internal class KodeverkHttpClientTest {
 
+    private val tokenOppslag = AzureClientStub
+
     @Test
     fun `Sjekk at vi finner poststed`() {
         startedWireMockServerWithCorrelationId {
@@ -19,8 +23,8 @@ internal class KodeverkHttpClientTest {
                         WireMock.ok(resultatPoststedJson),
                     ),
             )
-            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")
-            client.hentPoststed("1479") shouldBe "KURLAND".right()
+            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")
+            client.hentPoststed("1479", JwtToken.SystemToken) shouldBe "KURLAND".right()
         }
     }
 
@@ -39,8 +43,8 @@ internal class KodeverkHttpClientTest {
                     ),
             )
 
-            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")
-            client.hentPoststed("1479") shouldBe "KURLAND".right()
+            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")
+            client.hentPoststed("1479", JwtToken.SystemToken) shouldBe "KURLAND".right()
         }
     }
 
@@ -53,8 +57,8 @@ internal class KodeverkHttpClientTest {
                         WireMock.ok(resultatPoststedJson),
                     ),
             )
-            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")
-            client.hentPoststed("XXXX") shouldBe null.right()
+            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")
+            client.hentPoststed("XXXX", JwtToken.SystemToken) shouldBe null.right()
         }
     }
 
@@ -67,8 +71,8 @@ internal class KodeverkHttpClientTest {
                         WireMock.serverError(),
                     ),
             )
-            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")
-            client.hentPoststed("XXXX") shouldBe CouldNotGetKode.left()
+            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")
+            client.hentPoststed("XXXX", JwtToken.SystemToken) shouldBe CouldNotGetKode.left()
         }
     }
 
@@ -83,8 +87,8 @@ internal class KodeverkHttpClientTest {
                         WireMock.ok(resultatKommuneJson),
                     ),
             )
-            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")
-            client.hentKommunenavn("1103") shouldBe "Stavanger".right()
+            val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")
+            client.hentKommunenavn("1103", JwtToken.SystemToken) shouldBe "Stavanger".right()
         }
     }
 
diff --git a/common/infrastructure/src/main/kotlin/no/nav/su/se/bakover/common/infrastructure/config/ApplicationConfig.kt b/common/infrastructure/src/main/kotlin/no/nav/su/se/bakover/common/infrastructure/config/ApplicationConfig.kt
@@ -211,7 +211,6 @@ data class ApplicationConfig(
         val oppgaveConfig: OppgaveConfig,
         val pdlConfig: PdlConfig,
         val pdfgenUrl: String,
-        val kodeverkUrl: String,
         val stsUrl: String,
         val stsSamlUrl: String,
         val skjermingUrl: String,
@@ -221,13 +220,13 @@ data class ApplicationConfig(
         val skatteetatenConfig: SkatteetatenConfig,
         val dokArkivConfig: DokArkivConfig,
         val dokDistConfig: DokDistConfig,
+        val kodeverkConfig: KodeverkConfig,
     ) {
         companion object {
             fun createFromEnvironmentVariables() = ClientsConfig(
                 oppgaveConfig = OppgaveConfig.createFromEnvironmentVariables(),
                 pdlConfig = PdlConfig.createFromEnvironmentVariables(),
                 pdfgenUrl = getEnvironmentVariableOrDefault("PDFGEN_URL", "http://su-pdfgen.supstonad.svc.nais.local"),
-                kodeverkUrl = getEnvironmentVariableOrThrow("KODEVERK_URL"),
                 stsUrl = getEnvironmentVariableOrThrow(
                     "STS_URL",
                 ),
@@ -241,13 +240,13 @@ data class ApplicationConfig(
                 skatteetatenConfig = SkatteetatenConfig.createFromEnvironmentVariables(),
                 dokArkivConfig = DokArkivConfig.createFromEnvironmentVariables(),
                 dokDistConfig = DokDistConfig.createFromEnvironmentVariables(),
+                kodeverkConfig = KodeverkConfig.createFromEnvironmentVariables(),
             )
 
             fun createLocalConfig() = ClientsConfig(
                 oppgaveConfig = OppgaveConfig.createLocalConfig(),
                 pdlConfig = PdlConfig.createLocalConfig(),
                 pdfgenUrl = "mocked",
-                kodeverkUrl = "mocked",
                 stsUrl = getEnvironmentVariableOrDefault(
                     "STS_URL",
                     "mocked",
@@ -263,6 +262,7 @@ data class ApplicationConfig(
                 skatteetatenConfig = SkatteetatenConfig.createLocalConfig(),
                 dokArkivConfig = DokArkivConfig.createLocalConfig(),
                 dokDistConfig = DokDistConfig.createLocalConfig(),
+                kodeverkConfig = KodeverkConfig.createLocalConfig(),
             )
         }
 
@@ -354,6 +354,25 @@ data class ApplicationConfig(
             }
         }
 
+        data class KodeverkConfig(
+            val url: String,
+            val clientId: String,
+        ) {
+            companion object {
+                fun createFromEnvironmentVariables() = KodeverkConfig(
+                    url = getEnvironmentVariableOrThrow("KODEVERK_URL"),
+                    clientId = getEnvironmentVariableOrThrow(
+                        "KODEVERK_CLIENT_ID",
+                    ),
+                )
+
+                fun createLocalConfig() = KodeverkConfig(
+                    url = "mocked",
+                    clientId = "mocked",
+                )
+            }
+        }
+
         data class SkatteetatenConfig(
             val apiBaseUrl: String,
             val clientId: String,
diff --git a/common/infrastructure/src/test/kotlin/no/nav/su/se/bakover/common/infrastructure/config/ApplicationConfigTest.kt b/common/infrastructure/src/test/kotlin/no/nav/su/se/bakover/common/infrastructure/config/ApplicationConfigTest.kt
@@ -104,7 +104,6 @@ class ApplicationConfigTest {
                 clientId = "pdlClientId",
             ),
             pdfgenUrl = "http://su-pdfgen.supstonad.svc.nais.local",
-            kodeverkUrl = "kodeverkUrl",
             stsUrl = "stsUrl",
             stsSamlUrl = "stsSamlUrl",
             skjermingUrl = "skjermingUrl",
@@ -133,6 +132,10 @@ class ApplicationConfigTest {
                 url = "dokDistUrl",
                 clientId = "dokDistClientId",
             ),
+            kodeverkConfig = ApplicationConfig.ClientsConfig.KodeverkConfig(
+                url = "kodeverkUrl",
+                clientId = "kodeverkClientId",
+            ),
         ),
         kafkaConfig = ApplicationConfig.KafkaConfig(
             producerCfg = ApplicationConfig.KafkaConfig.ProducerCfg(
@@ -217,6 +220,7 @@ class ApplicationConfigTest {
                 "SKATT_CLIENT_ID" to "skattClientId",
                 "INSTITUSJONSOPPHOLD_TOPIC" to "INSTITUSJONSOPPHOLD_TOPIC",
                 "KODEVERK_URL" to "kodeverkUrl",
+                "KODEVERK_CLIENT_ID" to "kodeverkClientId",
             ),
         ) {
             ApplicationConfig.createFromEnvironmentVariables() shouldBe expectedApplicationConfig
@@ -284,7 +288,6 @@ class ApplicationConfigTest {
                         clientId = "mocked",
                     ),
                     pdfgenUrl = "mocked",
-                    kodeverkUrl = "mocked",
                     stsUrl = "mocked",
                     stsSamlUrl = "mocked",
                     skjermingUrl = "mocked",
@@ -313,6 +316,10 @@ class ApplicationConfigTest {
                         url = "mocked",
                         clientId = "mocked",
                     ),
+                    kodeverkConfig = ApplicationConfig.ClientsConfig.KodeverkConfig(
+                        url = "mocked",
+                        clientId = "mocked",
+                    ),
                 ),
                 kafkaConfig = ApplicationConfig.KafkaConfig(
                     producerCfg = ApplicationConfig.KafkaConfig.ProducerCfg((emptyMap())),
diff --git a/test-common/src/main/kotlin/ApplicationConfigTestData.kt b/test-common/src/main/kotlin/ApplicationConfigTestData.kt

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,10 @@ data class ProdClientsBuilder(`
`50`	`50`	`wellknownUrl = azureConfig.wellKnownUrl,`
`51`	`51`	`)`
`52`	`52`	`val kodeverk = KodeverkHttpClient(`
`53`		`- baseUrl = clientsConfig.kodeverkUrl,`
	`53`	`+ baseUrl = clientsConfig.kodeverkConfig.url,`
`54`	`54`	`consumerId = SU_SE_BAKOVER_CONSUMER_ID,`
	`55`	`+ kodeverkClientId = clientsConfig.kodeverkConfig.clientId,`
	`56`	`+ azureAd = oAuth,`
`55`	`57`	`)`
`56`	`58`	`val tokenOppslag = StsClient(`
`57`	`59`	`baseUrl = clientsConfig.stsUrl,`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,15 @@ import arrow.core.right`
`5`	`5`	`import com.github.tomakehurst.wiremock.client.WireMock`
`6`	`6`	`import io.kotest.matchers.shouldBe`
`7`	`7`	`import no.nav.su.se.bakover.client.kodeverk.Kodeverk.CouldNotGetKode`
	`8`	`+import no.nav.su.se.bakover.client.stubs.azure.AzureClientStub`
	`9`	`+import no.nav.su.se.bakover.common.infrastructure.token.JwtToken`
`8`	`10`	`import no.nav.su.se.bakover.test.wiremock.startedWireMockServerWithCorrelationId`
`9`	`11`	`import org.junit.jupiter.api.Test`
`10`	`12`
`11`	`13`	`internal class KodeverkHttpClientTest {`
`12`	`14`
	`15`	`+ private val tokenOppslag = AzureClientStub`
	`16`	`+`
`13`	`17`	`@Test`
`14`	`18`	fun `Sjekk at vi finner poststed`() {
`15`	`19`	`startedWireMockServerWithCorrelationId {`
`@@ -19,8 +23,8 @@ internal class KodeverkHttpClientTest {`
`19`	`23`	`WireMock.ok(resultatPoststedJson),`
`20`	`24`	`),`
`21`	`25`	`)`
`22`		`- val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")`
`23`		`- client.hentPoststed("1479") shouldBe "KURLAND".right()`
	`26`	`+ val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")`
	`27`	`+ client.hentPoststed("1479", JwtToken.SystemToken) shouldBe "KURLAND".right()`
`24`	`28`	`}`
`25`	`29`	`}`
`26`	`30`
`@@ -39,8 +43,8 @@ internal class KodeverkHttpClientTest {`
`39`	`43`	`),`
`40`	`44`	`)`
`41`	`45`
`42`		`- val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")`
`43`		`- client.hentPoststed("1479") shouldBe "KURLAND".right()`
	`46`	`+ val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")`
	`47`	`+ client.hentPoststed("1479", JwtToken.SystemToken) shouldBe "KURLAND".right()`
`44`	`48`	`}`
`45`	`49`	`}`
`46`	`50`
`@@ -53,8 +57,8 @@ internal class KodeverkHttpClientTest {`
`53`	`57`	`WireMock.ok(resultatPoststedJson),`
`54`	`58`	`),`
`55`	`59`	`)`
`56`		`- val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")`
`57`		`- client.hentPoststed("XXXX") shouldBe null.right()`
	`60`	`+ val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")`
	`61`	`+ client.hentPoststed("XXXX", JwtToken.SystemToken) shouldBe null.right()`
`58`	`62`	`}`
`59`	`63`	`}`
`60`	`64`
`@@ -67,8 +71,8 @@ internal class KodeverkHttpClientTest {`
`67`	`71`	`WireMock.serverError(),`
`68`	`72`	`),`
`69`	`73`	`)`
`70`		`- val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")`
`71`		`- client.hentPoststed("XXXX") shouldBe CouldNotGetKode.left()`
	`74`	`+ val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")`
	`75`	`+ client.hentPoststed("XXXX", JwtToken.SystemToken) shouldBe CouldNotGetKode.left()`
`72`	`76`	`}`
`73`	`77`	`}`
`74`	`78`
`@@ -83,8 +87,8 @@ internal class KodeverkHttpClientTest {`
`83`	`87`	`WireMock.ok(resultatKommuneJson),`
`84`	`88`	`),`
`85`	`89`	`)`
`86`		`- val client = KodeverkHttpClient(baseUrl(), "srvsupstonad")`
`87`		`- client.hentKommunenavn("1103") shouldBe "Stavanger".right()`
	`90`	`+ val client = KodeverkHttpClient(baseUrl(), "srvsupstonad", tokenOppslag, "kodeverkClientId")`
	`91`	`+ client.hentKommunenavn("1103", JwtToken.SystemToken) shouldBe "Stavanger".right()`
`88`	`92`	`}`
`89`	`93`	`}`
`90`	`94`