summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-07-21 15:05:32 -0300
committerTorsten Grote <t@grobox.de>2020-07-21 15:06:54 -0300
commit4bd0b7a75344b08cf5f84c360a28fc3f575b8501 (patch)
tree7c95adedfcdd2ee884170e35798210b3ccf04d80
parent18f311512aec7b828c87c3b297135482abd389a2 (diff)
downloadtaler-android-4bd0b7a75344b08cf5f84c360a28fc3f575b8501.tar.gz
taler-android-4bd0b7a75344b08cf5f84c360a28fc3f575b8501.tar.bz2
taler-android-4bd0b7a75344b08cf5f84c360a28fc3f575b8501.zip
[pos] config endpoint does not need authentication
-rw-r--r--merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt8
-rw-r--r--merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt2
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
index 656b0938..3406f784 100644
--- 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
index a7aff188..3f45e32d 100644
--- 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)
}
}