feat: Create & Store Presentation (#794)

Signed-off-by: Bassam Riman <[email protected]>
hyperledger · Feb 9, 2024 · 1aa4e14 · 1aa4e14
1 parent 32e9e51
commit 1aa4e14
Show file tree

Hide file tree

Showing 18 changed files with 547 additions and 109 deletions.
diff --git a/pollux/lib/anoncreds/src/main/scala/io/iohk/atala/pollux/anoncreds/AnoncredLib.scala b/pollux/lib/anoncreds/src/main/scala/io/iohk/atala/pollux/anoncreds/AnoncredLib.scala
@@ -141,12 +141,12 @@ object AnoncredLib {
 
   def createPresentation(
       presentationRequest: PresentationRequest,
-      credentialRequests: Seq[CredentialAndRequestedAttributesPredicates],
+      credentialRequests: Seq[CredentialRequests],
       selfAttested: Map[String, String],
       linkSecret: LinkSecret,
       schemas: Map[SchemaId, SchemaDef],
       credentialDefinitions: Map[CredentialDefinitionId, CredentialDefinition],
-  ): Either[uniffi.anoncreds_wrapper.AnoncredsException.CreatePresentationException, Presentation] = {
+  ): Either[uniffi.anoncreds_wrapper.AnoncredsException.CreatePresentationException, AnoncredPresentation] = {
     try {
       Right(
         uniffi.anoncreds_wrapper
@@ -181,7 +181,7 @@ object AnoncredLib {
 
   // FIXME its always return false ....
   def verifyPresentation(
-      presentation: Presentation,
+      presentation: AnoncredPresentation,
       presentationRequest: PresentationRequest,
       schemas: Map[SchemaId, SchemaDef],
       credentialDefinitions: Map[CredentialDefinitionId, CredentialDefinition],

diff --git a/pollux/lib/anoncreds/src/main/scala/io/iohk/atala/pollux/anoncreds/Models.scala b/pollux/lib/anoncreds/src/main/scala/io/iohk/atala/pollux/anoncreds/Models.scala
@@ -1,20 +1,6 @@
 package io.iohk.atala.pollux.anoncreds
 
-import uniffi.anoncreds_wrapper.{
-  Nonce,
-  Credential as UniffiCredential,
-  CredentialRequests as UniffiCredentialRequests,
-  CredentialDefinition as UniffiCredentialDefinition,
-  CredentialDefinitionPrivate as UniffiCredentialDefinitionPrivate,
-  CredentialKeyCorrectnessProof as UniffiCredentialKeyCorrectnessProof,
-  CredentialOffer as UniffiCredentialOffer,
-  CredentialRequest as UniffiCredentialRequest,
-  CredentialRequestMetadata as UniffiCredentialRequestMetadata,
-  LinkSecret as UniffiLinkSecret,
-  Schema as UniffiSchema,
-  Presentation as UniffiPresentation,
-  PresentationRequest as UniffiPresentationRequest,
-}
+import uniffi.anoncreds_wrapper.{Nonce, Credential as UniffiCredential, CredentialDefinition as UniffiCredentialDefinition, CredentialDefinitionPrivate as UniffiCredentialDefinitionPrivate, CredentialKeyCorrectnessProof as UniffiCredentialKeyCorrectnessProof, CredentialOffer as UniffiCredentialOffer, CredentialRequest as UniffiCredentialRequest, CredentialRequestMetadata as UniffiCredentialRequestMetadata, CredentialRequests as UniffiCredentialRequests, LinkSecret as UniffiLinkSecret, Presentation as UniffiPresentation, PresentationRequest as UniffiPresentationRequest, Schema as UniffiSchema}
 import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}
 
 import scala.jdk.CollectionConverters.*
@@ -259,27 +245,27 @@ object Credential {
 }
 
 // ****************************************************************************
-case class CredentialAndRequestedAttributesPredicates(
+case class CredentialRequests(
     credential: Credential,
     requestedAttribute: Seq[String],
     requestedPredicate: Seq[String],
 )
 
-object CredentialAndRequestedAttributesPredicates {
-  given Conversion[CredentialAndRequestedAttributesPredicates, UniffiCredentialRequests] with {
+object CredentialRequests {
+  given Conversion[CredentialRequests, UniffiCredentialRequests] with {
     import uniffi.anoncreds_wrapper.RequestedAttribute
     import uniffi.anoncreds_wrapper.RequestedPredicate
-    def apply(credentialRequests: CredentialAndRequestedAttributesPredicates): UniffiCredentialRequests = {
+    def apply(credentialRequests: CredentialRequests): UniffiCredentialRequests = {
       val credential = Credential.given_Conversion_Credential_UniffiCredential(credentialRequests.credential)
       val requestedAttributes = credentialRequests.requestedAttribute.map(a => RequestedAttribute(a, true))
       val requestedPredicates = credentialRequests.requestedPredicate.map(p => RequestedPredicate(p))
       UniffiCredentialRequests(credential, requestedAttributes.asJava, requestedPredicates.asJava)
     }
   }
 
-  given Conversion[UniffiCredentialRequests, CredentialAndRequestedAttributesPredicates] with {
-    def apply(credentialRequests: UniffiCredentialRequests): CredentialAndRequestedAttributesPredicates = {
-      CredentialAndRequestedAttributesPredicates(
+  given Conversion[UniffiCredentialRequests, CredentialRequests] with {
+    def apply(credentialRequests: UniffiCredentialRequests): CredentialRequests = {
+      CredentialRequests(
         Credential.given_Conversion_UniffiCredential_Credential(credentialRequests.getCredential()),
         credentialRequests
           .getRequestedAttribute()
@@ -316,17 +302,17 @@ object PresentationRequest {
 
 // ****************************************************************************
 
-case class Presentation(data: String)
-object Presentation {
-  given Conversion[Presentation, UniffiPresentation] with {
-    def apply(presentation: Presentation): UniffiPresentation = {
+case class AnoncredPresentation(data: String)
+object AnoncredPresentation {
+  given Conversion[AnoncredPresentation, UniffiPresentation] with {
+    def apply(presentation: AnoncredPresentation): UniffiPresentation = {
       UniffiPresentation(presentation.data)
     }
   }
 
-  given Conversion[UniffiPresentation, Presentation] with {
-    def apply(presentation: UniffiPresentation): Presentation = {
-      Presentation(presentation.getJson())
+  given Conversion[UniffiPresentation, AnoncredPresentation] with {
+    def apply(presentation: UniffiPresentation): AnoncredPresentation = {
+      AnoncredPresentation(presentation.getJson())
     }
   }
 }
diff --git a/pollux/lib/anoncredsTest/src/test/scala/io/iohk/atala/pollux/anoncreds/PoCNewLib.scala b/pollux/lib/anoncredsTest/src/test/scala/io/iohk/atala/pollux/anoncreds/PoCNewLib.scala
@@ -109,7 +109,7 @@ class PoCNewLib extends AnyFlatSpec {
     val presentation = AnoncredLib.createPresentation(
       presentationRequest, // : PresentationRequest,
       Seq(
-        CredentialAndRequestedAttributesPredicates(processedCredential, Seq("sex"), Seq("age"))
+        CredentialRequests(processedCredential, Seq("sex"), Seq("age"))
       ), // credentials: Seq[Credential],
       Map(), // selfAttested: Map[String, String],
       linkSecret.secret, // linkSecret: LinkSecret,

diff --git a/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/model/IssueCredentialRecord.scala b/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/model/IssueCredentialRecord.scala
@@ -73,6 +73,15 @@ final case class ValidIssuedCredentialRecord(
     subjectId: Option[String]
 )
 
+final case class ValidFullIssuedCredentialRecord(
+    id: DidCommID,
+    issuedCredential: Option[IssueCredential],
+    credentialFormat: CredentialFormat,
+    schemaId: Option[String],
+    credentialDefinitionId: Option[UUID],
+    subjectId: Option[String]
+)
+
 object IssueCredentialRecord {
 
   enum Role:

diff --git a/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/model/error/PresentationError.scala b/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/model/error/PresentationError.scala
@@ -20,4 +20,6 @@ object PresentationError {
   final case class UnsupportedCredentialFormat(vcFormat: String) extends PresentationError
   final case class InvalidAnoncredPresentationRequest(error: String) extends PresentationError
   final case class MissingAnoncredPresentationRequest(error: String) extends PresentationError
+
+  final case class AnoncredPresentationCreationError(cause: Throwable) extends PresentationError
 }
diff --git a/...x/lib/core/src/main/scala/io/iohk/atala/pollux/core/repository/CredentialRepository.scala b/...x/lib/core/src/main/scala/io/iohk/atala/pollux/core/repository/CredentialRepository.scala
@@ -74,6 +74,10 @@ trait CredentialRepository {
 
   def getValidIssuedCredentials(recordId: Seq[DidCommID]): RIO[WalletAccessContext, Seq[ValidIssuedCredentialRecord]]
 
+  def getValidAnoncredIssuedCredentials(
+      recordIds: Seq[DidCommID]
+  ): RIO[WalletAccessContext, Seq[ValidFullIssuedCredentialRecord]]
+
   def updateAfterFail(
       recordId: DidCommID,
       failReason: Option[String]

diff --git a/...re/src/main/scala/io/iohk/atala/pollux/core/repository/CredentialRepositoryInMemory.scala b/...re/src/main/scala/io/iohk/atala/pollux/core/repository/CredentialRepositoryInMemory.scala
@@ -137,6 +137,34 @@ class CredentialRepositoryInMemory(
       .toSeq
   }
 
+  override def getValidAnoncredIssuedCredentials(
+      recordId: Seq[DidCommID]
+  ): RIO[WalletAccessContext, Seq[ValidFullIssuedCredentialRecord]] = {
+    for {
+      storeRef <- walletStoreRef
+      store <- storeRef.get
+    } yield store.values
+      .filter(rec =>
+        recordId.contains(
+          rec.id
+        ) && rec.issueCredentialData.isDefined
+          && rec.schemaId.isDefined
+          && rec.credentialDefinitionId.isDefined
+          && rec.credentialFormat == CredentialFormat.AnonCreds
+      )
+      .map(rec =>
+        ValidFullIssuedCredentialRecord(
+          rec.id,
+          rec.issueCredentialData,
+          rec.credentialFormat,
+          rec.schemaId,
+          rec.credentialDefinitionId,
+          rec.subjectId
+        )
+      )
+      .toSeq
+  }
+
   override def deleteIssueCredentialRecord(recordId: DidCommID): RIO[WalletAccessContext, Int] = {
     for {
       storeRef <- walletStoreRef

diff --git a/...x/lib/core/src/main/scala/io/iohk/atala/pollux/core/service/MockPresentationService.scala b/...x/lib/core/src/main/scala/io/iohk/atala/pollux/core/service/MockPresentationService.scala
@@ -2,6 +2,7 @@ package io.iohk.atala.pollux.core.service
 
 import io.iohk.atala.mercury.model.DidId
 import io.iohk.atala.mercury.protocol.presentproof.{Presentation, ProofType, ProposePresentation, RequestPresentation}
+import io.iohk.atala.pollux.anoncreds.AnoncredPresentation
 import io.iohk.atala.pollux.core.model.error.PresentationError
 import io.iohk.atala.pollux.core.model.presentation.Options
 import io.iohk.atala.pollux.core.model.{DidCommID, PresentationRecord}
@@ -142,12 +143,18 @@ object MockPresentationService extends Mock[PresentationService] {
           ignoreWithZeroRetries: Boolean
       ): IO[PresentationError, Seq[PresentationRecord]] = ???
 
-      override def createPresentationPayloadFromRecord(
+      override def createJwtPresentationPayloadFromRecord(
           record: DidCommID,
           issuer: Issuer,
           issuanceDate: Instant
       ): IO[PresentationError, PresentationPayload] = ???
 
+      override def createAnoncredPresentationPayloadFromRecord(
+          record: DidCommID,
+          issuer: Issuer,
+          issuanceDate: Instant
+      ): IO[PresentationError, AnoncredPresentation] = ???
+
       override def getPresentationRecordsByStates(
           ignoreWithZeroRetries: Boolean,
           limit: Int,

diff --git a/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/service/PresentationService.scala b/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/service/PresentationService.scala
@@ -2,6 +2,7 @@ package io.iohk.atala.pollux.core.service
 
 import io.iohk.atala.mercury.model.*
 import io.iohk.atala.mercury.protocol.presentproof.*
+import io.iohk.atala.pollux.anoncreds.AnoncredPresentation
 import io.iohk.atala.pollux.core.model.*
 import io.iohk.atala.pollux.core.model.error.PresentationError
 import io.iohk.atala.pollux.core.model.presentation.*
@@ -39,12 +40,18 @@ trait PresentationService {
       ignoreWithZeroRetries: Boolean
   ): ZIO[WalletAccessContext, PresentationError, Seq[PresentationRecord]]
 
-  def createPresentationPayloadFromRecord(
+  def createJwtPresentationPayloadFromRecord(
       record: DidCommID,
       issuer: Issuer,
       issuanceDate: Instant
   ): ZIO[WalletAccessContext, PresentationError, PresentationPayload]
 
+  def createAnoncredPresentationPayloadFromRecord(
+      record: DidCommID,
+      issuer: Issuer,
+      issuanceDate: Instant
+  ): ZIO[WalletAccessContext, PresentationError, AnoncredPresentation]
+
   def getPresentationRecordsByStates(
       ignoreWithZeroRetries: Boolean,
       limit: Int,