Add EHIC and PDA1 attestations

* Attestation definitions

* Initial implementation

* Fixes sass map-get warnings

* Display nested attribute values in the presentation results

* Updated ehic and pda1 definitions

* Renaming

* Cleared console.log() statements

Author: gdimtsas

src/app/core/constants/attestation-definitions.ts

@@ -95,7 +95,7 @@ export const PHOTO_ID_ATTESTATION: AttestationDefinition = {
     { identifier: 'portrait', attribute: 'Portrait'},
     { identifier: 'portrait_capture_date', attribute: 'Portrait capture date'},
     { identifier: 'person_id', attribute: 'Person id'},
-    { identifier: 'family_name', attribute: 'Family_name'},
+    { identifier: 'family_name', attribute: 'Family name'},
     { identifier: 'given_name', attribute: 'Given name'},
     { identifier: 'birth_date', attribute: 'Birth date'},
     { identifier: 'age_over_18', attribute: 'Age over 18'},
@@ -127,10 +127,41 @@ export const PHOTO_ID_ATTESTATION: AttestationDefinition = {
   ]
 }
 
+export const EHIC_ATTESTATION: AttestationDefinition = {
+  name: "European Health Insurance Card (EHIC)",
+  type: AttestationType.EHIC,
+  dataSet: [
+    { identifier: "credential_holder", attribute: "Credential holder" },
+    { identifier: "subject", attribute: "Subject" },
+    { identifier: 'social_security_pin', attribute: 'Social security PIN'},
+    { identifier: "starting_date", attribute: "Starting date" },
+    { identifier: "ending_date", attribute: "Ending date" },
+    { identifier: 'document_id', attribute: 'Document identifier' },
+    { identifier: "competent_institution", attribute: 'Competent institution' }
+  ],
+}
+
+export const PDA1_ATTESTATION: AttestationDefinition = {
+  name: "Portable Document A1 (PDA1)",
+  type: AttestationType.PDA1,
+  dataSet: [
+    { identifier: "credential_holder", attribute: "Credential holder" },
+    { identifier: 'social_security_pin', attribute: 'Social security PIN' },
+    { identifier: "nationality", attribute: "Nationality" },
+    { identifier: "employment_details", attribute: "Employment details" },
+    { identifier: 'places_of_work', attribute: 'Places of work' },
+    { identifier: 'legislation', attribute: 'Legislation' },
+    { identifier: 'status_confirmation', attribute: 'Status confirmation'},
+    { identifier: 'document_id', attribute: 'Document identifier'},
+    { identifier: "competent_institution", attribute: "Competent institution"},
+  ]
+}
+
 export const SUPPORTED_ATTESTATIONS: { [id: string]: AttestationDefinition } = {
   "pid": PID_ATTESTATION,
   "mdl": MDL_ATTESTATION,
   "photo_id": PHOTO_ID_ATTESTATION,
   "age_over_18": AGE_OVER_18_ATTESTATION,
+  "ehic": EHIC_ATTESTATION,
+  "pda1": PDA1_ATTESTATION
 }
-

src/app/core/constants/attestations-per-format.ts

@@ -1,5 +1,5 @@
 import {Attestation, MsoMdocAttestation, SdJwtVcAttestation} from "@core/models/attestation/Attestations";
-import {AGE_OVER_18_ATTESTATION, MDL_ATTESTATION, PHOTO_ID_ATTESTATION, PID_ATTESTATION} from "@core/constants/attestation-definitions";
+import {AGE_OVER_18_ATTESTATION, EHIC_ATTESTATION, MDL_ATTESTATION, PDA1_ATTESTATION, PHOTO_ID_ATTESTATION, PID_ATTESTATION} from "@core/constants/attestation-definitions";
 import {AttestationFormat} from "@core/models/attestation/AttestationFormat";
 import {AttestationType} from "@core/models/attestation/AttestationType";
 import {DataElement} from "@core/models/attestation/AttestationDefinition";
@@ -56,8 +56,46 @@ export const PHOTO_ID_MSO_MDOC: MsoMdocAttestation = {
   claimPath: (attribute: DataElement) => { return { namespace: 'org.iso.23220.photoid.1', claim_name: attribute.identifier } }
 }
 
+/*---- EHIC INSTANCES PER FORMAT ----*/
+export const EHIC_MSO_MDOC: MsoMdocAttestation = {
+  format: AttestationFormat.MSO_MDOC,
+  attestationDef: EHIC_ATTESTATION,
+  doctype: 'eu.europa.ec.eudi.ehic.1',
+  namespace: 'eu.europa.ec.eudi.ehic.1',
+  attributePath: (attribute: DataElement) => { return msoMdocAttributePath(attribute, 'eu.europa.ec.eudi.ehic.1') },
+  claimPath: (attribute: DataElement) => { return { namespace: 'eu.europa.ec.eudi.ehic.1', claim_name: attribute.identifier } }
+}
+export const EHIC_SD_JWT_VC: SdJwtVcAttestation = {
+  format: AttestationFormat.SD_JWT_VC,
+  attestationDef: EHIC_ATTESTATION,
+  vct: 'urn:eu.europa.ec.eudi:ehic:1',
+  attributePath: (attribute: DataElement) => { return `$.${sdJwtVcAttributePath(attribute, AttestationType.EHIC)}` },
+  claimPath: (attribute: DataElement) => { return { path: sdJwtVcAttributePath(attribute, AttestationType.EHIC).split('.') } }
+}
+
+/*---- PDA1 INSTANCES PER FORMAT ----*/
+export const PDA1_MSO_MDOC: MsoMdocAttestation = {
+  format: AttestationFormat.MSO_MDOC,
+  attestationDef: PDA1_ATTESTATION,
+  doctype: 'eu.europa.ec.eudi.pda1.1',
+  namespace: 'eu.europa.ec.eudi.pda1.1',
+  attributePath: (attribute: DataElement) => { return msoMdocAttributePath(attribute, 'eu.europa.ec.eudi.pda1.1') },
+  claimPath: (attribute: DataElement) => { return { namespace: 'eu.europa.ec.eudi.pda1.1', claim_name: attribute.identifier } }
+}
+export const PDA1_SD_JWT_VC: SdJwtVcAttestation = {
+  format: AttestationFormat.SD_JWT_VC,
+  attestationDef: PDA1_ATTESTATION,
+  vct: 'urn:eu.europa.ec.eudi:pda1:1',
+  attributePath: (attribute: DataElement) => { return `$.${sdJwtVcAttributePath(attribute, AttestationType.PDA1)}` },
+  claimPath: (attribute: DataElement) => { return { path: sdJwtVcAttributePath(attribute, AttestationType.PDA1).split('.') } }
+}
+
 function msoMdocAttributePath(attribute: DataElement, namespace: string): string {
-  return '$[\'' + namespace + '\'][\'' + attribute.identifier + '\']'
+  if(attribute.identifier.includes('.')) {
+    return '$[\'' + namespace + '\'][\'' + attribute.identifier.split('.').join('\'][\'') + '\']'
+  } else {
+    return '$[\'' + namespace + '\'][\'' + attribute.identifier + '\']'
+  }
 }
 
 function sdJwtVcAttributePath(attribute: DataElement, attestationType: AttestationType): string {
@@ -88,8 +126,8 @@ export const PID_SD_JWT_VC_ATTRIBUTE_MAP: { [id: string]: string } = {
 }
 
 export const ATTESTATIONS_BY_FORMAT: { [id: string]: Attestation[] } = {
-  "mso_mdoc": [PID_MSO_MDOC, MDL_MSO_MDOC, PHOTO_ID_MSO_MDOC, AGE_OVER_18_MSO_MDOC],
-  "vc+sd-jwt": [PID_SD_JWT_VC]
+  "mso_mdoc": [PID_MSO_MDOC, MDL_MSO_MDOC, PHOTO_ID_MSO_MDOC, AGE_OVER_18_MSO_MDOC, EHIC_MSO_MDOC, PDA1_MSO_MDOC],
+  "vc+sd-jwt": [PID_SD_JWT_VC, EHIC_SD_JWT_VC, PDA1_SD_JWT_VC]
 }
 
 export const getAttestationByFormatAndType =

src/app/core/layout/wallet-layout/wallet-layout-header/wallet-layout-header.component.scss

@@ -1,10 +1,11 @@
 @use "/src/template" as temp;
+@use "sass:map";
 
 :host {
   border: none;
   border-bottom: 1px;
-  border-bottom-color: map-get(
-    map-get(map-get(temp.$palette, general), divider),
+  border-bottom-color: map.get(
+    map.get(map.get(temp.$palette, general), divider),
     dark
   );
   border-bottom-style: solid;

src/app/core/models/FormSelectableField.ts

@@ -3,4 +3,5 @@ export type FormSelectableField = {
   label: string,
   value: string,
   visible?: boolean
+  nested?: FormSelectableField[]
 }

src/app/core/models/attestation/AttestationDefinition.ts

@@ -10,4 +10,5 @@ export type DataElement = {
   identifier: string,
   attribute: string,
   description?: string,
+  nested?: DataElement[]
 }

src/app/core/models/attestation/AttestationType.ts

@@ -2,5 +2,7 @@ export enum AttestationType {
   PID = "pid",
   MDL = "mdl",
   PHOTO_ID = "photo_id",
-  AGE_OVER_18 = "age_over_18"
+  AGE_OVER_18 = "age_over_18",
+  EHIC = "ehic",
+  PDA1 = "pda1"
 }

src/app/core/services/decoders/DecodingUtils.ts

@@ -1,24 +1,6 @@
-
 export function elementAsString(element: any, prepend?: string): string {
-  if ((typeof element) === "object") {
-
-    if (Array.isArray(element)) {
-      return (element as string[]).map((it) => {
-        return JSON.stringify(it);
-      }).join(', ')
-
-    } else {
-      let str = ""
-      if (typeof prepend !== 'undefined') {
-        str += "<br/>"
-      } else {
-        prepend = ""
-      }
-      return str + Object.keys(element).map((it) => {
-        return prepend + "&nbsp;&nbsp;" + it + ": " + elementAsString(element[it], "&nbsp;&nbsp;").toString()
-      }).join("<br/>");
-    }
-
+  if (typeof element === 'object') {
+    return JSON.stringify(element);
   } else {
     return element.toString();
   }

src/app/core/services/decoders/JwtVcJsonAttestationDecoder.ts

@@ -29,18 +29,18 @@ export class JwtVcJsonAttestationDecoder implements AttestationDecoder {
     let sharedCredentials = this.unWrapCredentials(vp)
 
     if (sharedCredentials.length == 1) {
-      return of(this.toSinge(sharedCredentials[0]))
+      return of(this.toSingle(sharedCredentials[0]))
 
     } else {
-      let singles = sharedCredentials.map(it => this.toSinge(it));
+      let singles = sharedCredentials.map(it => this.toSingle(it));
       return of({
         kind: "enveloped",
         attestations: singles
       })
     }
   }
 
-  toSinge(vcJwt: string): Single {
+  toSingle(vcJwt: string): Single {
     let vc = this.jWTService.decodeToObject(vcJwt) as any;
     return {
       kind: "single",

src/app/core/services/jwt.service.ts

@@ -14,7 +14,6 @@ export class JWTService {
 
   decodeToKeyValues (token: string): KeyValue<string, string>[] {
     const decoded: any = jwtDecode(token);
-    console.log(decoded)
     const result: KeyValue<string, string>[] = [];
     Object.keys(decoded).forEach((item) => {
       result.push({

src/app/core/services/presentation-definition-service.ts

@@ -33,7 +33,7 @@ export class PresentationDefinitionService {
   ): PresentationDefinitionTransactionRequest {
     let inputDescriptors: InputDescriptor[] = [];
 
-    selectedAttestations.map((attestation) => {
+    selectedAttestations.forEach((attestation) => {
       const selectedAttributesForAttestation =
         selectedAttributes[attestation.type];
 
@@ -156,14 +156,21 @@ export class PresentationDefinitionService {
     includeAttributes?: string[]
   ): FieldConstraint[] {
     const fieldConstraints: FieldConstraint[] = [];
+    const includeAll = typeof includeAttributes == 'undefined';
+
     attestation.attestationDef.dataSet.forEach((dataElement: DataElement) => {
-      if (
-        typeof includeAttributes == 'undefined' ||
-        includeAttributes.includes(dataElement.identifier)
-      ) {
+      if (includeAll || includeAttributes.includes(dataElement.identifier)) {
         fieldConstraints.push(
           this.fieldConstraint(attestation.attributePath(dataElement))
         );
+      } else if (dataElement.nested) {
+        dataElement.nested.forEach((nestedDataElement: DataElement) => {
+          if (includeAll || includeAttributes.includes(nestedDataElement.identifier)) {
+            fieldConstraints.push(
+              this.fieldConstraint(attestation.attributePath(nestedDataElement))
+            );
+          }
+        });
       }
     });
     return fieldConstraints;