NOBUG: Refactor JWT verification logic in captchaUtil.js and writePas…

…s.test.js (#367)
bcgov · Apr 15, 2024 · 9b66330 · 9b66330
1 parent 51a1646
commit 9b66330
Show file tree

Hide file tree

Showing 3 changed files with 289 additions and 203 deletions.
diff --git a/__tests__/writePass.test.js b/__tests__/writePass.test.js
@@ -112,7 +112,6 @@ describe('Pass Fails', () => {
     const writePassHandler = require('../lambda/writePass/index');
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111111',
         facility: 'Trail B',
         bookingDate: '2022-01-01',
@@ -157,7 +156,6 @@ describe('Pass Fails', () => {
     const writePassHandler = require('../lambda/writePass/index');
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111112',
         facility: 'Trail B',
         orcs: 'Test Park 1',
@@ -205,7 +203,6 @@ describe('Pass Fails', () => {
     const writePassHandler = require('../lambda/writePass/index');
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111113',
         facility: 'Parking lot A',
         orcs: 'Test Park 1',
@@ -253,7 +250,6 @@ describe('Pass Fails', () => {
     const writePassHandler = require('../lambda/writePass/index');
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111114',
         facility: 'Trail B',
         orcs: 'Test Park 1',
@@ -414,10 +410,11 @@ describe('Pass Successes', () => {
 
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111115',
         facility: 'P1 and Lower P5',
-        orcs: '0015'
+        orcs: '0015',
+        bookingDate: '2022-01-01',
+        passType: 'DAY'
       },
       'defaultSecret',
       {
@@ -467,7 +464,6 @@ describe('Pass Successes', () => {
 
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111116',
         facility: 'Parking lot A',
         orcs: 'Test Park 1'
@@ -521,7 +517,6 @@ describe('Pass Successes', () => {
 
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111117',
         facility: 'Trail B',
         orcs: 'Test Park 1'
@@ -699,7 +694,6 @@ describe('Pass Successes', () => {
 
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111118',
         facility: undefined,
         orcs: 'Test Park 1'
@@ -740,7 +734,6 @@ describe('Pass Successes', () => {
 
     const token = jwt.sign(
       {
-        data: 'verified',
         registrationNumber: '1111111119',
         facility: 'Parking lot A',
         orcs: 'Test Park 1',

diff --git a/lambda/captchaUtil.js b/lambda/captchaUtil.js
@@ -173,21 +173,14 @@ function verifyJWT(token) {
   try {
     const decoded = jwt.verify(token, SECRET, { algorithm: ALGORITHM });
     logger.info('JWT decoded.')
-    // A256GCM
-    if (decoded.data) {
-      return {
-        valid: true,
-        registrationNumber: decoded.registrationNumber,
-        facility: decoded.facility,
-        orcs: decoded.orcs,
-        bookingDate: decoded.bookingDate,
-        passType: decoded.passType
-      };
-    } else {
-      return {
-        valid: false
-      };
-    }
+    return {
+      valid: true,
+      registrationNumber: decoded.registrationNumber,
+      facility: decoded.facility,
+      orcs: decoded.orcs,
+      bookingDate: decoded.bookingDate,
+      passType: decoded.passType
+    };
   } catch (e) {
     logger.error(e);
     return {