chore: log fetchStatement returned

Sphereon-Opensource · Nov 5, 2024 · c79dcb7 · c79dcb7
1 parent 287e36c
commit c79dcb7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ androidx-test-junit = "1.1.5"
 compose-plugin = "1.6.10"
 junit = "4.13.2"
 kotlin = "2.0.0"
-ktor = "2.3.11"
+ktor = "2.3.12"
 kotlinxSerialization = "1.7.1"
 kotlinxCoroutines = "1.8.0"
 springboot = "3.3.1"
@@ -84,4 +84,4 @@ kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 springboot = { id = "org.springframework.boot", version.ref = "springboot" }
 springDependencyManagement = { id = "io.spring.dependency-management", version.ref = "springDependencyManagement" }
-kotlinPluginSpring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
+kotlinPluginSpring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
diff --git a/.../openid-federation-client/src/jsMain/kotlin/com/sphereon/oid/fed/client/fetch/Fetch.js.kt b/.../openid-federation-client/src/jsMain/kotlin/com/sphereon/oid/fed/client/fetch/Fetch.js.kt
@@ -1,7 +1,9 @@
 package com.sphereon.oid.fed.client.fetch
 
 import com.sphereon.oid.fed.client.crypto.AbstractCryptoService
+import com.sphereon.oid.fed.client.crypto.CryptoConst
 import com.sphereon.oid.fed.client.service.DefaultCallbacks
+import com.sphereon.oid.fed.client.trustchain.TrustChainConst
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.js.Js
@@ -58,8 +60,11 @@ class FetchServiceJSAdapter(val fetchCallbackJS: FetchServiceJS = FetchServiceJS
 
     override fun platform(): IFetchCallbackServiceJS = fetchCallbackJS.platformCallback
 
-    override suspend fun fetchStatement(endpoint: String): String =
-        this.platformCallback.fetchStatement(endpoint).await()
+    override suspend fun fetchStatement(endpoint: String): String {
+        val result = this.platformCallback.fetchStatement(endpoint).await()
+        TrustChainConst.LOG.info("fetchStatement returned ${result}")
+        return result
+    }
 
     override suspend fun getHttpClient(): HttpClient = this.platformCallback.getHttpClient().await()
 }
@@ -92,7 +97,7 @@ class DefaultFetchJSImpl : IFetchCallbackServiceJS {
             return@async getHttpClient().await().get(endpoint) {
                 headers {
                     append(HttpHeaders.Accept, "application/entity-statement+jwt")
-                    append(HttpHeaders.AcceptCharset, "ascii, utf-8")
+                    append(HttpHeaders.AcceptCharset, "iso-8859-1, us-ascii, utf-8")
                 }
             }.body() as String
         }.asPromise()

diff --git a/...penid-federation-client/src/jvmMain/kotlin/com/sphereon/oid/fed/client/fetch/Fetch.jvm.kt b/...penid-federation-client/src/jvmMain/kotlin/com/sphereon/oid/fed/client/fetch/Fetch.jvm.kt
@@ -21,7 +21,7 @@ class DefaultFetchJvmImpl : IFetchCallbackService {
         return getHttpClient().get(endpoint) {
             headers {
                 append(HttpHeaders.Accept, "application/entity-statement+jwt")
-                append(HttpHeaders.AcceptCharset, "ascii, utf-8")
+                append(HttpHeaders.AcceptCharset, "iso-8859-1, us-ascii, utf-8")
             }
         }.body() as String
     }