Skip to content

Commit 05f2811

Browse files
authored
Merge pull request #81 from FullstackAcademy/next-everything
Next everything
2 parents d574821 + a109c30 commit 05f2811

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

generated/server/app/configure/authentication/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,14 @@ module.exports = function (app, db) {
5454
// We provide a simple GET /session in order to get session information directly.
5555
// This is used by the browser application (Angular) to determine if a user is
5656
// logged in already.
57-
app.get('/session', function (req, res) {
57+
app.get('/session', function (req, res, next) {
58+
var err;
5859
if (req.user) {
5960
res.send({ user: req.user.sanitize() });
6061
} else {
61-
res.status(401).send('No authenticated user.');
62+
err = new Error('No authenticated user.');
63+
err.status = 401;
64+
next(err);
6265
}
6366
});
6467

generated/server/app/index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ module.exports = function (db) {
2222
*/
2323
app.use(function (req, res, next) {
2424

25+
var err;
26+
2527
if (path.extname(req.path).length > 0) {
26-
res.status(404).end();
28+
err = new Error('Not found.');
29+
err.status = 404;
30+
next(err);
2731
} else {
28-
next(null);
32+
next();
2933
}
3034

3135
});

generated/server/app/routes/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ router.use('/members', require('./members'));
66

77
// Make sure this is after all of
88
// the registered routes!
9-
router.use(function (req, res) {
10-
res.status(404).end();
9+
router.use(function (req, res, next) {
10+
var err = new Error('Not found.');
11+
err.status = 404;
12+
next(err);
1113
});

generated/server/app/routes/members/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ module.exports = router;
44
var _ = require('lodash');
55

66
var ensureAuthenticated = function (req, res, next) {
7+
var err;
78
if (req.isAuthenticated()) {
89
next();
910
} else {
10-
res.status(401).end();
11+
err = new Error('You must be logged in.');
12+
err.status = 401;
13+
next(err);
1114
}
1215
};
1316

0 commit comments

Comments
 (0)