From ab6d60173c1818cb88796472adaebb2b5acfa2e1 Mon Sep 17 00:00:00 2001 From: Kaushik Date: Wed, 20 Jul 2022 00:08:16 +0530 Subject: [PATCH] moved authHeader to middleware --- axios.js | 13 ------------- middleware/authCheck.js | 6 ++++-- package.json | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/axios.js b/axios.js index b82f279..72a3c2c 100644 --- a/axios.js +++ b/axios.js @@ -19,20 +19,7 @@ const axiosInstance = axios.default.create({ }, }); -const getAuthHeaders = (req) => { - let authHeaders; - - if (req.session.access_token) { - authHeaders = { - 'Authorization': req.session.access_token ? `Bearer ${req.session.access_token}` : '', - } - } - - return authHeaders; -}; - module.exports = { authInstance, axiosInstance, - getAuthHeaders, }; \ No newline at end of file diff --git a/middleware/authCheck.js b/middleware/authCheck.js index 58e0c26..4b73af9 100644 --- a/middleware/authCheck.js +++ b/middleware/authCheck.js @@ -7,8 +7,10 @@ const typedefs = require("../typedefs"); * @param {typedefs.Next} next */ const isAuthenticated = (req, res, next) => { - if (req.session.refreshToken && req.session.accessToken) next() - else { + if (req.session.refreshToken && req.session.accessToken) { + req.authHeader = `Bearer ${req.session.access_token}`; + next() + } else { res.status(401).redirect("/"); } } diff --git a/package.json b/package.json index 475cb61..5f465be 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "start": "node index.js", - "dev": "nodemon index.js" + "dev": "SET NODE_ENV=development& nodemon index.js" }, "repository": { "type": "git",