Refactor verifyJWT middleware to handle refresh tokens alongside access token
This commit is contained in:
1 parent
412ac3312b
commit
3e9593fa23
2 files changed
+51
-75
No files matched your search
@@ -2,7 +2,6 @@ const jwt = require("jsonwebtoken");
|
|||||||
const SERVICE_NAME = "verifyJWT";
|
const SERVICE_NAME = "verifyJWT";
|
||||||
const TOKEN_PREFIX = "Bearer ";
|
const TOKEN_PREFIX = "Bearer ";
|
||||||
const { errorMessages } = require("../utils/messages");
|
const { errorMessages } = require("../utils/messages");
|
||||||
const { getTokenFromHeaders } = require("../utils/utils");
|
|
||||||
const { handleError } = require("../controllers/controllerUtils");
|
const { handleError } = require("../controllers/controllerUtils");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -20,7 +19,7 @@ const verifyJWT = (req, res, next) => {
|
|||||||
const error = new Error(errorMessages.NO_AUTH_TOKEN);
|
const error = new Error(errorMessages.NO_AUTH_TOKEN);
|
||||||
error.status = 401;
|
error.status = 401;
|
||||||
error.service = SERVICE_NAME;
|
error.service = SERVICE_NAME;
|
||||||
next(error);
|
next(handleError(error));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Make sure it is properly formatted
|
// Make sure it is properly formatted
|
||||||
@@ -29,7 +28,7 @@ const verifyJWT = (req, res, next) => {
|
|||||||
error.status = 400;
|
error.status = 400;
|
||||||
error.service = SERVICE_NAME;
|
error.service = SERVICE_NAME;
|
||||||
error.method = "verifyJWT";
|
error.method = "verifyJWT";
|
||||||
next(error);
|
next(handleError(error));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,82 +37,58 @@ const verifyJWT = (req, res, next) => {
|
|||||||
const { jwtSecret } = req.settingsService.getSettings();
|
const { jwtSecret } = req.settingsService.getSettings();
|
||||||
jwt.verify(parsedToken, jwtSecret, (err, decoded) => {
|
jwt.verify(parsedToken, jwtSecret, (err, decoded) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
const errorMessage =
|
if (err.name === "TokenExpiredError") {
|
||||||
err.name === "TokenExpiredError"
|
// token has expired
|
||||||
? errorMessages.EXPIRED_AUTH_TOKEN
|
handleExpiredJwtToken(req, res, next);
|
||||||
: errorMessages.INVALID_AUTH_TOKEN;
|
}
|
||||||
return res.status(401).json({ success: false, msg: errorMessage });
|
else {
|
||||||
|
// Invalid token (signature or token altered or other issue)
|
||||||
|
const errorMessage = errorMessages.INVALID_AUTH_TOKEN;
|
||||||
|
return res.status(401).json({ success: false, msg: errorMessage });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Token is valid and not expired, carry on with request, Add the decoded payload to the request
|
||||||
|
req.user = decoded;
|
||||||
|
next();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add the user to the request object for use in the route
|
|
||||||
req.user = decoded;
|
|
||||||
next();
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
function handleExpiredJwtToken(req, res, next) {
|
||||||
* Verifies the Refresh token
|
// check for refreshToken
|
||||||
* @function
|
const refreshToken = req.headers["x-refresh-token"];
|
||||||
* @param {express.Request} req
|
|
||||||
* @param {express.Response} res
|
|
||||||
* @param {express.NextFunction} next
|
|
||||||
* @property {Object} req.body - The Refresh Token & JWT Token will be passed in body of the request.
|
|
||||||
* @returns {express.Response}
|
|
||||||
*/
|
|
||||||
const verifyRefreshToken = (req, res, next) => {
|
|
||||||
try {
|
|
||||||
const jwtToken = getTokenFromHeaders(req.headers);
|
|
||||||
// Make sure a jwtToken is provided
|
|
||||||
if (!jwtToken) {
|
|
||||||
const error = new Error(errorMessages.NO_AUTH_TOKEN);
|
|
||||||
error.status = 401;
|
|
||||||
error.service = SERVICE_NAME;
|
|
||||||
error.method = "verifyRefreshToken";
|
|
||||||
next(error);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const { refreshToken } = req.body;
|
if (!refreshToken) {
|
||||||
// Make sure refreshTokens is provided
|
// No refresh token provided
|
||||||
if (!refreshToken) {
|
const error = new Error(errorMessages.NO_REFRESH_TOKEN);
|
||||||
const error = new Error(errorMessages.NO_REFRESH_TOKEN);
|
error.status = 401;
|
||||||
error.status = 401;
|
error.service = SERVICE_NAME;
|
||||||
error.service = SERVICE_NAME;
|
error.method = "handleExpiredJwtToken";
|
||||||
error.method = "verifyRefreshToken";
|
return next(handleError(error));
|
||||||
next(error);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verify the refreshToken's authenticity
|
|
||||||
const { refreshTokenSecret } = req.settingsService.getSettings();
|
|
||||||
jwt.verify(refreshToken, refreshTokenSecret, (err, decoded) => {
|
|
||||||
if (err) {
|
|
||||||
const errorMessage =
|
|
||||||
err.name === "TokenExpiredError"
|
|
||||||
? errorMessages.EXPIRED_REFRESH_TOKEN
|
|
||||||
: errorMessages.INVALID_REFRESH_TOKEN;
|
|
||||||
return res.status(401).json({ success: false, msg: errorMessage });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Authenticity of refreshToken is verified, now we can decode jwtToken for payload
|
|
||||||
const jwtSecret = req.settingsService.getSettings().jwtSecret;
|
|
||||||
const decoded = jwt.verify(jwtToken, jwtSecret, { ignoreExpiration: true });
|
|
||||||
|
|
||||||
if (!decoded) {
|
|
||||||
const error = new Error(errorMessages.INVALID_PAYLOAD);
|
|
||||||
error.status = 401;
|
|
||||||
error.service = SERVICE_NAME;
|
|
||||||
error.method = "verifyRefreshToken";
|
|
||||||
next(error);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
req.user = decoded;
|
|
||||||
next();
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
next(handleError(error, SERVICE_NAME, "verifyRefreshToken"));
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = { verifyJWT, verifyRefreshToken };
|
// Verify refresh token
|
||||||
|
const { refreshTokenSecret } = req.settingsService.getSettings();
|
||||||
|
jwt.verify(refreshToken, refreshTokenSecret, (refreshErr, refreshDecoded) => {
|
||||||
|
if (refreshErr) {
|
||||||
|
// Invalid or expired refresh token, trigger logout
|
||||||
|
const errorMessage =
|
||||||
|
refreshErr.name === "TokenExpiredError"
|
||||||
|
? errorMessages.EXPIRED_REFRESH_TOKEN
|
||||||
|
: errorMessages.INVALID_REFRESH_TOKEN;
|
||||||
|
const error = new Error(errorMessage);
|
||||||
|
error.status = 401;
|
||||||
|
error.service = SERVICE_NAME;
|
||||||
|
return next(handleError(error));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Refresh token is valid and unexpired, request for new access token
|
||||||
|
res.status(403).json({
|
||||||
|
success: false,
|
||||||
|
msg: errorMessages.REQUEST_NEW_ACCESS_TOKEN,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { verifyJWT };
|
||||||
@@ -16,6 +16,7 @@ const errorMessages = {
|
|||||||
NO_REFRESH_TOKEN: "No refresh token provided",
|
NO_REFRESH_TOKEN: "No refresh token provided",
|
||||||
INVALID_REFRESH_TOKEN: "Invalid refresh token",
|
INVALID_REFRESH_TOKEN: "Invalid refresh token",
|
||||||
EXPIRED_REFRESH_TOKEN: "Refresh token expired",
|
EXPIRED_REFRESH_TOKEN: "Refresh token expired",
|
||||||
|
REQUEST_NEW_ACCESS_TOKEN: "Request new access token",
|
||||||
|
|
||||||
//Payload
|
//Payload
|
||||||
INVALID_PAYLOAD: "Invalid payload",
|
INVALID_PAYLOAD: "Invalid payload",
|
||||||
|
|||||||
Reference in new issue
Block a user