Merge pull request #108 from wwWallet/verifier-conf-extensions

Implement new functions of VerifierConfigurationInterface
wwWallet · Nov 22, 2024 · b157b65 · b157b65
2 parents 7ad1377 + 7a08da1
commit b157b65
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 7 deletions.
diff --git a/...e-configurations/acme-verifier/src/configuration/verifier/VerifierConfigurationService.ts b/...e-configurations/acme-verifier/src/configuration/verifier/VerifierConfigurationService.ts
@@ -4,9 +4,13 @@ import { authorizationServerMetadataConfiguration } from "../../authorizationSer
 import { config } from "../../../config";
 import { VerifierConfigurationInterface } from "../../services/interfaces";
 import "reflect-metadata";
+import { PresentationParserChain } from "../../vp_token/PresentationParserChain";
+import { PublicKeyResolverChain } from "../../vp_token/PublicKeyResolverChain";
 
 
-const verifiableIdDescriptor =	{
+
+
+const verifiableIdDescriptor = {
 	"id": "VerifiableId",
 	"constraints": {
 		"fields": [
@@ -116,14 +120,23 @@ const customVerifiableIdSdJwtPresentationDefinition = {
 	"title": "Custom Verifiable ID",
 	"description": "Selectable Fields: personalIdentifier, firstName, familyName, birthdate",
 	"_selectable": true,
-	"format": { "vc+sd-jwt": { alg: ['ES256'] }  },
+	"format": { "vc+sd-jwt": { alg: ['ES256'] } },
 	"input_descriptors": [
 		verifiableIdDescriptor
 	]
 }
 
 @injectable()
 export class VerifierConfigurationService implements VerifierConfigurationInterface {
+
+
+	getPublicKeyResolverChain(): PublicKeyResolverChain {
+		return new PublicKeyResolverChain();
+	}
+
+	getPresentationParserChain(): PresentationParserChain {
+		return new PresentationParserChain();
+	}
 
 
 	getPresentationDefinitions(): any[] {
@@ -133,7 +146,7 @@ export class VerifierConfigurationService implements VerifierConfigurationInterf
 				"id": "VerifiableId",
 				"title": "Verifiable ID",
 				"description": "Required Fields: VC type, Given Name, Family Name & Birthdate",
-				"format": { "vc+sd-jwt": { alg: [ 'ES256' ] },jwt_vc_json: { alg: [ 'ES256' ] }, jwt_vp: { alg: [ 'ES256' ] } },
+				"format": { "vc+sd-jwt": { alg: ['ES256'] }, jwt_vc_json: { alg: ['ES256'] }, jwt_vp: { alg: ['ES256'] } },
 				"input_descriptors": [
 					verifiableIdDescriptor
 				]
@@ -142,7 +155,7 @@ export class VerifierConfigurationService implements VerifierConfigurationInterf
 				"id": "Bachelor",
 				"title": "Bachelor Diploma",
 				"description": "Required Fields: VC type, Grade, EQF Level & Diploma Title",
-				"format": { "vc+sd-jwt": { alg: [ 'ES256' ] },jwt_vc_json: { alg: [ 'ES256' ] }, jwt_vp: { alg: [ 'ES256' ] } },
+				"format": { "vc+sd-jwt": { alg: ['ES256'] }, jwt_vc_json: { alg: ['ES256'] }, jwt_vp: { alg: ['ES256'] } },
 				"input_descriptors": [
 					bachelorDescriptor
 				]
@@ -151,8 +164,18 @@ export class VerifierConfigurationService implements VerifierConfigurationInterf
 				"id": "EuropeanHealthInsuranceCard",
 				"title": "European HealthInsurance Card",
 				"description": "Required Fields: VC type, SSN, Family Name, Given Name & Birth Date",
-				"format": { "vc+sd-jwt": { alg: [ 'ES256' ] },jwt_vc_json: { alg: [ 'ES256' ] }, jwt_vp: { alg: [ 'ES256' ] } },
+				"format": { "vc+sd-jwt": { alg: ['ES256'] }, jwt_vc_json: { alg: ['ES256'] }, jwt_vp: { alg: ['ES256'] } },
+				"input_descriptors": [
+					europeanHealthInsuranceCardDescriptor
+				]
+			},
+			{
+				"id": "VIDAndEuropeanHealthInsuranceCard",
+				"title": "VID + EHIC",
+				"description": "",
+				"format": { "vc+sd-jwt": { alg: ['ES256'] }, jwt_vc_json: { alg: ['ES256'] }, jwt_vp: { alg: ['ES256'] } },
 				"input_descriptors": [
+					verifiableIdDescriptor,
 					europeanHealthInsuranceCardDescriptor
 				]
 			}
@@ -172,4 +195,3 @@ export class VerifierConfigurationService implements VerifierConfigurationInterf
 }
 
 
-
diff --git a/...-configurations/diploma-issuer/src/configuration/verifier/VerifierConfigurationService.ts b/...-configurations/diploma-issuer/src/configuration/verifier/VerifierConfigurationService.ts
@@ -4,9 +4,20 @@ import { authorizationServerMetadataConfiguration } from "../../authorizationSer
 import { config } from "../../../config";
 import { VerifierConfigurationInterface } from "../../services/interfaces";
 import "reflect-metadata";
+import { PresentationParserChain } from "../../vp_token/PresentationParserChain";
+import { PublicKeyResolverChain } from "../../vp_token/PublicKeyResolverChain";
+
 
 @injectable()
 export class VerifierConfigurationService implements VerifierConfigurationInterface {
+	getPublicKeyResolverChain(): PublicKeyResolverChain {
+		return new PublicKeyResolverChain();
+	}
+
+	getPresentationParserChain(): PresentationParserChain {
+		return new PresentationParserChain();
+	}
+
 
 	getPresentationDefinitions(): any[] {
 		return [

diff --git a/...ise-configurations/ehic-issuer/src/configuration/verifier/VerifierConfigurationService.ts b/...ise-configurations/ehic-issuer/src/configuration/verifier/VerifierConfigurationService.ts
@@ -4,9 +4,18 @@ import { authorizationServerMetadataConfiguration } from "../../authorizationSer
 import { config } from "../../../config";
 import { VerifierConfigurationInterface } from "../../services/interfaces";
 import "reflect-metadata";
+import { PresentationParserChain } from "../../vp_token/PresentationParserChain";
+import { PublicKeyResolverChain } from "../../vp_token/PublicKeyResolverChain";
 
 @injectable()
 export class VerifierConfigurationService implements VerifierConfigurationInterface {
+	getPublicKeyResolverChain(): PublicKeyResolverChain {
+		return new PublicKeyResolverChain();
+	}
+
+	getPresentationParserChain(): PresentationParserChain {
+		return new PresentationParserChain();
+	}
 
 	getPresentationDefinitions(): any[] {
 		return [

diff --git a/...rise-configurations/vid-issuer/src/configuration/verifier/VerifierConfigurationService.ts b/...rise-configurations/vid-issuer/src/configuration/verifier/VerifierConfigurationService.ts
@@ -4,12 +4,21 @@ import { authorizationServerMetadataConfiguration } from "../../authorizationSer
 import { config } from "../../../config";
 import { VerifierConfigurationInterface } from "../../services/interfaces";
 import "reflect-metadata";
-
+import { PublicKeyResolverChain } from "../../vp_token/PublicKeyResolverChain";
+import { PresentationParserChain } from "../../vp_token/PresentationParserChain";
 
 
 @injectable()
 export class VerifierConfigurationService implements VerifierConfigurationInterface {
 
+	getPublicKeyResolverChain(): PublicKeyResolverChain {
+		return new PublicKeyResolverChain();
+	}
+
+	getPresentationParserChain(): PresentationParserChain {
+		return new PresentationParserChain();
+	}
+
 	getPresentationDefinitions(): any[] {
 		return []
 	}