Fix basic authentication during schema registry init

RADAR-base · Mar 19, 2024 · 9437b4d · 9437b4d
1 parent f8523a5
commit 9437b4d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...ar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt b/...ar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt
@@ -18,8 +18,7 @@ package org.radarbase.schema.registration
 import io.ktor.client.plugins.auth.Auth
 import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
 import io.ktor.client.plugins.auth.providers.basic
-import io.ktor.client.request.setBody
-import io.ktor.client.request.url
+import io.ktor.client.request.*
 import io.ktor.http.ContentType
 import io.ktor.http.HttpMethod
 import io.ktor.http.contentType
@@ -56,8 +55,8 @@ import kotlin.time.toKotlinDuration
  */
 class SchemaRegistry(
     private val baseUrl: String,
-    apiKey: String? = null,
-    apiSecret: String? = null,
+    private val apiKey: String? = null,
+    private val apiSecret: String? = null,
     private val topicConfiguration: Map<String, TopicConfig> = emptyMap(),
 ) {
     private val schemaClient: SchemaRetriever = schemaRetriever(baseUrl) {
@@ -66,6 +65,7 @@ class SchemaRegistry(
             if (apiKey != null && apiSecret != null) {
                 install(Auth) {
                     basic {
+                        sendWithoutRequest { true }
                         credentials {
                             BasicAuthCredentials(username = apiKey, password = apiSecret)
                         }
@@ -93,6 +93,9 @@ class SchemaRegistry(
                     try {
                         httpClient.request<List<String>> {
                             url("subjects")
+                            if (apiKey != null && apiSecret != null) {
+                                basicAuth(apiKey, apiSecret)
+                            }
                         }
                     } catch (ex: RestException) {
                         logger.error(