Fix null pointers when auth token is missing

(fixes #1628 and similar issue in data export route)
juice-shop · May 18, 2021 · 60e1d3d · 60e1d3d
1 parent 54aa467
commit 60e1d3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/routes/dataExport.ts b/routes/dataExport.ts
@@ -11,7 +11,7 @@ import models = require('../models/index')
 
 module.exports = function dataExport () {
   return async (req, res, next) => {
-    const loggedInUser = security.authenticatedUsers.get(req.headers.authorization.replace('Bearer ', ''))
+    const loggedInUser = security.authenticatedUsers.get(req.headers?.authorization?.replace('Bearer ', ''))
     if (loggedInUser?.data?.email && loggedInUser.data.id) {
       const username = loggedInUser.data.username
       const email = loggedInUser.data.email

diff --git a/routes/orderHistory.ts b/routes/orderHistory.ts
@@ -8,7 +8,7 @@ import db = require('../data/mongodb')
 
 module.exports.orderHistory = function orderHistory () {
   return async (req, res, next) => {
-    const loggedInUser = security.authenticatedUsers.get(req.headers.authorization.replace('Bearer ', ''))
+    const loggedInUser = security.authenticatedUsers.get(req.headers?.authorization?.replace('Bearer ', ''))
     if (loggedInUser?.data?.email && loggedInUser.data.id) {
       const email = loggedInUser.data.email
       const updatedEmail = email.replace(/[aeiou]/gi, '*')