diff options
author | Torsten Grote <t@grobox.de> | 2020-07-28 17:16:57 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-07-28 17:16:57 -0300 |
commit | bc35e8924e652c323001f62f6781657545fa378f (patch) | |
tree | 2a40b28b28c2abe0aed6ca36e2c2bcaa9019c577 /merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt | |
parent | 8eb241ccce345a35b05a6335d11306465220f66d (diff) | |
download | taler-android-bc35e8924e652c323001f62f6781657545fa378f.tar.gz taler-android-bc35e8924e652c323001f62f6781657545fa378f.tar.bz2 taler-android-bc35e8924e652c323001f62f6781657545fa378f.zip |
[pos] adapt history to new v1 API
Diffstat (limited to 'merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt')
-rw-r--r-- | merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt | 19 |
1 files changed, 9 insertions, 10 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 e995724..db37586 100644 --- a/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt +++ b/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt @@ -16,7 +16,6 @@ package net.taler.merchantlib -import android.util.Log import io.ktor.client.HttpClient import io.ktor.client.engine.okhttp.OkHttp import io.ktor.client.features.json.JsonFeature @@ -25,8 +24,6 @@ import io.ktor.client.request.delete import io.ktor.client.request.get import io.ktor.client.request.header import io.ktor.client.request.post -import io.ktor.client.statement.HttpResponse -import io.ktor.client.statement.readBytes import io.ktor.http.ContentType.Application.Json import io.ktor.http.HttpHeaders.Authorization import io.ktor.http.contentType @@ -64,14 +61,16 @@ class MerchantApi(private val httpClient: HttpClient) { suspend fun deleteOrder( merchantConfig: MerchantConfig, orderId: String - ): Response<HttpResponse> = response { - val resp = httpClient.delete(merchantConfig.urlFor("private/orders/$orderId")) { + ): Response<Unit> = response { + httpClient.delete(merchantConfig.urlFor("private/orders/$orderId")) { header(Authorization, "ApiKey ${merchantConfig.apiKey}") - } as HttpResponse - // TODO remove when the API call was fixed - Log.e("TEST", "status: ${resp.status.value}") - Log.e("TEST", String(resp.readBytes())) - resp + } as Unit + } + + suspend fun getOrderHistory(merchantConfig: MerchantConfig): Response<OrderHistory> = response { + httpClient.get(merchantConfig.urlFor("private/orders")) { + header(Authorization, "ApiKey ${merchantConfig.apiKey}") + } as OrderHistory } } |