From 214f29a64ff75b3deac4310352c146ad58204ee3 Mon Sep 17 00:00:00 2001 From: Kyle Huang Junyuan Date: Mon, 11 Oct 2021 10:49:57 +0800 Subject: [PATCH] fix: type error on signPayload() fix: update tests --- .../notarise-examples/pdt-multi-record.json | 2 +- .../notarise-examples/pdt-single-record.json | 2 +- .../notarise-examples/vac-multi-record.json | 4 ++-- .../notarise-examples/vac-single-record.json | 4 ++-- src/index.ts | 4 ++-- src/models/gpay-covid-card.test.ts | 19 +++++++++++++------ 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/fixtures/notarise-examples/pdt-multi-record.json b/fixtures/notarise-examples/pdt-multi-record.json index 111f32a..db1a06e 100644 --- a/fixtures/notarise-examples/pdt-multi-record.json +++ b/fixtures/notarise-examples/pdt-multi-record.json @@ -14,7 +14,7 @@ "barcode": { "alternateText": "Scan this QR to verify your HealthCert", "type": "qrCode", - "value": "https://www.verify.gov.sg/" + "value": "https://www.verify.gov.sg" }, "expiration": "2021-10-01", "logo": { diff --git a/fixtures/notarise-examples/pdt-single-record.json b/fixtures/notarise-examples/pdt-single-record.json index 83114b1..920ce86 100644 --- a/fixtures/notarise-examples/pdt-single-record.json +++ b/fixtures/notarise-examples/pdt-single-record.json @@ -14,7 +14,7 @@ "barcode": { "alternateText": "Scan this QR to verify your HealthCert", "type": "qrCode", - "value": "https://www.verify.gov.sg/" + "value": "https://www.verify.gov.sg" }, "expiration": "2021-10-01", "logo": { diff --git a/fixtures/notarise-examples/vac-multi-record.json b/fixtures/notarise-examples/vac-multi-record.json index 2c64d11..0e21165 100644 --- a/fixtures/notarise-examples/vac-multi-record.json +++ b/fixtures/notarise-examples/vac-multi-record.json @@ -10,11 +10,11 @@ "id": "3388000000016843803.some_uuid", "issuerId": "3388000000016843803", "cardColorHex": "#FFFFFF", - "title": "COVID-19 Test Result Card", + "title": "Vaccination Certificate", "barcode": { "alternateText": "Scan this QR to verify your HealthCert", "type": "qrCode", - "value": "https://www.verify.gov.sg/" + "value": "https://www.verify.gov.sg" }, "expiration": "2021-10-01", "logo": { diff --git a/fixtures/notarise-examples/vac-single-record.json b/fixtures/notarise-examples/vac-single-record.json index c0bfe8a..c303c0e 100644 --- a/fixtures/notarise-examples/vac-single-record.json +++ b/fixtures/notarise-examples/vac-single-record.json @@ -10,11 +10,11 @@ "id": "3388000000016843803.some_uuid", "issuerId": "3388000000016843803", "cardColorHex": "#FFFFFF", - "title": "COVID-19 Test Result Card", + "title": "Vaccination Certificate", "barcode": { "alternateText": "Scan this QR to verify your HealthCert", "type": "qrCode", - "value": "https://www.verify.gov.sg/" + "value": "https://www.verify.gov.sg" }, "expiration": "2021-10-01", "logo": { diff --git a/src/index.ts b/src/index.ts index ce13056..b4d1f53 100644 --- a/src/index.ts +++ b/src/index.ts @@ -18,8 +18,8 @@ export default (secret: Secret) => { * @param payload * @returns */ - signPayload: (payload: string | Record | Buffer) => - jwt.sign(payload, secret, { algorithm: "RS256" }), + // eslint-disable-next-line @typescript-eslint/ban-types + signPayload: (payload: string | object | Buffer) => jwt.sign(payload, secret, { algorithm: "RS256" }), /** * Returns the full URL with the provided signedPayload. diff --git a/src/models/gpay-covid-card.test.ts b/src/models/gpay-covid-card.test.ts index 3b2127f..9d00194 100644 --- a/src/models/gpay-covid-card.test.ts +++ b/src/models/gpay-covid-card.test.ts @@ -18,16 +18,21 @@ export const patientDetails: PatientDetails = { patientName: "Tan Chen Chen", }; -export const basicDetails: BasicDetails = { +export const basicDetailsTest: BasicDetails = { iss: "staging@notarise-gpay-covid-cards.iam.gserviceaccount.com", uuid: "some_uuid", issuerId: "3388000000016843803", title: "COVID-19 Test Result Card", - qr: "https://www.verify.gov.sg/", + qr: "https://www.verify.gov.sg", expiration: "2021-10-01", patientDetails: genPatientDetails(patientDetails), }; +export const basicDetailsVaccination: BasicDetails = { + ...basicDetailsTest, + title: "Vaccination Certificate", +}; + export const testingRecord: TestingRecord = { administrationDateTime: "27 September 2020, 2:15 pm SGT", contactInfo: "MacRitchie Hospital, Thomson Road, Singapore 123000", @@ -53,19 +58,21 @@ export const vaccinationRecord: VaccinationRecord = { describe("genGPayCovidCard() [Single record]", () => { it("TestingRecord", () => { - const singleTestingRecord = genGPayCovidCard(basicDetails, [genTestingRecord(testingRecord)]); + const singleTestingRecord = genGPayCovidCard(basicDetailsTest, [genTestingRecord(testingRecord)]); expect({ iat: TEST_IAT, ...singleTestingRecord }).toStrictEqual(notarisePdtSingleRecord); }); it("VaccinationRecord", () => { - const singleVaccinationRecord = genGPayCovidCard(basicDetails, [genVaccinationRecord(vaccinationRecord)]); + const singleVaccinationRecord = genGPayCovidCard(basicDetailsVaccination, [ + genVaccinationRecord(vaccinationRecord), + ]); expect({ iat: TEST_IAT, ...singleVaccinationRecord }).toStrictEqual(notariseVacSingleRecord); }); }); describe("genGPayCovidCard() [Multi record]", () => { it("TestingRecord", () => { - const multiTestingRecord = genGPayCovidCard(basicDetails, [ + const multiTestingRecord = genGPayCovidCard(basicDetailsTest, [ genTestingRecord(testingRecord), genTestingRecord(testingRecord), ]); @@ -73,7 +80,7 @@ describe("genGPayCovidCard() [Multi record]", () => { }); it("VaccinationRecord", () => { - const multiVaccinationRecord = genGPayCovidCard(basicDetails, [ + const multiVaccinationRecord = genGPayCovidCard(basicDetailsVaccination, [ genVaccinationRecord(vaccinationRecord), genVaccinationRecord(vaccinationRecord), ]);