added changes

chibaba · Jul 26, 2018 · 9b472f7 · 9b472f7
1 parent 8f6d670
commit 9b472f7
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 30 deletions.
diff --git a/routes/routes.js b/routes/routes.js
@@ -95,40 +95,76 @@ passport.use(
   // )
 
 
-  app.post('/signup', function(req, res) {
-    var newUser = new User();
-      newUser.email= req.body.email;
-      newUser.password= req.body.password;
-
-      User.findOne({ email: req.body.email}, (err, existingUser) =>{
-        if(existingUser) {
-      return res.status(400).json({
-        message: (req.body.email + "User is currently existing")
-      })
-    } else {
-      User.save((err, newUser) => {
-       if (err) return next(err);
-       res.json("New User has been created")
-      })
-    }
-    })
+  // app.post('/signup', function(req, res) {
+  //   var newUser = new User();
+  //     newUser.email= req.body.email;
+  //     newUser.password= req.body.password;
+
+  //     User.findOne({ email: req.body.email}, (err, existingUser) =>{
+  //       if(existingUser) {
+  //     return res.status(400).json({
+  //       message: (req.body.email + "User is currently existing")
+  //     })
+  //   } else {
+  //     User.save((err, newUser) => {
+  //      if (err) return next(err);
+  //      res.json("New User has been created")
+  //     })
+  //   }
+  //   })
 
 
-    User.createUser(newUser, function(err, user){
-      if(errors) {
-        res.status(400).json({success: false, message: 'user is not registered '})
-       // if(err) throw err;
-        console.log(user)
-      }
-      });
-      //res.status(200).json({success:true, message: 'user is registered'});
-          res.status(200).json({ token: jwt.sign({ id: User.id}, 'newpassword  '),
-          success: true,
-          message: 'user created'
+  //   User.createUser(newUser, function(err, user){
+  //     if(errors) {
+  //       res.status(400).json({success: false, message: 'user is not registered '})
+  //      // if(err) throw err;
+  //       console.log(user)
+  //     }
+  //     });
+  //     //res.status(200).json({success:true, message: 'user is registered'});
+  //         res.status(200).json({ token: jwt.sign({ id: User.id}, 'newpassword  '),
+  //         success: true,
+  //         message: 'user created'
 
-  })  
+  // })  
+
+  //       })
+
+        app.post("/signup", (req, res) => {
+          const { email, password } = req.body;
+
+          if (!email || !password) {
+            res.status(400).json({
+              success: false,
+              message: "Incorrect details"
+            });
+          }
+          if (email && password) {
+            User.findOrCreate({
+              where: {
+                email,
+                password
+              }
+            }).spread((userResult, created) => {
+              if (created) {
+                res.status(200).json({ token: jwt.sign({ id: User.id}, 'newpassword  '),
+                     success: true,
+                 message: 'user created'
+
+               })
+
+              } else {
+                return res.status(400).json({
+                  message: false,
+                  message: "User already exists"
+                });
+              }
+            })
+          }
+
+            });
+
 
-        })
 
 
 

diff --git a/test/api/accounTest.spec.js b/test/api/accounTest.spec.js
@@ -23,6 +23,7 @@ describe('POST /signup', () => {
         res.body.should.be.a('object');
 
         res.body.should.have.property('token');
+        res.body.should.have.property('success');
         done();
       });
   });
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ describe('POST /signup', () => { @@
             res.body.should.be.a('object');
             res.body.should.have.property('token');
+            res.body.should.have.property('success');
             done();
           });
       });
@@ Expand Down @@