verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #335 from karlmikko/bug/invalid-token-unhandled 

Ignore unhanded error - simulate token missing
This commit is contained in:
Miroslav Bajtoš 2014-06-27 09:56:17 +02:00
parent a976481adb 46af483bdd
commit 45d026e7de
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/middleware/token.js
View File

@ -51,14 +51,8 @@ function token(options) {
return function (req, res, next) { return function (req, res, next) {
if (req.accessToken !== undefined) return next(); if (req.accessToken !== undefined) return next();
TokenModel.findForRequest(req, options, function(err, token) { TokenModel.findForRequest(req, options, function(err, token) {
if(err) return next(err); req.accessToken = token || null;
if(token) { next(err);
req.accessToken = token;
next();
} else {
req.accessToken = null;
return next();
}
}); });
} }
} }

4
lib/models/access-token.js
View File

@ -133,7 +133,9 @@ AccessToken.findForRequest = function(req, options, cb) {
} else if(isValid) { } else if(isValid) {
cb(null, token); cb(null, token);
} else { } else {
cb(new Error('Invalid Access Token')); var e = new Error('Invalid Access Token');
e.status = e.statusCode = 401;
cb(e);
} }
}); });
} else { } else {