Skip to content

Commit 507e214

Browse files
committed
Added error status codes and made response more consistant
1 parent e6d6306 commit 507e214

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

server/controllers/authController.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ exports.authenticate = function(req, res) {
99
var password = req.body.password;
1010

1111
if (!username || !password) {
12-
return res.json({Message : "Username and Password required"});
12+
return res.status(422).json({message : "Username and Password required"});
1313
}
1414

1515
User.filter({username:username}).run().then(function(userArray){
1616

1717
var user = userArray[0];
1818

1919
if (!user) {
20-
return res.json({Message : "The username is incorrect"});
20+
return res.status(422).json({message : "This username does not exist"});
2121
}
2222

2323
User.comparePassword(password, user, function (err, valid){
2424

2525
if (err) {
26-
return res.json({Message : err});
26+
return res.status(422).json({message : err});
2727
}
2828

2929
if (!valid) {
30-
return res.json({Message : "The username or password is incorrect"});
30+
return res.status(422).json({message : "The username or password is incorrect"});
3131
} else {
3232
res.json({
3333
user: user,

server/controllers/userController.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ var tokenAuth = require('../services/tokenAuth');
77

88
exports.register = function(req , res){
99

10-
if(!req.body.username){return res.json({Error : "Username is Required"});}
11-
if(!req.body.password){return res.json({Error : "Password is Required"});}
10+
if(!req.body.username){return res.status(422).json({message : "Username is Required"});}
11+
if(!req.body.password){return res.status(422).json({message : "Password is Required"});}
1212

1313
User.filter({username:req.body.username}).run().then(function(userArray){
14-
if(userArray[0]){return res.json({Error : "Username is in use"});}
14+
if(userArray[0]){return res.status(422).json({message : "Username is in use"});}
1515

1616

1717
var user = new User(req.body);

server/policies/isAuthorized.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ module.exports = function (req, res, next) {
1616
}
1717

1818
} else {
19-
return res.json({err: 'Format is Authorization: Bearer [token]'});
19+
return res.status(400).json({message: 'Format is Authorization: Bearer [token]'});
2020
}
2121

2222
} else {
23-
return res.json({err: 'No Authorization header was found'});
23+
return res.status(400).json({message: 'No Authorization header was found'});
2424
}
2525

2626
tokenAuth.verify(token, function (err, token) {
27-
if (err) return res.json({err: 'Invalid Token!'});
27+
if (err) return res.status(401).json({message: 'Invalid Token!'});
2828
req.token = token;
2929
next();
3030
});

server/policies/isCurrentUser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = function(req, res, next) {
44
var currentUserId = req.token.id;
55

66
if (userId != currentUserId) {
7-
return res.json({Error : 'You are not allowed to do that'});
7+
return res.status(401).json({message : 'You are not allowed to do that'});
88
}
99

1010
next();

0 commit comments

Comments
 (0)