Add error handler & file names

Author: ultimateakash

config/database.js renamed to config/database.config.js

@@ -1,11 +1,11 @@
-const User = require('../models/user.model');
-const cache = require('../utils/cache');
-const jwtConfig = require('../config/jwt');
-const jwt = require('../utils/jwt');
+const UserModel = require('../models/user.model');
+const jwtConfig = require('../config/jwt.config');
+const cache = require('../utils/cache.util');
+const jwt = require('../utils/jwt.util');
 const bcrypt = require('bcrypt');
 
 exports.register = async (req, res) => {
-    const isExist = await User.findOne({
+    const isExist = await UserModel.findOne({
         where:{
             email: req.body.email
         }
@@ -15,7 +15,7 @@ exports.register = async (req, res) => {
     }
     const hashedPassword = await bcrypt.hash(req.body.password, 10);
 
-    const user = await User.create({
+    const user = await UserModel.create({
         name: req.body.name,
         email: req.body.email,
         password: hashedPassword
@@ -24,7 +24,7 @@ exports.register = async (req, res) => {
 }
 
 exports.login = async (req, res) => {
-    const user = await User.findOne({
+    const user = await UserModel.findOne({
         where: {
             email: req.body.email
         }
@@ -44,7 +44,7 @@ exports.login = async (req, res) => {
 }
 
 exports.getUser = async (req, res) => {
-    const user = await User.findByPk(req.user.id);
+    const user = await UserModel.findByPk(req.user.id);
     return res.json(user);
 }
 

config/jwt.js renamed to config/jwt.config.js

@@ -1,5 +1,5 @@
-const jwt = require('../utils/jwt');
-const cache = require('../utils/cache');
+const cache = require('../utils/cache.util');
+const jwt = require('../utils/jwt.util');
 
 module.exports = async (req, res, next) => {
 

controllers/auth.controller.js

@@ -0,0 +1,7 @@
+module.exports = fn => (req, res, next) => {
+    fn(req, res, next).catch((err) => {
+        res.status(500).json({ 
+            message: err?.message || 'Something went wrong.' 
+        });
+    });
+}

middleware/auth.guard.js renamed to middleware/auth.middleware.js

@@ -1,5 +1,5 @@
 const { Sequelize } = require('sequelize');
-const config = require('../config/database'); 
+const config = require('../config/database.config'); 
 
 const sequelize = new Sequelize(config.database, config.username, config.password, {
     host: config.host,

middleware/error.middleware.js

@@ -1,6 +1,6 @@
 {
   "name": "node-mysql-jwt",
-  "version": "0.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "start": "node ./bin/www"

models/connection.js

@@ -1,15 +1,16 @@
 const express = require('express');
 const router = express.Router();
 
-const authController = require('../controllers/auth.controller');
-const authGuard = require('../middleware/auth.guard');
+const AuthController = require('../controllers/auth.controller');
+const ErrorHandler = require('../middleware/error.middleware');
+const AuthGuard = require('../middleware/auth.middleware');
 const schema = require('../validatons/auth.validation');
-const validate = require('../utils/validator'); 
+const validate = require('../utils/validator.util'); 
 
-router.post('/register', validate(schema.register), authController.register);
-router.post('/login',    validate(schema.login),    authController.login);
-router.get('/user',      authGuard,                 authController.getUser);
-router.get('/logout',    authGuard,                 authController.logout);
+router.post('/register', validate(schema.register), ErrorHandler(AuthController.register));
+router.post('/login',    validate(schema.login),    ErrorHandler(AuthController.login));
+router.get('/user',      AuthGuard,                 ErrorHandler(AuthController.getUser));
+router.get('/logout',    AuthGuard,                 ErrorHandler(AuthController.logout));
 
 router.all('*',  (req, res) => res.status(400).json({ message: 'Bad Request.'}))
 

package.json

@@ -1,5 +1,5 @@
 const jwt = require('jsonwebtoken');
-const jwtConfig = require('../config/jwt');
+const jwtConfig = require('../config/jwt.config');
 
 exports.verifyToken = (token) => jwt.verify(token, jwtConfig.secret);
 

routes/index.js

@@ -0,0 +1,17 @@
+module.exports = (schema) => (req, res, next) => {
+    if (schema) {
+        const options = {
+            errors: {
+                wrap: { label: '' }
+            },
+            abortEarly: false
+        }
+        const result = schema.validate((req.method == 'GET' ? req.query : req.body), options);
+        if (result.error) {
+            const { details } = result.error;
+            const message = details.length ? details[0].message : 'Invalid payload.'
+            return res.status(400).json({ message });
+        }
+    }
+    next();
+}