From 7c22310356666bdcd988e6a7d22b814a82ab1412 Mon Sep 17 00:00:00 2001 From: Ryan Slobojan Date: Fri, 24 Sep 2021 15:15:27 -0400 Subject: [PATCH] Fix double-encoding breaking generated URLs * We encoded spaces once to %20, and then a second time to %2520 :( --- src/pass.ts | 2 +- src/photo.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pass.ts b/src/pass.ts index 7c47cd9..806630c 100644 --- a/src/pass.ts +++ b/src/pass.ts @@ -130,7 +130,7 @@ export class PassData { return Promise.reject(); } - const encodedUri = encodeURI(`serialNumber=${encodeURIComponent(payload.serialNumber)}&vaccineName=${encodeURIComponent(payload.receipt.vaccineName)}&vaccinationDate=${encodeURIComponent(payload.receipt.vaccinationDate)}&organization=${encodeURIComponent(payload.receipt.organization)}&dose=${encodeURIComponent(payload.receipt.numDoses)}`); + const encodedUri = `serialNumber=${encodeURIComponent(payload.serialNumber)}&vaccineName=${encodeURIComponent(payload.receipt.vaccineName)}&vaccinationDate=${encodeURIComponent(payload.receipt.vaccinationDate)}&organization=${encodeURIComponent(payload.receipt.organization)}&dose=${encodeURIComponent(payload.receipt.numDoses)}`; const qrCodeUrl = `${verifierHost}/verify?${encodedUri}`; // console.log(qrCodeUrl); diff --git a/src/photo.ts b/src/photo.ts index 3084197..496f859 100644 --- a/src/photo.ts +++ b/src/photo.ts @@ -73,7 +73,7 @@ export class Photo { if (responseJson["result"] != 'OK') return Promise.reject(); - const encodedUri = encodeURI(`serialNumber=${encodeURIComponent(payload.serialNumber)}&vaccineName=${encodeURIComponent(payload.receipt.vaccineName)}&vaccinationDate=${encodeURIComponent(payload.receipt.vaccinationDate)}&organization=${encodeURIComponent(payload.receipt.organization)}&dose=${encodeURIComponent(payload.receipt.numDoses)}`); + const encodedUri = `serialNumber=${encodeURIComponent(payload.serialNumber)}&vaccineName=${encodeURIComponent(payload.receipt.vaccineName)}&vaccinationDate=${encodeURIComponent(payload.receipt.vaccinationDate)}&organization=${encodeURIComponent(payload.receipt.organization)}&dose=${encodeURIComponent(payload.receipt.numDoses)}`; const qrCodeUrl = `${verifierHost}/verify?${encodedUri}`; // Create QR Code Object