Merge pull request #19 from billylo1/fix-uri-encoding
Fix URI encoding for indivual params
This commit is contained in:
commit
c3d38b965d
|
@ -130,9 +130,9 @@ export class PassData {
|
||||||
return Promise.reject();
|
return Promise.reject();
|
||||||
}
|
}
|
||||||
|
|
||||||
const encodedUri = encodeURI(`serialNumber=${payload.serialNumber}&vaccineName=${payload.receipt.vaccineName}&vaccinationDate=${payload.receipt.vaccinationDate}&organization=${payload.receipt.organization}&dose=${payload.receipt.numDoses}`);
|
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 qrCodeUrl = `${verifierHost}/verify?${encodedUri}`;
|
const qrCodeUrl = `${verifierHost}/verify?${encodedUri}`;
|
||||||
|
|
||||||
// console.log(qrCodeUrl);
|
// console.log(qrCodeUrl);
|
||||||
|
|
||||||
// Create QR Code Object
|
// Create QR Code Object
|
||||||
|
|
14
src/photo.ts
14
src/photo.ts
|
@ -70,10 +70,10 @@ export class Photo {
|
||||||
|
|
||||||
console.log(JSON.stringify(responseJson,null,2));
|
console.log(JSON.stringify(responseJson,null,2));
|
||||||
|
|
||||||
if (responseJson["result"] != 'OK')
|
if (responseJson["result"] != 'OK')
|
||||||
return Promise.reject();
|
return Promise.reject();
|
||||||
|
|
||||||
const encodedUri = encodeURI(`serialNumber=${payload.serialNumber}&vaccineName=${payload.receipt.vaccineName}&vaccinationDate=${payload.receipt.vaccinationDate}&organization=${payload.receipt.organization}&dose=${payload.receipt.numDoses}`);
|
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 qrCodeUrl = `${verifierHost}/verify?${encodedUri}`;
|
const qrCodeUrl = `${verifierHost}/verify?${encodedUri}`;
|
||||||
|
|
||||||
// Create QR Code Object
|
// Create QR Code Object
|
||||||
|
@ -102,25 +102,25 @@ export class Photo {
|
||||||
vaccineNameProper = 'Pfizer (Comirnaty)'
|
vaccineNameProper = 'Pfizer (Comirnaty)'
|
||||||
|
|
||||||
if (vaccineName.includes('MODERNA'))
|
if (vaccineName.includes('MODERNA'))
|
||||||
vaccineNameProper = 'Moderna (SpikeVax)'
|
vaccineNameProper = 'Moderna (SpikeVax)'
|
||||||
|
|
||||||
if (vaccineName.includes('ASTRAZENECA'))
|
if (vaccineName.includes('ASTRAZENECA'))
|
||||||
vaccineNameProper = 'AstraZeneca (Vaxzevria)'
|
vaccineNameProper = 'AstraZeneca (Vaxzevria)'
|
||||||
|
|
||||||
let doseVaccine = "#" + String(payload.receipt.numDoses) + ": " + vaccineNameProper;
|
let doseVaccine = "#" + String(payload.receipt.numDoses) + ": " + vaccineNameProper;
|
||||||
|
|
||||||
document.getElementById('vaccineName').innerText = doseVaccine;
|
document.getElementById('vaccineName').innerText = doseVaccine;
|
||||||
document.getElementById('vaccinationDate').innerText = payload.receipt.vaccinationDate;
|
document.getElementById('vaccinationDate').innerText = payload.receipt.vaccinationDate;
|
||||||
document.getElementById('organization').innerText = payload.receipt.organization;
|
document.getElementById('organization').innerText = payload.receipt.organization;
|
||||||
document.getElementById('name').innerText = payload.receipt.name;
|
document.getElementById('name').innerText = payload.receipt.name;
|
||||||
document.getElementById('dob').innerText = payload.receipt.dateOfBirth;
|
document.getElementById('dob').innerText = payload.receipt.dateOfBirth;
|
||||||
|
|
||||||
|
|
||||||
const codeWriter = new BrowserQRCodeSvgWriter();
|
const codeWriter = new BrowserQRCodeSvgWriter();
|
||||||
const svg = codeWriter.write(qrCode.message,200,200);
|
const svg = codeWriter.write(qrCode.message,200,200);
|
||||||
svg.setAttribute('style','background-color: white');
|
svg.setAttribute('style','background-color: white');
|
||||||
document.getElementById('qrcode').appendChild(svg);
|
document.getElementById('qrcode').appendChild(svg);
|
||||||
|
|
||||||
const blobPromise = toBlob(body);
|
const blobPromise = toBlob(body);
|
||||||
return blobPromise;
|
return blobPromise;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
Loading…
Reference in New Issue