From 93a48178e565ac0c5d0787be5fc259f4f70d9ba9 Mon Sep 17 00:00:00 2001
From: turnoffthiscomputer <colin.remi07@gmail.com>
Date: Mon, 23 Sep 2024 15:03:45 +0200
Subject: [PATCH] fix nfcScanner.ts

---
 app/src/utils/nfcScanner.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/utils/nfcScanner.ts b/app/src/utils/nfcScanner.ts
index c351964a..2daa8ec6 100644
--- a/app/src/utils/nfcScanner.ts
+++ b/app/src/utils/nfcScanner.ts
@@ -160,13 +160,13 @@ const handleResponseIOS = async (
   const passportData = {
     mrz,
     dsc: pem,
-    dataGroupHashes: concatenatedDataHashesArraySigned,
-    eContent: signedEContentArray,
+    eContent: concatenatedDataHashesArraySigned,
+    signedAttr: signedEContentArray,
     encryptedDigest: encryptedDigestArray,
     photoBase64: "data:image/jpeg;base64," + parsed.passportPhoto,
     mockUser: false
   };
-  
+
   try {
     useUserStore.getState().registerPassportData(passportData)
     const { signatureAlgorithm, hashFunction } = parseDSC(pem);
@@ -209,8 +209,8 @@ const handleResponseAndroid = async (
   const passportData: PassportData = {
     mrz: mrz.replace(/\n/g, ''),
     dsc: pem,
-    dataGroupHashes: JSON.parse(encapContent),
-    eContent: JSON.parse(eContent),
+    eContent: JSON.parse(encapContent),
+    signedAttr: JSON.parse(eContent),
     encryptedDigest: JSON.parse(encryptedDigest),
     photoBase64: photo.base64,
     mockUser: false
@@ -222,7 +222,7 @@ const handleResponseAndroid = async (
   }, null, 2));
 
   console.log('mrz', passportData?.mrz);
-  console.log('dataGroupHashes', passportData?.dataGroupHashes);
+  console.log('dataGroupHashes', passportData?.eContent);
   console.log('eContent', passportData?.eContent);
   console.log('encryptedDigest', passportData?.encryptedDigest);
   console.log("photoBase64", passportData?.photoBase64.substring(0, 100) + '...')
@@ -235,7 +235,7 @@ const handleResponseAndroid = async (
   console.log("documentSigningCertificate", documentSigningCertificate)
 
   amplitude.track('nfc_response_parsed', {
-    dataGroupHashesLength: passportData?.dataGroupHashes?.length,
+    dataGroupHashesLength: passportData?.eContent?.length,
     eContentLength: passportData?.eContent?.length,
     encryptedDigestLength: passportData?.encryptedDigest?.length,
     digestAlgorithm: digestAlgorithm,
@@ -243,7 +243,7 @@ const handleResponseAndroid = async (
     digestEncryptionAlgorithm: digestEncryptionAlgorithm,
     dsc: pem,
   });
-  
+
   try {
     useUserStore.getState().registerPassportData(passportData)
     const { signatureAlgorithm, hashFunction } = parseDSC(pem);