Added verification middleware, protected monitor routes
This commit is contained in:
1 parent
7dbd3b28d2
commit
073f8b2e30
5 files changed
+58
-8
No files matched your search
@@ -2,9 +2,18 @@ const express = require("express");
|
|||||||
const { registerValidation, loginValidation } = require("../validation/joi");
|
const { registerValidation, loginValidation } = require("../validation/joi");
|
||||||
const logger = require("../utils/logger");
|
const logger = require("../utils/logger");
|
||||||
require("dotenv").config();
|
require("dotenv").config();
|
||||||
|
|
||||||
var jwt = require("jsonwebtoken");
|
var jwt = require("jsonwebtoken");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates and returns JWT token with an arbitrary payload
|
||||||
|
* @function
|
||||||
|
* @param {Object} payload
|
||||||
|
* @returns {String}
|
||||||
|
*/
|
||||||
|
const issueToken = (payload) => {
|
||||||
|
return jwt.sign(payload, process.env.JWT_SECRET, { expiresIn: "1h" });
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @function
|
* @function
|
||||||
* @param {express.Request} req
|
* @param {express.Request} req
|
||||||
@@ -44,11 +53,11 @@ const registerController = async (req, res) => {
|
|||||||
// TODO: Send an email to user
|
// TODO: Send an email to user
|
||||||
// Will add this later
|
// Will add this later
|
||||||
logger.info("New user created!", { service: "auth", userId: newUser._id });
|
logger.info("New user created!", { service: "auth", userId: newUser._id });
|
||||||
const token = jwt.sign(newUser, process.env.JWT_SECRET);
|
const token = issueToken(newUser);
|
||||||
|
|
||||||
return res
|
return res
|
||||||
.status(200)
|
.status(200)
|
||||||
.json({ success: true, msg: "User created}", data: token });
|
.json({ success: true, msg: "User created", data: token });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error(error.message, { service: "auth" });
|
logger.error(error.message, { service: "auth" });
|
||||||
return res.status(500).json({ success: false, msg: error.message });
|
return res.status(500).json({ success: false, msg: error.message });
|
||||||
@@ -88,7 +97,7 @@ const loginController = async (req, res) => {
|
|||||||
delete userWithoutPassword.password;
|
delete userWithoutPassword.password;
|
||||||
|
|
||||||
// Happy path, return token
|
// Happy path, return token
|
||||||
const token = jwt.sign(userWithoutPassword, process.env.JWT_SECRET);
|
const token = issueToken(userWithoutPassword);
|
||||||
return res
|
return res
|
||||||
.status(200)
|
.status(200)
|
||||||
.json({ success: true, msg: "Found user", data: token });
|
.json({ success: true, msg: "Found user", data: token });
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ const {
|
|||||||
} = require("../validation/joi");
|
} = require("../validation/joi");
|
||||||
|
|
||||||
const logger = require("../utils/logger");
|
const logger = require("../utils/logger");
|
||||||
const Monitor = require("../models/Monitor");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns all monitors
|
* Returns all monitors
|
||||||
|
|||||||
+3
-2
@@ -6,6 +6,8 @@ const monitorRouter = require("./routes/monitorRoute");
|
|||||||
const { connectDbAndRunServer } = require("./configs/db");
|
const { connectDbAndRunServer } = require("./configs/db");
|
||||||
require("dotenv").config();
|
require("dotenv").config();
|
||||||
const logger = require("./utils/logger");
|
const logger = require("./utils/logger");
|
||||||
|
var { verifyJWT } = require("./middleware/verifyJWT");
|
||||||
|
|
||||||
// const { sendEmail } = require('./utils/sendEmail')
|
// const { sendEmail } = require('./utils/sendEmail')
|
||||||
|
|
||||||
// **************************
|
// **************************
|
||||||
@@ -58,8 +60,7 @@ app.use((req, res, next) => {
|
|||||||
|
|
||||||
//routes
|
//routes
|
||||||
app.use("/api/v1/auth", authRouter);
|
app.use("/api/v1/auth", authRouter);
|
||||||
|
app.use("/api/v1/monitors", verifyJWT, monitorRouter);
|
||||||
app.use("/api/v1/monitors", monitorRouter);
|
|
||||||
|
|
||||||
// Testing email service
|
// Testing email service
|
||||||
// app.use('/sendEmail', async (req, res) => {
|
// app.use('/sendEmail', async (req, res) => {
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
const verifyJwt = (req, res, next) => {};
|
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
const jwt = require("jsonwebtoken");
|
||||||
|
const logger = require("../utils/logger");
|
||||||
|
const SERVICE_NAME = "verifyJWT";
|
||||||
|
const TOKEN_PREFIX = "Bearer ";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verifies the JWT token
|
||||||
|
* @function
|
||||||
|
* @param {express.Request} req
|
||||||
|
* @param {express.Response} res
|
||||||
|
* @param {express.NextFunction} next
|
||||||
|
* @returns {express.Response}
|
||||||
|
*/
|
||||||
|
const verifyJWT = (req, res, next) => {
|
||||||
|
const token = req.headers["authorization"];
|
||||||
|
// Make sure a token is provided
|
||||||
|
if (!token) {
|
||||||
|
logger.error("No token provided", { service: SERVICE_NAME });
|
||||||
|
return res.status(401).json({ success: false, msg: "No token provided" });
|
||||||
|
}
|
||||||
|
// Make sure it is properly formatted
|
||||||
|
if (token.startsWith(TOKEN_PREFIX)) {
|
||||||
|
const parsedToken = token.slice(TOKEN_PREFIX.length, token.length);
|
||||||
|
// Verify the token's authenticity
|
||||||
|
jwt.verify(parsedToken, process.env.JWT_SECRET, (err, decoded) => {
|
||||||
|
if (err) {
|
||||||
|
logger.error("Invalid token", { service: SERVICE_NAME });
|
||||||
|
return res.status(401).json({ success: false, msg: "Invalid token" });
|
||||||
|
}
|
||||||
|
//Add the user to the request object for use in the route
|
||||||
|
req.user = decoded;
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
logger.error("Invalid token format", { service: SERVICE_NAME });
|
||||||
|
return res
|
||||||
|
.status(400)
|
||||||
|
.json({ success: false, msg: "Invalid token format" });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = { verifyJWT };
|
||||||
Reference in new issue
Block a user