Merge pull request #1 from tcet-opensource/setup

separation of routes and controllers

Author: TejasNair9977

controller/auth.js

@@ -0,0 +1,27 @@
+const { genrateToken } = require('../util');
+const user = require('../models/user');
+
+exports.login = async function(req, res, next) {
+	const {id, password} = req.body;
+	let userValidated = await user.validateUser(id, password); 
+	if(userValidated){
+		userDetails = {
+		"uid": userValidated.uid,
+		"name": userValidated.name, 
+		"emailId":userValidated.emailId,
+		"type": userValidated.userType,
+		}
+		let token = genrateToken(userDetails);
+		userDetails["token"] = token;
+		res.send({res:"welcome", user:userDetails})
+	}
+	else{
+		res.status(403)
+		res.send({err:"incorrect ID password"});
+		}
+}
+
+exports.validateUser = function(req, res, next) {
+  res.json({res: req.user, msg: "user validated", err:null})
+}
+

controller/index.js

@@ -0,0 +1,3 @@
+exports.home = function(req, res, next) {
+  res.render('index', { title: 'Express' });
+}

controller/user.js

@@ -0,0 +1,10 @@
+const user = require('../models/user');
+
+exports.addUser = async function(req, res, next){
+  const {name,password,emailId,uid,userType} = req.body;
+  let newUser = await user.createUser(name,password,emailId,uid,userType);
+  if(newUser.id!=null)
+  	res.send({"res":"added user "+newUser.id});
+  else
+  	res.send({err:newUser.err});
+}

package-lock.json

@@ -14,6 +14,7 @@
     "debug": "~2.6.9",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
+    "express-validator": "^6.15.0",
     "jsonwebtoken": "^9.0.0",
     "mongoose": "^6.9.0",
     "morgan": "~1.9.1"

package.json

@@ -1,31 +1,11 @@
-var express = require('express');
+const express = require('express');
+const router = express.Router();
+const authController = require('../controller/auth');
 const authenticateToken = require('../middleware/auth');
-const { genrateToken } = require('../util');
-const user = require('../models/user');
-var router = express.Router();
 
-router.post('/', async function(req, res, next) {
-	const {id, password} = req.body;
-	let userValidated = await user.validateUser(id, password); 
-	if(userValidated){
-		userDetails = {
-		"uid": userValidated.uid,
-		"name": userValidated.name, 
-		"emailId":userValidated.emailId,
-		"type": userValidated.userType,
-		}
-		let token = genrateToken(userDetails);
-		userDetails["token"] = token;
-		res.send({res:"welcome", user:userDetails})
-	}
-	else{
-		res.status(403)
-		res.send({err:"incorrect ID password"});
-		}
-});
 
-router.post("/validateUser", authenticateToken, function(req, res, next) {
-  res.json({res: req.user, msg: "user validated", err:null})
-})
+router.post('/', authController.login);
+
+router.post("/validateUser", authenticateToken, authController.validateUser)
 
 module.exports = router;

routes/auth.js

@@ -1,15 +1,8 @@
-var express = require('express');
-const { genrateToken } = require('../util');
-var router = express.Router();
+const express = require('express');
+const router = express.Router();
+const indexController = require('../controller/index')
 
 /* GET home page. */
-router.get('/', function(req, res, next) {
-  res.render('index', { title: 'Express' });
-});
-
-router.get("/token", function(req, res, next) {
-  res.send("token : " + genrateToken("User123456789"));
-})
-
+router.get('/', indexController.home);
 
 module.exports = router;

routes/index.js

@@ -1,22 +1,9 @@
-var express = require('express');
+const express = require('express');
 const authenticateToken = require('../middleware/auth');
 const { asyncPlaceholders } = require('../util');
-const user = require('../models/user');
-var router = express.Router();
+const router = express.Router();
+const userController = require('../controller/user');
 
-/* GET users listing. */
-router.get('/', async function(req, res, next) {
-  let temp = await asyncPlaceholders([1,2,3], 1000)
-  res.send('welcome user: '+req.user+" "+temp);
-});
-
-router.post("/add", async function(req, res, next){
-  const {name,password,emailId,uid,userType} = req.body;
-  let newUser = await user.createUser(name,password,emailId,uid,userType);
-  if(newUser.id!=null)
-  	res.send({"res":"added user "+newUser.id});
-  else
-  	res.send({err:newUser.err});
-})
+router.post("/add", userController.addUser)
 
 module.exports = router;