Fjerner generic på token og logger innhold i cache.

Co-authored-by: Robin Tordly <[email protected]> Co-authored-by: Halvor Grizzly Bjørn <[email protected]> Co-authored-by: Vetle Hollund <[email protected]>
navikt · Jan 26, 2024 · 5d4fd70 · 5d4fd70
1 parent 40b6aac
commit 5d4fd70
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/ktor-auth-azuread/main/no/nav/aap/ktor/client/AzureAdTokenProvider.kt b/ktor-auth-azuread/main/no/nav/aap/ktor/client/AzureAdTokenProvider.kt
@@ -31,9 +31,10 @@ class AzureAdTokenProvider(
         "client_id=${config.clientId}&client_secret=${config.clientSecret}&assertion=$accessToken&scope=$scope&grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer&requested_token_use=on_behalf_of"
     }
 
-    private val cache = TokenCache<String>()
+    private val cache = TokenCache()
 
     private suspend fun getAccessToken(cacheKey: String, body: () -> String): String {
+        cache.logg(secureLog)
         val token = cache.get(cacheKey)
             ?: client.post(config.tokenEndpoint) {
                 accept(ContentType.Application.Json)

diff --git a/ktor-auth-azuread/main/no/nav/aap/ktor/client/Token.kt b/ktor-auth-azuread/main/no/nav/aap/ktor/client/Token.kt
@@ -2,8 +2,8 @@ package no.nav.aap.ktor.client
 
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import org.slf4j.Logger
 import java.time.Instant
-import java.util.concurrent.ConcurrentHashMap
 
 internal data class Token(val expires_in: Long, val access_token: String) {
     private val expiry: Instant = Instant.now().plusSeconds(expires_in - LEEWAY_SECONDS)
@@ -13,19 +13,29 @@ internal data class Token(val expires_in: Long, val access_token: String) {
     private companion object {
         const val LEEWAY_SECONDS = 60
     }
+
+    override fun toString(): String {
+        return "($expires_in, $access_token)"
+    }
 }
 
-internal class TokenCache<K> {
-    private val tokens: HashMap<K, Token> = hashMapOf()
+internal class TokenCache {
+    private val tokens: HashMap<String, Token> = hashMapOf()
     private val mutex = Mutex()
 
-    internal suspend fun add(key: K, token: Token) {
+    internal suspend fun logg(logger: Logger) {
+        tokens.forEach { (key, value) ->
+            logger.info("Key: $key, Value: $value")
+        }
+    }
+
+    internal suspend fun add(key: String, token: Token) {
         mutex.withLock {
             tokens[key] = token
         }
     }
 
-    internal suspend fun get(key: K): Token? {
+    internal suspend fun get(key: String): Token? {
         mutex.withLock {
             tokens[key]
         }?.let {
@@ -39,7 +49,7 @@ internal class TokenCache<K> {
         }
     }
 
-    private suspend fun rm(key: K) {
+    private suspend fun rm(key: String) {
         mutex.withLock {
             tokens.remove(key)
         }

diff --git a/ktor-auth-tokenx/main/no/nav/aap/ktor/client/Token.kt b/ktor-auth-tokenx/main/no/nav/aap/ktor/client/Token.kt
@@ -2,6 +2,7 @@ package no.nav.aap.ktor.client
 
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import org.slf4j.Logger
 import java.time.Instant
 
 internal data class Token(val expires_in: Long, val access_token: String) {
@@ -12,30 +13,43 @@ internal data class Token(val expires_in: Long, val access_token: String) {
     private companion object {
         const val LEEWAY_SECONDS = 60
     }
+
+    override fun toString(): String {
+        return "($expires_in, $access_token)"
+    }
 }
 
-internal class TokenCache<K> {
-    private val tokens: HashMap<K, Token> = hashMapOf()
+internal class TokenCache {
+    private val tokens: HashMap<String, Token> = hashMapOf()
     private val mutex = Mutex()
 
-    internal suspend fun add(key: K, token: Token) {
+    internal suspend fun logg(logger: Logger) {
+        tokens.forEach { (key, value) ->
+            logger.info("Key: $key, Value: $value")
+        }
+    }
+
+    internal suspend fun add(key: String, token: Token) {
         mutex.withLock {
             tokens[key] = token
         }
     }
 
-    internal suspend fun get(key: K): Token? {
-        tokens[key]?.let {
+    internal suspend fun get(key: String): Token? {
+        mutex.withLock {
+            tokens[key]
+        }?.let {
             if (it.expired()) {
                 rm(key)
             }
         }
+
         return mutex.withLock {
             tokens[key]
         }
     }
 
-    private suspend fun rm(key: K) {
+    private suspend fun rm(key: String) {
         mutex.withLock {
             tokens.remove(key)
         }

diff --git a/ktor-auth-tokenx/main/no/nav/aap/ktor/client/TokenXTokenProvider.kt b/ktor-auth-tokenx/main/no/nav/aap/ktor/client/TokenXTokenProvider.kt
@@ -39,9 +39,10 @@ class TokenXTokenProvider(
             .replace("\n", "")
     }
 
-    private val cache = TokenCache<String>()
+    private val cache = TokenCache()
 
     private suspend fun getAccessToken(cacheKey: String, body: () -> String): String {
+        cache.logg(secureLog)
         val token = cache.get(cacheKey)
             ?: client.post(config.tokenEndpoint) {
                 accept(io.ktor.http.ContentType.Application.Json)