style: soothe linter

nais · Jun 24, 2024 · 79dd01c · 79dd01c
1 parent a01724c
commit 79dd01c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/wonderwalled-azure/src/main/kotlin/io/nais/AzureAdClient.kt b/wonderwalled-azure/src/main/kotlin/io/nais/AzureAdClient.kt
@@ -12,10 +12,11 @@ class AzureAdClient(
     private val httpClient: HttpClient = defaultHttpClient(),
 ) {
     private suspend inline fun fetchAccessToken(formParameters: Parameters): AccessToken =
-        httpClient.submitForm(
-            url = config.openIdConfiguration.tokenEndpoint,
-            formParameters = formParameters,
-        ).body()
+        httpClient
+            .submitForm(
+                url = config.openIdConfiguration.tokenEndpoint,
+                formParameters = formParameters,
+            ).body()
 
     // Service-to-service access token request (client credentials grant)
     suspend fun getMachineToMachineAccessToken(audience: String): AccessToken =

diff --git a/wonderwalled-common/src/main/kotlin/io/nais/common/OpenId.kt b/wonderwalled-common/src/main/kotlin/io/nais/common/OpenId.kt
@@ -35,9 +35,7 @@ data class OpenIdConfiguration(
 private fun invalidOpenIdConfigurationException(
     expected: List<String>,
     got: String,
-): RuntimeException {
-    return RuntimeException("authority does not match the issuer returned by provider: got $got, expected one of $expected")
-}
+): RuntimeException = RuntimeException("authority does not match the issuer returned by provider: got $got, expected one of $expected")
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class AccessToken(

diff --git a/wonderwalled-idporten/src/main/kotlin/io/nais/TokenXClient.kt b/wonderwalled-idporten/src/main/kotlin/io/nais/TokenXClient.kt
@@ -21,14 +21,16 @@ class TokenXClient(
     private val httpClient: HttpClient = defaultHttpClient(),
 ) {
     private suspend inline fun fetchAccessToken(formParameters: Parameters): AccessToken =
-        httpClient.submitForm(
-            url = config.openIdConfiguration.tokenEndpoint,
-            formParameters = formParameters,
-        ).body()
+        httpClient
+            .submitForm(
+                url = config.openIdConfiguration.tokenEndpoint,
+                formParameters = formParameters,
+            ).body()
 
     private fun clientAssertion(): String {
         val now = Date.from(Instant.now())
-        return JWTClaimsSet.Builder()
+        return JWTClaimsSet
+            .Builder()
             .issuer(config.clientId)
             .subject(config.clientId)
             .audience(config.openIdConfiguration.tokenEndpoint)
@@ -43,9 +45,11 @@ class TokenXClient(
 
     private fun JWTClaimsSet.sign(): SignedJWT =
         SignedJWT(
-            JWSHeader.Builder(JWSAlgorithm.RS256)
+            JWSHeader
+                .Builder(JWSAlgorithm.RS256)
                 .keyID(config.rsaKey.keyID)
-                .type(JOSEObjectType.JWT).build(),
+                .type(JOSEObjectType.JWT)
+                .build(),
             this,
         ).apply {
             sign(RSASSASigner(config.rsaKey.toPrivateKey()))