From a6c94131545c8304bc03da481c607c2dc6b85372 Mon Sep 17 00:00:00 2001
From: Emmanuel Opoku-Ameyaw <110876611+the-pro7@users.noreply.github.com>
Date: Thu, 17 Oct 2024 11:42:22 +0000
Subject: [PATCH] Update validateTokenHandler.js

---
 middleware/validateTokenHandler.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/middleware/validateTokenHandler.js b/middleware/validateTokenHandler.js
index f101fcb..32d9865 100644
--- a/middleware/validateTokenHandler.js
+++ b/middleware/validateTokenHandler.js
@@ -2,22 +2,23 @@ const asyncHandler = require("express-async-handler");
 const jwt = require("jsonwebtoken");
 
 const validateToken = asyncHandler(async (req, res, next) => {
-  let token;
+  // If any token available in the incoming request
+  let storedToken = req.cookies?.jwt
   let authHeader = req.headers.Authorization || req.headers.authorization;
   if (authHeader && authHeader.startsWith("Bearer")) {
-    token = authHeader.split(" ")[1];
+   let token = authHeader.split(" ")[1] || storedToken;
     jwt.verify(token, process.env.ACCESS_TOKEN_SECERT, (err, decoded) => {
       if (err) {
-        res.status(401);
-        throw new Error("User is not authorized");
+        // Minor update
+        return res.status(401).json({message: 'User is not authorized'})
       }
       req.user = decoded.user;
       next();
     });
 
     if (!token) {
-      res.status(401);
-      throw new Error("User is not authorized or token is missing");
+        // Minor update
+     return res.status(401).json({message: 'User is not authorized or token is missing'})
     }
   }
 });