Skip to content

Commit eca9024

Browse files
committed
chore(app): update express res code
Changes: - use `res.status()` instead of `res.verb(123, item)` Closes angular-fullstack#576
1 parent d2bd1f5 commit eca9024

File tree

6 files changed

+22
-23
lines changed

6 files changed

+22
-23
lines changed

Diff for: app/templates/server/api/thing/thing.controller.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ var Thing = require('./thing.model');
1515
function handleError(res, statusCode){
1616
statusCode = statusCode || 500;
1717
return function(err){
18-
res.send(statusCode, err);
18+
res.status(statusCode).send(err);
1919
};
2020
}
2121

2222
function responseWithResult(res, statusCode){
2323
statusCode = statusCode || 200;
2424
return function(entity){
2525
if(entity){
26-
return res.json(statusCode, entity);
26+
return res.status(statusCode).json(entity);
2727
}
2828
};
2929
}
3030

3131
function handleEntityNotFound(res){
3232
return function(entity){
3333
if(!entity){
34-
res.send(404);
34+
res.status(404).end();
3535
return null;
3636
}
3737
return entity;
@@ -53,7 +53,7 @@ function removeEntity(res){
5353
if(entity){
5454
return entity.removeAsync()
5555
.then(function() {
56-
return res.send(204);
56+
return res.status(204).end();
5757
});
5858
}
5959
};

Diff for: app/templates/server/api/user(auth)/user.controller.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ var jwt = require('jsonwebtoken');
88
var validationError = function(res, statusCode) {
99
statusCode = statusCode || 422;
1010
return function(err){
11-
res.json(statusCode, err);
11+
res.status(statusCode).json(err);
1212
};
1313
};
1414

1515
function handleError(res, statusCode){
1616
statusCode = statusCode || 500;
1717
return function(err){
18-
res.send(statusCode, err);
18+
res.status(statusCode).send(err);
1919
};
2020
}
2121

2222
function respondWith(res, statusCode){
2323
statusCode = statusCode || 200;
2424
return function(){
25-
res.send(statusCode);
25+
res.status(statusCode).end();
2626
};
2727
}
2828

@@ -33,7 +33,7 @@ function respondWith(res, statusCode){
3333
exports.index = function(req, res) {
3434
User.findAsync({}, '-salt -hashedPassword')
3535
.then(function (users) {
36-
res.json(200, users);
36+
res.json(users);
3737
})
3838
.catch(handleError(res));
3939
};
@@ -62,7 +62,7 @@ exports.show = function (req, res, next) {
6262
User.findByIdAsync(userId)
6363
.then(function (user) {
6464
if(!user) {
65-
return res.send(401);
65+
return res.status(401).end();
6666
}
6767
res.json(user.profile);
6868
})
@@ -97,7 +97,7 @@ exports.changePassword = function(req, res, next) {
9797
.spread(respondWith(res, 200))
9898
.catch(validationError(res));
9999
} else {
100-
return res.send(403);
100+
return res.status(403).end();
101101
}
102102
});
103103
};
@@ -110,7 +110,7 @@ exports.me = function(req, res, next) {
110110

111111
User.findOneAsync({ _id: userId }, '-salt -hashedPassword')
112112
.then(function(user) { // don't ever give out the password or salt
113-
if (!user) { return res.json(401); }
113+
if (!user) { return res.status(401).end(); }
114114
res.json(user);
115115
})
116116
.catch(function(err){ return next(err); });

Diff for: app/templates/server/auth(auth)/auth.service.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function isAuthenticated() {
2828
User.findByIdAsync(req.user._id)
2929
.then(function (user) {
3030
if (!user) {
31-
return res.send(401);
31+
return res.status(401).end();
3232
}
3333
req.user = user;
3434
next();
@@ -54,7 +54,7 @@ function hasRole(roleRequired) {
5454
next();
5555
}
5656
else {
57-
res.send(403);
57+
res.status(403).end();
5858
}
5959
});
6060
}
@@ -71,7 +71,7 @@ function signToken(id) {
7171
*/
7272
function setTokenCookie(req, res) {
7373
if (!req.user) {
74-
return res.json(404, { message: 'Something went wrong, please try again.'});
74+
return res.status(404).json({ message: 'Something went wrong, please try again.'});
7575
}
7676
var token = signToken(req.user._id, req.user.role);
7777
res.cookie('token', JSON.stringify(token));

Diff for: app/templates/server/auth(auth)/local/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ var router = express.Router();
99
router.post('/', function(req, res, next) {
1010
passport.authenticate('local', function (err, user, info) {
1111
var error = err || info;
12-
if (error) return res.json(401, error);
13-
if (!user) return res.json(404, {message: 'Something went wrong, please try again.'});
12+
if (error) return res.status(401).json(error);
13+
if (!user) return res.status(404).json({message: 'Something went wrong, please try again.'});
1414

1515
var token = auth.signToken(user._id, user.role);
1616
res.json({token: token});
1717
})(req, res, next)
1818
});
1919

20-
module.exports = router;
20+
module.exports = router;

Diff for: app/templates/server/components/errors/index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ module.exports[404] = function pageNotFound(req, res) {
1111
status: statusCode
1212
};
1313

14-
res.status(result.status);
15-
res.render(viewFilePath, function (err) {
14+
res.status(result.status).render(viewFilePath, function (err) {
1615
if (err) { return res.json(result, result.status); }
1716

1817
res.render(viewFilePath);

Diff for: endpoint/templates/name.controller.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ var <%= classedName %> = require('./<%= name %>.model');
66
function handleError(res, statusCode){
77
statusCode = statusCode || 500;
88
return function(err){
9-
res.send(statusCode, err);
9+
res.status(statusCode).send(err);
1010
};
1111
}
1212

1313
function responseWithResult(res, statusCode){
1414
statusCode = statusCode || 200;
1515
return function(entity){
1616
if(entity){
17-
return res.json(statusCode, entity);
17+
return res.status(statusCode).json(entity);
1818
}
1919
};
2020
}
2121

2222
function handleEntityNotFound(res){
2323
return function(entity){
2424
if(!entity){
25-
res.send(404);
25+
res.status(404).end();
2626
return null;
2727
}
2828
return entity;
@@ -44,7 +44,7 @@ function removeEntity(res){
4444
if(entity){
4545
return entity.removeAsync()
4646
.then(function() {
47-
return res.send(204);
47+
return res.status(204).end();
4848
});
4949
}
5050
};

0 commit comments

Comments
 (0)