Merge pull request #289 from walt-id/fix-policy-result-serialization-etc

fix verification policy result serialization
walt-id · Apr 18, 2023 · 0a77a28 · 0a77a28
2 parents 520e4c9 + 308ddb6
commit 0a77a28
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/src/main/kotlin/id/walt/auditor/VerificationPolicy.kt b/src/main/kotlin/id/walt/auditor/VerificationPolicy.kt
@@ -1,5 +1,6 @@
 package id.walt.auditor
 
+import com.beust.klaxon.Json
 import com.fasterxml.jackson.annotation.JsonIgnore
 import id.walt.credentials.w3c.VerifiableCredential
 import id.walt.credentials.w3c.VerifiablePresentation
@@ -57,9 +58,9 @@ data class VerificationPolicyMetadata(
 )
 
 class VerificationPolicyResult private constructor(
-    private val result: Boolean,
-    @JsonIgnore
-    private val errorList: List<Throwable> = emptyList()
+    val isSuccess: Boolean,
+    @JsonIgnore @Json(ignored = true)
+    val errors: List<Throwable> = emptyList()
 ) {
 
     companion object {
@@ -70,17 +71,15 @@ class VerificationPolicyResult private constructor(
         }
     }
 
-    val isSuccess = result
-    val isFailure = !result
-    @JsonIgnore
-    val errors = errorList
+    @JsonIgnore @Json(ignored = true)
+    val isFailure = !isSuccess
 
-    private fun getErrorString() = errorList.mapIndexed { index, throwable ->
+    private fun getErrorString() = errors.mapIndexed { index, throwable ->
         "#${index + 1}: ${throwable::class.simpleName ?: "Error"} - ${throwable.message}"
     }.joinToString()
 
     override fun toString(): String {
-        return when (result) {
+        return when (isSuccess) {
             true -> "passed"
             false -> "failed: ${getErrorString()}"
         }

diff --git a/src/main/kotlin/id/walt/auditor/policies/EbsiVerificationPolicies.kt b/src/main/kotlin/id/walt/auditor/policies/EbsiVerificationPolicies.kt
@@ -89,7 +89,7 @@ class EbsiTrustedIssuerRegistryPolicy(registryArg: EbsiTrustedIssuerRegistryPoli
     constructor() : this(
         EbsiTrustedIssuerRegistryPolicyArg(
             "${TrustedIssuerClient.domain}/${TrustedIssuerClient.trustedIssuerPath}",
-            TrustedIssuerType.Undefined
+            TrustedIssuerType.TI
         )
     )
 

diff --git a/src/test/kotlin/id/walt/auditor/AuditorTest.kt b/src/test/kotlin/id/walt/auditor/AuditorTest.kt
@@ -409,5 +409,20 @@ class AuditorCommandTest : StringSpec() {
                 unmockkObject(TrustedIssuerClient)
             }
         }
+
+        "12. test serialize verification result" {
+            val verificationResult = VerificationResult(true, mapOf(
+                "SignaturePolicy" to VerificationPolicyResult.success()
+            ))
+
+            val serializedResult = KlaxonWithConverters().toJsonString(verificationResult)
+
+            val deserializedResult = KlaxonWithConverters().parse<VerificationResult>(serializedResult)
+
+            verificationResult.result shouldBe deserializedResult!!.result
+            verificationResult.policyResults.forEach {
+                deserializedResult.policyResults[it.key]?.isSuccess shouldBe it.value.isSuccess
+            }
+        }
     }
 }
diff --git a/src/test/kotlin/id/walt/auditor/PolicyFactoryTest.kt b/src/test/kotlin/id/walt/auditor/PolicyFactoryTest.kt
@@ -14,11 +14,11 @@ import org.junit.jupiter.api.Assertions.assertAll
 
 class PolicyFactoryTest : AnnotationSpec() {
 
-    private val testArgument = EbsiTrustedIssuerRegistryPolicyArg("testArg", TrustedIssuerType.Undefined)
+    private val testArgument = EbsiTrustedIssuerRegistryPolicyArg("testArg", TrustedIssuerType.TI)
     private val wrongArg = AnotherArg("Else")
     private val defaultArg = EbsiTrustedIssuerRegistryPolicyArg(
         "${TrustedIssuerClient.domain}/${TrustedIssuerClient.trustedIssuerPath}",
-        TrustedIssuerType.Undefined
+        TrustedIssuerType.TI
     )
 
     @Test