Fixed AppstoreClientTest

Author: davidvedvick

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/api/AppstoreClient.kt

@@ -1,22 +1,18 @@
 package io.rebble.cobble.shared.api
 
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.delete
-import io.ktor.client.request.get
-import io.ktor.client.request.headers
-import io.ktor.client.request.put
-import io.ktor.http.HttpHeaders
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.request.*
+import io.ktor.http.*
 import io.rebble.cobble.shared.domain.api.appstore.LockerEntry
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 
 class AppstoreClient(
         val baseUrl: String,
-        private val token: String
+        private val token: String,
+        private val client: HttpClient,
 ): KoinComponent {
     private val version = "v1"
-    private val client: HttpClient by inject()
 
     suspend fun getLocker(): List<LockerEntry> {
         val res = client.get("$baseUrl/$version/locker") {
@@ -34,7 +30,7 @@ class AppstoreClient(
         return body["applications"] ?: emptyList()
     }
 
-    suspend fun addToLocker(uuid: String) {
+    suspend fun  addToLocker(uuid: String) {
         val res = client.put("$baseUrl/$version/locker/$uuid") {
             headers {
                 append(HttpHeaders.Accept, "application/json")

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/api/RWS.kt

@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 import org.koin.core.component.inject
 import org.koin.core.qualifier.named
 
@@ -18,7 +19,7 @@ object RWS: KoinComponent {
     private val scope = CoroutineScope(Dispatchers.Default)
 
     val appstoreClientFlow = token.map {
-        it.tokenOrNull?.let { t -> AppstoreClient("https://appstore-api.$domainSuffix/api", t) }
+        it.tokenOrNull?.let { t -> AppstoreClient("https://appstore-api.$domainSuffix/api", t, get()) }
     }.stateIn(scope, SharingStarted.Eagerly, null)
     val authClientFlow = token.map {
         it.tokenOrNull?.let { t -> AuthClient("https://auth.$domainSuffix/api", t) }

android/shared/src/commonTest/kotlin/io/rebble/cobble/domain/api/AppstoreClientTest.kt

@@ -1,11 +1,15 @@
 package io.rebble.cobble.domain.api
 
+import io.ktor.client.*
 import io.ktor.client.engine.mock.MockEngine
 import io.ktor.client.engine.mock.respond
+import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpMethod
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
+import io.ktor.serialization.kotlinx.json.*
+import io.ktor.utils.io.core.*
 import io.rebble.cobble.shared.api.AppstoreClient
 import io.rebble.libpebblecommon.util.runBlocking
 import kotlin.test.Test
@@ -1418,7 +1422,7 @@ class AppstoreClientTest {
                 ]
             }
         """.trimIndent()
-        val mockEngine = MockEngine { request ->
+        MockEngine { request ->
             when (request.url.encodedPath) {
                 "/api/v1/locker" -> {
                     if (request.headers[HttpHeaders.Authorization] != "Bearer x") {
@@ -1442,9 +1446,16 @@ class AppstoreClientTest {
                 }
                 else -> error("Unhandled ${request.url.encodedPath}")
             }
+        }.use { engine ->
+            val httpClient = HttpClient(engine) {
+                install(ContentNegotiation) {
+                    json() // Example: Register JSON content transformation
+                    // Add more transformations as needed for other content types
+                }
+            }
+            val client = AppstoreClient("https://appstore-api.rebble.io/api", "x", httpClient)
+            val locker = client.getLocker()
+            assertEquals(13, locker.size)
         }
-        val client = AppstoreClient("https://appstore-api.rebble.io/api", "x")
-        val locker = client.getLocker()
-        assertEquals(13, locker.size)
     }
 }