fix: anoncred nonce + enhancements

Signed-off-by: Allain Magyar <allain.magyar@iohk.io>
hyperledger · Sep 9, 2024 · 8d722d5 · 8d722d5
1 parent bf45b3d
commit 8d722d5
Show file tree

Hide file tree

Showing 5 changed files with 3,124 additions and 25 deletions.
diff --git a/...Main/kotlin/org/hyperledger/identus/walletsdk/edgeagent/mediation/BasicMediatorHandler.kt b/...Main/kotlin/org/hyperledger/identus/walletsdk/edgeagent/mediation/BasicMediatorHandler.kt
@@ -1,11 +1,9 @@
 package org.hyperledger.identus.walletsdk.edgeagent.mediation
 
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.websocket.WebSockets
-import io.ktor.client.plugins.websocket.webSocket
-import io.ktor.websocket.Frame
-import io.ktor.websocket.readText
+import io.ktor.client.*
+import io.ktor.client.plugins.*
+import io.ktor.client.plugins.websocket.*
+import io.ktor.websocket.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
@@ -214,17 +212,11 @@ class BasicMediatorHandler(
                     send(Frame.Text(packedMessage))
                 }
                 while (isActive) {
-                    try {
-                        for (frame in incoming) {
-                            if (frame is Frame.Text) {
-                                val messages =
-                                    handleReceivedMessagesFromSockets(frame.readText())
-                                onMessageCallback.onMessage(messages)
-                            }
+                    for (frame in incoming) {
+                        if (frame is Frame.Text) {
+                            val messages = handleReceivedMessagesFromSockets(frame.readText())
+                            onMessageCallback.onMessage(messages)
                         }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                        continue
                     }
                 }
             }

diff --git a/.../org/hyperledger/identus/walletsdk/edgeagent/protocols/issueCredential/IssueCredential.kt b/.../org/hyperledger/identus/walletsdk/edgeagent/protocols/issueCredential/IssueCredential.kt
@@ -62,14 +62,8 @@ data class IssueCredential(
      * @return An array of credential strings.
      */
     fun getCredentialStrings(): Array<String> {
-        return attachments.mapNotNull {
-            when (it.data) {
-                is AttachmentBase64 -> {
-                    it.data.base64.base64UrlEncoded
-                }
-
-                else -> null
-            }
+        return attachments.map {
+            it.data.getDataAsJsonString()
         }.toTypedArray()
     }