From 394f69c605e1556b7a6f27d38a27d4a6d4bd7453 Mon Sep 17 00:00:00 2001 From: Mikayla Dobson <93477693+innocuous-symmetry@users.noreply.github.com> Date: Thu, 2 Feb 2023 17:33:34 -0600 Subject: [PATCH] cleanup --- server/routes/index.js | 13 +++++++++++++ server/routes/item.js | 7 +++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/server/routes/index.js b/server/routes/index.js index 2866465..aeeeff3 100644 --- a/server/routes/index.js +++ b/server/routes/index.js @@ -1,7 +1,20 @@ +const jwt = require('jsonwebtoken'); const authRoute = require("./auth"); const itemRoute = require("./item"); async function routesLoader(app, passport) { + app.use('/app', (req, res, next) => { + const token = req.headers['authorization'].split(" ")[1]; + jwt.verify(token, process.env.SECRET, (err, data) => { + if (err) { + res.status(403).send(err); + } else { + req.user = data; + next(); + } + }) + }) + app.use('/auth', await authRoute(app, passport)); app.use('/app', await itemRoute(app, passport)); } diff --git a/server/routes/item.js b/server/routes/item.js index dd07abf..b364b34 100644 --- a/server/routes/item.js +++ b/server/routes/item.js @@ -1,11 +1,10 @@ -const jwt = require('jsonwebtoken'); +// const jwt = require('jsonwebtoken'); require('dotenv').config(); const router = require('express').Router(); const ItemController = require('../controllers/ItemController'); async function itemRoute(app, passport) { - router.use('/', (req, res, next) => { - console.log('check for jwt'); + /* router.use('/', (req, res, next) => { const token = req.headers['authorization'].split(" ")[1]; jwt.verify(token, process.env.SECRET, (err, data) => { if (err) { @@ -15,7 +14,7 @@ async function itemRoute(app, passport) { next(); } }) - }) + }) */ router.get('/item', async (req, res) => { const response = await ItemController.getAll();