add additional data to credential request parameters

a-sit-plus · Aug 31, 2023 · 14dc500 · 14dc500
1 parent d408fa4
commit 14dc500
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/...openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidvci/CredentialRequestParameters.kt b/...openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidvci/CredentialRequestParameters.kt
@@ -49,6 +49,9 @@ data class CredentialRequestParameters(
     @SerialName("claims")
     val claims: Map<String, Map<String, RequestedCredentialClaimSpecification>>? = null,
 
+    @SerialName("additionalData")
+    val additionalData: Map<String, String> = emptyMap(),
+
     /**
      * OID4VCI:
      * OPTIONAL. JSON object containing proof of possession of the key material the issued Credential shall be bound to.
@@ -69,6 +72,7 @@ data class CredentialRequestParameters(
         if (!types.contentEquals(other.types)) return false
         if (docType != other.docType) return false
         if (claims != other.claims) return false
+        if (additionalData != other.additionalData) return false
         return proof == other.proof
     }
 
@@ -77,6 +81,7 @@ data class CredentialRequestParameters(
         result = 31 * result + types.contentHashCode()
         result = 31 * result + (docType?.hashCode() ?: 0)
         result = 31 * result + (claims?.hashCode() ?: 0)
+        result = 31 * result + (additionalData?.hashCode() ?: 0)
         result = 31 * result + (proof?.hashCode() ?: 0)
         return result
     }

diff --git a/vclib-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidvci/IssuerService.kt b/vclib-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidvci/IssuerService.kt
@@ -158,7 +158,8 @@ class IssuerService(
                 CoseEllipticCurve.P256,
                 subjectPublicKey.toAnsiX963ByteArray().getOrThrow()
             ),
-            attributeTypes = params.types.toList()
+            attributeTypes = params.types.toList(),
+            additionalData = params.additionalData
         )
         if (issuedCredentialResult.successful.isEmpty()) {
             throw OAuth2Exception(Errors.INVALID_REQUEST)

diff --git a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/agent/Issuer.kt b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/agent/Issuer.kt
@@ -45,7 +45,8 @@ interface Issuer {
     suspend fun issueCredentialWithTypes(
         subjectId: String,
         subjectPublicKey: CoseKey? = null,
-        attributeTypes: Collection<String>
+        attributeTypes: Collection<String>,
+        additionalData: Map<String, String> = emptyMap()
     ): IssuedCredentialResult
 
     /**

diff --git a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/agent/IssuerAgent.kt b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/agent/IssuerAgent.kt
@@ -85,9 +85,10 @@ class IssuerAgent(
     override suspend fun issueCredentialWithTypes(
         subjectId: String,
         subjectPublicKey: CoseKey?,
-        attributeTypes: Collection<String>
+        attributeTypes: Collection<String>,
+        additionalData: Map<String, String>
     ): Issuer.IssuedCredentialResult {
-        val result = dataProvider.getCredentialWithType(subjectId, subjectPublicKey, attributeTypes)
+        val result = dataProvider.getCredentialWithType(subjectId, subjectPublicKey, attributeTypes, additionalData)
         result.exceptionOrNull()?.let { failure ->
             return Issuer.IssuedCredentialResult(failed = attributeTypes.map { Issuer.FailedAttribute(it, failure) })
         }

diff --git a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/agent/IssuerCredentialDataProvider.kt b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/agent/IssuerCredentialDataProvider.kt
@@ -19,7 +19,8 @@ interface IssuerCredentialDataProvider {
     fun getCredentialWithType(
         subjectId: String,
         subjectPublicKey: CoseKey? = null,
-        attributeTypes: Collection<String>
+        attributeTypes: Collection<String>,
+        additionalData: Map<String, String> = emptyMap()
     ): KmmResult<List<CredentialToBeIssued>>
 
 }