Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the ability to continue without a token #51

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added the ability to continue without a token #51

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
901da88
Added the ability to continue without token
KieronWiltshire Jul 6, 2017
1dd8915
Update index.js
KieronWiltshire Jul 6, 2017
170c13a
Update index.js
KieronWiltshire Jul 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,24 @@ function ExpressOAuthServer(options) {
*/

ExpressOAuthServer.prototype.authenticate = function(options) {
var that = this;

return function(req, res, next) {
var request = new Request(req);
var response = new Response(res);
const self = this;
options = options || {};

return Promise.bind(that)
return function(request, response, next) {
return Promise.bind(self)
.then(function() {
return this.server.authenticate(request, response, options);
return this.server.authenticate(new Request(request), new Response(response), options);
})
.tap(function(token) {
res.locals.oauth = { token: token };
next();
request.oauth = { token: token };
return next();
})
.catch(function(e) {
return handleError.call(this, e, req, res, null, next);
.catch(function(error) {
if (typeof options.catchErrorAndContinue !== 'undefined' && options.catchErrorAndContinue) {
return next();
} else {
return handleError.call(this, error, request, response, null, next);
}
});
};
};
Expand Down