fix: cleanup and minor refactoring to remove duplicates (#1309)

Signed-off-by: mineme0110 <shailesh.patil@iohk.io>

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/IssueBackgroundJobs.scala

@@ -228,7 +228,7 @@ object IssueBackgroundJobs extends BackgroundJobsHelper {
             walletAccessContext <- ZIO
               .fromOption(offer.to)
               .flatMap(buildWalletAccessContextLayer)
-              .orElseFail(ZIO.die(new IllegalArgumentException("OfferCredential must have a recipient")))
+              .mapError(e => CredentialServiceError.CredentialOfferMissingField(id.value, "recipient"))
             result <- for {
               credentialService <- ZIO.service[CredentialService]
               _ <- credentialService
@@ -274,7 +274,7 @@ object IssueBackgroundJobs extends BackgroundJobsHelper {
             walletAccessContext <- ZIO
               .fromOption(offer.to)
               .flatMap(buildWalletAccessContextLayer)
-              .orElseFail(ZIO.die(new IllegalArgumentException("OfferCredential must have a recipient")))
+              .mapError(e => CredentialServiceError.CredentialOfferMissingField(id.value, "recipient"))
             result <- for {
               credentialService <- ZIO.service[CredentialService]
               _ <- credentialService
@@ -320,7 +320,8 @@ object IssueBackgroundJobs extends BackgroundJobsHelper {
             walletAccessContext <- ZIO
               .fromOption(offer.to)
               .flatMap(buildWalletAccessContextLayer)
-              .orElseFail(ZIO.die(new IllegalArgumentException("OfferCredential must have a recipient")))
+              .mapError(e => CredentialServiceError.CredentialOfferMissingField(id.value, "recipient"))
+
             result <- for {
               credentialService <- ZIO.service[CredentialService]
               _ <- credentialService

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/PresentBackgroundJobs.scala

@@ -675,9 +675,10 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
         Unit
       ] = {
         val proverPresentationPendingToGeneratedFlow = for {
-          walletAccessContext <- buildWalletAccessContextLayer(
-            requestPresentation.to.getOrElse(throw new RuntimeException("to is None is not possible"))
-          )
+          walletAccessContext <- ZIO
+            .fromOption(requestPresentation.to)
+            .flatMap(buildWalletAccessContextLayer)
+            .mapError(_ => PresentationError.RequestPresentationMissingField(id.value, "recipient"))
           _ <- for {
             presentationService <- ZIO.service[PresentationService]
             prover <- createPrismDIDIssuerFromPresentationCredentials(id, credentialsToUse.getOrElse(Nil))
@@ -696,24 +697,7 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
                   presentationPayload.toW3CPresentationPayload,
                   prover
                 )
-                presentation <- ZIO.succeed(
-                  Presentation(
-                    body = Presentation.Body(
-                      goal_code = requestPresentation.body.goal_code,
-                      comment = requestPresentation.body.comment
-                    ),
-                    attachments = Seq(
-                      AttachmentDescriptor
-                        .buildBase64Attachment(
-                          payload = signedJwtPresentation.value.getBytes(),
-                          mediaType = Some(PresentCredentialFormat.JWT.name)
-                        )
-                    ),
-                    thid = requestPresentation.thid.orElse(Some(requestPresentation.id)),
-                    from = requestPresentation.to.getOrElse(throw new RuntimeException("to is None is not possible")),
-                    to = requestPresentation.from.getOrElse(throw new RuntimeException("from is None is not possible"))
-                  )
-                )
+                presentation <- createPresentation(id, requestPresentation, signedJwtPresentation)
               } yield presentation
             _ <- presentationService
               .markPresentationGenerated(id, presentation)
@@ -724,6 +708,36 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
         proverPresentationPendingToGeneratedFlow
       }
 
+      private def createPresentation(
+          id: DidCommID,
+          requestPresentation: RequestPresentation,
+          signedJwtPresentation: JWT
+      ): ZIO[Any, PresentationError, Presentation] = {
+        for {
+          from <- ZIO
+            .fromOption(requestPresentation.to)
+            .mapError(_ => PresentationError.RequestPresentationMissingField(id.value, "recipient"))
+          to <- ZIO
+            .fromOption(requestPresentation.from)
+            .mapError(_ => PresentationError.RequestPresentationMissingField(id.value, "sender"))
+        } yield Presentation(
+          body = Presentation.Body(
+            goal_code = requestPresentation.body.goal_code,
+            comment = requestPresentation.body.comment
+          ),
+          attachments = Seq(
+            AttachmentDescriptor
+              .buildBase64Attachment(
+                payload = signedJwtPresentation.value.getBytes(),
+                mediaType = Some(PresentCredentialFormat.JWT.name)
+              )
+          ),
+          thid = requestPresentation.thid.orElse(Some(requestPresentation.id)),
+          from = from,
+          to = to
+        )
+      }
+
       private def handleSDJWT(
           id: DidCommID,
           credentialsToUse: Option[List[String]],
@@ -733,9 +747,10 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
         ERROR,
         Unit
       ] = for {
-        walletAccessContext <- buildWalletAccessContextLayer(
-          requestPresentation.to.getOrElse(throw new RuntimeException("to is None is not possible"))
-        )
+        walletAccessContext <- ZIO
+          .fromOption(requestPresentation.to)
+          .flatMap(buildWalletAccessContextLayer)
+          .mapError(_ => PresentationError.RequestPresentationMissingField(id.value, "recipient"))
         result <-
           for {
             presentationService <- ZIO.service[PresentationService]
@@ -765,9 +780,10 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
         maybeCredentialsToUseJson match {
           case Some(credentialsToUseJson) =>
             val proverPresentationPendingToGeneratedFlow = for {
-              walletAccessContext <- buildWalletAccessContextLayer(
-                requestPresentation.to.getOrElse(throw new RuntimeException("to is None is not possible"))
-              )
+              walletAccessContext <- ZIO
+                .fromOption(requestPresentation.to)
+                .flatMap(buildWalletAccessContextLayer)
+                .mapError(_ => PresentationError.RequestPresentationMissingField(id.value, "recipient"))
               result <- for {
                 presentationService <- ZIO.service[PresentationService]
                 anoncredCredentialProofs <-

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/presentproof/controller/PresentProofController.scala

@@ -32,7 +32,7 @@ trait PresentProofController {
   ): ZIO[WalletAccessContext, ErrorResponse, PresentationStatus]
 
   def createOOBRequestPresentationInvitation(
-      request: OOBRequestPresentationInput
+      request: RequestPresentationInput
   )(implicit
       rc: RequestContext
   ): ZIO[WalletAccessContext, ErrorResponse, PresentationStatus]

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala

@@ -34,28 +34,32 @@ class PresentProofControllerImpl(
   override def requestPresentation(request: RequestPresentationInput)(implicit
       rc: RequestContext
   ): ZIO[WalletAccessContext, ErrorResponse, PresentationStatus] = {
-    val result: ZIO[WalletAccessContext, ConnectionServiceError | PresentationError, PresentationStatus] = for {
-      didIdPair <- getPairwiseDIDs(request.connectionId).provideSomeLayer(ZLayer.succeed(connectionService))
-      record <- createRequestPresentation(
-        verifierDID = didIdPair.myDID,
-        proverDID = Some(didIdPair.theirDid),
-        connectionId = Some(request.connectionId.toString),
-        request = request
-      )
-    } yield PresentationStatus.fromDomain(record)
+    val result: ZIO[WalletAccessContext, ConnectionServiceError | PresentationError, PresentationStatus] =
+      for {
+        connectionId <- ZIO
+          .fromOption(request.connectionId)
+          .mapError(_ => PresentationError.MissingConnectionIdForPresentationRequest)
+        didIdPair <- getPairwiseDIDs(connectionId).provideSomeLayer(ZLayer.succeed(connectionService))
+        record <- createRequestPresentation(
+          verifierDID = didIdPair.myDID,
+          proverDID = Some(didIdPair.theirDid),
+          request = request,
+          expirationDuration = None
+        )
+      } yield PresentationStatus.fromDomain(record)
     result
   }
 
-  override def createOOBRequestPresentationInvitation(request: OOBRequestPresentationInput)(implicit
+  override def createOOBRequestPresentationInvitation(request: RequestPresentationInput)(implicit
       rc: RequestContext
   ): ZIO[WalletAccessContext, ErrorResponse, PresentationStatus] = {
     val result: ZIO[WalletAccessContext, ConnectionServiceError | PresentationError, PresentationStatus] = for {
       peerDid <- managedDIDService.createAndStorePeerDID(appConfig.agent.didCommEndpoint.publicEndpointUrl)
       record <- createRequestPresentation(
         verifierDID = peerDid.did,
         proverDID = None,
-        connectionId = None,
-        request = request
+        request = request,
+        expirationDuration = Some(appConfig.pollux.presentationInvitationExpiry)
       )
     } yield PresentationStatus.fromDomain(record)
     result
@@ -64,39 +68,22 @@ class PresentProofControllerImpl(
   private def createRequestPresentation(
       verifierDID: DidId,
       proverDID: Option[DidId],
-      connectionId: Option[String],
-      request: RequestPresentationInput | OOBRequestPresentationInput
+      request: RequestPresentationInput,
+      expirationDuration: Option[Duration]
   ): ZIO[WalletAccessContext, PresentationError, PresentationRecord] = {
-    request match {
-      case req: RequestPresentationInput =>
-        createPresentationRecord(
-          verifierDID,
-          proverDID,
-          connectionId,
-          req.credentialFormat,
-          req.proofs,
-          req.options.map(o => Options(o.challenge, o.domain)),
-          req.claims,
-          req.anoncredPresentationRequest,
-          None,
-          None,
-          None
-        )
-      case req: OOBRequestPresentationInput =>
-        createPresentationRecord(
-          verifierDID,
-          proverDID,
-          connectionId,
-          req.credentialFormat,
-          req.proofs,
-          req.options.map(o => Options(o.challenge, o.domain)),
-          req.claims,
-          req.anoncredPresentationRequest,
-          req.goalCode,
-          req.goal,
-          Some(appConfig.pollux.presentationInvitationExpiry)
-        )
-    }
+    createPresentationRecord(
+      verifierDID,
+      proverDID,
+      request.connectionId.map(_.toString),
+      request.credentialFormat,
+      request.proofs,
+      request.options.map(o => Options(o.challenge, o.domain)),
+      request.claims,
+      request.anoncredPresentationRequest,
+      request.goalCode,
+      request.goal,
+      expirationDuration
+    )
   }
 
   private def createPresentationRecord(

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/presentproof/controller/PresentProofEndpoints.scala

@@ -120,7 +120,7 @@ object PresentProofEndpoints {
 
   val createOOBRequestPresentationInvitation: Endpoint[
     (ApiKeyCredentials, JwtCredentials),
-    (RequestContext, OOBRequestPresentationInput),
+    (RequestContext, RequestPresentationInput),
     ErrorResponse,
     PresentationStatus,
     Any
@@ -143,7 +143,7 @@ object PresentProofEndpoints {
       .securityIn(jwtAuthHeader)
       .in("present-proof" / "presentations" / "invitation")
       .in(extractFromRequest[RequestContext](RequestContext.apply))
-      .in(jsonBody[OOBRequestPresentationInput].description("The present proof creation request."))
+      .in(jsonBody[RequestPresentationInput].description("The present proof creation request."))
       .out(
         statusCode(StatusCode.Created).description(
           "The proof presentation request invitation was created successfully and that can be delivered as out-of-band to a peer Agent.."

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/presentproof/controller/PresentProofServerEndpoints.scala

@@ -6,7 +6,6 @@ import org.hyperledger.identus.api.http.RequestContext
 import org.hyperledger.identus.iam.authentication.{Authenticator, Authorizer, DefaultAuthenticator, SecurityLogic}
 import org.hyperledger.identus.presentproof.controller.http.{
   AcceptRequestPresentationInvitation,
-  OOBRequestPresentationInput,
   RequestPresentationAction,
   RequestPresentationInput
 }
@@ -82,7 +81,7 @@ class PresentProofServerEndpoints(
     createOOBRequestPresentationInvitation
       .zServerSecurityLogic(SecurityLogic.authorizeWalletAccessWith(_)(authenticator, authorizer))
       .serverLogic { wac =>
-        { case (ctx: RequestContext, action: OOBRequestPresentationInput) =>
+        { case (ctx: RequestContext, action: RequestPresentationInput) =>
           presentProofController
             .createOOBRequestPresentationInvitation(action)(ctx)
             .provideSomeLayer(ZLayer.succeed(wac))