1 files changed, 33 insertions, 30 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 a467c41..950cea6 100644
--- a/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt
+++ b/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt
@@ -17,16 +17,19 @@
 package net.taler.merchantlib
 
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 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.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.request.HttpRequestBuilder
 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.request.setBody
 import io.ktor.http.ContentType.Application.Json
 import io.ktor.http.HttpHeaders.Authorization
 import io.ktor.http.contentType
+import io.ktor.serialization.kotlinx.json.json
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -35,47 +38,47 @@ import net.taler.merchantlib.Response.Companion.response
 
 class MerchantApi(
     private val httpClient: HttpClient = getDefaultHttpClient(),
-    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) {
 
     suspend fun getConfig(baseUrl: String): Response<ConfigResponse> = withContext(ioDispatcher) {
         response {
-            httpClient.get("$baseUrl/config") as ConfigResponse
+            httpClient.get("$baseUrl/config").body()
         }
     }
 
     suspend fun postOrder(
         merchantConfig: MerchantConfig,
-        orderRequest: PostOrderRequest
+        orderRequest: PostOrderRequest,
     ): Response<PostOrderResponse> = withContext(ioDispatcher) {
         response {
             httpClient.post(merchantConfig.urlFor("private/orders")) {
-                header(Authorization, "ApiKey ${merchantConfig.apiKey}")
+                auth(merchantConfig)
                 contentType(Json)
-                body = orderRequest
-            } as PostOrderResponse
+                setBody(orderRequest)
+            }.body()
         }
     }
 
     suspend fun checkOrder(
         merchantConfig: MerchantConfig,
-        orderId: String
+        orderId: String,
     ): Response<CheckPaymentResponse> = withContext(ioDispatcher) {
         response {
             httpClient.get(merchantConfig.urlFor("private/orders/$orderId")) {
-                header(Authorization, "ApiKey ${merchantConfig.apiKey}")
-            } as CheckPaymentResponse
+                auth(merchantConfig)
+            }.body()
         }
     }
 
     suspend fun deleteOrder(
         merchantConfig: MerchantConfig,
-        orderId: String
+        orderId: String,
     ): Response<Unit> = withContext(ioDispatcher) {
         response {
             httpClient.delete(merchantConfig.urlFor("private/orders/$orderId")) {
-                header(Authorization, "ApiKey ${merchantConfig.apiKey}")
-            } as Unit
+                auth(merchantConfig)
+            }.body()
         }
     }
 
@@ -83,41 +86,41 @@ class MerchantApi(
         withContext(ioDispatcher) {
             response {
                 httpClient.get(merchantConfig.urlFor("private/orders")) {
-                    header(Authorization, "ApiKey ${merchantConfig.apiKey}")
-                } as OrderHistory
+                    auth(merchantConfig)
+                }.body()
             }
         }
 
     suspend fun giveRefund(
         merchantConfig: MerchantConfig,
         orderId: String,
-        request: RefundRequest
+        request: RefundRequest,
     ): Response<RefundResponse> = withContext(ioDispatcher) {
         response {
             httpClient.post(merchantConfig.urlFor("private/orders/$orderId/refund")) {
-                header(Authorization, "ApiKey ${merchantConfig.apiKey}")
+                auth(merchantConfig)
                 contentType(Json)
-                body = request
-            } as RefundResponse
+                setBody(request)
+            }.body()
         }
     }
+
+    private fun HttpRequestBuilder.auth(merchantConfig: MerchantConfig) {
+        header(Authorization, "Bearer ${merchantConfig.apiKey}")
+    }
 }
 
 fun getDefaultHttpClient(): HttpClient = HttpClient(OkHttp) {
+    expectSuccess = true
     engine {
         config {
             retryOnConnectionFailure(true)
         }
     }
-    install(JsonFeature) {
-        serializer = getSerializer()
+    install(ContentNegotiation) {
+        json(Json {
+            encodeDefaults = false
+            ignoreUnknownKeys = true
+        })
     }
 }
-
-fun getSerializer() = KotlinxSerializer(
-    Json {
-        encodeDefaults = false
-        ignoreUnknownKeys = true
-        classDiscriminator = "order_status"
-    }
-)