From c0195830a1b0a3e4ba3a063b80c8c3272ff5ca7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20S=C3=A6lensminde?= Date: Fri, 24 Jan 2025 09:24:21 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Logg=20maskert=20f=C3=B8dselsnummer=20kun?= =?UTF-8?q?=20til=20sikre=20logger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../altinn/Altinn3M2MClient.kt | 12 ++--------- .../altinn/Altinn3OBOClient.kt | 20 ++++++------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3M2MClient.kt b/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3M2MClient.kt index 7e5decc..7874bd0 100644 --- a/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3M2MClient.kt +++ b/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3M2MClient.kt @@ -9,7 +9,6 @@ import io.ktor.http.contentType import kotlinx.serialization.Serializable import no.nav.helsearbeidsgiver.utils.cache.LocalCache import no.nav.helsearbeidsgiver.utils.cache.getIfCacheNotNull -import no.nav.helsearbeidsgiver.utils.log.logger import no.nav.helsearbeidsgiver.utils.log.sikkerLogger /** @@ -24,7 +23,6 @@ class Altinn3M2MClient( private val getToken: () -> String, cacheConfig: CacheConfig? = null, ) { - private val logger = this.logger() private val sikkerLogger = sikkerLogger() private val urlString = "$baseUrl/m2m/altinn-tilganger" @@ -37,10 +35,7 @@ class Altinn3M2MClient( suspend fun hentHierarkiMedTilganger(fnr: String): AltinnTilgangRespons = cache.getIfCacheNotNull(fnr) { - "Henter Altinntilganger fra Fager sitt m2m-endepunkt for ${fnr.take(5)}XXXXX".also { - logger.info(it) - sikkerLogger.info(it) - } + sikkerLogger.info("Henter Altinntilganger fra Fager sitt m2m-endepunkt for ${fnr.take(6)}XXXX") val request = TilgangM2MRequest(fnr, tilgangFilter) @@ -51,10 +46,7 @@ class Altinn3M2MClient( setBody(request) }.body() .also { respons -> - "Hentet Altinntilganger for ${fnr.take(5)}XXXXX med ${respons.hierarki.size} hovedenheter.".also { - logger.info(it) - sikkerLogger.info(it) - } + sikkerLogger.info("Hentet Altinntilganger for ${fnr.take(6)}XXXX med ${respons.hierarki.size} hovedenheter.") } } diff --git a/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt b/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt index cecce1e..028606a 100644 --- a/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt +++ b/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt @@ -9,7 +9,6 @@ import io.ktor.http.contentType import kotlinx.serialization.Serializable import no.nav.helsearbeidsgiver.utils.cache.LocalCache import no.nav.helsearbeidsgiver.utils.cache.getIfCacheNotNull -import no.nav.helsearbeidsgiver.utils.log.logger import no.nav.helsearbeidsgiver.utils.log.sikkerLogger /** @@ -22,7 +21,6 @@ class Altinn3OBOClient( private val serviceCode: String, cacheConfig: CacheConfig? = null, ) { - private val logger = this.logger() private val sikkerLogger = sikkerLogger() private val urlString = "$baseUrl/altinn-tilganger" @@ -35,10 +33,10 @@ class Altinn3OBOClient( private val tilgangRequest = TilgangOBORequest( filter = - Filter( - altinn2Tilganger = setOf("$serviceCode:1"), - altinn3Tilganger = emptySet(), - ), + Filter( + altinn2Tilganger = setOf("$serviceCode:1"), + altinn3Tilganger = emptySet(), + ), ) suspend fun hentHierarkiMedTilganger( @@ -46,10 +44,7 @@ class Altinn3OBOClient( getToken: () -> String, ): AltinnTilgangRespons = cache.getIfCacheNotNull(fnr) { - "Henter Altinntilganger fra Fager sitt obo-endepunkt for ${fnr.take(5)}XXXXX".also { - logger.info(it) - sikkerLogger.info(it) - } + sikkerLogger.info("Henter Altinntilganger fra Fager sitt obo-endepunkt for ${fnr.take(6)}XXXX") httpClient .post(urlString) { @@ -58,10 +53,7 @@ class Altinn3OBOClient( setBody(tilgangRequest) }.body() .also { respons -> - "Hentet Altinntilganger for ${fnr.take(5)}XXXXX med ${respons.hierarki.size} hovedenheter.".also { - logger.info(it) - sikkerLogger.info(it) - } + sikkerLogger.info("Hentet Altinntilganger for ${fnr.take(6)}XXXX med ${respons.hierarki.size} hovedenheter.") } } From 30c51349d1af811ed14fb0b740e4eb5cf32d4383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20S=C3=A6lensminde?= Date: Fri, 24 Jan 2025 09:31:44 +0100 Subject: [PATCH 2/3] Lint me up before you gogo --- .../no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt b/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt index 028606a..c0a1e6e 100644 --- a/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt +++ b/src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt @@ -33,10 +33,10 @@ class Altinn3OBOClient( private val tilgangRequest = TilgangOBORequest( filter = - Filter( - altinn2Tilganger = setOf("$serviceCode:1"), - altinn3Tilganger = emptySet(), - ), + Filter( + altinn2Tilganger = setOf("$serviceCode:1"), + altinn3Tilganger = emptySet(), + ), ) suspend fun hentHierarkiMedTilganger( From 6c9de3fa399212b3406772689479bc6fc73045d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20S=C3=A6lensminde?= Date: Fri, 24 Jan 2025 09:39:25 +0100 Subject: [PATCH 3/3] Bump til neste patch-versjon --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2d35bd8..06b79ff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget group = "no.nav.helsearbeidsgiver" -version = "1.0.0" +version = "1.0.1" plugins { kotlin("jvm")