Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 74 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"cors": "^2.8.5",
"dotenv": "^17.2.3",
"express": "^5.1.0",
"joi": "^18.0.1",
"jsonwebtoken": "^9.0.2",
"mongoose": "^8.19.1",
"nodemon": "^3.1.10",
Expand Down
11 changes: 11 additions & 0 deletions src/middlewares/validate.middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export const validateMiddleware = (schema, property = 'body') => {
return (req, res, next) => {
const { error } = schema.validate(req[property]);
if (error) {
return res.status(400).json({
error: error.details[0].message,
});
}
next();
};
};
10 changes: 6 additions & 4 deletions src/routes/authRoutes.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import express from 'express';
import { registerUser,loginUser, forgotPassword, resetPassword } from '../controllers/authController.js';
import { authMiddleware } from '../middlewares/auth.middleware.js';
import { registerUser,loginUser } from '../controllers/authController.js';
import { registerSchema, loginSchema } from '../validations/authValidation.js';
import {validateMiddleware} from '../middlewares/validate.middleware.js';


const router = express.Router();

router.post('/register', registerUser);
router.post('/login', loginUser);
router.post('/register', validateMiddleware(registerSchema), registerUser);
router.post('/login', validateMiddleware(loginSchema), loginUser);
router.post('/forgotPassword',forgotPassword);
router.post('/resetPassword/:token',resetPassword);

Expand Down
8 changes: 5 additions & 3 deletions src/routes/rbacRoutes.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import express from 'express';
import { authMiddleware } from '../middlewares/auth.middleware.js';
import { checkRole } from '../middlewares/rbac.middleware.js';
import { adminAccessSchema, userAccessSchema } from '../validations/rbacValidation.js';
import {validateMiddleware} from '../middlewares/validate.middleware.js';

const router = express.Router();


router.get('/admin-only', authMiddleware, checkRole(['Admin']), (req, res) => {
router.get('/admin-only', validateMiddleware(adminAccessSchema, 'headers'), authMiddleware, checkRole(['Admin']), (req, res) => {
return res.status(200).json({ message: 'Welcome, Admin' });
});

router.get('/user-only', authMiddleware, checkRole(['User']), (req, res) => {

router.get('/user-only', validateMiddleware(userAccessSchema, 'headers'), authMiddleware, checkRole(['User']), (req, res) => {
return res.status(200).json({ message: 'Welcome, User' });
});

Expand Down
35 changes: 35 additions & 0 deletions src/validations/authValidation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import Joi from 'joi';

const registerSchema = Joi.object({
username: Joi.string().min(3).max(30).required().messages({
'string.empty': 'Username is required',
'string.min': 'Username must be at least 3 characters',
'string.max': 'Username must be at most 30 characters',
}),
fullname: Joi.string().min(3).max(50).required().messages({
'string.empty': 'Full name is required',
'string.min': 'Full name must be at least 3 characters',
'string.max': 'Full name must be at most 50 characters',
}),
email: Joi.string().email().required().messages({
'string.empty': 'Email is required',
'string.email': 'Email must be a valid email address',
}),
password: Joi.string().min(6).required().messages({
'string.empty': 'Password is required',
'string.min': 'Password must be at least 6 characters',
}),
});

const loginSchema = Joi.object({
email: Joi.string().email().required().messages({
'string.empty': 'Email is required',
'string.email': 'Email must be a valid email address',
}),
password: Joi.string().min(6).required().messages({
'string.empty': 'Password is required',
'string.min': 'Password must be at least 6 characters',
}),
});

export { registerSchema, loginSchema };
24 changes: 24 additions & 0 deletions src/validations/rbacValidation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// src/validations/rbacValidation.js
import Joi from "joi";

const adminAccessSchema = Joi.object({
authorization: Joi.string()
.pattern(/^Bearer\s.+$/)
.required()
.messages({
"string.pattern.base": "Authorization header must be in Bearer token format",
"string.empty": "Authorization token is required",
}),
}).unknown(true); // allows other headers

const userAccessSchema = Joi.object({
authorization: Joi.string()
.pattern(/^Bearer\s.+$/)
.required()
.messages({
"string.pattern.base": "Authorization header must be in Bearer token format",
"string.empty": "Authorization token is required",
}),
}).unknown(true);

export { adminAccessSchema, userAccessSchema };
Loading