More code

hyperledger · May 7, 2024 · 356d295 · 356d295
1 parent 581deee
commit 356d295
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 6 deletions.
diff --git a/.../server/src/main/scala/org/hyperledger/identus/issue/controller/IssueControllerImpl.scala b/.../server/src/main/scala/org/hyperledger/identus/issue/controller/IssueControllerImpl.scala
@@ -71,7 +71,7 @@ class IssueControllerImpl(
                   issuingDID = issuingDID.asCanonical
                 )
             } yield record
-          case SDJWT => // FIXME
+          case SDJWT =>
             for {
               issuingDID <- ZIO
                 .fromOption(request.issuingDID)

diff --git a/...in/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala b/...in/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala
@@ -47,7 +47,22 @@ class PresentProofControllerImpl(
                 },
                 options = request.options.map(x => Options(x.challenge, x.domain))
               )
-          case CredentialFormat.SDJWT => ??? // TODO
+          case CredentialFormat.SDJWT =>
+            presentationService
+              .createSDJWTPresentationRecord(
+                pairwiseVerifierDID = didIdPair.myDID,
+                pairwiseProverDID = didIdPair.theirDid,
+                thid = DidCommID(),
+                connectionId = Some(request.connectionId.toString),
+                proofTypes = request.proofs.map { e =>
+                  ProofType(
+                    schema = e.schemaId,
+                    requiredFields = None,
+                    trustIssuers = Some(e.trustIssuers.map(DidId(_)))
+                  )
+                },
+                options = request.options.map(x => Options(x.challenge, x.domain))
+              )
           case CredentialFormat.AnonCreds =>
             request.anoncredPresentationRequest match {
               case Some(presentationRequest) =>

diff --git a/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala b/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala
@@ -400,7 +400,7 @@ private class CredentialServiceImpl(
       attachment: AttachmentDescriptor
   ) = for {
     _ <- credentialFormat match
-      case CredentialFormat.JWT =>
+      case CredentialFormat.JWT | CredentialFormat.SDJWT =>
         attachment.data match
           case JsonData(json) =>
             ZIO
@@ -409,12 +409,16 @@ private class CredentialServiceImpl(
                 CredentialServiceError
                   .UnexpectedError(s"Unexpected error parsing credential offer attachment: ${e.toString}")
               )
+          case Base64(base64) => // TODO
+            ZIO.fail(
+              CredentialServiceError
+                .UnexpectedError(s"A Base64 attachment it's not yet implemented for credential offer")
+            )
           case _ =>
             ZIO.fail(
               CredentialServiceError
                 .UnexpectedError(s"A JSON attachment is expected in the credential offer")
             )
-      case CredentialFormat.SDJWT => ??? // FIXME
       case CredentialFormat.AnonCreds =>
         attachment.data match
           case Base64(value) =>

diff --git a/.../src/main/scala/org/hyperledger/identus/pollux/core/service/MockPresentationService.scala b/.../src/main/scala/org/hyperledger/identus/pollux/core/service/MockPresentationService.scala
@@ -28,6 +28,12 @@ object MockPresentationService extends Mock[PresentationService] {
         PresentationError,
         PresentationRecord
       ]
+  object CreateSDJWTPresentationRecord
+      extends Effect[
+        (DidId, DidId, DidCommID, Option[String], Seq[ProofType], Option[Options]),
+        PresentationError,
+        PresentationRecord
+      ]
 
   object CreateAnoncredPresentationRecord
       extends Effect[
@@ -90,6 +96,19 @@ object MockPresentationService extends Mock[PresentationService] {
           (pairwiseVerifierDID, pairwiseProverDID, thid, connectionId, proofTypes, options)
         )
 
+      override def createSDJWTPresentationRecord(
+          pairwiseVerifierDID: DidId,
+          pairwiseProverDID: DidId,
+          thid: DidCommID,
+          connectionId: Option[String],
+          proofTypes: Seq[ProofType],
+          options: Option[org.hyperledger.identus.pollux.core.model.presentation.Options],
+      ): ZIO[WalletAccessContext, PresentationError, PresentationRecord] =
+        proxy(
+          CreateSDJWTPresentationRecord,
+          (pairwiseVerifierDID, pairwiseProverDID, thid, connectionId, proofTypes, options)
+        )
+
       override def createAnoncredPresentationRecord(
           pairwiseVerifierDID: DidId,
           pairwiseProverDID: DidId,

diff --git a/...core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationService.scala b/...core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationService.scala
@@ -27,6 +27,15 @@ trait PresentationService {
       options: Option[org.hyperledger.identus.pollux.core.model.presentation.Options],
   ): ZIO[WalletAccessContext, PresentationError, PresentationRecord]
 
+  def createSDJWTPresentationRecord(
+      pairwiseVerifierDID: DidId,
+      pairwiseProverDID: DidId,
+      thid: DidCommID,
+      connectionId: Option[String],
+      proofTypes: Seq[ProofType],
+      options: Option[org.hyperledger.identus.pollux.core.model.presentation.Options],
+  ): ZIO[WalletAccessContext, PresentationError, PresentationRecord]
+
   def createAnoncredPresentationRecord(
       pairwiseVerifierDID: DidId,
       pairwiseProverDID: DidId,

diff --git a/.../src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceImpl.scala b/.../src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceImpl.scala
@@ -230,7 +230,7 @@ private class PresentationServiceImpl(
       thid: DidCommID,
       connectionId: Option[String],
       proofTypes: Seq[ProofType],
-      maybeOptions: Option[org.hyperledger.identus.pollux.core.model.presentation.Options]
+      options: Option[org.hyperledger.identus.pollux.core.model.presentation.Options]
   ): ZIO[WalletAccessContext, PresentationError, PresentationRecord] = {
     createPresentationRecord(
       pairwiseVerifierDID,
@@ -239,7 +239,26 @@ private class PresentationServiceImpl(
       connectionId,
       CredentialFormat.JWT,
       proofTypes,
-      maybeOptions.map(options => Seq(toJWTAttachment(options))).getOrElse(Seq.empty)
+      options.map(o => Seq(toJWTAttachment(o))).getOrElse(Seq.empty)
+    )
+  }
+
+  override def createSDJWTPresentationRecord(
+      pairwiseVerifierDID: DidId,
+      pairwiseProverDID: DidId,
+      thid: DidCommID,
+      connectionId: Option[String],
+      proofTypes: Seq[ProofType],
+      options: Option[org.hyperledger.identus.pollux.core.model.presentation.Options],
+  ): ZIO[WalletAccessContext, PresentationError, PresentationRecord] = {
+    createPresentationRecord(
+      pairwiseVerifierDID,
+      pairwiseProverDID,
+      thid,
+      connectionId,
+      CredentialFormat.SDJWT,
+      proofTypes,
+      options.map(o => Seq(toSDJWTAttachment(o))).getOrElse(Seq.empty)
     )
   }
 
@@ -1002,6 +1021,13 @@ private class PresentationServiceImpl(
     )
   }
 
+  private[this] def toSDJWTAttachment(options: Options): AttachmentDescriptor = {
+    AttachmentDescriptor.buildJsonAttachment(
+      payload = PresentationAttachment.build(Some(options)),
+      format = Some(PresentCredentialRequestFormat.SDJWT.name)
+    )
+  }
+
   private[this] def toAnoncredAttachment(
       presentationRequest: AnoncredPresentationRequestV1
   ): AttachmentDescriptor = {

diff --git a/.../main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceNotifier.scala b/.../main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceNotifier.scala
@@ -46,6 +46,25 @@ class PresentationServiceNotifier(
       )
     )
 
+  override def createSDJWTPresentationRecord(
+      pairwiseVerifierDID: DidId,
+      pairwiseProverDID: DidId,
+      thid: DidCommID,
+      connectionId: Option[String],
+      proofTypes: Seq[ProofType],
+      options: Option[org.hyperledger.identus.pollux.core.model.presentation.Options],
+  ): ZIO[WalletAccessContext, PresentationError, PresentationRecord] =
+    notifyOnSuccess(
+      svc.createSDJWTPresentationRecord(
+        pairwiseVerifierDID,
+        pairwiseProverDID,
+        thid,
+        connectionId,
+        proofTypes,
+        options
+      )
+    )
+
   def createAnoncredPresentationRecord(
       pairwiseVerifierDID: DidId,
       pairwiseProverDID: DidId,