network: Refactor ApiClientProvider

Infomaniak · Jul 9, 2024 · cfaae03 · cfaae03
1 parent fa811bc
commit cfaae03
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...commonMain/kotlin/com/infomaniak/multiplatform_swisstransfer/network/ApiClientProvider.kt b/...commonMain/kotlin/com/infomaniak/multiplatform_swisstransfer/network/ApiClientProvider.kt
@@ -18,6 +18,7 @@
 
 package com.infomaniak.multiplatform_swisstransfer.network
 
+import com.infomaniak.multiplatform_swisstransfer.common.exceptions.UnknownException
 import com.infomaniak.multiplatform_swisstransfer.network.exceptions.ApiException
 import com.infomaniak.multiplatform_swisstransfer.network.exceptions.NetworkException
 import com.infomaniak.multiplatform_swisstransfer.network.exceptions.UnknownApiException
@@ -36,7 +37,9 @@ import io.ktor.serialization.kotlinx.json.json
 import io.ktor.utils.io.errors.IOException
 import kotlinx.serialization.json.Json
 
-class ApiClientProvider {
+class ApiClientProvider internal constructor(engine: HttpClientEngineFactory<*>? = null) {
+
+    constructor() : this(null)
 
     val json = Json {
         ignoreUnknownKeys = true
@@ -45,7 +48,9 @@ class ApiClientProvider {
         useAlternativeNames = false
     }
 
-    fun createHttpClient(engine: HttpClientEngineFactory<*>? = null): HttpClient {
+    val httpClient = createHttpClient(engine)
+
+    fun createHttpClient(engine: HttpClientEngineFactory<*>?): HttpClient {
         val block: HttpClientConfig<*>.() -> Unit = {
             install(ContentNegotiation) {
                 json(this@ApiClientProvider.json)
@@ -68,21 +73,22 @@ class ApiClientProvider {
             }
             HttpResponseValidator {
                 validateResponse { response: HttpResponse ->
-                    val errorCode = response.status.value
+                    val statusCode = response.status.value
                     val bodyResponse = response.bodyAsText()
-                    if (errorCode >= 300) {
+                    if (statusCode >= 300) {
                         runCatching {
                             val apiError = json.decodeFromString<ApiError>(bodyResponse)
                             throw ApiException(apiError.errorCode, apiError.message)
                         }.onFailure {
-                            throw UnknownApiException(errorCode, bodyResponse)
+                            throw UnknownApiException(statusCode, bodyResponse)
                         }
                     }
                 }
                 handleResponseExceptionWithRequest { cause, _ ->
                     when (cause) {
                         is IOException -> throw NetworkException("Network error: ${cause.message}")
-                        else -> throw cause
+                        is ApiException, is UnknownApiException -> throw cause
+                        else -> throw UnknownException(cause)
                     }
                 }
             }

diff --git a/...tlin/com/infomaniak/multiplatform_swisstransfer/network/exceptions/UnknownApiException.kt b/...tlin/com/infomaniak/multiplatform_swisstransfer/network/exceptions/UnknownApiException.kt
@@ -18,4 +18,4 @@
 
 package com.infomaniak.multiplatform_swisstransfer.network.exceptions
 
-class UnknownApiException(val errorCode: Int, val bodyResponse: String) : Exception(bodyResponse)
+class UnknownApiException(val statusCode: Int, val bodyResponse: String) : Exception(bodyResponse)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,4 @@

		package com.infomaniak.multiplatform_swisstransfer.network.exceptions

		class UnknownApiException(val errorCode: Int, val bodyResponse: String) : Exception(bodyResponse)
		class UnknownApiException(val statusCode: Int, val bodyResponse: String) : Exception(bodyResponse)