diff --git a/.history/app_20210512123231.js b/.history/app_20210512123231.js
new file mode 100644
index 0000000..217a4fa
--- /dev/null
+++ b/.history/app_20210512123231.js
@@ -0,0 +1,107 @@
+const express = require("express");
+const mongoose = require("mongoose");
+const bodyparser = require("body-parser");
+const authRoute = require("./routes/auth");
+const profileRoute = require("./routes/profile");
+const paymentRoute = require("./routes/payment");
+const courseRoute = require("./routes/course");
+const couponRoute = require("./routes/Coupon");
+const queryRoute = require("./routes/query");
+const adminRoute = require("./routes/admin");
+const port = process.env.PORT || 5000;
+
+const cors = require("cors");
+
+//const passport = require('passport');
+//const cookieSession = require('cookie-session') ;
+//require('./passport-setup') ;
+
+const app = express();
+
+const MONGO_URI = `mongodb+srv://Cantilever:Cantilever@cluster0.dqxva.mongodb.net/myFirstDatabase?retryWrites=true&w=majority`;
+
+app.use(cors());
+app.use(bodyparser.json());
+require("./models/Coupon");
+
+// app.use(cookieSession({
+//     name: 'test-session',
+//     keys: ['key1', 'key2']
+//   }))
+
+// const isLoggedIn = (req , res , next) => {
+//     if(req.user)
+//     {
+//         next()
+//     }
+//     else
+//     {
+//         res.json({
+//             error : "No user"
+//         })
+//     }
+// }
+
+// app.use(passport.initialize());
+// app.use(passport.session());
+
+// app.get('/failed' , (req , res) => {
+//     res.json({
+//         error : "You have failed to login"
+//     })
+// })
+
+// app.get('/' , (req , res) => {
+//     console.log('you are not logged in');
+
+// })
+
+// app.get('/good' ,isLoggedIn ,  (req , res) => {
+//     res.json({
+//         message:"success" ,
+//         user : req.user
+//     })
+// })
+
+// app.get('/auth/google',
+//   passport.authenticate('google', { scope: ['profile' , 'email'] }));
+
+// app.get('/auth/google/callback',
+//   passport.authenticate('google', { failureRedirect: '/failed' }),
+//   function(req, res) {
+//     res.redirect('/good');
+//   });
+
+// app.get('/logout', (req , res) => {
+//     req.session = null ;
+//     req.logout() ;
+//     res.redirect('/') ;
+// })
+mongoose
+  .connect(MONGO_URI, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false,
+  })
+  .then((result) => {
+    console.log("connected");
+    app.listen(port, () => {
+      console.log("server is running on port", port);
+    });
+  })
+  .catch((err) => {
+    console.log(err);
+  });
+app.use(authRoute);
+
+app.use(profileRoute);
+
+app.use(paymentRoute);
+
+app.use(courseRoute);
+
+app.use(adminRoute);
+
+app.use(couponRoute);
+
+app.use(queryRoute);
diff --git a/.history/app_20210512162202.js b/.history/app_20210512162202.js
new file mode 100644
index 0000000..43635e8
--- /dev/null
+++ b/.history/app_20210512162202.js
@@ -0,0 +1,107 @@
+const express = require("express");
+const mongoose = require("mongoose");
+const bodyparser = require("body-parser");
+const authRoute = require("./routes/auth");
+const profileRoute = require("./routes/profile");
+const paymentRoute = require("./routes/payment");
+const courseRoute = require("./routes/course");
+const couponRoute = require("./routes/Coupon");
+const queryRoute = require("./routes/query");
+const adminRoute = require("./routes/admin");
+const port = process.env.PORT || 5000;
+
+const cors = require("cors");
+
+//const passport = require('passport');
+//const cookieSession = require('cookie-session') ;
+//require('./passport-setup') ;
+
+const app = express();
+
+const MONGO_URI = `mongodb+srv://${process.env.MONGO_USER}:${process.env.MONGO_PASSWORD}@cluster0.dqxva.mongodb.net/${process.env.MONGO_DEFAULT_DATABASE}?retryWrites=true&w=majority`;
+
+app.use(cors());
+app.use(bodyparser.json());
+require("./models/Coupon");
+
+// app.use(cookieSession({
+//     name: 'test-session',
+//     keys: ['key1', 'key2']
+//   }))
+
+// const isLoggedIn = (req , res , next) => {
+//     if(req.user)
+//     {
+//         next()
+//     }
+//     else
+//     {
+//         res.json({
+//             error : "No user"
+//         })
+//     }
+// }
+
+// app.use(passport.initialize());
+// app.use(passport.session());
+
+// app.get('/failed' , (req , res) => {
+//     res.json({
+//         error : "You have failed to login"
+//     })
+// })
+
+// app.get('/' , (req , res) => {
+//     console.log('you are not logged in');
+
+// })
+
+// app.get('/good' ,isLoggedIn ,  (req , res) => {
+//     res.json({
+//         message:"success" ,
+//         user : req.user
+//     })
+// })
+
+// app.get('/auth/google',
+//   passport.authenticate('google', { scope: ['profile' , 'email'] }));
+
+// app.get('/auth/google/callback',
+//   passport.authenticate('google', { failureRedirect: '/failed' }),
+//   function(req, res) {
+//     res.redirect('/good');
+//   });
+
+// app.get('/logout', (req , res) => {
+//     req.session = null ;
+//     req.logout() ;
+//     res.redirect('/') ;
+// })
+mongoose
+  .connect(MONGO_URI, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false,
+  })
+  .then((result) => {
+    console.log("connected");
+    app.listen(port, () => {
+      console.log("server is running on port", port);
+    });
+  })
+  .catch((err) => {
+    console.log(err);
+  });
+app.use(authRoute);
+
+app.use(profileRoute);
+
+app.use(paymentRoute);
+
+app.use(courseRoute);
+
+app.use(adminRoute);
+
+app.use(couponRoute);
+
+app.use(queryRoute);
diff --git a/.history/controllers/auth_20210512161317.js b/.history/controllers/auth_20210512161317.js
new file mode 100644
index 0000000..807b04e
--- /dev/null
+++ b/.history/controllers/auth_20210512161317.js
@@ -0,0 +1,226 @@
+const bcrypt = require("bcryptjs");
+const User = require("../models/User");
+const Student = require("../models/Student");
+const jwt = require("jsonwebtoken");
+const JWT_secret = "Cantileverlabs";
+const messagebird = require("messagebird")("llVKD53ve6QRpbCKOHzWBADaS");
+const nodemailer = require("nodemailer");
+
+module.exports.Protected = async (req, res, next) => {
+  res.send("Hello User");
+};
+module.exports.postSignup = async (req, res, next) => {
+  try {
+    //we need firstName , lastName , email , password as input
+    let firstName = req.body.firstName || " ";
+    let lastName = req.body.lastName || " ";
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      res.json({
+        message: "User already exist",
+        type: "error",
+      });
+    } else {
+      const hashedPass = await bcrypt.hash(password, 12);
+      user = new User({
+        firstName: firstName,
+        lastName: lastName,
+        email: email,
+        password: hashedPass,
+        isAdmin: false,
+      });
+      user = await user.save();
+      await Student.deleteOne({ user: user._id });
+      let student = new Student({
+        user: user._id,
+      });
+      student = await student.save();
+      user.student = student._id;
+      await user.save();
+      res.json({
+        message: "Successfully signed Up",
+        type: "success",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.postSignin = async (req, res, next) => {
+  try {
+    //we need email and password as input
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      const isMatched = await bcrypt.compare(password, user.password);
+      if (isMatched) {
+        const token = jwt.sign({ _id: user._id }, JWT_secret);
+        res.json({
+          token: token,
+        });
+      } else {
+        res.json({
+          message: "email and password doesn't match",
+          type: "error",
+        });
+      }
+    } else {
+      res.json({
+        message: "No user with this email exists",
+        type: "error",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.sendOTP = (req, res, next) => {
+  //uNNYosMopvvCW9RTR1tRWJmYC test
+  //llVKD53ve6QRpbCKOHzWBADaS live
+  try {
+    const { phoneNumber } = req.body;
+    if (!phoneNumber) {
+      res.status(422).json({ message: "Please Add All Required Fields" });
+      return;
+    } else {
+      messagebird.verify.create(
+        phoneNumber,
+        {
+          template: "Your verification code is %token",
+        },
+        function (err, response) {
+          if (err) {
+            console.log(err);
+            res.status(422).json({ message: err.errors[0].description });
+          } else {
+            console.log(response);
+            res.json({ id: response.id });
+          }
+        }
+      );
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.getOTP = (req, res, next) => {
+  try {
+    const { id, token } = req.body;
+    messagebird.verify.verify(id, token, function (err, response) {
+      if (err) {
+        console.log({ error: err.errors[0].description, id: id });
+        res.json({ error: err.errors[0].description, id: id });
+      } else {
+        console.log(response);
+        res.json({ message: "Code Verified" });
+      }
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+var transport = nodemailer.createTransport({
+  host: "smtp.mailtrap.io",
+  port: 2525,
+  auth: {
+    user: "5578544cc56856",
+    pass: "a510d3d969d3b3",
+  },
+});
+module.exports.forgotpassword = async (req, res, next) => {
+  const { email, link, _html, sending_company_email, subject } = req.body; //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  try {
+    await User.findOne({ email }).then((user) => {
+      if (!user) {
+        res.status(404).json({ error: "User not found with this Email" });
+        return;
+      } else {
+        const payload = {
+          email: user.email,
+          _id: user._id,
+        };
+        const secret = JWT_secret + user.password;
+        const token = jwt.sign(payload, secret, { expiresIn: "10m" });
+        User.findByIdAndUpdate(user._id, {
+          $set: { passwordResetToken: token },
+        })
+          .then((data) => {
+            const reset_link = `${link}/${user._id}/${token}`;
+            const message = {
+              from: `${sending_company_email}`, // Sender address
+              to: `${user.email}`, // List of recipients
+              subject: `${subject}`, // Subject line
+              html: `${_html}`, // design html for email message.
+            };
+            transport.sendMail(message, function (err, info) {
+              if (err) {
+                console.log(err);
+              } else {
+                console.log(info);
+              }
+            });
+            res.status(200).json({
+              message: "Token Saved and link is active for 10 mins",
+              reset_link,
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    });
+  } catch {
+    (error) => {
+      console.log("Error from forgot pass", error);
+    };
+  }
+  //verify email then set password.
+};
+module.exports.resetpassword = async (req, res, next) => {
+  const { _id, token } = req.params;
+  const { password } = req.body;
+  try {
+    let user = await User.findById({ _id });
+    if (!user) {
+      res.json({ error: "User not Found or WrongId" });
+      return;
+    } else {
+      const secret = JWT_secret + user.password;
+      const user_token = user.passwordResetToken;
+      const payload = jwt.verify(token, secret);
+      const hashedPass = await bcrypt.hash(password, 12);
+      if (token == user_token) {
+        user.password = hashedPass;
+        await user
+          .save()
+          .then((ok) => {
+            res.json({ message: "Password Updated!" });
+          })
+          .catch((err) => {
+            console.log("Error in save", err);
+          });
+      } else {
+        res.status(422).json({ error: "Either Token not found or Expired!" });
+        return;
+      }
+    }
+  } catch {
+    (err) => {
+      console.log("error from try catch resetpass", err);
+    };
+  }
+};
+
+module.exports.checkProtected = (req, res, next) => {
+  console.log(req.user);
+  res.json({
+    message: "Protected",
+    user: req.user,
+  });
+};
diff --git a/.history/controllers/auth_20210512162616.js b/.history/controllers/auth_20210512162616.js
new file mode 100644
index 0000000..1f373e1
--- /dev/null
+++ b/.history/controllers/auth_20210512162616.js
@@ -0,0 +1,226 @@
+const bcrypt = require("bcryptjs");
+const User = require("../models/User");
+const Student = require("../models/Student");
+const jwt = require("jsonwebtoken");
+const JWT_secret = "Cantileverlabs";
+const messagebird = require("messagebird")("llVKD53ve6QRpbCKOHzWBADaS");
+const nodemailer = require("nodemailer");
+
+module.exports.Protected = async (req, res, next) => {
+  res.send("Hello User");
+};
+module.exports.postSignup = async (req, res, next) => {
+  try {
+    //we need firstName , lastName , email , password as input
+    let firstName = req.body.firstName || " ";
+    let lastName = req.body.lastName || " ";
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      res.json({
+        message: "User already exist",
+        type: "error",
+      });
+    } else {
+      const hashedPass = await bcrypt.hash(password, 12);
+      user = new User({
+        firstName: firstName,
+        lastName: lastName,
+        email: email,
+        password: hashedPass,
+        isAdmin: false,
+      });
+      user = await user.save();
+      await Student.deleteOne({ user: user._id });
+      let student = new Student({
+        user: user._id,
+      });
+      student = await student.save();
+      user.student = student._id;
+      await user.save();
+      res.json({
+        message: "Successfully signed Up",
+        type: "success",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.postSignin = async (req, res, next) => {
+  try {
+    //we need email and password as input
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      const isMatched = await bcrypt.compare(password, user.password);
+      if (isMatched) {
+        const token = jwt.sign({ _id: user._id }, JWT_secret);
+        res.json({
+          token: token,
+        });
+      } else {
+        res.json({
+          message: "email and password doesn't match",
+          type: "error",
+        });
+      }
+    } else {
+      res.json({
+        message: "No user with this email exists",
+        type: "error",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.sendOTP = (req, res, next) => {
+  //uNNYosMopvvCW9RTR1tRWJmYC test
+  //llVKD53ve6QRpbCKOHzWBADaS live
+  try {
+    const { phoneNumber } = req.body;
+    if (!phoneNumber) {
+      res.status(422).json({ message: "Please Add All Required Fields" });
+      return;
+    } else {
+      messagebird.verify.create(
+        phoneNumber,
+        {
+          template: "Your verification code is %token",
+        },
+        function (err, response) {
+          if (err) {
+            console.log(err);
+            res.status(422).json({ message: err.errors[0].description });
+          } else {
+            console.log(response);
+            res.json({ id: response.id });
+          }
+        }
+      );
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.getOTP = (req, res, next) => {
+  try {
+    const { id, otp } = req.body;
+    messagebird.verify.verify(id, otp, function (err, response) {
+      if (err) {
+        console.log({ error: err.errors[0].description, id: id });
+        res.json({ error: err.errors[0].description, id: id });
+      } else {
+        console.log(response);
+        res.json({ message: "Code Verified" });
+      }
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+var transport = nodemailer.createTransport({
+  host: "smtp.mailtrap.io",
+  port: 2525,
+  auth: {
+    user: "5578544cc56856",
+    pass: "a510d3d969d3b3",
+  },
+});
+module.exports.forgotpassword = async (req, res, next) => {
+  const { email, link, _html, sending_company_email, subject } = req.body; //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  try {
+    await User.findOne({ email }).then((user) => {
+      if (!user) {
+        res.status(404).json({ error: "User not found with this Email" });
+        return;
+      } else {
+        const payload = {
+          email: user.email,
+          _id: user._id,
+        };
+        const secret = JWT_secret + user.password;
+        const token = jwt.sign(payload, secret, { expiresIn: "10m" });
+        User.findByIdAndUpdate(user._id, {
+          $set: { passwordResetToken: token },
+        })
+          .then((data) => {
+            const reset_link = `${link}/${user._id}/${token}`;
+            const message = {
+              from: `${sending_company_email}`, // Sender address
+              to: `${user.email}`, // List of recipients
+              subject: `${subject}`, // Subject line
+              html: `${_html}`, // design html for email message.
+            };
+            transport.sendMail(message, function (err, info) {
+              if (err) {
+                console.log(err);
+              } else {
+                console.log(info);
+              }
+            });
+            res.status(200).json({
+              message: "Token Saved and link is active for 10 mins",
+              reset_link,
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    });
+  } catch {
+    (error) => {
+      console.log("Error from forgot pass", error);
+    };
+  }
+  //verify email then set password.
+};
+module.exports.resetpassword = async (req, res, next) => {
+  const { _id, token } = req.params;
+  const { password } = req.body;
+  try {
+    let user = await User.findById({ _id });
+    if (!user) {
+      res.json({ error: "User not Found or WrongId" });
+      return;
+    } else {
+      const secret = JWT_secret + user.password;
+      const user_token = user.passwordResetToken;
+      const payload = jwt.verify(token, secret);
+      const hashedPass = await bcrypt.hash(password, 12);
+      if (token == user_token) {
+        user.password = hashedPass;
+        await user
+          .save()
+          .then((ok) => {
+            res.json({ message: "Password Updated!" });
+          })
+          .catch((err) => {
+            console.log("Error in save", err);
+          });
+      } else {
+        res.status(422).json({ error: "Either Token not found or Expired!" });
+        return;
+      }
+    }
+  } catch {
+    (err) => {
+      console.log("error from try catch resetpass", err);
+    };
+  }
+};
+
+module.exports.checkProtected = (req, res, next) => {
+  console.log(req.user);
+  res.json({
+    message: "Protected",
+    user: req.user,
+  });
+};
diff --git a/.history/controllers/auth_20210512162619.js b/.history/controllers/auth_20210512162619.js
new file mode 100644
index 0000000..1f373e1
--- /dev/null
+++ b/.history/controllers/auth_20210512162619.js
@@ -0,0 +1,226 @@
+const bcrypt = require("bcryptjs");
+const User = require("../models/User");
+const Student = require("../models/Student");
+const jwt = require("jsonwebtoken");
+const JWT_secret = "Cantileverlabs";
+const messagebird = require("messagebird")("llVKD53ve6QRpbCKOHzWBADaS");
+const nodemailer = require("nodemailer");
+
+module.exports.Protected = async (req, res, next) => {
+  res.send("Hello User");
+};
+module.exports.postSignup = async (req, res, next) => {
+  try {
+    //we need firstName , lastName , email , password as input
+    let firstName = req.body.firstName || " ";
+    let lastName = req.body.lastName || " ";
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      res.json({
+        message: "User already exist",
+        type: "error",
+      });
+    } else {
+      const hashedPass = await bcrypt.hash(password, 12);
+      user = new User({
+        firstName: firstName,
+        lastName: lastName,
+        email: email,
+        password: hashedPass,
+        isAdmin: false,
+      });
+      user = await user.save();
+      await Student.deleteOne({ user: user._id });
+      let student = new Student({
+        user: user._id,
+      });
+      student = await student.save();
+      user.student = student._id;
+      await user.save();
+      res.json({
+        message: "Successfully signed Up",
+        type: "success",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.postSignin = async (req, res, next) => {
+  try {
+    //we need email and password as input
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      const isMatched = await bcrypt.compare(password, user.password);
+      if (isMatched) {
+        const token = jwt.sign({ _id: user._id }, JWT_secret);
+        res.json({
+          token: token,
+        });
+      } else {
+        res.json({
+          message: "email and password doesn't match",
+          type: "error",
+        });
+      }
+    } else {
+      res.json({
+        message: "No user with this email exists",
+        type: "error",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.sendOTP = (req, res, next) => {
+  //uNNYosMopvvCW9RTR1tRWJmYC test
+  //llVKD53ve6QRpbCKOHzWBADaS live
+  try {
+    const { phoneNumber } = req.body;
+    if (!phoneNumber) {
+      res.status(422).json({ message: "Please Add All Required Fields" });
+      return;
+    } else {
+      messagebird.verify.create(
+        phoneNumber,
+        {
+          template: "Your verification code is %token",
+        },
+        function (err, response) {
+          if (err) {
+            console.log(err);
+            res.status(422).json({ message: err.errors[0].description });
+          } else {
+            console.log(response);
+            res.json({ id: response.id });
+          }
+        }
+      );
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.getOTP = (req, res, next) => {
+  try {
+    const { id, otp } = req.body;
+    messagebird.verify.verify(id, otp, function (err, response) {
+      if (err) {
+        console.log({ error: err.errors[0].description, id: id });
+        res.json({ error: err.errors[0].description, id: id });
+      } else {
+        console.log(response);
+        res.json({ message: "Code Verified" });
+      }
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+var transport = nodemailer.createTransport({
+  host: "smtp.mailtrap.io",
+  port: 2525,
+  auth: {
+    user: "5578544cc56856",
+    pass: "a510d3d969d3b3",
+  },
+});
+module.exports.forgotpassword = async (req, res, next) => {
+  const { email, link, _html, sending_company_email, subject } = req.body; //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  try {
+    await User.findOne({ email }).then((user) => {
+      if (!user) {
+        res.status(404).json({ error: "User not found with this Email" });
+        return;
+      } else {
+        const payload = {
+          email: user.email,
+          _id: user._id,
+        };
+        const secret = JWT_secret + user.password;
+        const token = jwt.sign(payload, secret, { expiresIn: "10m" });
+        User.findByIdAndUpdate(user._id, {
+          $set: { passwordResetToken: token },
+        })
+          .then((data) => {
+            const reset_link = `${link}/${user._id}/${token}`;
+            const message = {
+              from: `${sending_company_email}`, // Sender address
+              to: `${user.email}`, // List of recipients
+              subject: `${subject}`, // Subject line
+              html: `${_html}`, // design html for email message.
+            };
+            transport.sendMail(message, function (err, info) {
+              if (err) {
+                console.log(err);
+              } else {
+                console.log(info);
+              }
+            });
+            res.status(200).json({
+              message: "Token Saved and link is active for 10 mins",
+              reset_link,
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    });
+  } catch {
+    (error) => {
+      console.log("Error from forgot pass", error);
+    };
+  }
+  //verify email then set password.
+};
+module.exports.resetpassword = async (req, res, next) => {
+  const { _id, token } = req.params;
+  const { password } = req.body;
+  try {
+    let user = await User.findById({ _id });
+    if (!user) {
+      res.json({ error: "User not Found or WrongId" });
+      return;
+    } else {
+      const secret = JWT_secret + user.password;
+      const user_token = user.passwordResetToken;
+      const payload = jwt.verify(token, secret);
+      const hashedPass = await bcrypt.hash(password, 12);
+      if (token == user_token) {
+        user.password = hashedPass;
+        await user
+          .save()
+          .then((ok) => {
+            res.json({ message: "Password Updated!" });
+          })
+          .catch((err) => {
+            console.log("Error in save", err);
+          });
+      } else {
+        res.status(422).json({ error: "Either Token not found or Expired!" });
+        return;
+      }
+    }
+  } catch {
+    (err) => {
+      console.log("error from try catch resetpass", err);
+    };
+  }
+};
+
+module.exports.checkProtected = (req, res, next) => {
+  console.log(req.user);
+  res.json({
+    message: "Protected",
+    user: req.user,
+  });
+};
diff --git a/.history/controllers/auth_20210512162622.js b/.history/controllers/auth_20210512162622.js
new file mode 100644
index 0000000..1f373e1
--- /dev/null
+++ b/.history/controllers/auth_20210512162622.js
@@ -0,0 +1,226 @@
+const bcrypt = require("bcryptjs");
+const User = require("../models/User");
+const Student = require("../models/Student");
+const jwt = require("jsonwebtoken");
+const JWT_secret = "Cantileverlabs";
+const messagebird = require("messagebird")("llVKD53ve6QRpbCKOHzWBADaS");
+const nodemailer = require("nodemailer");
+
+module.exports.Protected = async (req, res, next) => {
+  res.send("Hello User");
+};
+module.exports.postSignup = async (req, res, next) => {
+  try {
+    //we need firstName , lastName , email , password as input
+    let firstName = req.body.firstName || " ";
+    let lastName = req.body.lastName || " ";
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      res.json({
+        message: "User already exist",
+        type: "error",
+      });
+    } else {
+      const hashedPass = await bcrypt.hash(password, 12);
+      user = new User({
+        firstName: firstName,
+        lastName: lastName,
+        email: email,
+        password: hashedPass,
+        isAdmin: false,
+      });
+      user = await user.save();
+      await Student.deleteOne({ user: user._id });
+      let student = new Student({
+        user: user._id,
+      });
+      student = await student.save();
+      user.student = student._id;
+      await user.save();
+      res.json({
+        message: "Successfully signed Up",
+        type: "success",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.postSignin = async (req, res, next) => {
+  try {
+    //we need email and password as input
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      const isMatched = await bcrypt.compare(password, user.password);
+      if (isMatched) {
+        const token = jwt.sign({ _id: user._id }, JWT_secret);
+        res.json({
+          token: token,
+        });
+      } else {
+        res.json({
+          message: "email and password doesn't match",
+          type: "error",
+        });
+      }
+    } else {
+      res.json({
+        message: "No user with this email exists",
+        type: "error",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.sendOTP = (req, res, next) => {
+  //uNNYosMopvvCW9RTR1tRWJmYC test
+  //llVKD53ve6QRpbCKOHzWBADaS live
+  try {
+    const { phoneNumber } = req.body;
+    if (!phoneNumber) {
+      res.status(422).json({ message: "Please Add All Required Fields" });
+      return;
+    } else {
+      messagebird.verify.create(
+        phoneNumber,
+        {
+          template: "Your verification code is %token",
+        },
+        function (err, response) {
+          if (err) {
+            console.log(err);
+            res.status(422).json({ message: err.errors[0].description });
+          } else {
+            console.log(response);
+            res.json({ id: response.id });
+          }
+        }
+      );
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.getOTP = (req, res, next) => {
+  try {
+    const { id, otp } = req.body;
+    messagebird.verify.verify(id, otp, function (err, response) {
+      if (err) {
+        console.log({ error: err.errors[0].description, id: id });
+        res.json({ error: err.errors[0].description, id: id });
+      } else {
+        console.log(response);
+        res.json({ message: "Code Verified" });
+      }
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+var transport = nodemailer.createTransport({
+  host: "smtp.mailtrap.io",
+  port: 2525,
+  auth: {
+    user: "5578544cc56856",
+    pass: "a510d3d969d3b3",
+  },
+});
+module.exports.forgotpassword = async (req, res, next) => {
+  const { email, link, _html, sending_company_email, subject } = req.body; //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  try {
+    await User.findOne({ email }).then((user) => {
+      if (!user) {
+        res.status(404).json({ error: "User not found with this Email" });
+        return;
+      } else {
+        const payload = {
+          email: user.email,
+          _id: user._id,
+        };
+        const secret = JWT_secret + user.password;
+        const token = jwt.sign(payload, secret, { expiresIn: "10m" });
+        User.findByIdAndUpdate(user._id, {
+          $set: { passwordResetToken: token },
+        })
+          .then((data) => {
+            const reset_link = `${link}/${user._id}/${token}`;
+            const message = {
+              from: `${sending_company_email}`, // Sender address
+              to: `${user.email}`, // List of recipients
+              subject: `${subject}`, // Subject line
+              html: `${_html}`, // design html for email message.
+            };
+            transport.sendMail(message, function (err, info) {
+              if (err) {
+                console.log(err);
+              } else {
+                console.log(info);
+              }
+            });
+            res.status(200).json({
+              message: "Token Saved and link is active for 10 mins",
+              reset_link,
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    });
+  } catch {
+    (error) => {
+      console.log("Error from forgot pass", error);
+    };
+  }
+  //verify email then set password.
+};
+module.exports.resetpassword = async (req, res, next) => {
+  const { _id, token } = req.params;
+  const { password } = req.body;
+  try {
+    let user = await User.findById({ _id });
+    if (!user) {
+      res.json({ error: "User not Found or WrongId" });
+      return;
+    } else {
+      const secret = JWT_secret + user.password;
+      const user_token = user.passwordResetToken;
+      const payload = jwt.verify(token, secret);
+      const hashedPass = await bcrypt.hash(password, 12);
+      if (token == user_token) {
+        user.password = hashedPass;
+        await user
+          .save()
+          .then((ok) => {
+            res.json({ message: "Password Updated!" });
+          })
+          .catch((err) => {
+            console.log("Error in save", err);
+          });
+      } else {
+        res.status(422).json({ error: "Either Token not found or Expired!" });
+        return;
+      }
+    }
+  } catch {
+    (err) => {
+      console.log("error from try catch resetpass", err);
+    };
+  }
+};
+
+module.exports.checkProtected = (req, res, next) => {
+  console.log(req.user);
+  res.json({
+    message: "Protected",
+    user: req.user,
+  });
+};
diff --git a/.history/controllers/auth_20210512162827.js b/.history/controllers/auth_20210512162827.js
new file mode 100644
index 0000000..62c1413
--- /dev/null
+++ b/.history/controllers/auth_20210512162827.js
@@ -0,0 +1,238 @@
+const bcrypt = require("bcryptjs");
+const User = require("../models/User");
+const Student = require("../models/Student");
+const jwt = require("jsonwebtoken");
+const JWT_secret = "Cantileverlabs";
+const messagebird = require("messagebird")("llVKD53ve6QRpbCKOHzWBADaS");
+const nodemailer = require("nodemailer");
+
+module.exports.Protected = async (req, res, next) => {
+  res.send("Hello User");
+};
+module.exports.postSignup = async (req, res, next) => {
+  try {
+    //we need firstName , lastName , email , password as input
+    let firstName = req.body.firstName || " ";
+    let lastName = req.body.lastName || " ";
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      res.json({
+        message: "User already exist",
+        type: "error",
+      });
+    } else {
+      const hashedPass = await bcrypt.hash(password, 12);
+      user = new User({
+        firstName: firstName,
+        lastName: lastName,
+        email: email,
+        password: hashedPass,
+        isAdmin: false,
+      });
+      user = await user.save();
+      await Student.deleteOne({ user: user._id });
+      let student = new Student({
+        user: user._id,
+      });
+      student = await student.save();
+      user.student = student._id;
+      await user.save();
+      res.json({
+        message: "Successfully signed Up",
+        type: "success",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.postSignin = async (req, res, next) => {
+  try {
+    //we need email and password as input
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      const isMatched = await bcrypt.compare(password, user.password);
+      if (isMatched) {
+        const token = jwt.sign({ _id: user._id }, JWT_secret);
+        res.json({
+          token: token,
+        });
+      } else {
+        res.json({
+          message: "email and password doesn't match",
+          type: "error",
+        });
+      }
+    } else {
+      res.json({
+        message: "No user with this email exists",
+        type: "error",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+//                                     Phone verification Starts.
+// -----------------------------------------------------------------------------------------------
+
+module.exports.sendOTP = (req, res, next) => {
+  //uNNYosMopvvCW9RTR1tRWJmYC test
+  //llVKD53ve6QRpbCKOHzWBADaS live
+  try {
+    const { phoneNumber } = req.body;
+    if (!phoneNumber) {
+      res.status(422).json({ message: "Please Add All Required Fields" });
+      return;
+    } else {
+      messagebird.verify.create(
+        phoneNumber,
+        {
+          template: "Your verification code is %token",
+        },
+        function (err, response) {
+          if (err) {
+            console.log(err);
+            res.status(422).json({ message: err.errors[0].description });
+          } else {
+            console.log(response);
+            res.json({ id: response.id });
+          }
+        }
+      );
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.getOTP = (req, res, next) => {
+  try {
+    const { id, otp } = req.body;
+    messagebird.verify.verify(id, otp, function (err, response) {
+      if (err) {
+        console.log({ error: err.errors[0].description, id: id });
+        res.json({ error: err.errors[0].description, id: id });
+      } else {
+        console.log(response);
+        res.json({ message: "Code Verified" });
+      }
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+//                                     Phone verification End.
+// -----------------------------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------------------------
+//                                      Email verification Starts
+
+var transport = nodemailer.createTransport({
+  host: "smtp.mailtrap.io",
+  port: 2525,
+  auth: {
+    user: "5578544cc56856",
+    pass: "a510d3d969d3b3",
+  },
+});
+module.exports.forgotpassword = async (req, res, next) => {
+  const { email, link, _html, sending_company_email, subject } = req.body;
+  //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  try {
+    await User.findOne({ email }).then((user) => {
+      if (!user) {
+        res.status(404).json({ error: "User not found with this Email" });
+        return;
+      } else {
+        const payload = {
+          email: user.email,
+          _id: user._id,
+        };
+        const secret = JWT_secret + user.password;
+        const token = jwt.sign(payload, secret, { expiresIn: "10m" });
+        User.findByIdAndUpdate(user._id, {
+          $set: { passwordResetToken: token },
+        })
+          .then((data) => {
+            const reset_link = `${link}/${user._id}/${token}`;
+            const message = {
+              from: `${sending_company_email}`, // Sender address
+              to: `${user.email}`, // List of recipients
+              subject: `${subject}`, // Subject line
+              html: `${_html}`, // design html for email message.
+            };
+            transport.sendMail(message, function (err, info) {
+              if (err) {
+                console.log(err);
+              } else {
+                console.log(info);
+              }
+            });
+            res.status(200).json({
+              message: "Token Saved and link is active for 10 mins",
+              reset_link,
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    });
+  } catch {
+    (error) => {
+      console.log("Error from forgot pass", error);
+    };
+  }
+};
+module.exports.resetpassword = async (req, res, next) => {
+  const { _id, token } = req.params;
+  const { password } = req.body;
+  try {
+    let user = await User.findById({ _id });
+    if (!user) {
+      res.json({ error: "User not Found or WrongId" });
+      return;
+    } else {
+      const secret = JWT_secret + user.password;
+      const user_token = user.passwordResetToken;
+      const payload = jwt.verify(token, secret);
+      const hashedPass = await bcrypt.hash(password, 12);
+      if (token == user_token) {
+        user.password = hashedPass;
+        await user
+          .save()
+          .then((ok) => {
+            res.json({ message: "Password Updated!" });
+          })
+          .catch((err) => {
+            console.log("Error in save", err);
+          });
+      } else {
+        res.status(422).json({ error: "Either Token not found or Expired!" });
+        return;
+      }
+    }
+  } catch {
+    (err) => {
+      console.log("error from try catch resetpass", err);
+    };
+  }
+};
+
+//                                      Email verification Ends
+// -----------------------------------------------------------------------------------------------
+
+module.exports.checkProtected = (req, res, next) => {
+  console.log(req.user);
+  res.json({
+    message: "Protected",
+    user: req.user,
+  });
+};
diff --git a/.history/controllers/auth_20210512162910.js b/.history/controllers/auth_20210512162910.js
new file mode 100644
index 0000000..2a52b56
--- /dev/null
+++ b/.history/controllers/auth_20210512162910.js
@@ -0,0 +1,238 @@
+const bcrypt = require("bcryptjs");
+const User = require("../models/User");
+const Student = require("../models/Student");
+const jwt = require("jsonwebtoken");
+const JWT_secret = "Cantileverlabs";
+const messagebird = require("messagebird")("llVKD53ve6QRpbCKOHzWBADaS");
+const nodemailer = require("nodemailer");
+
+module.exports.Protected = async (req, res, next) => {
+  res.send("Hello User");
+};
+module.exports.postSignup = async (req, res, next) => {
+  try {
+    //we need firstName , lastName , email , password as input
+    let firstName = req.body.firstName || " ";
+    let lastName = req.body.lastName || " ";
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      res.json({
+        message: "User already exist",
+        type: "error",
+      });
+    } else {
+      const hashedPass = await bcrypt.hash(password, 12);
+      user = new User({
+        firstName: firstName,
+        lastName: lastName,
+        email: email,
+        password: hashedPass,
+        isAdmin: false,
+      });
+      user = await user.save();
+      await Student.deleteOne({ user: user._id });
+      let student = new Student({
+        user: user._id,
+      });
+      student = await student.save();
+      user.student = student._id;
+      await user.save();
+      res.json({
+        message: "Successfully signed Up",
+        type: "success",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.postSignin = async (req, res, next) => {
+  try {
+    //we need email and password as input
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      const isMatched = await bcrypt.compare(password, user.password);
+      if (isMatched) {
+        const token = jwt.sign({ _id: user._id }, JWT_secret);
+        res.json({
+          token: token,
+        });
+      } else {
+        res.json({
+          message: "email and password doesn't match",
+          type: "error",
+        });
+      }
+    } else {
+      res.json({
+        message: "No user with this email exists",
+        type: "error",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+//                                     Phone verification Starts.
+// -----------------------------------------------------------------------------------------------
+
+module.exports.sendOTP = (req, res, next) => {
+  //uNNYosMopvvCW9RTR1tRWJmYC test
+  //llVKD53ve6QRpbCKOHzWBADaS live
+  try {
+    const { phoneNumber } = req.body;
+    if (!phoneNumber) {
+      res.status(422).json({ message: "Please Add All Required Fields" });
+      return;
+    } else {
+      messagebird.verify.create(
+        phoneNumber,
+        {
+          template: "Your verification code is %token",
+        },
+        function (err, response) {
+          if (err) {
+            console.log(err);
+            res.status(422).json({ message: err.errors[0].description });
+          } else {
+            console.log(response);
+            res.json({ id: response.id });
+          }
+        }
+      );
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.getOTP = (req, res, next) => {
+  try {
+    const { id, otp } = req.body;
+    messagebird.verify.verify(id, otp, function (err, response) {
+      if (err) {
+        console.log({ error: err.errors[0].description, id: id });
+        res.json({ error: err.errors[0].description, id: id });
+      } else {
+        console.log(response);
+        res.json({ message: "Code Verified" });
+      }
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+//                                     Phone verification End.
+// -----------------------------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------------------------
+//                                      Email verification Starts
+
+var transport = nodemailer.createTransport({
+  service: "gmail",
+  port: 2525,
+  auth: {
+    user: "5578544cc56856",
+    pass: "a510d3d969d3b3",
+  },
+});
+module.exports.forgotpassword = async (req, res, next) => {
+  const { email, link, _html, sending_company_email, subject } = req.body;
+  //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  try {
+    await User.findOne({ email }).then((user) => {
+      if (!user) {
+        res.status(404).json({ error: "User not found with this Email" });
+        return;
+      } else {
+        const payload = {
+          email: user.email,
+          _id: user._id,
+        };
+        const secret = JWT_secret + user.password;
+        const token = jwt.sign(payload, secret, { expiresIn: "10m" });
+        User.findByIdAndUpdate(user._id, {
+          $set: { passwordResetToken: token },
+        })
+          .then((data) => {
+            const reset_link = `${link}/${user._id}/${token}`;
+            const message = {
+              from: `${sending_company_email}`, // Sender address
+              to: `${user.email}`, // List of recipients
+              subject: `${subject}`, // Subject line
+              html: `${_html}`, // design html for email message.
+            };
+            transport.sendMail(message, function (err, info) {
+              if (err) {
+                console.log(err);
+              } else {
+                console.log(info);
+              }
+            });
+            res.status(200).json({
+              message: "Token Saved and link is active for 10 mins",
+              reset_link,
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    });
+  } catch {
+    (error) => {
+      console.log("Error from forgot pass", error);
+    };
+  }
+};
+module.exports.resetpassword = async (req, res, next) => {
+  const { _id, token } = req.params;
+  const { password } = req.body;
+  try {
+    let user = await User.findById({ _id });
+    if (!user) {
+      res.json({ error: "User not Found or WrongId" });
+      return;
+    } else {
+      const secret = JWT_secret + user.password;
+      const user_token = user.passwordResetToken;
+      const payload = jwt.verify(token, secret);
+      const hashedPass = await bcrypt.hash(password, 12);
+      if (token == user_token) {
+        user.password = hashedPass;
+        await user
+          .save()
+          .then((ok) => {
+            res.json({ message: "Password Updated!" });
+          })
+          .catch((err) => {
+            console.log("Error in save", err);
+          });
+      } else {
+        res.status(422).json({ error: "Either Token not found or Expired!" });
+        return;
+      }
+    }
+  } catch {
+    (err) => {
+      console.log("error from try catch resetpass", err);
+    };
+  }
+};
+
+//                                      Email verification Ends
+// -----------------------------------------------------------------------------------------------
+
+module.exports.checkProtected = (req, res, next) => {
+  console.log(req.user);
+  res.json({
+    message: "Protected",
+    user: req.user,
+  });
+};
diff --git a/.history/controllers/auth_20210512162916.js b/.history/controllers/auth_20210512162916.js
new file mode 100644
index 0000000..5884d9e
--- /dev/null
+++ b/.history/controllers/auth_20210512162916.js
@@ -0,0 +1,237 @@
+const bcrypt = require("bcryptjs");
+const User = require("../models/User");
+const Student = require("../models/Student");
+const jwt = require("jsonwebtoken");
+const JWT_secret = "Cantileverlabs";
+const messagebird = require("messagebird")("llVKD53ve6QRpbCKOHzWBADaS");
+const nodemailer = require("nodemailer");
+
+module.exports.Protected = async (req, res, next) => {
+  res.send("Hello User");
+};
+module.exports.postSignup = async (req, res, next) => {
+  try {
+    //we need firstName , lastName , email , password as input
+    let firstName = req.body.firstName || " ";
+    let lastName = req.body.lastName || " ";
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      res.json({
+        message: "User already exist",
+        type: "error",
+      });
+    } else {
+      const hashedPass = await bcrypt.hash(password, 12);
+      user = new User({
+        firstName: firstName,
+        lastName: lastName,
+        email: email,
+        password: hashedPass,
+        isAdmin: false,
+      });
+      user = await user.save();
+      await Student.deleteOne({ user: user._id });
+      let student = new Student({
+        user: user._id,
+      });
+      student = await student.save();
+      user.student = student._id;
+      await user.save();
+      res.json({
+        message: "Successfully signed Up",
+        type: "success",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.postSignin = async (req, res, next) => {
+  try {
+    //we need email and password as input
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      const isMatched = await bcrypt.compare(password, user.password);
+      if (isMatched) {
+        const token = jwt.sign({ _id: user._id }, JWT_secret);
+        res.json({
+          token: token,
+        });
+      } else {
+        res.json({
+          message: "email and password doesn't match",
+          type: "error",
+        });
+      }
+    } else {
+      res.json({
+        message: "No user with this email exists",
+        type: "error",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+//                                     Phone verification Starts.
+// -----------------------------------------------------------------------------------------------
+
+module.exports.sendOTP = (req, res, next) => {
+  //uNNYosMopvvCW9RTR1tRWJmYC test
+  //llVKD53ve6QRpbCKOHzWBADaS live
+  try {
+    const { phoneNumber } = req.body;
+    if (!phoneNumber) {
+      res.status(422).json({ message: "Please Add All Required Fields" });
+      return;
+    } else {
+      messagebird.verify.create(
+        phoneNumber,
+        {
+          template: "Your verification code is %token",
+        },
+        function (err, response) {
+          if (err) {
+            console.log(err);
+            res.status(422).json({ message: err.errors[0].description });
+          } else {
+            console.log(response);
+            res.json({ id: response.id });
+          }
+        }
+      );
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.getOTP = (req, res, next) => {
+  try {
+    const { id, otp } = req.body;
+    messagebird.verify.verify(id, otp, function (err, response) {
+      if (err) {
+        console.log({ error: err.errors[0].description, id: id });
+        res.json({ error: err.errors[0].description, id: id });
+      } else {
+        console.log(response);
+        res.json({ message: "Code Verified" });
+      }
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+//                                     Phone verification End.
+// -----------------------------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------------------------
+//                                      Email verification Starts
+
+var transport = nodemailer.createTransport({
+  service: "gmail",
+  auth: {
+    user: "5578544cc56856",
+    pass: "a510d3d969d3b3",
+  },
+});
+module.exports.forgotpassword = async (req, res, next) => {
+  const { email, link, _html, sending_company_email, subject } = req.body;
+  //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  try {
+    await User.findOne({ email }).then((user) => {
+      if (!user) {
+        res.status(404).json({ error: "User not found with this Email" });
+        return;
+      } else {
+        const payload = {
+          email: user.email,
+          _id: user._id,
+        };
+        const secret = JWT_secret + user.password;
+        const token = jwt.sign(payload, secret, { expiresIn: "10m" });
+        User.findByIdAndUpdate(user._id, {
+          $set: { passwordResetToken: token },
+        })
+          .then((data) => {
+            const reset_link = `${link}/${user._id}/${token}`;
+            const message = {
+              from: `${sending_company_email}`, // Sender address
+              to: `${user.email}`, // List of recipients
+              subject: `${subject}`, // Subject line
+              html: `${_html}`, // design html for email message.
+            };
+            transport.sendMail(message, function (err, info) {
+              if (err) {
+                console.log(err);
+              } else {
+                console.log(info);
+              }
+            });
+            res.status(200).json({
+              message: "Token Saved and link is active for 10 mins",
+              reset_link,
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    });
+  } catch {
+    (error) => {
+      console.log("Error from forgot pass", error);
+    };
+  }
+};
+module.exports.resetpassword = async (req, res, next) => {
+  const { _id, token } = req.params;
+  const { password } = req.body;
+  try {
+    let user = await User.findById({ _id });
+    if (!user) {
+      res.json({ error: "User not Found or WrongId" });
+      return;
+    } else {
+      const secret = JWT_secret + user.password;
+      const user_token = user.passwordResetToken;
+      const payload = jwt.verify(token, secret);
+      const hashedPass = await bcrypt.hash(password, 12);
+      if (token == user_token) {
+        user.password = hashedPass;
+        await user
+          .save()
+          .then((ok) => {
+            res.json({ message: "Password Updated!" });
+          })
+          .catch((err) => {
+            console.log("Error in save", err);
+          });
+      } else {
+        res.status(422).json({ error: "Either Token not found or Expired!" });
+        return;
+      }
+    }
+  } catch {
+    (err) => {
+      console.log("error from try catch resetpass", err);
+    };
+  }
+};
+
+//                                      Email verification Ends
+// -----------------------------------------------------------------------------------------------
+
+module.exports.checkProtected = (req, res, next) => {
+  console.log(req.user);
+  res.json({
+    message: "Protected",
+    user: req.user,
+  });
+};
diff --git a/.history/controllers/auth_20210512163012.js b/.history/controllers/auth_20210512163012.js
new file mode 100644
index 0000000..5884d9e
--- /dev/null
+++ b/.history/controllers/auth_20210512163012.js
@@ -0,0 +1,237 @@
+const bcrypt = require("bcryptjs");
+const User = require("../models/User");
+const Student = require("../models/Student");
+const jwt = require("jsonwebtoken");
+const JWT_secret = "Cantileverlabs";
+const messagebird = require("messagebird")("llVKD53ve6QRpbCKOHzWBADaS");
+const nodemailer = require("nodemailer");
+
+module.exports.Protected = async (req, res, next) => {
+  res.send("Hello User");
+};
+module.exports.postSignup = async (req, res, next) => {
+  try {
+    //we need firstName , lastName , email , password as input
+    let firstName = req.body.firstName || " ";
+    let lastName = req.body.lastName || " ";
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      res.json({
+        message: "User already exist",
+        type: "error",
+      });
+    } else {
+      const hashedPass = await bcrypt.hash(password, 12);
+      user = new User({
+        firstName: firstName,
+        lastName: lastName,
+        email: email,
+        password: hashedPass,
+        isAdmin: false,
+      });
+      user = await user.save();
+      await Student.deleteOne({ user: user._id });
+      let student = new Student({
+        user: user._id,
+      });
+      student = await student.save();
+      user.student = student._id;
+      await user.save();
+      res.json({
+        message: "Successfully signed Up",
+        type: "success",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.postSignin = async (req, res, next) => {
+  try {
+    //we need email and password as input
+    let email = req.body.email;
+    let password = req.body.password;
+    let user = await User.findOne({ email: email });
+    if (user) {
+      const isMatched = await bcrypt.compare(password, user.password);
+      if (isMatched) {
+        const token = jwt.sign({ _id: user._id }, JWT_secret);
+        res.json({
+          token: token,
+        });
+      } else {
+        res.json({
+          message: "email and password doesn't match",
+          type: "error",
+        });
+      }
+    } else {
+      res.json({
+        message: "No user with this email exists",
+        type: "error",
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+//                                     Phone verification Starts.
+// -----------------------------------------------------------------------------------------------
+
+module.exports.sendOTP = (req, res, next) => {
+  //uNNYosMopvvCW9RTR1tRWJmYC test
+  //llVKD53ve6QRpbCKOHzWBADaS live
+  try {
+    const { phoneNumber } = req.body;
+    if (!phoneNumber) {
+      res.status(422).json({ message: "Please Add All Required Fields" });
+      return;
+    } else {
+      messagebird.verify.create(
+        phoneNumber,
+        {
+          template: "Your verification code is %token",
+        },
+        function (err, response) {
+          if (err) {
+            console.log(err);
+            res.status(422).json({ message: err.errors[0].description });
+          } else {
+            console.log(response);
+            res.json({ id: response.id });
+          }
+        }
+      );
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+module.exports.getOTP = (req, res, next) => {
+  try {
+    const { id, otp } = req.body;
+    messagebird.verify.verify(id, otp, function (err, response) {
+      if (err) {
+        console.log({ error: err.errors[0].description, id: id });
+        res.json({ error: err.errors[0].description, id: id });
+      } else {
+        console.log(response);
+        res.json({ message: "Code Verified" });
+      }
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+//                                     Phone verification End.
+// -----------------------------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------------------------
+//                                      Email verification Starts
+
+var transport = nodemailer.createTransport({
+  service: "gmail",
+  auth: {
+    user: "5578544cc56856",
+    pass: "a510d3d969d3b3",
+  },
+});
+module.exports.forgotpassword = async (req, res, next) => {
+  const { email, link, _html, sending_company_email, subject } = req.body;
+  //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  try {
+    await User.findOne({ email }).then((user) => {
+      if (!user) {
+        res.status(404).json({ error: "User not found with this Email" });
+        return;
+      } else {
+        const payload = {
+          email: user.email,
+          _id: user._id,
+        };
+        const secret = JWT_secret + user.password;
+        const token = jwt.sign(payload, secret, { expiresIn: "10m" });
+        User.findByIdAndUpdate(user._id, {
+          $set: { passwordResetToken: token },
+        })
+          .then((data) => {
+            const reset_link = `${link}/${user._id}/${token}`;
+            const message = {
+              from: `${sending_company_email}`, // Sender address
+              to: `${user.email}`, // List of recipients
+              subject: `${subject}`, // Subject line
+              html: `${_html}`, // design html for email message.
+            };
+            transport.sendMail(message, function (err, info) {
+              if (err) {
+                console.log(err);
+              } else {
+                console.log(info);
+              }
+            });
+            res.status(200).json({
+              message: "Token Saved and link is active for 10 mins",
+              reset_link,
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    });
+  } catch {
+    (error) => {
+      console.log("Error from forgot pass", error);
+    };
+  }
+};
+module.exports.resetpassword = async (req, res, next) => {
+  const { _id, token } = req.params;
+  const { password } = req.body;
+  try {
+    let user = await User.findById({ _id });
+    if (!user) {
+      res.json({ error: "User not Found or WrongId" });
+      return;
+    } else {
+      const secret = JWT_secret + user.password;
+      const user_token = user.passwordResetToken;
+      const payload = jwt.verify(token, secret);
+      const hashedPass = await bcrypt.hash(password, 12);
+      if (token == user_token) {
+        user.password = hashedPass;
+        await user
+          .save()
+          .then((ok) => {
+            res.json({ message: "Password Updated!" });
+          })
+          .catch((err) => {
+            console.log("Error in save", err);
+          });
+      } else {
+        res.status(422).json({ error: "Either Token not found or Expired!" });
+        return;
+      }
+    }
+  } catch {
+    (err) => {
+      console.log("error from try catch resetpass", err);
+    };
+  }
+};
+
+//                                      Email verification Ends
+// -----------------------------------------------------------------------------------------------
+
+module.exports.checkProtected = (req, res, next) => {
+  console.log(req.user);
+  res.json({
+    message: "Protected",
+    user: req.user,
+  });
+};
diff --git a/app.js b/app.js
index 217a4fa..43635e8 100644
--- a/app.js
+++ b/app.js
@@ -18,7 +18,7 @@ const cors = require("cors");
 
 const app = express();
 
-const MONGO_URI = `mongodb+srv://Cantilever:Cantilever@cluster0.dqxva.mongodb.net/myFirstDatabase?retryWrites=true&w=majority`;
+const MONGO_URI = `mongodb+srv://${process.env.MONGO_USER}:${process.env.MONGO_PASSWORD}@cluster0.dqxva.mongodb.net/${process.env.MONGO_DEFAULT_DATABASE}?retryWrites=true&w=majority`;
 
 app.use(cors());
 app.use(bodyparser.json());
diff --git a/controllers/auth.js b/controllers/auth.js
index 807b04e..5884d9e 100644
--- a/controllers/auth.js
+++ b/controllers/auth.js
@@ -79,6 +79,9 @@ module.exports.postSignin = async (req, res, next) => {
   }
 };
 
+//                                     Phone verification Starts.
+// -----------------------------------------------------------------------------------------------
+
 module.exports.sendOTP = (req, res, next) => {
   //uNNYosMopvvCW9RTR1tRWJmYC test
   //llVKD53ve6QRpbCKOHzWBADaS live
@@ -111,8 +114,8 @@ module.exports.sendOTP = (req, res, next) => {
 
 module.exports.getOTP = (req, res, next) => {
   try {
-    const { id, token } = req.body;
-    messagebird.verify.verify(id, token, function (err, response) {
+    const { id, otp } = req.body;
+    messagebird.verify.verify(id, otp, function (err, response) {
       if (err) {
         console.log({ error: err.errors[0].description, id: id });
         res.json({ error: err.errors[0].description, id: id });
@@ -125,16 +128,22 @@ module.exports.getOTP = (req, res, next) => {
     console.log(err);
   }
 };
+//                                     Phone verification End.
+// -----------------------------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------------------------
+//                                      Email verification Starts
+
 var transport = nodemailer.createTransport({
-  host: "smtp.mailtrap.io",
-  port: 2525,
+  service: "gmail",
   auth: {
     user: "5578544cc56856",
     pass: "a510d3d969d3b3",
   },
 });
 module.exports.forgotpassword = async (req, res, next) => {
-  const { email, link, _html, sending_company_email, subject } = req.body; //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
+  const { email, link, _html, sending_company_email, subject } = req.body;
+  //link = https://cantileverlabs.herokuapp.com/resetpassword/:id/:token
   try {
     await User.findOne({ email }).then((user) => {
       if (!user) {
@@ -180,7 +189,6 @@ module.exports.forgotpassword = async (req, res, next) => {
       console.log("Error from forgot pass", error);
     };
   }
-  //verify email then set password.
 };
 module.exports.resetpassword = async (req, res, next) => {
   const { _id, token } = req.params;
@@ -217,6 +225,9 @@ module.exports.resetpassword = async (req, res, next) => {
   }
 };
 
+//                                      Email verification Ends
+// -----------------------------------------------------------------------------------------------
+
 module.exports.checkProtected = (req, res, next) => {
   console.log(req.user);
   res.json({