From c0e9561c0caaf0189549ab0d88fa5bafa674a7c8 Mon Sep 17 00:00:00 2001
From: Lucas Gabriel Lima <lgl15@inf.ufpr.br>
Date: Wed, 28 Sep 2016 10:11:13 -0300
Subject: [PATCH] refactor user route
---
src/libs/routes/user.js | 46 +++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/libs/routes/user.js b/src/libs/routes/user.js
index 94e525d8..274e68bb 100644
--- a/src/libs/routes/user.js
+++ b/src/libs/routes/user.js
@@ -14,32 +14,38 @@ const jwt = require('jwt-simple');
function emailSyntax(email) {
- regex = /^(([^<>()\[\]\.,;:\s@\"]+(\.[^<>()\[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
- return regex.test(email);
+ const regex = /^(([^<>()\[\]\.,;:\s@\"]+(\.[^<>()\[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
+ return regex.test(email);
}
-userApp.post('/', (req, res) => {
+userApp.post('/', (req, res, next) => {
if (!req.body.email || !req.body.password) {
res.json({success: false, msg: 'Please pass email and password.'});
+ } else {
+ next();
}
- else {
- if(!emailSyntax(req.body.email)){
- res.json({success: false, msg: 'Invalid email syntax.'});
- }
- var newUser = new User({
- email: req.body.email,
- password: req.body.password
- });const jwt = require('jwt-simple');
-
- // save the user
- newUser.save((err) => {
- if (err) {
- return res.json({success: false, msg: 'Email already in use.'});
- }
- res.json({success: true, msg: 'Successful created new user.'});
- });
+}, (req, res, next) => {
+ if(!emailSyntax(req.body.email)){
+ res.json({success: false, msg: 'Invalid email syntax.'});
+ } else {
+ next();
}
+
+}, (req, res, next) => {
+ var newUser = new User({
+ email: req.body.email,
+ password: req.body.password
+ });
+
+ // save the user
+ newUser.save((err) => {
+ if (err) {
+ res.json({success: false, msg: 'Email already in use.'});
+ } else {
+ res.json({success: true, msg: 'Successful created new user.'});
+ }
+ });
});
userApp.post('/authenticate', (req, res) => {
@@ -63,7 +69,7 @@ userApp.post('/authenticate', (req, res) => {
res.json({success: true, token: 'JWT ' + token});
}
else {
- res.send({success: false, msg: 'Authentication failed. Wrong password'});
+ res.json({success: false, msg: 'Authentication failed. Wrong password'});
}
})
}
--
GitLab