From f2039bf63c53d697e16fc03cb3004a0863c8ba9d Mon Sep 17 00:00:00 2001 From: Bassam Riman Date: Tue, 10 Sep 2024 09:48:48 -0400 Subject: [PATCH] ATL-7741: Fix PR comments Signed-off-by: Bassam Riman --- .../oid4vci/service/OIDCCredentialIssuerService.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/oid4vci/service/OIDCCredentialIssuerService.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/oid4vci/service/OIDCCredentialIssuerService.scala index af25090b37..47427c4e81 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/oid4vci/service/OIDCCredentialIssuerService.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/oid4vci/service/OIDCCredentialIssuerService.scala @@ -164,9 +164,11 @@ case class OIDCCredentialIssuerServiceImpl( jwtIssuer <- credentialService .getJwtIssuer(issuingDID, VerificationRelationship.AssertionMethod, None) .provideSomeLayer(ZLayer.succeed(wac)) - + issuerDid <- ZIO + .fromEither(DID.fromString(jwtIssuer.did)) + .mapError(error => ServiceError(error)) jwtVC <- buildJwtVerifiableCredential( - jwtIssuer.did, + issuerDid, subjectDID, credentialIdentifier, credentialDefinition, @@ -177,7 +179,7 @@ case class OIDCCredentialIssuerServiceImpl( } def buildJwtVerifiableCredential( - issuerDid: String, + issuerDid: DID, subjectDid: Option[DID], credentialIdentifier: Option[String], credentialDefinition: CredentialDefinition, @@ -192,7 +194,7 @@ case class OIDCCredentialIssuerServiceImpl( `type` = Set( "VerifiableCredential" ) ++ credentialDefinition.`type`, // TODO: This information should come from Schema registry by record.schemaId - issuer = Left(issuerDid), + issuer = Left(issuerDid.toString), issuanceDate = Instant.now(), maybeExpirationDate = None, // TODO: Add expiration date maybeCredentialSchema = None, // TODO: Add schema from schema registry