Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add schemaId to the issuance session #1199

Merged
merged 3 commits into from
Jun 21, 2024
Merged

feat: add schemaId to the issuance session #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77a2b1f
feat: add schemaId to the issuance session
yshyn-iohk Jun 19, 2024
618b6cc
Merge branch 'main' into feat/atl-7271-add-schemaId-to-oidc-session
yshyn-iohk Jun 19, 2024
2356bfb
Merge branch 'main' into feat/atl-7271-add-schemaId-to-oidc-session
yshyn-iohk Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .../src/main/scala/org/hyperledger/identus/oid4vci/service/OIDCCredentialIssuerService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,20 @@ import org.hyperledger.identus.pollux.core.service.{
OID4VCIIssuerMetadataServiceError,
URIDereferencer
}
import org.hyperledger.identus.pollux.vc.jwt.*
import org.hyperledger.identus.pollux.vc.jwt.{
DID as PolluxDID,
DidResolver,
Issuer,
JWT,
JWTVerification,
JwtCredential,
W3cCredentialPayload
W3cCredentialPayload,
*
}
import org.hyperledger.identus.shared.models.{WalletAccessContext, WalletId}
import zio.*

import java.net.URL
import java.security.PublicKey
import java.net.{URI, URL}
import java.time.Instant
import java.util.UUID
import scala.util.Try
Expand Down Expand Up @@ -248,7 +247,7 @@ case class OIDCCredentialIssuerServiceImpl(
_ <- CredentialSchema
.validateJWTCredentialSubject(schemaId.toString(), simpleZioToCirce(claims).noSpaces, uriDereferencer)
.mapError(e => CredentialSchemaError(e))
session <- buildNewIssuanceSession(issuerId, issuingDID, claims)
session <- buildNewIssuanceSession(issuerId, issuingDID, claims, schemaId)
_ <- issuanceSessionStorage
.start(session)
.mapError(e => ServiceError(s"Failed to start issuance session: ${e.message}"))
Expand Down Expand Up @@ -278,7 +277,8 @@ case class OIDCCredentialIssuerServiceImpl(
private def buildNewIssuanceSession(
issuerId: UUID,
issuerDid: PrismDID,
claims: zio.json.ast.Json
claims: zio.json.ast.Json,
schemaId: URI
): UIO[IssuanceSession] = {
for {
id <- ZIO.random.flatMap(_.nextUUID)
Expand All @@ -290,7 +290,7 @@ case class OIDCCredentialIssuerServiceImpl(
nonce = nonce.toString,
issuerState = issuerState.toString,
claims = claims,
schemaId = None, // FIXME: populate correct value
schemaId = Some(schemaId.toString),
subjectDid = None, // FIXME: populate correct value
issuingDid = issuerDid,
)
Expand Down
5 changes: 3 additions & 2 deletions ...c/test/scala/org/hyperledger/identus/oid4vci/domain/OIDCCredentialIssuerServiceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ object OIDCCredentialIssuerServiceSpec
MockOID4VCIIssuerMetadataService.empty,
layers
),
test("create credential-offer with valid claims") {
test("create credential-offer with valid claims and schemaId") {
val wac = ZLayer.succeed(WalletAccessContext(WalletId.random))
val claims = Json(
"credentialSubject" -> Json.Obj(
Expand All @@ -187,7 +187,8 @@ object OIDCCredentialIssuerServiceSpec
.provide(wac)
issuerState = offer.grants.get.authorization_code.issuer_state.get
session <- oidcCredentialIssuerService.getIssuanceSessionByIssuerState(issuerState)
} yield assert(session.claims)(equalTo(claims))
} yield assert(session.claims)(equalTo(claims)) &&
assert(session.schemaId)(isSome(equalTo("resource:///vc-schema-example.json")))
}.provide(
MockDIDService.empty,
MockManagedDIDService.empty,
Expand Down
Loading