Skip to content
Open
Changes from all commits
Commits
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
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