Skip to content

Commit

Permalink
bruk kotlin annoteringer for å redefinere getters
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan-Olav Eide committed Oct 14, 2024
1 parent be53395 commit ce4dae3
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 42 deletions.
21 changes: 11 additions & 10 deletions ...main/kotlin/no/nav/security/token/support/client/core/oauth2/OAuth2AccessTokenResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package no.nav.security.token.support.client.core.oauth2

data class OAuth2AccessTokenResponse (@get:JvmName("getAccessToken") var access_token : String? = null,
@get:JvmName("getExpiresAt") var expires_at : Int? = null,
@get:JvmName("getExpiresIn") var expires_in : Int? = 60,
private val additionalParameters : Map<String, Any> = emptyMap()) {
data class OAuth2AccessTokenResponse (@get:JvmName("getAccessToken") var access_token : String? = null,
@get:JvmName("getExpiresAt") var expires_at : Int? = null,
@get:JvmName("getExpiresIn") var expires_in : Int? = 60,
private val additionalParameters : Map<String, Any> = emptyMap()) {

@Deprecated(message = "Ikke bruk denne", replaceWith = ReplaceWith("getAccessToken()"))
fun getAccess_token() = access_token
@Deprecated(message = "Ikke bruk denne", replaceWith = ReplaceWith("getExpiresAt()"))
fun getExpires_at() = expires_at
@Deprecated(message = "Ikke bruk denne", replaceWith = ReplaceWith("getExpiresIn()"))
fun getExpires_in() = expires_in

@Deprecated(message = "Ikke bruk denne", replaceWith = ReplaceWith("getAccessToken()"))
fun getAccess_token() = access_token
@Deprecated(message = "Ikke bruk denne", replaceWith = ReplaceWith("getExpiresAt()"))
fun getExpires_at() = expires_at
@Deprecated(message = "Ikke bruk denne", replaceWith = ReplaceWith("getExpiresIn()"))
fun getExpires_in() = expires_in
}
6 changes: 3 additions & 3 deletions ...tlin/no/nav/security/token/support/client/core/oauth2/ClientCredentialsTokenClientTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ internal class ClientCredentialsTokenClientTest {
private const val ERROR_RESPONSE = """{"error": "some client error occurred"}"""
private fun assertThatResponseContainsAccessToken(response : OAuth2AccessTokenResponse?) {
assertThat(response).isNotNull()
assertThat(response!!.accessToken).isNotBlank()
assertThat(response.expiresAt).isPositive()
assertThat(response.expiresIn).isPositive()
assertThat(response!!.access_token).isNotBlank()
assertThat(response.expires_at).isPositive()
assertThat(response.expires_in).isPositive()
}

private fun assertThatClientAuthMethodIsPrivateKeyJwt(body : String, clientProperties : ClientProperties) {
Expand Down
22 changes: 11 additions & 11 deletions ...t/kotlin/no/nav/security/token/support/client/core/oauth2/OAuth2AccessTokenServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ internal class OAuth2AccessTokenServiceTest {
val res = oAuth2AccessTokenService.getAccessToken(onBehalfOfProperties())
verify(onBehalfOfTokenResponseClient).getTokenResponse(reifiedAny( OnBehalfOfGrantRequest::class.java))
assertThat(res).hasNoNullFieldsOrProperties()
assertThat(res.accessToken).isEqualTo("first_access_token")
assertThat(res.access_token).isEqualTo("first_access_token")
}

@Test
Expand All @@ -74,7 +74,7 @@ internal class OAuth2AccessTokenServiceTest {
val res = oAuth2AccessTokenService.getAccessToken(clientCredentialsProperties())
verify(clientCredentialsTokenResponseClient).getTokenResponse(reifiedAny(ClientCredentialsGrantRequest::class.java))
assertThat(res).hasNoNullFieldsOrProperties()
assertThat(res.accessToken).isEqualTo("first_access_token")
assertThat(res.access_token).isEqualTo("first_access_token")
}

@Test
Expand All @@ -96,13 +96,13 @@ internal class OAuth2AccessTokenServiceTest {
val res = oAuth2AccessTokenService.getAccessToken(clientProperties)
verify(onBehalfOfTokenResponseClient).getTokenResponse(reifiedAny(OnBehalfOfGrantRequest::class.java))
assertThat(res).hasNoNullFieldsOrProperties()
assertThat(res.accessToken).isEqualTo("first_access_token")
assertThat(res.access_token).isEqualTo("first_access_token")

//should get response from cache and NOT invoke client
reset(onBehalfOfTokenResponseClient)
val res2 = oAuth2AccessTokenService.getAccessToken(clientProperties)
verify(onBehalfOfTokenResponseClient, never()).getTokenResponse(reifiedAny(OnBehalfOfGrantRequest::class.java))
assertThat(res2.accessToken).isEqualTo("first_access_token")
assertThat(res2.access_token).isEqualTo("first_access_token")

//another user/token but same clientconfig, should invoke client and populate cache
reset(assertionResolver)
Expand All @@ -113,7 +113,7 @@ internal class OAuth2AccessTokenServiceTest {
.thenReturn(accessTokenResponse(secondAccessToken, 60))
val res3 = oAuth2AccessTokenService.getAccessToken(clientProperties)
verify(onBehalfOfTokenResponseClient).getTokenResponse(reifiedAny(OnBehalfOfGrantRequest::class.java))
assertThat(res3.accessToken).isEqualTo(secondAccessToken)
assertThat(res3.access_token).isEqualTo(secondAccessToken)
}

@Test
Expand All @@ -128,14 +128,14 @@ internal class OAuth2AccessTokenServiceTest {
val res1 = oAuth2AccessTokenService.getAccessToken(clientProperties)
verify(clientCredentialsTokenResponseClient).getTokenResponse(reifiedAny(ClientCredentialsGrantRequest::class.java))
assertThat(res1).hasNoNullFieldsOrProperties()
assertThat(res1.accessToken).isEqualTo("first_access_token")
assertThat(res1.access_token).isEqualTo("first_access_token")

//should get response from cache and NOT invoke client
reset(clientCredentialsTokenResponseClient)
val res2 = oAuth2AccessTokenService.getAccessToken(clientProperties)
verify(clientCredentialsTokenResponseClient, never()).getTokenResponse(reifiedAny(
ClientCredentialsGrantRequest::class.java))
assertThat(res2.accessToken).isEqualTo("first_access_token")
assertThat(res2.access_token).isEqualTo("first_access_token")

//another clientconfig, should invoke client and populate cache
clientProperties = clientCredentialsProperties("scope3")
Expand All @@ -145,7 +145,7 @@ internal class OAuth2AccessTokenServiceTest {
.thenReturn(accessTokenResponse(secondAccessToken, 60))
val res3 = oAuth2AccessTokenService.getAccessToken(clientProperties)
verify(clientCredentialsTokenResponseClient).getTokenResponse(reifiedAny(ClientCredentialsGrantRequest::class.java))
assertThat(res3.accessToken).isEqualTo(secondAccessToken)
assertThat(res3.access_token).isEqualTo(secondAccessToken)
}

@Test
Expand All @@ -161,7 +161,7 @@ internal class OAuth2AccessTokenServiceTest {
val res1 = oAuth2AccessTokenService.getAccessToken(clientProperties)
verify(onBehalfOfTokenResponseClient).getTokenResponse(reifiedAny(OnBehalfOfGrantRequest::class.java))
assertThat(res1).hasNoNullFieldsOrProperties()
assertThat(res1.getAccessToken()).isEqualTo("first_access_token")
assertThat(res1.access_token).isEqualTo("first_access_token")
Thread.sleep(1000)

//entry should be missing from cache due to expiry
Expand All @@ -171,7 +171,7 @@ internal class OAuth2AccessTokenServiceTest {
.thenReturn(accessTokenResponse(secondAccessToken, 1))
val res2 = oAuth2AccessTokenService.getAccessToken(clientProperties)
verify(onBehalfOfTokenResponseClient).getTokenResponse(reifiedAny(OnBehalfOfGrantRequest::class.java))
assertThat(res2.accessToken).isEqualTo(secondAccessToken)
assertThat(res2.access_token).isEqualTo(secondAccessToken)
}

@Test
Expand All @@ -186,7 +186,7 @@ internal class OAuth2AccessTokenServiceTest {
verify(exchangeTokeResponseClient, times(1)).getTokenResponse(reifiedAny(
TokenExchangeGrantRequest::class.java))
assertThat(res1).hasNoNullFieldsOrProperties()
assertThat(res1.accessToken).isEqualTo("first_access_token")
assertThat(res1.access_token).isEqualTo("first_access_token")
}

companion object {
Expand Down
6 changes: 3 additions & 3 deletions ...test/kotlin/no/nav/security/token/support/client/core/oauth2/OnBehalfOfTokenClientTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ internal class OnBehalfOfTokenClientTest {
.contains("requested_token_use=on_behalf_of")
.contains("assertion=$assertion")
assertThat(response).isNotNull()
assertThat(response.accessToken).isNotBlank()
assertThat(response.expiresAt).isPositive()
assertThat(response.expiresIn).isPositive()
assertThat(response.access_token).isNotBlank()
assertThat(response.expires_at).isPositive()
assertThat(response.expires_in).isPositive()
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions ...c/test/kotlin/no/nav/security/token/support/client/core/oauth2/TokenExchangeClientTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ internal class TokenExchangeClientTest {
private const val ERROR_RESPONSE = """{"error": "some client error occurred"}"""
private fun assertThatResponseContainsAccessToken(response : OAuth2AccessTokenResponse?) {
assertThat(response).isNotNull()
assertThat(response!!.accessToken).isNotBlank()
assertThat(response.expiresAt).isPositive()
assertThat(response.expiresIn).isPositive()
assertThat(response!!.access_token).isNotBlank()
assertThat(response.expires_in).isPositive()
assertThat(response.expires_at).isPositive()
}

private fun assertThatClientAuthMethodIsPrivateKeyJwt(
Expand Down
2 changes: 1 addition & 1 deletion token-client-kotlin-demo/src/main/kotlin/no/nav/security/token/support/ktor/Application.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fun Application.module() {
}

data class DemoTokenResponse(val grantType: String, val tokenResponse: OAuth2AccessTokenResponse) {
val claims = SignedJWT.parse(tokenResponse.accessToken).jwtClaimsSet.claims
val claims = SignedJWT.parse(tokenResponse.access_token).jwtClaimsSet.claims
}

internal fun TokenValidationContextPrincipal?.asTokenString() =
Expand Down
2 changes: 1 addition & 1 deletion ...lient-kotlin-demo/src/main/kotlin/no/nav/security/token/support/ktor/oauth/OAuth2Cache.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ data class OAuth2CacheConfig(val enabled: Boolean, val maximumSize: Long = 1000,

override fun expireAfterCreate(key: GrantRequest, response: OAuth2AccessTokenResponse, currentTime: Long): Long {
val seconds =
if (response.expiresIn!! > skewInSeconds) response.expiresIn!! - skewInSeconds else response.expiresIn!!
if (response.expires_in!! > skewInSeconds) response.expires_in!! - skewInSeconds else response.expires_in!!
.toLong()
return TimeUnit.SECONDS.toNanos(seconds)
}
Expand Down
2 changes: 1 addition & 1 deletion ...tlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientRequestInterceptor.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class OAuth2ClientRequestInterceptor(private val properties: ClientConfiguration
private val matcher: ClientConfigurationPropertiesMatcher) : ClientHttpRequestInterceptor {
override fun intercept(req: HttpRequest, body: ByteArray, execution: ClientHttpRequestExecution): ClientHttpResponse {
matcher.findProperties(properties, req.uri)?.let {
service.getAccessToken(it).accessToken?.let { token -> req.headers.setBearerAuth(token) }
service.getAccessToken(it).access_token?.let { token -> req.headers.setBearerAuth(token) }
}
return execution.execute(req, body)
}
Expand Down
18 changes: 9 additions & 9 deletions ...av/security/token/support/client/spring/oauth2/OAuth2AccessTokenServiceIntegrationTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ internal class OAuth2AccessTokenServiceIntegrationTest {
whenever(tokenValidationContextHolder!!.getTokenValidationContext()).thenReturn(tokenValidationContext("sub1"))
val response = oAuth2AccessTokenService.getAccessToken(this)

assertThat(response.accessToken).isNotBlank
assertThat(response.expiresAt).isGreaterThan(0)
assertThat(response.expiresIn).isGreaterThan(0)
assertThat(response.access_token).isNotBlank
assertThat(response.expires_at).isGreaterThan(0)
assertThat(response.expires_in).isGreaterThan(0)

val request = server.takeRequest()
assertThat(request.headers["Content-Type"]).contains(APPLICATION_FORM_URLENCODED_VALUE)
Expand All @@ -99,9 +99,9 @@ internal class OAuth2AccessTokenServiceIntegrationTest {
whenever(tokenValidationContextHolder!!.getTokenValidationContext()).thenReturn(tokenValidationContext("sub1"))

val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
assertThat(response.accessToken).isNotBlank
assertThat(response.expiresAt).isGreaterThan(0)
assertThat(response.expiresIn).isGreaterThan(0)
assertThat(response.access_token).isNotBlank
assertThat(response.expires_in).isGreaterThan(0)
assertThat(response.expires_at).isGreaterThan(0)

val request = server.takeRequest()
val body = request.body.readUtf8()
Expand All @@ -115,9 +115,9 @@ internal class OAuth2AccessTokenServiceIntegrationTest {
val clientProperties = clientConfigurationProperties.registration["example1-clientcredentials1"]?.toBuilder()?.tokenEndpointUrl(tokenEndpointUrl)?.build() ?: fail("clientProperties is null")
server.enqueue(jsonResponse(TOKEN_RESPONSE))
val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
assertThat(response.accessToken).isNotBlank
assertThat(response.expiresAt).isGreaterThan(0)
assertThat(response.expiresIn).isGreaterThan(0)
assertThat(response.access_token).isNotBlank
assertThat(response.expires_in).isGreaterThan(0)
assertThat(response.expires_at).isGreaterThan(0)

val request = server.takeRequest()
val body = request.body.readUtf8()
Expand Down

0 comments on commit ce4dae3

Please sign in to comment.