Mer validering på orgnr og fnr

navikt · Feb 25, 2025 · e331884 · e331884
1 parent 7ad66d0
commit e331884
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/app/main/api/afp/VedtakRequest.kt b/app/main/api/afp/VedtakRequest.kt
@@ -16,6 +16,4 @@ data class VedtakRequest(
     val personidentifikator: String,
     val fraOgMedDato: LocalDate,
     val tilOgMedDato: LocalDate
-) {
-    fun toVedtakRequest() = VedtakRequest(personidentifikator, fraOgMedDato, tilOgMedDato)
-}
+)
diff --git a/app/main/api/auth/MaskinportenAuth.kt b/app/main/api/auth/MaskinportenAuth.kt
@@ -21,7 +21,12 @@ const val MASKINPORTEN_TP_ORDNINGEN = "tp-ordningen"
 fun ApplicationCall.hentConsumerId(): String {
     val principal = requireNotNull(this.principal<JWTPrincipal>())
     val consumer = requireNotNull(principal.payload.getClaim("consumer"))
-    return consumer.asMap()["ID"].toString().split(":").last()
+    val id = consumer.asMap()["ID"]
+    requireNotNull(id) { "ID-feltet må være satt i JWT i consumer-claimen." }
+
+    val res = (id as String).split(":").last()
+    require(res.isNotBlank())
+    return res
 }
 
 fun AuthenticationConfig.maskinporten(name: String, scope: List<String>, config: Config) {

diff --git a/app/main/api/tp/TpRegisterClient.kt b/app/main/api/tp/TpRegisterClient.kt
@@ -1,12 +1,12 @@
 package api.tp
 
-import no.nav.aap.komponenter.httpklient.httpclient.ClientConfig
-import no.nav.aap.komponenter.httpklient.httpclient.RestClient
 import no.nav.aap.komponenter.config.requiredConfigForKey
-import no.nav.aap.komponenter.httpklient.httpclient.request.PostRequest
+import no.nav.aap.komponenter.httpklient.httpclient.ClientConfig
 import no.nav.aap.komponenter.httpklient.httpclient.Header
+import no.nav.aap.komponenter.httpklient.httpclient.RestClient
 import no.nav.aap.komponenter.httpklient.httpclient.error.IkkeFunnetException
 import no.nav.aap.komponenter.httpklient.httpclient.post
+import no.nav.aap.komponenter.httpklient.httpclient.request.PostRequest
 import no.nav.aap.komponenter.httpklient.httpclient.tokenprovider.azurecc.ClientCredentialsTokenProvider
 import org.slf4j.LoggerFactory
 import java.net.URI
@@ -35,13 +35,16 @@ object TpRegisterClient : ITpRegisterClient {
         orgnr: String,
         requestId: String
     ): Boolean? {
+        require(orgnr.isNotBlank())
+        require(fnr.isNotBlank())
+
         val uri = baseUri.resolve("/api/tjenestepensjon/hasYtelse?orgnr=$orgnr")
         val httpRestClient = PostRequest(
             body = fnr,
             additionalHeaders = listOf(
                 Header("Content-Type", "text/plain"),
                 Header("Nav-Consumer-Id", "aap-api"),
-                Header("Nav-Call-Id", requestId)
+                Header("X-Request-Id", requestId)
             )
         )
         return try {

diff --git a/app/test/AfpOffentligServerTest.kt b/app/test/AfpOffentligServerTest.kt
@@ -231,7 +231,7 @@ class AfpOffentligServerTest {
         issuerId = "default",
         claims = mapOf(
             "scope" to scope,
-            "consumer" to mapOf("authority" to "123")
+            "consumer" to mapOf("authority" to "123", "ID" to "0192:889640782")
         ),
     )
 }
diff --git a/app/test/api/VedtakTest.kt b/app/test/api/VedtakTest.kt