Merge branch 'main' into release/0.7.0

Author: gdimtsas

.github/workflows/publish-to-container-registry.yml

@@ -26,13 +26,13 @@ jobs:
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.3.0
+        uses: docker/setup-buildx-action@v3.10.0
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3.2.0
+        uses: docker/login-action@v3.4.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -42,15 +42,15 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v5.5.1
+        uses: docker/metadata-action@v5.7.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v6.2.0
+        uses: docker/build-push-action@v6.15.0
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

package.json

@@ -29,21 +29,21 @@
     "@types/codemirror": "^5.60.7",
     "@types/crypto-js": "^4.1.1",
     "@types/uuid": "10.0.0",
+    "angularx-qrcode": "^19.0.0",
     "bignumber.js": "^9.1.2",
     "buffer": "^6.0.3",
     "cbor-x": "^1.6.0",
     "codemirror": "^6.0.1",
     "crypto-js": "^4.1.1",
     "jsonpath-plus": "^9.0.0",
     "jwt-decode": "^3.0.0",
+    "ngx-toastr": "16.2.0",
     "nofilter": "^4.0.2",
-    "angularx-qrcode": "^19.0.0",
     "rxjs": "~7.8.0",
     "stream-browserify": "^3.0.0",
     "thememirror": "^2.0.1",
     "tslib": "^2.3.0",
-    "zone.js": "~0.15.0",
-    "ngx-toastr": "16.2.0"
+    "zone.js": "~0.15.0"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^19.1.4",
@@ -75,4 +75,4 @@
     "stylelint-order": "^6.0.3",
     "typescript": "~5.5.4"
   }
-}
+}

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";
@@ -57,8 +57,46 @@ export const PHOTO_ID_MSO_MDOC: MsoMdocAttestation = {
   claimQuery: (attribute: DataElement) => { return msoMdocClaimQuery('org.iso.23220.photoid.1', 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 {
@@ -93,8 +131,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/constants/general.ts

@@ -1,3 +1,4 @@
 export const ACTIVE_TRANSACTION = 'ACTIVE_TRANSACTION';
 export const SCHEME = 'scheme';
 export const DEFAULT_SCHEME = 'eudi-openid4vp://';
+export const ISSUER_CHAIN = 'ISSUER_CHAIN';

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

@@ -13,5 +13,10 @@
         >Change default scheme</a
       >
     </button>
+    <button mat-menu-item>
+      <a id="issuerChain" (click)="changeIssuerChain()"
+        >Configure issuer chain</a
+      >
+    </button>
   </mat-menu>
 </header>

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/layout/wallet-layout/wallet-layout-header/wallet-layout-header.component.ts

@@ -7,6 +7,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { OpenLogsComponent } from "@shared/elements/open-logs/open-logs.component";
 import { MatDialog, MatDialogModule } from "@angular/material/dialog";
 import {InputSchemeComponent} from "@shared/elements/input-scheme/input-scheme.component";
+import { IssuerChainComponent } from '@app/shared/elements/trusted-issuer/issuer-chain.component';
 
 @Component({
     selector: 'vc-wallet-layout-header',
@@ -23,7 +24,7 @@ import {InputSchemeComponent} from "@shared/elements/input-scheme/input-scheme.c
 export class WalletLayoutHeaderComponent {
 	constructor (private readonly navigateService: NavigateService) {}
 
-  private dialog: MatDialog = inject(MatDialog);
+  private readonly dialog: MatDialog = inject(MatDialog);
 
 	goHome () {
 		this.navigateService.goHome();
@@ -48,4 +49,13 @@ export class WalletLayoutHeaderComponent {
       },
     });
   }
+
+  changeIssuerChain () {
+    this.dialog.open(IssuerChainComponent, {
+      data: {
+      },
+      height: '70%',
+      width: '80%',
+    });
+  }
 }

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/InitializedTransaction.ts

@@ -1,5 +1,6 @@
 export type InitializedTransaction = {
   client_id: string,
   request_uri: string,
+  request_uri_method: 'get' | 'post',
   transaction_id: string
 }