Change ClientProperties and ClientAuthenticationProperties to data classes for caching to work (#1011)

Author: ugur93

token-client-core/src/main/kotlin/no/nav/security/token/support/client/core/ClientAuthenticationProperties.kt

@@ -8,7 +8,7 @@ import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod.PRIVATE_KEY_JWT
 import no.nav.security.token.support.client.core.jwk.JwkFactory.fromJson
 import no.nav.security.token.support.client.core.jwk.JwkFactory.fromJsonFile
 
-class ClientAuthenticationProperties @JvmOverloads constructor(val clientId: String, val clientAuthMethod: ClientAuthenticationMethod,val clientSecret: String?,val clientJwk: String? = null, val clientRsaKey: RSAKey? = loadKey(clientJwk)) {
+data class ClientAuthenticationProperties @JvmOverloads constructor(val clientId: String, val clientAuthMethod: ClientAuthenticationMethod,val clientSecret: String?,val clientJwk: String? = null, val clientRsaKey: RSAKey? = loadKey(clientJwk)) {
 
     init {
         require(clientAuthMethod in CLIENT_AUTH_METHODS) {
@@ -22,7 +22,6 @@ class ClientAuthenticationProperties @JvmOverloads constructor(val clientId: Str
         }
     }
 
-
     companion object {
         private val CLIENT_AUTH_METHODS = listOf(CLIENT_SECRET_BASIC, CLIENT_SECRET_POST, PRIVATE_KEY_JWT)
 

token-client-core/src/main/kotlin/no/nav/security/token/support/client/core/ClientProperties.kt

@@ -10,7 +10,7 @@ import com.nimbusds.oauth2.sdk.`as`.AuthorizationServerMetadata.parse
 import java.io.IOException
 import java.net.URI
 
-class ClientProperties @JvmOverloads constructor(var tokenEndpointUrl: URI? = null,
+data class ClientProperties @JvmOverloads constructor(var tokenEndpointUrl: URI? = null,
                                                  private val wellKnownUrl: URI? = null,
                                                  val grantType: GrantType,
                                                  val scope: List<String> = emptyList(),
@@ -24,7 +24,6 @@ class ClientProperties @JvmOverloads constructor(var tokenEndpointUrl: URI? = nu
         require(grantType in GRANT_TYPES) { "Unsupported grantType $grantType, must be one of $GRANT_TYPES" }
     }
 
-
     fun toBuilder() =
         ClientPropertiesBuilder(grantType, authentication)
             .tokenEndpointUrl(tokenEndpointUrl)

token-client-core/src/test/kotlin/no/nav/security/token/support/client/core/oauth2/OAuth2AccessTokenServiceTest.kt

@@ -130,6 +130,8 @@ internal class OAuth2AccessTokenServiceTest {
             assertThat(res1).hasNoNullFieldsOrProperties()
             assertThat(res1.access_token).isEqualTo("first_access_token")
 
+            clientProperties = clientCredentialsProperties()
+
             //should get response from cache and NOT invoke client
             reset(clientCredentialsTokenResponseClient)
             val res2 = oAuth2AccessTokenService.getAccessToken(clientProperties)