From 98b01068d2324f9dc00b7e84a182ccf88fba6b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hauke=20T=C3=B6njes?= <git@htoenjes.de>
Date: Thu, 1 Jul 2021 01:27:17 +0200
Subject: [PATCH] Fixed zip creation Bug - Using do-not-zip - Added loading
 Animation while creating pass

---
 components/Form.tsx |  7 ++++-
 src/decode.js       | 68 +++++++++++++++++++--------------------------
 src/pass.ts         | 13 +++------
 3 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/components/Form.tsx b/components/Form.tsx
index 16d959d..6d47469 100644
--- a/components/Form.tsx
+++ b/components/Form.tsx
@@ -21,6 +21,7 @@ function Form(): JSX.Element {
     const [file, setFile] = useState<File>(undefined);
 
     const [errorMessage, setErrorMessage] = useState<string>(undefined);
+    const [loading, setLoading] = useState<boolean>(false);
 
     // File Input ref
     const inputFile = useRef<HTMLInputElement>(undefined)
@@ -88,9 +89,11 @@ function Form(): JSX.Element {
     // Add Pass to wallet
     async function addToWallet(event: FormEvent<HTMLFormElement>) {
         event.preventDefault();
+        setLoading(true);
 
         if (!file && !qrCode) {
             setErrorMessage("Please scan a QR Code, or select a file to scan")
+            setLoading(false);
             return;
         }
 
@@ -108,8 +111,10 @@ function Form(): JSX.Element {
 
             const passBlob = new Blob([pass], {type: "application/vnd.apple.pkpass"});
             saveAs(passBlob, 'covid.pkpass');
+            setLoading(false);
         } catch (e) {
             setErrorMessage(e.toString());
+            setLoading(false);
         }
     }
 
@@ -210,7 +215,7 @@ function Form(): JSX.Element {
                                     className="focus:outline-none bg-green-600 py-2 px-3 text-white font-semibold rounded-md disabled:bg-gray-400">
                                 Add to Wallet
                             </button>
-                            <div id="spin" style={{"display": "none"}}>
+                            <div id="spin" className={loading ? undefined : "hidden"}>
                                 <svg className="animate-spin h-5 w-5 ml-2" viewBox="0 0 24 24">
                                     <circle className="opacity-0" cx="12" cy="12" r="10" stroke="currentColor"
                                             strokeWidth="4"/>
diff --git a/src/decode.js b/src/decode.js
index fe17213..b339286 100644
--- a/src/decode.js
+++ b/src/decode.js
@@ -6,60 +6,50 @@ const zlib = require('pako')
 const cbor = require('cbor-js')
 
 export function typedArrayToBufferSliced(array) {
-  return array.buffer.slice(array.byteOffset, array.byteLength + array.byteOffset)
+    return array.buffer.slice(array.byteOffset, array.byteLength + array.byteOffset)
 }
 
 export function typedArrayToBuffer(array) {
-  var buffer = new ArrayBuffer(array.length)
+    var buffer = new ArrayBuffer(array.length)
 
-  array.map(function(value, i) {
-    buffer[i] = value
-  })
-  return array.buffer
-}
-
-export function toBuffer(ab) {
-  var buf = Buffer.alloc(ab.byteLength)
-  var view = new Uint8Array(ab)
-
-  for (var i = 0; i < buf.length; ++i) {
-      buf[i] = view[i]
-  }
-  return buf
+    array.map(function (value, i) {
+        buffer[i] = value
+    })
+    return array.buffer
 }
 
 export function decodeData(data) {
-  data = data.toString('ASCII')
+    data = data.toString('ASCII')
 
-  if (data.startsWith('HC1')) {
-    data = data.substring(3)
-    if (data.startsWith(':')) {
-      data = data.substring(1)
+    if (data.startsWith('HC1')) {
+        data = data.substring(3)
+        if (data.startsWith(':')) {
+            data = data.substring(1)
+        } else {
+            console.log("Warning: unsafe HC1: header - update to v0.0.4")
+        }
     } else {
-      console.log("Warning: unsafe HC1: header - update to v0.0.4")
+        console.log("Warning: no HC1: header - update to v0.0.4")
     }
-  } else {
-    console.log("Warning: no HC1: header - update to v0.0.4")
-  }
 
-  data = base45.decode(data)
+    data = base45.decode(data)
 
-  if (data[0] == 0x78) {
-    data = zlib.inflate(data)
-  }
+    if (data[0] == 0x78) {
+        data = zlib.inflate(data)
+    }
 
-  data = cbor.decode(typedArrayToBuffer(data))
+    data = cbor.decode(typedArrayToBuffer(data))
 
-  if (!Array.isArray(data)) {
-    throw new Error('Expecting Array')
-  }
+    if (!Array.isArray(data)) {
+        throw new Error('Expecting Array')
+    }
 
-  if (data.length !== 4) {
-    throw new Error('Expecting Array of length 4')
-  }
+    if (data.length !== 4) {
+        throw new Error('Expecting Array of length 4')
+    }
 
-  let plaintext = data[2]
-  let decoded = cbor.decode(typedArrayToBufferSliced(plaintext))
+    let plaintext = data[2]
+    let decoded = cbor.decode(typedArrayToBufferSliced(plaintext))
 
-  return decoded
+    return decoded
 }
\ No newline at end of file
diff --git a/src/pass.ts b/src/pass.ts
index 6de51d8..2685c39 100644
--- a/src/pass.ts
+++ b/src/pass.ts
@@ -1,7 +1,7 @@
 import {Constants} from "./constants";
 import {Payload, PayloadBody} from "./payload";
 import {ValueSets} from "./value_sets";
-import {toBuffer} from "./decode";
+import {toBuffer as createZip} from 'do-not-zip';
 
 const crypto = require('crypto')
 
@@ -34,11 +34,6 @@ interface GenericFields {
     backFields: Array<Field>;
 }
 
-interface ZipData {
-    path: string;
-    data: Buffer;
-}
-
 interface SignData {
     PassJsonHash: string;
     useBlackVersion: boolean;
@@ -62,7 +57,7 @@ export class PassData {
     generic: GenericFields;
 
     // Generates a sha1 hash from a given buffer
-    private static getBufferHash(buffer: Buffer): string {
+    private static getBufferHash(buffer: Buffer | string): string {
         const sha = crypto.createHash('sha1');
         sha.update(buffer);
         return sha.digest('hex');
@@ -107,7 +102,7 @@ export class PassData {
         const pass: PassData = new PassData(payload, qrCode);
 
         // Create new zip
-        const zip: Array<ZipData> = [];
+        const zip = [] as { path: string; data: Buffer | string }[];
 
         // Adding required fields
 
@@ -150,7 +145,7 @@ export class PassData {
         // Add signature to zip
         zip.push({path: 'signature', data: Buffer.from(manifestSignature)});
 
-        return toBuffer(zip);
+        return createZip(zip);
     }
 
     private constructor(payload: Payload, qrCode: QrCode) {