fix: fetch class

Sphereon-Opensource · Oct 12, 2024 · 1c32dee · 1c32dee
1 parent 5a85d7b
commit 1c32dee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/...openid-federation-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/fetch/Fetch.kt b/...openid-federation-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/fetch/Fetch.kt
@@ -4,11 +4,6 @@ import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.http.*
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlin.js.JsExport
-import kotlin.jvm.JvmStatic
 
 interface ICallbackService<PlatformCallbackType> {
     fun register(platformCallback: PlatformCallbackType?): ICallbackService<PlatformCallbackType>
@@ -19,27 +14,23 @@ interface IFetchService {
 }
 
 interface IFetchServiceInternal {
-    fun fetchStatement(
+    suspend fun fetchStatement(
         endpoint: String
-    ): Deferred<String>
+    ): String
 }
 
 interface IFetchCallbackService : ICallbackService<IFetchService>, IFetchService, IFetchServiceInternal
 
-@JsExport
 object FetchServiceObject : IFetchCallbackService {
-    @JvmStatic
     private lateinit var platformCallback: IFetchService
     private lateinit var httpClient: HttpClient
 
-    override fun fetchStatement(endpoint: String): Deferred<String> {
-        return GlobalScope.async {
-            httpClient.get(endpoint) {
-                headers {
-                    append(HttpHeaders.Accept, "application/entity-statement+jwt")
-                }
-            }.body()
-        }
+    override suspend fun fetchStatement(endpoint: String): String {
+        return httpClient.get(endpoint) {
+            headers {
+                append(HttpHeaders.Accept, "application/entity-statement+jwt")
+            }
+        }.body()
     }
 
     override fun getHttpClient(): HttpClient {

diff --git a/...eration-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/trustchain/TrustChain.kt b/...eration-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/trustchain/TrustChain.kt
@@ -36,11 +36,10 @@ class SimpleCache<K, V> {
     ): MutableList<String>? {
 
         val entityConfigurationJwt =
-            fetchService.fetchStatement(getEntityConfigurationEndpoint(entityIdentifier)).await()
+            fetchService.fetchStatement(getEntityConfigurationEndpoint(entityIdentifier))
 
         val decodedEntityConfiguration = decodeJWTComponents(entityConfigurationJwt)
 
-
         // need to verify JWT
 
         val entityStatement: EntityConfigurationStatement =
@@ -88,7 +87,7 @@ class SimpleCache<K, V> {
             if (cache.get(authorityConfigurationEndpoint) != null) return null
 
             val authorityEntityConfigurationJwt =
-                fetchService.fetchStatement(authorityConfigurationEndpoint).await() ?: return null
+                fetchService.fetchStatement(authorityConfigurationEndpoint)
             cache.put(authorityConfigurationEndpoint, authorityEntityConfigurationJwt)
 
             val authorityEntityConfiguration: EntityConfigurationStatement =
@@ -105,7 +104,7 @@ class SimpleCache<K, V> {
             val subordinateStatementEndpoint =
                 getSubordinateStatementEndpoint(authorityEntityFetchEndpoint, entityIdentifier)
 
-            val subordinateStatementJwt = fetchService.fetchStatement(subordinateStatementEndpoint).await()
+            val subordinateStatementJwt = fetchService.fetchStatement(subordinateStatementEndpoint)
             val subordinateStatement: SubordinateStatement =
                 mapEntityStatement(subordinateStatementJwt, SubordinateStatement::class)
                     ?: return null