Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logg maskert fødselsnummer kun til sikre logger #16

Merged
merged 3 commits into from
Jan 24, 2025
Merged

Logg maskert fødselsnummer kun til sikre logger #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c019583
Logg maskert fødselsnummer kun til sikre logger
magnusae Jan 24, 2025
30c5134
Lint me up before you gogo
magnusae Jan 24, 2025
6c9de3f
Bump til neste patch-versjon
magnusae Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
12 changes: 2 additions & 10 deletions src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3M2MClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand All @@ -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"
Expand All @@ -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")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Endrer sånn at vi like greit tar med hele fødselsdatoen, nå som dette går til sikre logger.


val request = TilgangM2MRequest(fnr, tilgangFilter)

Expand All @@ -51,10 +46,7 @@ class Altinn3M2MClient(
setBody(request)
}.body<AltinnTilgangRespons>()
.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.")
}
}

Expand Down
12 changes: 2 additions & 10 deletions src/main/kotlin/no/nav/helsearbeidsgiver/altinn/Altinn3OBOClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand All @@ -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"
Expand All @@ -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) {
Expand All @@ -58,10 +53,7 @@ class Altinn3OBOClient(
setBody(tilgangRequest)
}.body<AltinnTilgangRespons>()
.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.")
}
}

Expand Down
Loading