fix: segregate credential config model

hyperledger · May 7, 2024 · accff4f · accff4f
1 parent 3a8aff2
commit accff4f
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 30 deletions.
diff --git a/...ice/server/src/main/scala/org/hyperledger/identus/oidc4vc/CredentialIssuerEndpoints.scala b/...ice/server/src/main/scala/org/hyperledger/identus/oidc4vc/CredentialIssuerEndpoints.scala
@@ -35,7 +35,7 @@ object CredentialIssuerEndpoints {
     .description("An issuer identifier in the oidc4vc protocol")
     .example(UUID.fromString("f47ac10b-58cc-4372-a567-0e02b2c3d479"))
 
-  private val credentialConfigurationIdSegment = path[String]("credentialConfigurationId")
+  private val credentialConfigIdSegment = path[String]("configurationId")
     .description("An identifier for the credential configuration")
     .example("configurationId")
 
@@ -204,7 +204,7 @@ object CredentialIssuerEndpoints {
     Unit,
     Any
   ] = baseIssuerPrivateEndpoint.delete
-    .in(issuerIdPathSegment / "credential-configurations" / credentialConfigurationIdSegment)
+    .in(issuerIdPathSegment / "credential-configurations" / credentialConfigIdSegment)
     .out(
       statusCode(StatusCode.Ok).description("Credential configuration deleted successfully")
     )

diff --git a/.../server/src/main/scala/org/hyperledger/identus/oidc4vc/http/CredentialConfiguration.scala b/.../server/src/main/scala/org/hyperledger/identus/oidc4vc/http/CredentialConfiguration.scala
@@ -4,6 +4,8 @@ import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialConfiguration
 import sttp.tapir.Schema
 import zio.json.*
 
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
 import scala.language.implicitConversions
 
 final case class CreateCredentialConfigurationRequest(
@@ -19,13 +21,11 @@ object CreateCredentialConfigurationRequest {
 }
 
 final case class CredentialConfiguration(
+    configurationId: String,
     format: CredentialFormat,
     scope: String,
-    credential_definition: CredentialDefinition,
-    cryptographic_binding_methods_supported: Seq[String] = Seq("did:prism"),
-    credential_signing_alg_values_supported: Seq[String] = Seq("ES256K"),
-    proof_types_supported: SupportProofType =
-      SupportProofType(jwt = ProofTypeConfiguration(proof_signing_alg_values_supported = Seq("ES256K")))
+    schemaId: String,
+    createdAt: OffsetDateTime
 )
 
 object CredentialConfiguration {
@@ -35,28 +35,10 @@ object CredentialConfiguration {
 
   given Conversion[PolluxCredentialConfiguration, CredentialConfiguration] = cc =>
     CredentialConfiguration(
+      configurationId = cc.configurationId,
       format = cc.format,
       scope = cc.scope,
-      credential_definition = CredentialDefinition(
-        `@context` = Some(Seq("https://www.w3.org/2018/credentials/v1")),
-        `type` = Seq("VerifiableCredential"),
-        credentialSubject = None
-      )
+      schemaId = cc.schemaId.toString(),
+      createdAt = cc.createdAt.atOffset(ZoneOffset.UTC),
     )
 }
-
-final case class SupportProofType(jwt: ProofTypeConfiguration)
-
-object SupportProofType {
-  given schema: Schema[SupportProofType] = Schema.derived
-  given encoder: JsonEncoder[SupportProofType] = DeriveJsonEncoder.gen
-  given decoder: JsonDecoder[SupportProofType] = DeriveJsonDecoder.gen
-}
-
-final case class ProofTypeConfiguration(proof_signing_alg_values_supported: Seq[String])
-
-object ProofTypeConfiguration {
-  given schema: Schema[ProofTypeConfiguration] = Schema.derived
-  given encoder: JsonEncoder[ProofTypeConfiguration] = DeriveJsonEncoder.gen
-  given decoder: JsonDecoder[ProofTypeConfiguration] = DeriveJsonDecoder.gen
-}
diff --git a/...t/service/server/src/main/scala/org/hyperledger/identus/oidc4vc/http/IssuerMetadata.scala b/...t/service/server/src/main/scala/org/hyperledger/identus/oidc4vc/http/IssuerMetadata.scala
@@ -12,7 +12,7 @@ case class IssuerMetadata(
     credential_issuer: String,
     authorization_servers: Option[Seq[String]],
     credential_endpoint: String,
-    credential_configurations_supported: Map[String, CredentialConfiguration]
+    credential_configurations_supported: Map[String, SupportedCredentialConfiguration]
 )
 
 object IssuerMetadata {
@@ -31,7 +31,50 @@ object IssuerMetadata {
       authorization_servers = Some(Seq(issuer.authorizationServer.toString())),
       credential_endpoint = s"$credentialIssuerBaseUrl/credentials",
       credential_configurations_supported =
-        credentialConfigurations.map(cc => (cc.configurationId, cc: CredentialConfiguration)).toMap
+        credentialConfigurations.map(cc => (cc.configurationId, cc: SupportedCredentialConfiguration)).toMap
     )
   }
 }
+
+final case class SupportedCredentialConfiguration(
+    format: CredentialFormat,
+    scope: String,
+    credential_definition: CredentialDefinition,
+    cryptographic_binding_methods_supported: Seq[String] = Seq("did:prism"),
+    credential_signing_alg_values_supported: Seq[String] = Seq("ES256K"),
+    proof_types_supported: SupportProofType =
+      SupportProofType(jwt = ProofTypeConfiguration(proof_signing_alg_values_supported = Seq("ES256K")))
+)
+
+object SupportedCredentialConfiguration {
+  given schema: Schema[SupportedCredentialConfiguration] = Schema.derived
+  given encoder: JsonEncoder[SupportedCredentialConfiguration] = DeriveJsonEncoder.gen
+  given decoder: JsonDecoder[SupportedCredentialConfiguration] = DeriveJsonDecoder.gen
+
+  given Conversion[pollux.CredentialConfiguration, SupportedCredentialConfiguration] = cc =>
+    SupportedCredentialConfiguration(
+      format = cc.format,
+      scope = cc.scope,
+      credential_definition = CredentialDefinition(
+        `@context` = Some(Seq("https://www.w3.org/2018/credentials/v1")),
+        `type` = Seq("VerifiableCredential"),
+        credentialSubject = None
+      )
+    )
+}
+
+final case class SupportProofType(jwt: ProofTypeConfiguration)
+
+object SupportProofType {
+  given schema: Schema[SupportProofType] = Schema.derived
+  given encoder: JsonEncoder[SupportProofType] = DeriveJsonEncoder.gen
+  given decoder: JsonDecoder[SupportProofType] = DeriveJsonDecoder.gen
+}
+
+final case class ProofTypeConfiguration(proof_signing_alg_values_supported: Seq[String])
+
+object ProofTypeConfiguration {
+  given schema: Schema[ProofTypeConfiguration] = Schema.derived
+  given encoder: JsonEncoder[ProofTypeConfiguration] = DeriveJsonEncoder.gen
+  given decoder: JsonDecoder[ProofTypeConfiguration] = DeriveJsonDecoder.gen
+}