Skip to content

Commit 29e081b

Browse files
jorenvandeweyerjorenvandeweyer
authored
Merge branch 'development' into issue_89_4_482
2 parents 3a1e433 + 92bea82 commit 29e081b

17 files changed

+826
-192
lines changed

‎docs/model/spec.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ An ``Object`` representing the access token and associated data.
214214

215215
function getAccessToken(accessToken) {
216216
// imaginary DB queries
217-
db.queryAccessToken({access_token: accessToken})
217+
return db.queryAccessToken({access_token: accessToken})
218218
.then(function(token) {
219219
return Promise.all([
220220
token,
@@ -288,7 +288,7 @@ An ``Object`` representing the refresh token and associated data.
288288

289289
function getRefreshToken(refreshToken) {
290290
// imaginary DB queries
291-
db.queryRefreshToken({refresh_token: refreshToken})
291+
return db.queryRefreshToken({refresh_token: refreshToken})
292292
.then(function(token) {
293293
return Promise.all([
294294
token,
@@ -364,7 +364,7 @@ An ``Object`` representing the authorization code and associated data.
364364

365365
function getAuthorizationCode(authorizationCode) {
366366
// imaginary DB queries
367-
db.queryAuthorizationCode({authorization_code: authorizationCode})
367+
return db.queryAuthorizationCode({authorization_code: authorizationCode})
368368
.then(function(code) {
369369
return Promise.all([
370370
code,
@@ -446,7 +446,7 @@ The return value (``client``) can carry additional properties that will be ignor
446446
if (clientSecret) {
447447
params.client_secret = clientSecret;
448448
}
449-
db.queryClient(params)
449+
return db.queryClient(params)
450450
.then(function(client) {
451451
return {
452452
id: client.id,
@@ -1026,4 +1026,3 @@ Section-5.2.3.5 is implemented by default.
10261026
function validateRedirectUri(redirectUri, client) {
10271027
return client.redirectUris.includes(redirectUri);
10281028
}
1029-

‎lib/grant-types/abstract-grant-type.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const InvalidArgumentError = require('../errors/invalid-argument-error');
88
const InvalidScopeError = require('../errors/invalid-scope-error');
99
const Promise = require('bluebird');
1010
const promisify = require('promisify-any').use(Promise);
11-
const is = require('../validator/is');
11+
const isFormat = require('@node-oauth/formats');
1212
const tokenUtil = require('../utils/token-util');
1313

1414
/**
@@ -83,7 +83,7 @@ AbstractGrantType.prototype.getRefreshTokenExpiresAt = function() {
8383
*/
8484

8585
AbstractGrantType.prototype.getScope = function(request) {
86-
if (!is.nqschar(request.body.scope)) {
86+
if (!isFormat.nqschar(request.body.scope)) {
8787
throw new InvalidArgumentError('Invalid parameter: `scope`');
8888
}
8989

‎lib/grant-types/authorization-code-grant-type.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const InvalidRequestError = require('../errors/invalid-request-error');
1111
const Promise = require('bluebird');
1212
const promisify = require('promisify-any').use(Promise);
1313
const ServerError = require('../errors/server-error');
14-
const is = require('../validator/is');
14+
const isFormat = require('@node-oauth/formats');
1515
const util = require('util');
1616

1717
/**
@@ -85,7 +85,7 @@ AuthorizationCodeGrantType.prototype.getAuthorizationCode = function(request, cl
8585
throw new InvalidRequestError('Missing parameter: `code`');
8686
}
8787

88-
if (!is.vschar(request.body.code)) {
88+
if (!isFormat.vschar(request.body.code)) {
8989
throw new InvalidRequestError('Invalid parameter: `code`');
9090
}
9191
return promisify(this.model.getAuthorizationCode, 1).call(this.model, request.body.code)
@@ -114,7 +114,7 @@ AuthorizationCodeGrantType.prototype.getAuthorizationCode = function(request, cl
114114
throw new InvalidGrantError('Invalid grant: authorization code has expired');
115115
}
116116

117-
if (code.redirectUri && !is.uri(code.redirectUri)) {
117+
if (code.redirectUri && !isFormat.uri(code.redirectUri)) {
118118
throw new InvalidGrantError('Invalid grant: `redirect_uri` is not a valid URI');
119119
}
120120

@@ -140,7 +140,7 @@ AuthorizationCodeGrantType.prototype.validateRedirectUri = function(request, cod
140140

141141
const redirectUri = request.body.redirect_uri || request.query.redirect_uri;
142142

143-
if (!is.uri(redirectUri)) {
143+
if (!isFormat.uri(redirectUri)) {
144144
throw new InvalidRequestError('Invalid request: `redirect_uri` is not a valid URI');
145145
}
146146

‎lib/grant-types/password-grant-type.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const InvalidGrantError = require('../errors/invalid-grant-error');
1010
const InvalidRequestError = require('../errors/invalid-request-error');
1111
const Promise = require('bluebird');
1212
const promisify = require('promisify-any').use(Promise);
13-
const is = require('../validator/is');
13+
const isFormat = require('@node-oauth/formats');
1414
const util = require('util');
1515

1616
/**
@@ -80,11 +80,11 @@ PasswordGrantType.prototype.getUser = function(request) {
8080
throw new InvalidRequestError('Missing parameter: `password`');
8181
}
8282

83-
if (!is.uchar(request.body.username)) {
83+
if (!isFormat.uchar(request.body.username)) {
8484
throw new InvalidRequestError('Invalid parameter: `username`');
8585
}
8686

87-
if (!is.uchar(request.body.password)) {
87+
if (!isFormat.uchar(request.body.password)) {
8888
throw new InvalidRequestError('Invalid parameter: `password`');
8989
}
9090

‎lib/grant-types/refresh-token-grant-type.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const InvalidRequestError = require('../errors/invalid-request-error');
1111
const Promise = require('bluebird');
1212
const promisify = require('promisify-any').use(Promise);
1313
const ServerError = require('../errors/server-error');
14-
const is = require('../validator/is');
14+
const isFormat = require('@node-oauth/formats');
1515
const util = require('util');
1616

1717
/**
@@ -82,7 +82,7 @@ RefreshTokenGrantType.prototype.getRefreshToken = function(request, client) {
8282
throw new InvalidRequestError('Missing parameter: `refresh_token`');
8383
}
8484

85-
if (!is.vschar(request.body.refresh_token)) {
85+
if (!isFormat.vschar(request.body.refresh_token)) {
8686
throw new InvalidRequestError('Invalid parameter: `refresh_token`');
8787
}
8888

‎lib/handlers/authorize-handler.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const Request = require('../request');
1818
const Response = require('../response');
1919
const ServerError = require('../errors/server-error');
2020
const UnauthorizedClientError = require('../errors/unauthorized-client-error');
21-
const is = require('../validator/is');
21+
const isFormat = require('@node-oauth/formats');
2222
const tokenUtil = require('../utils/token-util');
2323
const url = require('url');
2424

@@ -96,6 +96,12 @@ AuthorizeHandler.prototype.handle = function(request, response) {
9696
let ResponseType;
9797

9898
return Promise.bind(this)
99+
.then(function() {
100+
state = this.getState(request);
101+
if(request.query.allowed === 'false') {
102+
throw new AccessDeniedError('Access denied: user denied access to application');
103+
}
104+
})
99105
.then(function() {
100106
const requestedScope = this.getScope(request);
101107

@@ -107,7 +113,6 @@ AuthorizeHandler.prototype.handle = function(request, response) {
107113
return this.generateAuthorizationCode(client, user, scope);
108114
})
109115
.then(function(authorizationCode) {
110-
state = this.getState(request);
111116
ResponseType = this.getResponseType(request);
112117

113118
return this.saveAuthorizationCode(authorizationCode, expiresAt, scope, client, uri, user);
@@ -167,13 +172,13 @@ AuthorizeHandler.prototype.getClient = function(request) {
167172
throw new InvalidRequestError('Missing parameter: `client_id`');
168173
}
169174

170-
if (!is.vschar(clientId)) {
175+
if (!isFormat.vschar(clientId)) {
171176
throw new InvalidRequestError('Invalid parameter: `client_id`');
172177
}
173178

174179
const redirectUri = request.body.redirect_uri || request.query.redirect_uri;
175180

176-
if (redirectUri && !is.uri(redirectUri)) {
181+
if (redirectUri && !isFormat.uri(redirectUri)) {
177182
throw new InvalidRequestError('Invalid request: `redirect_uri` is not a valid URI');
178183
}
179184
return promisify(this.model.getClient, 2).call(this.model, clientId, null)
@@ -233,7 +238,7 @@ AuthorizeHandler.prototype.validateScope = function(user, client, scope) {
233238
AuthorizeHandler.prototype.getScope = function(request) {
234239
const scope = request.body.scope || request.query.scope;
235240

236-
if (!is.nqschar(scope)) {
241+
if (!isFormat.nqschar(scope)) {
237242
throw new InvalidScopeError('Invalid parameter: `scope`');
238243
}
239244

@@ -246,13 +251,14 @@ AuthorizeHandler.prototype.getScope = function(request) {
246251

247252
AuthorizeHandler.prototype.getState = function(request) {
248253
const state = request.body.state || request.query.state;
249-
250-
if (!this.allowEmptyState && !state) {
251-
throw new InvalidRequestError('Missing parameter: `state`');
252-
}
253-
254-
if (!is.vschar(state)) {
255-
throw new InvalidRequestError('Invalid parameter: `state`');
254+
const stateExists = state && state.length > 0;
255+
const stateIsValid = stateExists
256+
? isFormat.vschar(state)
257+
: this.allowEmptyState;
258+
259+
if (!stateIsValid) {
260+
const message = (!stateExists) ? 'Missing' : 'Invalid';
261+
throw new InvalidRequestError(`${message} parameter: \`state\``);
256262
}
257263

258264
return state;

‎lib/handlers/token-handler.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const TokenModel = require('../models/token-model');
1818
const UnauthorizedClientError = require('../errors/unauthorized-client-error');
1919
const UnsupportedGrantTypeError = require('../errors/unsupported-grant-type-error');
2020
const auth = require('basic-auth');
21-
const is = require('../validator/is');
21+
const isFormat = require('@node-oauth/formats');
2222

2323
/**
2424
* Grant types.
@@ -123,11 +123,11 @@ TokenHandler.prototype.getClient = function(request, response) {
123123
throw new InvalidRequestError('Missing parameter: `client_secret`');
124124
}
125125

126-
if (!is.vschar(credentials.clientId)) {
126+
if (!isFormat.vschar(credentials.clientId)) {
127127
throw new InvalidRequestError('Invalid parameter: `client_id`');
128128
}
129129

130-
if (credentials.clientSecret && !is.vschar(credentials.clientSecret)) {
130+
if (credentials.clientSecret && !isFormat.vschar(credentials.clientSecret)) {
131131
throw new InvalidRequestError('Invalid parameter: `client_secret`');
132132
}
133133

@@ -203,7 +203,7 @@ TokenHandler.prototype.handleGrantType = function(request, client) {
203203
throw new InvalidRequestError('Missing parameter: `grant_type`');
204204
}
205205

206-
if (!is.nchar(grantType) && !is.uri(grantType)) {
206+
if (!isFormat.nchar(grantType) && !isFormat.uri(grantType)) {
207207
throw new InvalidRequestError('Invalid parameter: `grant_type`');
208208
}
209209

‎package-lock.json

Lines changed: 32 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"lib"
2525
],
2626
"dependencies": {
27+
"@node-oauth/formats": "^1.0.0",
2728
"basic-auth": "2.0.1",
2829
"bluebird": "3.7.2",
2930
"promisify-any": "2.0.1",
@@ -44,6 +45,7 @@
4445
"pretest": "./node_modules/.bin/eslint lib test index.js",
4546
"test": "NODE_ENV=test ./node_modules/.bin/mocha 'test/**/*_test.js'",
4647
"test-debug": "NODE_ENV=test ./node_modules/.bin/mocha --inspect --debug-brk 'test/**/*_test.js'",
48+
"test:watch": "NODE_ENV=test ./node_modules/.bin/mocha --watch 'test/**/*_test.js'",
4749
"test:coverage": "NODE_ENV=test nyc --reporter=html --reporter=text ./node_modules/.bin/mocha 'test/**/*_test.js'",
4850
"lint": "npx eslint .",
4951
"lint:fix": "npx eslint . --fix"

0 commit comments

Comments
 (0)