diff --git a/Controllers/admin.controllers.js b/Controllers/admin.controllers.js index 688aec5..b5f058f 100644 --- a/Controllers/admin.controllers.js +++ b/Controllers/admin.controllers.js @@ -9,9 +9,9 @@ const adminRegister = (req, res, next) => { .exec() .then((admin) => { if (admin.length >= 1) { - res.status(409).json({ - message:"Email Exists" - }) + res.status(409).json({ + message: "Email Exists" + }) } else { bcrypt.hash(req.body.password, 10, (err, hash) => { if (err) { @@ -23,8 +23,8 @@ const adminRegister = (req, res, next) => { _id: new mongoose.Types.ObjectId(), email: req.body.email, password: hash, - name: req.body.name, - phone_number: req.body.phone_number + name: req.body.name, + phone_number: req.body.phone_number }); admin .save() @@ -32,39 +32,39 @@ const adminRegister = (req, res, next) => { await result .save() .then((result1) => { - console.log(`admin created ${result}`) - res.status(201).json({ - adminDetails: { - adminId: result._id, - email: result.email, - name: result.name, - phone_number: result.phone_number, - }, - }) + console.log(`admin created ${result}`) + res.status(201).json({ + adminDetails: { + adminId: result._id, + email: result.email, + name: result.name, + phone_number: result.phone_number, + }, + }) }) .catch((err) => { - console.log(err) - res.status(400).json({ - message: err.toString() - }) + console.log(err) + res.status(400).json({ + message: err.toString() + }) }); }) .catch((err) => { - console.log(err) - res.status(500).json({ - message: err.toString() - }) + console.log(err) + res.status(500).json({ + message: err.toString() + }) }); } }); } }) .catch((err) => { - console.log(err) - res.status(500).json({ - message: err.toString() - }) - }); + console.log(err) + res.status(500).json({ + message: err.toString() + }) + }); } @@ -72,7 +72,7 @@ const adminLogin = (req, res, next) => { Admin.find({ email: req.body.email }) .exec() .then((admin) => { - console.log(admin) + console.log(admin) if (admin.length < 1) { return res.status(401).json({ message: "Auth failed: Email not found probably", @@ -80,7 +80,7 @@ const adminLogin = (req, res, next) => { } bcrypt.compare(req.body.password, admin[0].password, (err, result) => { if (err) { - console.log(err) + console.log(err) return res.status(401).json({ message: "Auth failed", }); @@ -88,7 +88,7 @@ const adminLogin = (req, res, next) => { if (result) { const token = jwt.sign( { - adminId: admin[0]._id, + adminId: admin[0]._id, email: admin[0].email, name: admin[0].name, phone_number: admin[0].phone_number, @@ -97,8 +97,8 @@ const adminLogin = (req, res, next) => { { expiresIn: "1d", } - ); - console.log(admin[0]) + ); + console.log(admin[0]) return res.status(200).json({ message: "Auth successful", adminDetails: { @@ -138,7 +138,7 @@ const getMe = async (req, res) => { }; module.exports = { - adminLogin, - adminRegister, + adminLogin, + adminRegister, getMe, }; diff --git a/Controllers/users.controllers.js b/Controllers/users.controllers.js index 8d11287..45c7035 100644 --- a/Controllers/users.controllers.js +++ b/Controllers/users.controllers.js @@ -9,9 +9,9 @@ const userRegister = (req, res, next) => { .exec() .then((user) => { if (user.length >= 1) { - res.status(409).json({ - message:"Email Exists" - }) + res.status(409).json({ + message: "Email Exists" + }) } else { bcrypt.hash(req.body.password, 10, (err, hash) => { if (err) { @@ -23,8 +23,8 @@ const userRegister = (req, res, next) => { _id: new mongoose.Types.ObjectId(), email: req.body.email, password: hash, - name: req.body.name, - phone_number: req.body.phone_number + name: req.body.name, + phone_number: req.body.phone_number }); user .save() @@ -32,39 +32,39 @@ const userRegister = (req, res, next) => { await result .save() .then((result1) => { - console.log(`User created ${result}`) - res.status(201).json({ - userDetails: { - userId: result._id, - email: result.email, - name: result.name, - phone_number: result.phone_number, - }, - }) + console.log(`User created ${result}`) + res.status(201).json({ + userDetails: { + userId: result._id, + email: result.email, + name: result.name, + phone_number: result.phone_number, + }, + }) }) .catch((err) => { - console.log(err) - res.status(400).json({ - message: err.toString() - }) + console.log(err) + res.status(400).json({ + message: err.toString() + }) }); }) .catch((err) => { - console.log(err) - res.status(500).json({ - message: err.toString() - }) + console.log(err) + res.status(500).json({ + message: err.toString() + }) }); } }); } }) .catch((err) => { - console.log(err) - res.status(500).json({ - message: err.toString() - }) - }); + console.log(err) + res.status(500).json({ + message: err.toString() + }) + }); } @@ -72,7 +72,7 @@ const userLogin = (req, res, next) => { User.find({ email: req.body.email }) .exec() .then((user) => { - console.log(user) + console.log(user) if (user.length < 1) { return res.status(401).json({ message: "Auth failed: Email not found probably", @@ -80,7 +80,7 @@ const userLogin = (req, res, next) => { } bcrypt.compare(req.body.password, user[0].password, (err, result) => { if (err) { - console.log(err) + console.log(err) return res.status(401).json({ message: "Auth failed", }); @@ -88,7 +88,7 @@ const userLogin = (req, res, next) => { if (result) { const token = jwt.sign( { - userId: user[0]._id, + userId: user[0]._id, email: user[0].email, name: user[0].name, phone_number: user[0].phone_number, @@ -97,8 +97,8 @@ const userLogin = (req, res, next) => { { expiresIn: "1d", } - ); - console.log(user[0]) + ); + console.log(user[0]) return res.status(200).json({ message: "Auth successful", userDetails: { @@ -138,7 +138,7 @@ const getMe = async (req, res) => { }; module.exports = { - userLogin, - userRegister, + userLogin, + userRegister, getMe, }; diff --git a/Middleware/checkAuth.middleware.js b/Middleware/checkAuth.middleware.js index c69d1dd..461d26a 100644 --- a/Middleware/checkAuth.middleware.js +++ b/Middleware/checkAuth.middleware.js @@ -1,14 +1,14 @@ const jwt = require("jsonwebtoken"); module.exports = function (req, res, next) { - const token = req.header("auth-token"); - if (!token) return res.status(400).send("Access Denied!, no token entered"); + const token = req.header("auth-token"); + if (!token) return res.status(400).send("Access Denied!, no token entered"); - try { - const verified = jwt.verify(token, process.env.jwtSecret); - req.user = verified; - next(); - } catch (err) { - res.status(400).send({ error: "auth failed, check auth-token222" }); - } -}; \ No newline at end of file + try { + const verified = jwt.verify(token, process.env.jwtSecret); + req.user = verified; + next(); + } catch (err) { + res.status(400).send({ error: "auth failed, check auth-token222" }); + } +}; diff --git a/Models/admin.js b/Models/admin.js index d789e77..6576fef 100644 --- a/Models/admin.js +++ b/Models/admin.js @@ -2,14 +2,14 @@ const mongoose = require("mongoose"); const adminSchema = new mongoose.Schema({ _id: mongoose.Schema.Types.ObjectId, - name: String, - email: { + name: String, + email: { type: String, lowercase: true, match: /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/, - }, - password: String, - phone_number: Number, + }, + password: String, + phone_number: Number, }); -module.exports = mongoose.model("Admin", adminSchema); \ No newline at end of file +module.exports = mongoose.model("Admin", adminSchema); diff --git a/Models/user.js b/Models/user.js index e3ceae0..003a9e5 100644 --- a/Models/user.js +++ b/Models/user.js @@ -2,14 +2,14 @@ const mongoose = require("mongoose"); const userSchema = new mongoose.Schema({ _id: mongoose.Schema.Types.ObjectId, - name: String, - email: { + name: String, + email: { type: String, lowercase: true, match: /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/, - }, - password: String, - phone_number: Number, + }, + password: String, + phone_number: Number, }); -module.exports = mongoose.model("User", userSchema); \ No newline at end of file +module.exports = mongoose.model("User", userSchema); diff --git a/Routes/admin.routes.js b/Routes/admin.routes.js index cda9a7f..84a7825 100644 --- a/Routes/admin.routes.js +++ b/Routes/admin.routes.js @@ -7,4 +7,4 @@ router.post('/signup', adminControllers.adminRegister); router.post('/login', adminControllers.adminLogin); router.get('/me', checkAuth, adminControllers.getMe); -module.exports = router \ No newline at end of file +module.exports = router diff --git a/Routes/users.routes.js b/Routes/users.routes.js index 6649124..db6b3be 100644 --- a/Routes/users.routes.js +++ b/Routes/users.routes.js @@ -7,4 +7,4 @@ router.post('/signup', userControllers.userRegister); router.post('/login', userControllers.userLogin); router.get('/me', checkAuth, userControllers.getMe); -module.exports = router \ No newline at end of file +module.exports = router diff --git a/app.js b/app.js index 68f539d..441d63a 100644 --- a/app.js +++ b/app.js @@ -30,16 +30,16 @@ app.use('/admin', adminRouter) // catch 404 and forward to error handler app.use(function(req, res, next) { - res.status(404).json({ - message: "No such route exists" - }) + res.status(404).json({ + message: "No such route exists" + }) }); // error handler app.use(function(err, req, res, next) { - res.status(err.status || 500).json({ - message: "Error Message" - }) + res.status(err.status || 500).json({ + message: "Error Message" + }) }); module.exports = app; diff --git a/package.json b/package.json index a58a6dc..98fee77 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,20 @@ { - "name": "express-coding-practices", - "version": "0.0.0", - "private": true, - "scripts": { - "start": "node ./bin/www" - }, - "dependencies": { - "bcrypt": "^5.0.0", - "body-parser": "^1.19.0", - "cookie-parser": "~1.4.4", - "debug": "~2.6.9", - "express": "~4.16.1", - "http-errors": "~1.6.3", - "jade": "~1.11.0", - "jsonwebtoken": "^8.5.1", - "mongoose": "^5.10.9", - "morgan": "~1.9.1" - } + "name": "express-coding-practices", + "version": "0.0.0", + "private": true, + "scripts": { + "start": "node ./bin/www" + }, + "dependencies": { + "bcrypt": "^5.0.0", + "body-parser": "^1.19.0", + "cookie-parser": "~1.4.4", + "debug": "~2.6.9", + "express": "~4.16.1", + "http-errors": "~1.6.3", + "jade": "~1.11.0", + "jsonwebtoken": "^8.5.1", + "mongoose": "^5.10.9", + "morgan": "~1.9.1" + } }