Merge pull request #4 from yashrajverma/main

Resolved

controllers/auth.js

@@ -221,19 +221,28 @@ module.exports.postSignin = async (req, res, next) => {
   try {
     //we need email and password as input
     let { email, password, isGoogle } = req.body;
-    let user = await User.findOne({ email: email });
+    console.log("req.body", req.body);
+    let user = await User.findOne({ email });
     if (isGoogle) {
-      user.isVerified = true;
-      user = await user.save();
-      const isMatched = await bcrypt.compare(password, user.password);
-      if (isMatched) {
-        const token = jwt.sign({ _id: user._id }, JWT_secret);
-        res.json({
-          token: token,
-        });
+      if (user) {
+        user.isVerified = true;
+        user = await user.save();
+        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",
+          });
+          return;
+        }
       } else {
         res.json({
-          message: "email and password doesn't match",
+          message: "User Doesn't Exists",
           type: "error",
         });
         return;
@@ -295,36 +304,30 @@ module.exports.postSignin = async (req, res, next) => {
 //                                     Phone verification Starts.
 // -----------------------------------------------------------------------------------------------
 
-module.exports.sendOTP = async (req, res, next) => {
+module.exports.sendOTP = (req, res, next) => {
   //uNNYosMopvvCW9RTR1tRWJmYC test
   //llVKD53ve6QRpbCKOHzWBADaS live
-  const { phoneNumber, _id } = req.body;
+  const { phoneNumber } = req.body;
   try {
-    let user = await User.findOne({ _id });
-    if (user) {
-      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 });
-            }
-          }
-        );
-      }
-    } else {
-      res.status(422).json({ error: "User Doesn't Exists!" });
+    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);