From a14699ad558cf8f925f26f977937f8fe32c0a405 Mon Sep 17 00:00:00 2001
From: Tim Schauder <temscha@live.com>
Date: Thu, 8 Aug 2024 17:57:37 +0200
Subject: [PATCH 1/2] Fix link and qr code generation

---
 components/QrCode.vue | 7 +++----
 pages/provider.vue    | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/components/QrCode.vue b/components/QrCode.vue
index cc3bcff..82ea749 100644
--- a/components/QrCode.vue
+++ b/components/QrCode.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="props.data" class="flex flex-col justify-center items-center gap-6">
+  <div v-if="props.qrCodeData" class="flex flex-col justify-center items-center gap-6">
     <qrcode-vue :value="link" :level="level" :render-as="renderAs" :size="200" class="my-10"/>
     <NuxtLink :to="link">
       <button class="btn btn-primary">
@@ -17,10 +17,9 @@ const runtimeConfig = useRuntimeConfig()
 const baseUrl = runtimeConfig.public.apiUrl
 
 const props = defineProps<{
-  data: { client_id: string, request_uri: string }
+  qrCodeData: { client_id: string, request_uri: string }
 }>();
-const {client_id, request_uri} = props.data;
-
+const {client_id, request_uri} = props.qrCodeData;
 const authenticationUrl = `eudi-openid4vp://${baseUrl}?client_id=${client_id}&request_uri=${request_uri}`
 
 const link = ref(authenticationUrl)
diff --git a/pages/provider.vue b/pages/provider.vue
index 76799bd..a47dbb9 100644
--- a/pages/provider.vue
+++ b/pages/provider.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <PresentationForm v-if="!qrCodeData"  @data-posted="handleDataPosted"/>
-    <QrCode v-if="qrCodeData" :data="qrCodeData"/>
+    <PresentationForm v-if="!qrCodeData" @data-posted="handleDataPosted"/>
+    <QrCode v-if="qrCodeData" :qr-code-data="qrCodeData"/>
   </div>
 </template>
 
@@ -9,9 +9,9 @@
 import QrCode from "~/components/QrCode.vue";
 import PresentationForm from "~/components/PresentationForm.vue";
 
-const qrCodeData = ref<{client_id: string, request_uri: string} | null>(null);
+const qrCodeData = ref<{ client_id: string, request_uri: string } | null>(null);
 
-const handleDataPosted = (client_id: string, request_uri: string) => {
+const handleDataPosted = ({client_id, request_uri}: {client_id: string, request_uri: string}) => {
   qrCodeData.value = {client_id, request_uri};
 };
 </script>
\ No newline at end of file

From ebbe803af9ac88e79bec01ea26a97c6af8e78e10 Mon Sep 17 00:00:00 2001
From: Tim Schauder <temscha@live.com>
Date: Thu, 8 Aug 2024 18:01:07 +0200
Subject: [PATCH 2/2] Add check for mdoc/sdjwt  + zkp formats to request and
 sd-jwt claims

---
 components/PresentationForm.vue | 94 ++++++++++++++++++++++++++-------
 models/MDocClaims.ts            | 26 +++++++++
 models/PresentationInfo.ts      | 33 ------------
 models/SdJwtClaims.ts           | 25 +++++++++
 models/TransactionRequest.ts    | 19 +++++--
 5 files changed, 141 insertions(+), 56 deletions(-)
 create mode 100644 models/MDocClaims.ts
 delete mode 100644 models/PresentationInfo.ts
 create mode 100644 models/SdJwtClaims.ts

diff --git a/components/PresentationForm.vue b/components/PresentationForm.vue
index 6f0a4dd..b0ffa76 100644
--- a/components/PresentationForm.vue
+++ b/components/PresentationForm.vue
@@ -1,6 +1,30 @@
 <template>
   <div class="text-xl lg:text-3xl font-bold text-accent m-6 text-center">
-    <h1>Ihre Daten</h1>
+    <h1>Ausweisen</h1>
+  </div>
+  <div class="text-center border border-gray-400 rounded m-6 p-2">
+    <p class="m-2">Wählen Sie zuerst die Art der Übertragung:</p>
+    <div class="flex flex-row w-full text-sm items-center justify-center">
+      <div class="form-control flex-1 mx-1 lg:px-8">
+        <label class="label cursor-pointer">
+          <span class="label-text mr-1">mDoc</span>
+          <input v-model="formType" type="radio" name="formType" value="mDoc" class="radio checked:bg-blue-500">
+        </label>
+      </div>
+      <div class="form-control flex-1 mx-1">
+        <label class="label cursor-pointer">
+          <span class="label-text mr-1">SDJWT</span>
+          <input v-model="formType" type="radio" name="formType" value="SDJWT" class="radio checked:bg-blue-500">
+        </label>
+      </div>
+      <label class="flex items-center flex-1 mx-2">
+        <input v-model="isZkpSelected" type="checkbox" class="mr-2">
+        <span class="cursor-pointer">ZKP</span>
+      </label>
+    </div>
+  </div>
+  <div class="text-xl lg:text-xl font-bold text-accent m-6 text-center">
+    <h2>Ihre Daten</h2>
   </div>
   <div class="text-base text-black m-6 text-center">
     <p>Wählen Sie hier die Daten, welche Sie übermitteln möchten.</p>
@@ -31,12 +55,14 @@
 
 <script setup lang="ts">
 import axios from 'axios';
-import type {TransactionRequest} from "~/models/TransactionRequest.ts";
-import {presentationInfo} from '~/models/PresentationInfo';
+import type {Format, TransactionRequest, ZkpFormat} from "~/models/TransactionRequest.ts";
+import {MDocClaims} from '~/models/MDocClaims';
 import type {TransactionResponse} from "~/models/TransactionResponse";
-import {ref} from "vue";
+import {SdJwtClaims} from "~/models/SdJwtClaims";
 
 const errorMessage = ref<string | null>(null);
+const formType = ref<string>('mDoc');
+const isZkpSelected = ref<boolean>(false);
 
 const emit = defineEmits(['data-posted']);
 const sessionStore = useSessionStore();
@@ -45,13 +71,50 @@ const runtimeConfig = useRuntimeConfig()
 const baseUrl = runtimeConfig.public.apiUrl
 const nonce = crypto.randomUUID()
 
-const dataList = ref<{ kind: string, selected: boolean }[]>(Object.keys(presentationInfo).map(kind => ({
-  kind,
-  selected: false
-})));
+const dataList = computed(() => {
+  const claims = formType.value === 'mDoc' ? MDocClaims : SdJwtClaims;
+  return Object.keys(claims).map(kind => ({
+    kind,
+    selected: false
+  }));
+});
+
 const postData = async () => {
   const selectedItems = dataList.value.filter(item => item.selected);
 
+  const alg: string[] = [
+    "ES256", "ES384", "ES512", "EdDSA",
+    "ESB256", "ESB320", "ESB384", "ESB512"
+  ]
+
+  const format: Format = formType.value === 'mDoc' ? {
+    mso_mdoc: {
+      alg
+    }
+  } : {
+    vc_sd_jwt: {
+      alg
+    }
+  };
+
+  const zkpformat: ZkpFormat = formType.value === 'mDoc' ? {
+    "mso_mdoc+zkp": {
+      "proof_type": ["secp256r1-sha256"]
+    }
+  } : {
+    "vc+sd-jwt+zkp": {
+      "proof_type": ["secp256r1-sha256"]
+    }
+  }
+
+  function pathLayout(kind: string) {
+    if (formType.value === 'mDoc') {
+      return [`$['eu.europa.ec.eudi.pid.1']['${MDocClaims[kind]}']`]
+    } else {
+      return [`$.${SdJwtClaims[kind]}`]
+    }
+  }
+
   const presentationRequest: TransactionRequest = {
     nonce: nonce,
     response_mode: 'direct_post',
@@ -63,24 +126,16 @@ const postData = async () => {
           id: "eu.europa.ec.eudi.pid.1",
           name: "EUDI PID",
           purpose: "We need to verify your identity",
-          format: {
-            mso_mdoc: {
-              alg: [
-                "ES256", "ES384", "ES512", "EdDSA",
-                "ESB256", "ESB320", "ESB384", "ESB512"
-              ]
-            }
-          },
+          format: isZkpSelected.value ? zkpformat : format,
           constraints: {
             fields: selectedItems.map(item => ({
-              path: [`$['eu.europa.ec.eudi.pid.1']['${presentationInfo[item.kind]}']`],
+              path: pathLayout(item.kind),
               intent_to_retain: false
             }))
           }
         }
       ],
     },
-
   };
 
   try {
@@ -88,8 +143,7 @@ const postData = async () => {
     const {client_id, presentation_id, request_uri}: TransactionResponse = response.data;
 
     sessionStore.setPresentationStore({client_id, presentation_id, request_uri, nonce});
-    emit('data-posted', {client_id, request_uri});
-    console.log('client_id: ', client_id);
+    emit('data-posted', { client_id, request_uri });
 
   } catch (error) {
     console.error('Error posting data:', error);
diff --git a/models/MDocClaims.ts b/models/MDocClaims.ts
new file mode 100644
index 0000000..b0fcc68
--- /dev/null
+++ b/models/MDocClaims.ts
@@ -0,0 +1,26 @@
+export type ClaimSignature = {
+    [key: string]: string;
+}
+export const MDocClaims: ClaimSignature = {
+    'Familienname': 'family_name',
+    'Geburtsname': 'family_name_birth',
+    'Geburtsdatum': 'birthdate',
+    'Alter in Geburtsjahren': 'age_birth_year',
+    'Alter in Jahren': 'age_in_years',
+    'Über 12': 'age_equal_or_over.12',
+    'Über 14': 'age_equal_or_over.14',
+    'Über 16': 'age_equal_or_over.16',
+    'Über 18': 'age_equal_or_over.18',
+    'Über 21': 'age_equal_or_over.21',
+    'Über 65': 'age_equal_or_over.65',
+    'Geburtsort': 'birth_place',
+    'Wohnland': 'resident_country',
+    'Wohnstadt': 'resident_city',
+    'Postleitzahl': 'resident_postal_code',
+    'Wohnstraße': 'resident_street',
+    'Nationalität': 'nationality',
+    'Ausstellungsdatum': 'issuance_date',
+    'Ablaufdatum': 'expiry_date',
+    'Ausstellungsland': 'issuing_country',
+    'Ausstellende Behörde': 'issuing_authority',
+};
diff --git a/models/PresentationInfo.ts b/models/PresentationInfo.ts
deleted file mode 100644
index ac48dbc..0000000
--- a/models/PresentationInfo.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-type PresentationInfoSig = {
-    [key: string]: string;
-}
-export const presentationInfo: PresentationInfoSig = {
-    'Familienname': 'family_name',
-    'Name': 'given_name',
-    'Geburtsdatum': 'birth_date',
-    'Über 18': 'age_over_18',
-    'Alter in Jahren': 'age_in_years',
-    'Alter in Geburtsjahren': 'age_birth_year',
-    'Familien-Geburtsname': 'family_name_birth',
-    'Geburtsname': 'given_name_birth',
-    'Geburtsort': 'birth_place',
-    'Geburtsland': 'birth_country',
-    'Geburtsstaat': 'birth_state',
-    'Geburtsstadt': 'birth_city',
-    'Wohnadresse': 'resident_address',
-    'Wohnland': 'resident_country',
-    'Wohnstaat': 'resident_state',
-    'Wohnstadt': 'resident_city',
-    'Postleitzahl': 'resident_postal_code',
-    'Wohnstraße': 'resident_street',
-    'Hausnummer': 'resident_house_number',
-    'Geschlecht': 'gender',
-    'Nationalität': 'nationality',
-    'Ausstellungsdatum': 'issuance_date',
-    'Ablaufdatum': 'expiry_date',
-    'Ausstellende Behörde': 'issuing_authority',
-    'Dokumentnummer': 'document_number',
-    'Verwaltungsnummer': 'administrative_number',
-    'Ausstellungsland': 'issuing_country',
-    'Ausstellungsbehörde': 'issuing_jurisdiction'
-};
diff --git a/models/SdJwtClaims.ts b/models/SdJwtClaims.ts
new file mode 100644
index 0000000..0b665e8
--- /dev/null
+++ b/models/SdJwtClaims.ts
@@ -0,0 +1,25 @@
+import type {ClaimSignature} from "~/models/MDocClaims";
+
+export const SdJwtClaims: ClaimSignature = {
+    'VCT': 'vct',
+    'Aussteller': 'iss',
+    'Name': 'given_name',
+    'Familienname': 'family_name',
+    'Geburtsname': 'birth_family_name',
+    'Geburtsdatum': 'birthdate',
+    'Alter in Geburtsjahren': 'age_birth_year',
+    'Alter in Jahren': 'age_in_years',
+    'Über 12': 'age_equal_or_over.12',
+    'Über 14': 'age_equal_or_over.14',
+    'Über 16': 'age_equal_or_over.16',
+    'Über 18': 'age_equal_or_over.18',
+    'Über 21': 'age_equal_or_over.21',
+    'Über 65': 'age_equal_or_over.65',
+    'Geburtsort': 'place_of_birth.locality',
+    'Wohnstadt': 'address.locality',
+    'Postleitzahl': 'address.postal_code',
+    'Wohnadresse': 'address.street_address',
+    'Nationalität': 'nationalities',
+    'Ausstellungsland': 'issuing_country',
+    'Ausstellende Behörde': 'issuing_authority',
+};
diff --git a/models/TransactionRequest.ts b/models/TransactionRequest.ts
index e88c1cf..f4ecc8a 100644
--- a/models/TransactionRequest.ts
+++ b/models/TransactionRequest.ts
@@ -14,16 +14,29 @@ type InputDescriptor = {
     id: string;
     name: string;
     purpose: string;
-    format: Format;
+    format: Format | ZkpFormat;
     constraints: Constraint;
 }
 
-type Format = {
+export type Format = {
     mso_mdoc: {
         alg: string[];
-    };
+    }
+} | {
+    vc_sd_jwt: {
+        alg: string[];
+    }
 }
 
+export type ZkpFormat = {
+    "vc+sd-jwt+zkp": {
+        proof_type: string[];
+    }
+} | {
+    "mso_mdoc+zkp": {
+        proof_type: string[];
+    }
+}
 type Constraint = {
     fields: Field[];
 }