refactor: use form-post for texas client

nais · Nov 20, 2024 · 65003f8 · 65003f8
1 parent 931cc5a
commit 65003f8
Showing 1 changed file with 18 additions and 39 deletions.
diff --git a/wonderwalled-common/src/main/kotlin/io/nais/common/Auth.kt b/wonderwalled-common/src/main/kotlin/io/nais/common/Auth.kt
@@ -10,10 +10,8 @@ import com.natpryce.konfig.Key
 import com.natpryce.konfig.stringType
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
-import io.ktor.client.request.post
-import io.ktor.client.request.setBody
-import io.ktor.http.ContentType
-import io.ktor.http.contentType
+import io.ktor.client.request.forms.submitForm
+import io.ktor.http.parameters
 import io.ktor.server.application.ApplicationCall
 import io.ktor.server.application.createRouteScopedPlugin
 import io.ktor.server.request.host
@@ -45,33 +43,13 @@ data class AuthClientConfig(
     )
 }
 
-data class TokenRequest(
-    val target: String,
-    @JsonProperty("identity_provider")
-    val identityProvider: IdentityProvider,
-)
-
 data class TokenResponse(
     @JsonProperty("access_token")
     val accessToken: String,
     @JsonProperty("expires_in")
     val expiresInSeconds: Int,
 )
 
-data class TokenExchangeRequest(
-    val target: String,
-    @JsonProperty("identity_provider")
-    val identityProvider: IdentityProvider,
-    @JsonProperty("user_token")
-    val userToken: String,
-)
-
-data class TokenIntrospectionRequest(
-    val token: String,
-    @JsonProperty("identity_provider")
-    val identityProvider: IdentityProvider,
-)
-
 data class TokenIntrospectionResponse(
     val active: Boolean,
     @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -88,33 +66,34 @@ class AuthClient(
     private val tracer: Tracer = GlobalOpenTelemetry.get().getTracer("io.nais.common.AuthClient")
 
     suspend fun token(target: String) =
-        tracer.withSpan("auth/token", parameters = {
+        tracer.withSpan("AuthClient/token (${provider.alias})", parameters = {
             setAllAttributes(traceAttributes(target))
         }) {
-            httpClient.post(config.tokenEndpoint) {
-                contentType(ContentType.Application.Json)
-                setBody(TokenRequest(target, provider))
-            }.body<TokenResponse>()
+            httpClient.submitForm(config.tokenEndpoint, parameters {
+                set("target", target)
+                set("identity_provider", provider.alias)
+            }).body<TokenResponse>()
         }
 
     suspend fun exchange(target: String, userToken: String) =
-        tracer.withSpan("auth/exchange", parameters = {
+        tracer.withSpan("AuthClient/exchange (${provider.alias})", parameters = {
             setAllAttributes(traceAttributes(target))
         }) {
-            httpClient.post(config.tokenExchangeEndpoint) {
-                contentType(ContentType.Application.Json)
-                setBody(TokenExchangeRequest(target, provider, userToken))
-            }.body<TokenResponse>()
+            httpClient.submitForm(config.tokenExchangeEndpoint, parameters {
+                set("target", target)
+                set("user_token", userToken)
+                set("identity_provider", provider.alias)
+            }).body<TokenResponse>()
         }
 
     suspend fun introspect(accessToken: String) =
-        tracer.withSpan("auth/introspect", parameters = {
+        tracer.withSpan("AuthClient/introspect (${provider.alias})", parameters = {
             setAllAttributes(traceAttributes())
         }) {
-            httpClient.post(config.tokenIntrospectionEndpoint) {
-                contentType(ContentType.Application.Json)
-                setBody(TokenIntrospectionRequest(accessToken, provider))
-            }.body<TokenIntrospectionResponse>()
+            httpClient.submitForm(config.tokenIntrospectionEndpoint, parameters {
+                set("token", accessToken)
+                set("identity_provider", provider.alias)
+            }).body<TokenIntrospectionResponse>()
         }
 
     private fun traceAttributes(target: String? = null) = Attributes.builder().apply {