Skip to content
Merged
Show file tree
Hide file tree
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
36 changes: 36 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"env": {
"jquery": true,
"mocha": true,
"node": true
},
"globals": {},
"rules": {
"no-bitwise": 2,
"curly": 2,
"eqeqeq": 2,
"no-unused-expressions": 2,
"strict": 0,
"wrap-iife": [
2,
"any"
],
"indent": [
2,
2,
{
"SwitchCase": 1
}
],
"no-use-before-define": 0,
"new-cap": 2,
"no-caller": 2,
"require-yield": 2,
"quotes": [
2,
"single"
],
"no-undef": 2,
"no-unused-vars": 2
}
}
1 change: 0 additions & 1 deletion .jshintignore

This file was deleted.

26 changes: 0 additions & 26 deletions .jshintrc

This file was deleted.

7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
language: node_js

node_js:
- 4
- 4.0
- 6
- 6.0
- 7
- 7.0
- 8
- 8.0
- 9
- 10

sudo: false
24 changes: 12 additions & 12 deletions lib/grant-types/authorization-code-grant-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,21 @@ AuthorizationCodeGrantType.prototype.getAuthorizationCode = function(request, cl
* @see https://tools.ietf.org/html/rfc6749#section-4.1.3
*/

AuthorizationCodeGrantType.prototype.validateRedirectUri = function(request, code) {
if (!code.redirectUri) {
return;
}
AuthorizationCodeGrantType.prototype.validateRedirectUri = function(request, code) {
if (!code.redirectUri) {
return;
}

var redirectUri = request.body.redirect_uri || request.query.redirect_uri;
var redirectUri = request.body.redirect_uri || request.query.redirect_uri;

if (!is.uri(redirectUri)) {
throw new InvalidRequestError('Invalid request: `redirect_uri` is not a valid URI');
}
if (!is.uri(redirectUri)) {
throw new InvalidRequestError('Invalid request: `redirect_uri` is not a valid URI');
}

if (redirectUri !== code.redirectUri) {
throw new InvalidRequestError('Invalid request: `redirect_uri` is invalid');
}
};
if (redirectUri !== code.redirectUri) {
throw new InvalidRequestError('Invalid request: `redirect_uri` is invalid');
}
};

/**
* Revoke the authorization code.
Expand Down
6 changes: 3 additions & 3 deletions lib/handlers/revoke-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ RevokeHandler.prototype.handleRevokeToken = function(request, client) {
})
.then(function(token) {
return Promise.any([
this.getAccessToken(token, client),
this.getRefreshToken(token, client)
])
this.getAccessToken(token, client),
this.getRefreshToken(token, client)
])
.catch(Promise.AggregateError, function(err) {
err.forEach(function(e) {
throw e;
Expand Down
Loading