adding bcrypt and signup module

masteru2017 · masteru2017 · commit dd9c3937bb16 · 2018-01-16T15:21:16.000+05:30
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A simple and structured way boilerplate for Node with MySQL, equipped with MVC layer model with basic validation of schema and common error handler, authentication and easily pluggable code base.
 
-This Boilerplate have a basic CRUD operation with MySQL, authetication of API endpoint with JWT Token and Validation of request and response of each route. It contained a documentation folder which contain swagger documentation easy for front-end developer to use and understand. It contained Pm2 which helps to restart, reload and monitor application in production, provides zero downtime availability. It has Nodemailer which will send email.
+This Boilerplate have a basic CRUD operation with MySQL, authetication of API endpoint with JWT Token and Validation of request and response of each route. It contained a documentation folder which contain swagger documentation easy for front-end developer to use and understand. It contained Pm2 which helps to restart, reload and monitor application in production, provides zero downtime availability. It has Nodemailer which will send email. It has bcrypt module which will encrypt password and make it more secure.
 
 # PreRequisite
 
@@ -75,6 +75,17 @@ npm install nodemailer
 
 ---
 
+---
+
+### 8. bcrypt
+```
+npm install bcrypt  
+```
+* bcrypt will encrypt your password throughing hashing so your password won't store as plain text .[know more about bcrypt](https://www.npmjs.com/package/bcrypt)
+* To Know more about nodemailer [check here](https://www.npmjs.com/package/bcrypt)
+
+---
+
 # Get Started
 
 1. `$ git clone https://github.com/yug95/node-mysql.git`
@@ -118,6 +129,7 @@ Example object for login and Post request -
 * Includes `documents` folder which contain swagger representation both in JSON and HTML, which will help front-end developer for better understanding.
 * `Pm2` a process manager which help to watch, reload, restart and monitor with load balancer in each and every activity.
 * `nodemailer` is used to send mail over SMTP. as for i now used for sending mail if error comes.
+* `bcrypt` is used to encrypt your password through salt and hashing technique and which won't store password as plain text in database.
 
 # Swagger Related task
 
diff --git a/app/models/authentic.model.js b/app/models/authentic.model.js
@@ -1,20 +1,73 @@
 var db = require('../../config/database');
+var dbFunc = require('../../config/db-function');
+const bcrypt = require('bcrypt');
 
 var authenticModel = {
-    authentic:authentic
+    authentic: authentic,
+    signup: signup
 }
 
 function authentic(authenticData) {
-    return new Promise((resolve,reject) => {
-        db.query(`SELECT * FROM user WHERE username ='${authenticData.username}' AND password='${authenticData.password}'`,(error,rows,fields)=>{
-            if(!!error) {
+    return new Promise((resolve, reject) => {
+        db.query(`SELECT * FROM user WHERE username ='${authenticData.username}'`, (error, rows, fields) => {
+            if (error) {
                 reject(error);
             } else {
-                resolve(rows);
+                bcrypt.compare(authenticData.password, rows[0].password, function (err, isMatch) {
+                    if (err) {
+                        reject(error);
+                    } else if (isMatch) {
+                        resolve(rows);
+                    }
+                    else {
+                        reject({"success":false,"message":"password doesnot match"});
+                    }
+                });
+
             }
-       });
-    });  
+        });
+    });
+
+}
+
+
+function signup(user) {
+    return new Promise((resolve, reject) => {
+        bcrypt.genSalt(10, function (err, salt) {
+            if (err) {
+                return next(err);
+            }
+            bcrypt.hash(user.password, salt, function (err, hash) {
+                if (err) {
+                    return next(err);
+                }
+                user.password = hash;
+                db.query("SELECT * FROM user WHERE username='"+user.username+"'", (error, rows, fields) => {
+                    if (error) {
+                        dbFunc.connectionRelease;
+                        reject(error);
+                    } else if(rows.length>0) {
+                        dbFunc.connectionRelease;
+                        reject({"success":false,"message":"user already exist ! try with different user"});
+                    } else {
+                        db.query("INSERT INTO user(username,password)VALUES('" + user.username + "','" + user.password + "')", (error, rows, fields) => {
+                            if (error) {
+                                dbFunc.connectionRelease;
+                                reject(error);
+                            } else {
+                                dbFunc.connectionRelease;
+                                resolve(rows);
+                            }
+                        });
+                    }
+                });
+            })
+
+        });
+    });
 }
 
 module.exports = authenticModel;
 
+
+
diff --git a/app/models/user-model.js b/app/models/user-model.js
@@ -1,5 +1,6 @@
 var db = require('../../config/database');
 var dbFunc = require('../../config/db-function');
+
 var userModel = {
    getAllUser:getAllUser,
    addUser:addUser,
@@ -10,7 +11,7 @@ var userModel = {
 
 function getAllUser() {
     return new Promise((resolve,reject) => {
-        db.query("SELECT * FROM user",(error,rows,fields)=>{
+        db.query("SELECT * FROM test",(error,rows,fields)=>{
             if(!!error) {
                 dbFunc.connectionRelease;
                 reject(error);
@@ -24,7 +25,7 @@ function getAllUser() {
 
 function getUserById(id) {
     return new Promise((resolve,reject) => {
-        db.query("SELECT * FROM user WHERE id ="+id.id,(error,rows,fields)=>{
+        db.query("SELECT * FROM test WHERE id ="+id.id,(error,rows,fields)=>{
             if(!!error) {
                 dbFunc.connectionRelease;
                 reject(error);
@@ -38,22 +39,22 @@ function getUserById(id) {
 
 function addUser(user) {
      return new Promise((resolve,reject) => {
-        db.query("INSERT INTO user(username,password)VALUES('"+user.username+"','"+user.password+"')",(error,rows,fields)=>{
-            if(!!error) {
+         db.query("INSERT INTO test(name,age,state,country)VALUES('"+user.name+"','"+user.age+"','"+user.state+"','"+user.country+"')",(error,rows,fields)=>{
+            if(error) {
                 dbFunc.connectionRelease;
                 reject(error);
             } else {
                 dbFunc.connectionRelease;
                 resolve(rows);
             }
-       });    
-    })
+          });
+        });
 }
 
 
 function updateUser(id,user) {
     return new Promise((resolve,reject) => {
-        db.query("UPDATE user set username='"+user.username+"',password='"+user.password+"' WHERE id='"+id+"'",(error,rows,fields)=>{
+        db.query("UPDATE test set name='"+user.name+"',age='"+user.age+"',state='"+user.state+"',country='"+user.country+"' WHERE id='"+id+"'",(error,rows,fields)=>{
             if(!!error) {
                 dbFunc.connectionRelease;
                 reject(error);
@@ -67,7 +68,7 @@ function updateUser(id,user) {
 
 function deleteUser(id) {
    return new Promise((resolve,reject) => {
-        db.query("DELETE FROM user WHERE id='"+id+"'",(error,rows,fields)=>{
+        db.query("DELETE FROM test WHERE id='"+id+"'",(error,rows,fields)=>{
             if(!!error) {
                 dbFunc.connectionRelease;
                 reject(error);
diff --git a/app/routes/authentic.route.js b/app/routes/authentic.route.js
@@ -1,5 +1,5 @@
 const authenticService = require('../services/authentic.service');
-var schema = require('../schema/userValidationSchema.json')
+var schema = require('../schema/loginValidationSchema.json')
 var iValidator = require('../../common/iValidator');
 var errorCode = require('../../common/error-code');
 var errorMessage = require('../../common/error-methods');
@@ -11,6 +11,8 @@ const jwt = require('jsonwebtoken');
 function init(router) {
     router.route('/login')
         .post(authentic); 
+    router.route('/signup')
+          .post(signup); 
 }
 
 function authentic(req,res) {
@@ -40,6 +42,30 @@ function authentic(req,res) {
 }
 
 
+function signup(req,res) {
+  var signUpData=req.body;
+  
+  //Validating the input entity
+   var json_format = iValidator.json_schema(schema.postSchema, signUpData, "signUpData");
+   if (json_format.valid == false) {
+     return res.status(422).send(json_format.errorMessage);
+   }
+
+   authenticService.signup(signUpData).then((data) => {
+    if(data) {
+       res.json({
+         "success":true,
+         "data":data
+       });
+     }
+   }).catch((err) => {
+     mail.mail(err);
+     res.json(err);
+   });
+
+}
+
+
 
 module.exports.init = init;
 
diff --git a/app/schema/loginValidationSchema.json b/app/schema/loginValidationSchema.json
@@ -0,0 +1,31 @@
+{
+    "getSchema":{
+       "type": "object",
+       "required": [
+         "id"     
+       ],
+       "properties": {
+         "id" : {
+           "type": "string"
+         }
+       }
+    },
+    "postSchema":{
+        "type": "object",
+        "required": [
+          "username"     
+        ],
+        "properties": {
+          "username" : {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 10
+          },
+          "password" : {
+            "type" : "string",
+            "minLength": 1,
+            "maxLength": 10
+          }
+        }
+     }
+}
diff --git a/app/schema/userValidationSchema.json b/app/schema/userValidationSchema.json
@@ -13,16 +13,26 @@
     "postSchema":{
         "type": "object",
         "required": [
-          "username"     
+          "name"     
         ],
         "properties": {
-          "username" : {
+          "name" : {
             "type": "string",
             "minLength": 1,
             "maxLength": 10
           },
-          "password" : {
-            "type" : "string",
+          "age" : {
+            "type" : "integer",
+            "minimum": 1,
+            "maximum": 150
+          },
+          "state":{
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 10
+          },
+          "country": {
+            "type": "string",
             "minLength": 1,
             "maxLength": 10
           }
diff --git a/app/services/authentic.service.js b/app/services/authentic.service.js
@@ -2,7 +2,8 @@ var authenticModel = require("../models/authentic.model");
 
 
 var authenticService = {
-    authentic: authentic
+    authentic: authentic,
+    signup:signup
 }
 
 function authentic(authenticData) {
@@ -16,6 +17,17 @@ function authentic(authenticData) {
    
 }
 
+function signup(signUpData) {
+    
+    return new Promise((resolve,reject) => {
+        authenticModel.signup(signUpData).then((data)=>{
+            resolve(data);
+        }).catch((err) => {
+            reject(err);
+        })
+    })
+   
+}
 
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
