Merge branch 'main' into ATL-6543-epic-vdr-phase-3

Signed-off-by: Shota Jolbordi <[email protected]>
hyperledger · Sep 14, 2024 · 2fb5020 · 2fb5020
2 parents c9ef4f3 + 948e314
commit 2fb5020
Show file tree

Hide file tree

Showing 8 changed files with 305 additions and 57 deletions.
diff --git a/...la/org/hyperledger/identus/verification/controller/VcVerificationControllerImplSpec.scala b/...la/org/hyperledger/identus/verification/controller/VcVerificationControllerImplSpec.scala
@@ -42,9 +42,11 @@ object VcVerificationControllerImplSpec extends ZIOSpecDefault with VcVerificati
           maybeValidFrom = Some(Instant.parse("2010-01-12T00:00:00Z")),
           maybeValidUntil = Some(Instant.parse("2010-01-12T00:00:00Z")),
           maybeCredentialSchema = Some(
-            CredentialSchema(
-              id = "did:work:MDP8AsFhHzhwUvGNuYkX7T;id=06e126d1-fa44-4882-a243-1e326fbe21db;version=1.0",
-              `type` = "JsonSchemaValidator2018"
+            Left(
+              CredentialSchema(
+                id = "did:work:MDP8AsFhHzhwUvGNuYkX7T;id=06e126d1-fa44-4882-a243-1e326fbe21db;version=1.0",
+                `type` = "JsonSchemaValidator2018"
+              )
             )
           ),
           credentialSubject = Json.obj(

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
@@ -1142,8 +1142,9 @@ class CredentialServiceImpl(
         issuer = Right(CredentialIssuer(jwtIssuer.did.toString, `type` = "Profile")),
         issuanceDate = issuanceDate,
         maybeExpirationDate = record.validityPeriod.map(sec => issuanceDate.plusSeconds(sec.toLong)),
-        maybeCredentialSchema =
-          record.schemaUri.map(id => org.hyperledger.identus.pollux.vc.jwt.CredentialSchema(id, VC_JSON_SCHEMA_TYPE)),
+        maybeCredentialSchema = record.schemaUri.map(id =>
+          Left(org.hyperledger.identus.pollux.vc.jwt.CredentialSchema(id, VC_JSON_SCHEMA_TYPE))
+        ),
         maybeCredentialStatus = Some(credentialStatus),
         credentialSubject = claims.add("id", jwtPresentation.iss.asJson).asJson,
         maybeRefreshService = None,

diff --git a/.../org/hyperledger/identus/pollux/core/service/verification/VcVerificationServiceImpl.scala b/.../org/hyperledger/identus/pollux/core/service/verification/VcVerificationServiceImpl.scala
@@ -47,17 +47,23 @@ class VcVerificationServiceImpl(didResolver: DidResolver, uriResolver: UriResolv
         decodedJwt <-
           JwtCredential
             .decodeJwt(JWT(credential))
-            .mapError(error => VcVerificationServiceError.UnexpectedError(s"Unable decode JWT: $error"))
+            .mapError(error => VcVerificationServiceError.UnexpectedError(s"Unable to decode JWT: $error"))
         credentialSchema <-
           ZIO
             .fromOption(decodedJwt.maybeCredentialSchema)
             .mapError(error => VcVerificationServiceError.UnexpectedError(s"Missing Credential Schema: $error"))
-        result <- CredentialSchema
-          .validSchemaValidator(
-            credentialSchema.id,
-            uriResolver
+        credentialSchemas = credentialSchema.fold(List(_), identity)
+        result <-
+          ZIO.collectAll(
+            credentialSchemas.map(credentialSchema =>
+              CredentialSchema
+                .validSchemaValidator(
+                  credentialSchema.id,
+                  uriResolver
+                )
+                .mapError(error => VcVerificationServiceError.UnexpectedError(s"Schema Validator Failed: $error"))
+            )
           )
-          .mapError(error => VcVerificationServiceError.UnexpectedError(s"Schema Validator Failed: $error"))
       } yield result
 
     result
@@ -90,14 +96,20 @@ class VcVerificationServiceImpl(didResolver: DidResolver, uriResolver: UriResolv
           ZIO
             .fromOption(decodedJwt.maybeCredentialSchema)
             .mapError(error => VcVerificationServiceError.UnexpectedError(s"Missing Credential Schema: $error"))
-        result <- CredentialSchema
-          .validateJWTCredentialSubject(
-            credentialSchema.id,
-            decodedJwt.credentialSubject.noSpaces,
-            uriResolver
-          )
-          .mapError(error =>
-            VcVerificationServiceError.UnexpectedError(s"JWT Credential Subject Validation Failed: $error")
+        credentialSchemas = credentialSchema.fold(List(_), identity)
+        result <-
+          ZIO.collectAll(
+            credentialSchemas.map(credentialSchema =>
+              CredentialSchema
+                .validateJWTCredentialSubject(
+                  credentialSchema.id,
+                  decodedJwt.credentialSubject.noSpaces,
+                  uriResolver
+                )
+                .mapError(error =>
+                  VcVerificationServiceError.UnexpectedError(s"JWT Credential Subject Validation Failed: $error")
+                )
+            )
           )
       } yield result
 

diff --git a/pollux/core/src/test/resources/vc-schema-driver-license.json b/pollux/core/src/test/resources/vc-schema-driver-license.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "description": "Driving License",
+  "type": "object",
+  "properties": {
+    "credentialSubject": {
+      "type": "object",
+      "properties": {
+        "dateOfIssuance": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "drivingLicenseID": {
+          "type": "string"
+        },
+        "drivingClass": {
+          "type": "integer"
+        }
+      },
+      "required": ["dateOfIssuance", "drivingLicenseID", "drivingClass"],
+      "additionalProperties": false
+    }
+  },
+  "required": ["credentialSubject"],
+  "additionalProperties": false
+}
diff --git a/pollux/core/src/test/resources/vc-schema-example.json b/pollux/core/src/test/resources/vc-schema-example.json
@@ -37,8 +37,6 @@
       "additionalProperties": false
     }
   },
-  "required": [
-    "credentialSubject"
-  ],
+  "required": ["credentialSubject"],
   "additionalProperties": false
-}
+}
diff --git a/pollux/core/src/test/resources/vc-schema-personal.json b/pollux/core/src/test/resources/vc-schema-personal.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "description": "Age",
+  "type": "object",
+  "properties": {
+    "credentialSubject": {
+      "type": "object",
+      "properties": {
+        "email": {
+          "type": "string",
+          "format": "email"
+        },
+        "userName": {
+          "type": "string"
+        },
+        "age": {
+          "type": "integer"
+        }
+      },
+      "required": ["email", "userName", "age"],
+      "additionalProperties": false
+    }
+  },
+  "required": ["credentialSubject"],
+  "additionalProperties": false
+}