fix: JWTJsonPayload fields are optional except (#80)

hyperledger · Jun 27, 2023 · e095c49 · e095c49
1 parent 96100f9
commit e095c49
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/...src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/JWTCredentialPayload.kt b/...src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/JWTCredentialPayload.kt
@@ -43,13 +43,13 @@ import kotlin.jvm.JvmOverloads
  */
 @Serializable
 data class JWTCredentialPayload(
-    val iss: DID,
+    val iss: DID?,
     val sub: String?,
     @SerialName(VC)
     val verifiableCredential: JWTVerifiableCredential,
-    val nbf: String,
+    val nbf: String?,
     val exp: String?,
-    val jti: String
+    val jti: String?
 ) : VerifiableCredential {
 
     /**
@@ -60,7 +60,7 @@ data class JWTCredentialPayload(
         override val credentialType: CredentialType,
         override val context: Array<String> = arrayOf(),
         override val type: Array<String> = arrayOf(),
-        override val issuer: DID,
+        override val issuer: DID?,
         override val credentialSchema: VerifiableCredentialTypeContainer? = null,
         override val credentialSubject: String,
         override val credentialStatus: VerifiableCredentialTypeContainer? = null,
@@ -125,7 +125,7 @@ data class JWTCredentialPayload(
     }
 
     override val id: String
-        get() = jti
+        get() = jti ?: ""
     override val credentialType: CredentialType
         get() = CredentialType.JWT
     override val context: Array<String>
@@ -144,7 +144,7 @@ data class JWTCredentialPayload(
         get() = verifiableCredential.evidence
     override val termsOfUse: VerifiableCredentialTypeContainer?
         get() = verifiableCredential.termsOfUse
-    override val issuer: DID
+    override val issuer: DID?
         get() = verifiableCredential.issuer
     override val issuanceDate: String
         get() = verifiableCredential.issuanceDate

diff --git a/...src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/VerifiableCredential.kt b/...src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/VerifiableCredential.kt
@@ -44,7 +44,7 @@ sealed interface VerifiableCredential {
     val refreshService: VerifiableCredentialTypeContainer?
     val evidence: VerifiableCredentialTypeContainer?
     val termsOfUse: VerifiableCredentialTypeContainer?
-    val issuer: DID
+    val issuer: DID?
     val issuanceDate: String // TODO(Date)
     val expirationDate: String? // TODO(Date)
     val validFrom: VerifiableCredentialTypeContainer?

diff --git a/.../commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/W3CVerifiableCredential.kt b/.../commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/W3CVerifiableCredential.kt
@@ -19,7 +19,7 @@ data class W3CVerifiableCredential @JvmOverloads constructor(
     override val credentialType: CredentialType = CredentialType.W3C,
     override val context: Array<String>,
     override val type: Array<String>,
-    override val issuer: DID,
+    override val issuer: DID?,
     override val issuanceDate: String,
     override val expirationDate: String? = null,
     override val credentialSchema: VerifiableCredentialTypeContainer? = null,

diff --git a/atala-prism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/pollux/JWTJsonPayload.kt b/atala-prism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/pollux/JWTJsonPayload.kt
@@ -5,9 +5,9 @@ import kotlinx.serialization.json.JsonElement
 
 @Serializable
 data class JWTJsonPayload(
-    val iss: String,
-    val sub: String,
-    val nbf: Long,
-    val exp: Long,
+    val iss: String? = null,
+    val sub: String? = null,
+    val nbf: Long? = null,
+    val exp: Long? = null,
     val vc: JsonElement
 )
diff --git a/atala-prism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/pollux/PolluxImpl.kt b/atala-prism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/pollux/PolluxImpl.kt
@@ -48,14 +48,14 @@ class PolluxImpl(val castor: Castor) : Pollux {
         val verifiableCredentialJson = Json.decodeFromString<JWTJsonPayload>(decodedBase64CredentialJson)
 
         return JWTCredentialPayload(
-            iss = DID(verifiableCredentialJson.iss),
-            exp = verifiableCredentialJson.exp.toString(),
-            nbf = verifiableCredentialJson.nbf.toString(),
+            iss = if (verifiableCredentialJson.iss != null) DID(verifiableCredentialJson.iss) else null,
+            exp = if (verifiableCredentialJson.exp != null) verifiableCredentialJson.exp.toString() else null,
+            nbf = if (verifiableCredentialJson.nbf != null) verifiableCredentialJson.nbf.toString() else null,
             jti = jwtString,
             verifiableCredential = JWTCredentialPayload.JWTVerifiableCredential(
                 credentialType = CredentialType.JWT,
-                issuer = DID(verifiableCredentialJson.iss),
-                credentialSubject = verifiableCredentialJson.sub,
+                issuer = if (verifiableCredentialJson.iss != null) DID(verifiableCredentialJson.iss) else null,
+                credentialSubject = verifiableCredentialJson.sub ?: "",
                 id = jwtString,
                 issuanceDate = verifiableCredentialJson.nbf.toString(),
                 expirationDate = verifiableCredentialJson.exp.toString(),