Included GaiaxSelfDescription cred

walt-id · Nov 30, 2021 · 2c42b35 · 2c42b35
1 parent 001de31
commit 2c42b35
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ Notable changes since the last release of the [SSI Kit](https://github.com/walt-
 
 ## [Unreleased]
 
+- Features
+  - Added GaiaxSelfDecription credential https://github.com/dNationCloud/waltid-ssikit/pull/1 thx to https://github.com/dNationCloud & https://github.com/matofeder
+
 ## [1.1.0] - 2021-11-25
 
 -   Features

diff --git a/src/main/kotlin/id/walt/auditor/VerificationPolicy.kt b/src/main/kotlin/id/walt/auditor/VerificationPolicy.kt
@@ -11,7 +11,6 @@ import id.walt.vclib.Helpers.encode
 import id.walt.vclib.VcUtils
 import id.walt.vclib.credentials.GaiaxCredential
 import id.walt.vclib.credentials.VerifiablePresentation
-import id.walt.vclib.credentials.GaiaxSD
 import id.walt.vclib.model.VerifiableCredential
 import id.walt.vclib.schema.SchemaService
 import kotlinx.serialization.Serializable
@@ -69,11 +68,11 @@ class JsonSchemaPolicy : VerificationPolicy {
     override fun verify(vc: VerifiableCredential): Boolean {
 
         SchemaService.validateSchema(vc.json!!).apply {
-            if(valid)
+            if (valid)
                 return true
 
             log.error { "Credential not valid according the json-schema of type ${vc.type}. The validation errors are:" }
-            errors?.forEach{ error -> log.error { error }}
+            errors?.forEach { error -> log.error { error } }
         }
         return false
     }
@@ -128,7 +127,7 @@ class TrustedIssuerRegistryPolicy : VerificationPolicy {
     private fun isValidTrustedIssuerRecord(tirRecord: TrustedIssuer): Boolean {
         for (attribute in tirRecord.attributes) {
             val attributeInfo = AttributeInfo.from(attribute.body)
-            if(TIR_TYPE_ATTRIBUTE.equals(attributeInfo?.type) && TIR_NAME_ISSUER.equals(attributeInfo?.name)) {
+            if (TIR_TYPE_ATTRIBUTE.equals(attributeInfo?.type) && TIR_NAME_ISSUER.equals(attributeInfo?.name)) {
                 return true
             }
         }
@@ -187,12 +186,12 @@ class GaiaxTrustedPolicy : VerificationPolicy {
         val gaiaxVc = vc as GaiaxCredential
 
         // TODO: validate trusted fields properly
-        if (gaiaxVc.credentialSubject.DNSpublicKey.length < 0) {
+        if (gaiaxVc.credentialSubject.DNSpublicKey.length < 1) {
             log.debug { "DNS Public key not valid." }
             return false
         }
 
-        if (gaiaxVc.credentialSubject.ethereumAddress.id.length < 0) {
+        if (gaiaxVc.credentialSubject.ethereumAddress.id.length < 1) {
             log.debug { "ETH address not valid." }
             return false
         }

diff --git a/src/main/kotlin/id/walt/signatory/CLIDataProvider.kt b/src/main/kotlin/id/walt/signatory/CLIDataProvider.kt
@@ -1,7 +1,7 @@
 package id.walt.signatory
 
 import id.walt.vclib.model.VerifiableCredential
-import id.walt.vclib.credentials.GaiaxSD
+import id.walt.vclib.credentials.GaiaxSelfDescription
 import id.walt.vclib.credentials.GaiaxCredential
 import id.walt.vclib.credentials.VerifiableDiploma
 import id.walt.vclib.credentials.VerifiableId
@@ -13,7 +13,7 @@ object CLIDataProviders {
             "VerifiableDiploma" -> VerifiableDiplomaCLIDataProvider()
             "VerifiableId" -> VerifiableIDCLIDataProvider()
             "GaiaxCredential" -> GaiaxCLIDataProvider()
-            "GaiaxSD" -> GaiaxSDProvider()
+            "GaiaxSelfDescription" -> GaiaxSDProvider()
             else -> null
         }
     }
@@ -188,7 +188,7 @@ class GaiaxCLIDataProvider : CLIDataProvider() {
 
 class GaiaxSDProvider : CLIDataProvider() {
     override fun populate(template: VerifiableCredential, proofConfig: ProofConfig): VerifiableCredential {
-        (template as GaiaxSD).apply {
+        (template as GaiaxSelfDescription).apply {
             println()
             println("> Subject information")
             println()

diff --git a/src/main/kotlin/id/walt/signatory/SignatoryDataProvider.kt b/src/main/kotlin/id/walt/signatory/SignatoryDataProvider.kt
@@ -32,7 +32,7 @@ object DataProviderRegistry {
         register(VerifiableId::class, VerifiableIdDataProvider())
         register(Europass::class, EuropassDataProvider())
         register(GaiaxCredential::class, DeltaDaoDataProvider())
-        register(GaiaxSD::class, SdDataProvider())
+        register(GaiaxSelfDescription::class, SdDataProvider())
         register(PermanentResidentCard::class, PermanentResidentCardDataProvider())
     }
 }
@@ -122,11 +122,11 @@ class NoSuchDataProviderException(credentialType: KClass<out VerifiableCredentia
 
 class SdDataProvider : SignatoryDataProvider {
 
-    override fun populate(template: VerifiableCredential, proofConfig: ProofConfig): GaiaxSD {
-        val vc = template as GaiaxSD
+    override fun populate(template: VerifiableCredential, proofConfig: ProofConfig): GaiaxSelfDescription {
+        val vc = template as GaiaxSelfDescription
         vc.id = proofConfig.credentialId
         vc.issuer = proofConfig.issuerDid
-        vc.credentialSubject!!.id = proofConfig.subjectDid!!
+        vc.credentialSubject.id = proofConfig.subjectDid!!
         return vc
     }
 }