Skip to content

Enable the use of useErrorHandler per route #71

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

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

Enable the use of useErrorHandler per route #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d1dfb2
add webstorm project file ignore
d-fischer Jul 7, 2018
6dbb323
enabled the use of useErrorHandler per route
d-fischer Jul 7, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
.idea
19 changes: 11 additions & 8 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ function ExpressOAuthServer(options) {
throw new InvalidArgumentError('Missing parameter: `model`');
}

this.useErrorHandler = options.useErrorHandler ? true : false;
this.useErrorHandler = !!options.useErrorHandler;
delete options.useErrorHandler;

this.continueMiddleware = options.continueMiddleware ? true : false;
this.continueMiddleware = !!options.continueMiddleware;
delete options.continueMiddleware;

this.server = new NodeOAuthServer(options);
Expand Down Expand Up @@ -54,7 +54,7 @@ ExpressOAuthServer.prototype.authenticate = function(options) {
next();
})
.catch(function(e) {
return handleError.call(this, e, req, res, null, next);
return handleError.call(this, e, req, res, null, next, options);
});
};
};
Expand Down Expand Up @@ -88,7 +88,7 @@ ExpressOAuthServer.prototype.authorize = function(options) {
return handleResponse.call(this, req, res, response);
})
.catch(function(e) {
return handleError.call(this, e, req, res, response, next);
return handleError.call(this, e, req, res, response, next, options);
});
};
};
Expand Down Expand Up @@ -122,7 +122,7 @@ ExpressOAuthServer.prototype.token = function(options) {
return handleResponse.call(this, req, res, response);
})
.catch(function(e) {
return handleError.call(this, e, req, res, response, next);
return handleError.call(this, e, req, res, response, next, options);
});
};
};
Expand All @@ -147,9 +147,12 @@ var handleResponse = function(req, res, response) {
* Handle error.
*/

var handleError = function(e, req, res, response, next) {

if (this.useErrorHandler === true) {
var handleError = function(e, req, res, response, next, options) {
var useErrorHandler = this.useErrorHandler;
if (options && 'useErrorHandler' in options) {
useErrorHandler = options.useErrorHandler;
}
if (useErrorHandler === true) {
next(e);
} else {
if (response) {
Expand Down