taler-android

commit 4bd0b7a75344b08cf5f84c360a28fc3f575b8501
parent 18f311512aec7b828c87c3b297135482abd389a2
Author: Torsten Grote <t@grobox.de>
Date:   Tue, 21 Jul 2020 15:05:32 -0300

[pos] config endpoint does not need authentication

Diffstat:
M
merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt
 | 
8
++------
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
 | 
2
+-

2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt b/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt
@@ -21,17 +21,13 @@ import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
 import io.ktor.client.request.get
-import io.ktor.client.request.header
-import io.ktor.http.HttpHeaders.Authorization
 
 class MerchantApi(private val httpClient: HttpClient) {
 
     constructor() : this(getDefaultHttpClient())
 
-    suspend fun getConfig(baseUrl: String, apiKey: String = "sandbox"): ConfigResponse {
-        return httpClient.get("$baseUrl/config") {
-            header(Authorization, "ApiKey $apiKey")
-        }
+    suspend fun getConfig(baseUrl: String): ConfigResponse {
+        return httpClient.get("$baseUrl/config")
     }
 
 }
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
@@ -122,7 +122,7 @@ class ConfigManager(
         }
 
         scope.launch(Dispatchers.IO) {
-            val configResponse = api.getConfig(merchantConfig.baseUrl, merchantConfig.apiKey)
+            val configResponse = api.getConfig(merchantConfig.baseUrl)
             onMerchantConfigReceived(config, json, merchantConfig, configResponse)
         }
     }