Explicitly specify scope and audience in client credentials config

RADAR-base · Nov 28, 2024 · f237a9a · f237a9a
1 parent c0f4baf
commit f237a9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/radar-commons-kotlin/src/main/kotlin/org/radarbase/ktor/auth/ClientCredentialsConfig.kt b/radar-commons-kotlin/src/main/kotlin/org/radarbase/ktor/auth/ClientCredentialsConfig.kt
@@ -6,7 +6,8 @@ data class ClientCredentialsConfig(
     val tokenUrl: String,
     val clientId: String? = null,
     val clientSecret: String? = null,
-    val additionalParameters: Map<String, String>? = null,
+    val scope: String? = null,
+    val audience: String? = null,
 ) {
     /**
      * Fill in the client ID and client secret from environment variables. The variables are

diff --git a/radar-commons-kotlin/src/main/kotlin/org/radarbase/ktor/auth/OAuthClientProvider.kt b/radar-commons-kotlin/src/main/kotlin/org/radarbase/ktor/auth/OAuthClientProvider.kt
@@ -56,9 +56,8 @@ fun Auth.clientCredentials(
                     append("grant_type", "client_credentials")
                     append("client_id", authConfig.clientId)
                     append("client_secret", authConfig.clientSecret)
-                    authConfig.additionalParameters?.forEach { (key, value) ->
-                        append(key, value)
-                    }
+                    authConfig.scope?.let { append("scope", it) }
+                    authConfig.audience?.let { append("audience", it) }
                 },
             ) {
                 accept(ContentType.Application.Json)