Merge pull request auth0-blog#5 from chenkie/master

Allow for front end to send either username or email as user scheme

Author: chenkie

user-routes.js

@@ -16,15 +16,45 @@ function createToken(user) {
  return jwt.sign(_.omit(user, 'password'), config.secret, { expiresInMinutes: 60*5 });
 }
 
+function getUserScheme(req) {
+ 
+ var username;
+ var type;
+ var userSearch = {};
+
+ // The POST contains a username and not an email
+ if(req.body.username) {
+ username = req.body.username;
+ type = 'username';
+ userSearch = { username: username };
+ }
+ // The POST contains an email and not an username
+ else if(req.body.email) {
+ username = req.body.email;
+ type = 'email';
+ userSearch = { email: username };
+ }
+
+ return {
+ username: username,
+ type: type,
+ userSearch: userSearch
+ }
+}
+
 app.post('/users', function(req, res) {
- if (!req.body.username || !req.body.password) {
+ 
+ var userScheme = getUserScheme(req); 
+
+ if (!userScheme.username || !req.body.password) {
  return res.status(400).send("You must send the username and the password");
  }
- if (_.find(users, {username: req.body.username})) {
+
+ if (_.find(users, userScheme.userSearch)) {
  return res.status(400).send("A user with that username already exists");
  }
 
- var profile = _.pick(req.body, 'username', 'password', 'extra');
+ var profile = _.pick(req.body, userScheme.type, 'password', 'extra');
  profile.id = _.max(users, 'id').id + 1;
 
  users.push(profile);
@@ -35,13 +65,17 @@ app.post('/users', function(req, res) {
 });
 
 app.post('/sessions/create', function(req, res) {
- if (!req.body.username || !req.body.password) {
+
+ var userScheme = getUserScheme(req);
+
+ if (!userScheme.username || !req.body.password) {
  return res.status(400).send("You must send the username and the password");
  }
 
- var user = _.find(users, {username: req.body.username});
+ var user = _.find(users, userScheme.userSearch);
+ 
  if (!user) {
- return res.status(401).send("The username or password don't match");
+ return res.status(401).send({message:"The username or password don't match", user: user});
  }
 
  if (user.password !== req.body.password) {
@@ -51,4 +85,4 @@ app.post('/sessions/create', function(req, res) {
  res.status(201).send({
  id_token: createToken(user)
  });
-});
+});