Skip to content

Commit

Permalink
Clarify code grant test cases.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaredhanson
jaredhanson committed May 18, 2016
1 parent cef0cb4 commit 82335ce
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 15 deletions.
3 changes: 1 addition & 2 deletions lib/grant/code.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ module.exports = function code(options, issue) {
if (!clientID) { throw new AuthorizationError('Missing required parameter: client_id', 'invalid_request'); }

if (scope) {

if (typeof scope !== 'string') {
throw new AuthorizationError('scope parameter must be a string', 'invalid_request');
throw new AuthorizationError('Invalid parameter: scope must be a string', 'invalid_request');
}

for (var i = 0, len = separators.length; i < len; i++) {
Expand Down
76 changes: 63 additions & 13 deletions test/grant/code.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ describe('grant.code', function() {
it('should error', function() {
expect(err).to.be.an.instanceOf(Error);
expect(err.constructor.name).to.equal('AuthorizationError');
expect(err.message).to.equal('scope parameter must be a string');
expect(err.message).to.equal('Invalid parameter: scope must be a string');
expect(err.code).to.equal('invalid_request');
});
});
Expand All @@ -305,6 +305,14 @@ describe('grant.code', function() {
var response;

before(function(done) {
function issue(client, redirectURI, user, done) {
if (client.id !== 'c123') { return done(new Error('incorrect client argument')); }
if (redirectURI !== 'http://example.com/auth/callback') { return done(new Error('incorrect redirectURI argument')); }
if (user.id !== 'u123') { return done(new Error('incorrect user argument')); }

return done(null, 'xyz');
}

chai.oauth2orize.grant(code(issue))
.txn(function(txn) {
txn.client = { id: 'c123', name: 'Example' };
Expand Down Expand Up @@ -332,6 +340,14 @@ describe('grant.code', function() {
var response;

before(function(done) {
function issue(client, redirectURI, user, done) {
if (client.id !== 'c123') { return done(new Error('incorrect client argument')); }
if (redirectURI !== 'http://example.com/auth/callback') { return done(new Error('incorrect redirectURI argument')); }
if (user.id !== 'u123') { return done(new Error('incorrect user argument')); }

return done(null, 'xyz');
}

chai.oauth2orize.grant(code(issue))
.txn(function(txn) {
txn.client = { id: 'c123', name: 'Example' };
Expand Down Expand Up @@ -360,6 +376,14 @@ describe('grant.code', function() {
var response;

before(function(done) {
function issue(client, redirectURI, user, done) {
if (client.id !== 'c123') { return done(new Error('incorrect client argument')); }
if (redirectURI !== 'http://example.com/auth/callback') { return done(new Error('incorrect redirectURI argument')); }
if (user.id !== 'u123') { return done(new Error('incorrect user argument')); }

return done(null, 'xyz');
}

chai.oauth2orize.grant(code(issue))
.txn(function(txn) {
txn.client = { id: 'c123', name: 'Example' };
Expand Down Expand Up @@ -387,6 +411,14 @@ describe('grant.code', function() {
var response;

before(function(done) {
function issue(client, redirectURI, user, done) {
if (client.id !== 'c123') { return done(new Error('incorrect client argument')); }
if (redirectURI !== 'http://example.com/auth/callback') { return done(new Error('incorrect redirectURI argument')); }
if (user.id !== 'u123') { return done(new Error('incorrect user argument')); }

return done(null, 'xyz');
}

chai.oauth2orize.grant(code(issue))
.txn(function(txn) {
txn.client = { id: 'c123', name: 'Example' };
Expand Down Expand Up @@ -415,6 +447,10 @@ describe('grant.code', function() {
var err;

before(function(done) {
function issue(client, redirectURI, user, done) {
return done(null, false);
}

chai.oauth2orize.grant(code(issue))
.txn(function(txn) {
txn.client = { id: 'cUNAUTHZ', name: 'Example' };
Expand Down Expand Up @@ -445,6 +481,10 @@ describe('grant.code', function() {
var err;

before(function(done) {
function issue(client, redirectURI, user, done) {
return done(new Error('something went wrong'));
}

chai.oauth2orize.grant(code(issue))
.txn(function(txn) {
txn.client = { id: 'cERROR', name: 'Example' };
Expand Down Expand Up @@ -472,6 +512,10 @@ describe('grant.code', function() {
var err;

before(function(done) {
function issue(client, redirectURI, user, done) {
throw new Error('something was thrown');
}

chai.oauth2orize.grant(code(issue))
.txn(function(txn) {
txn.client = { id: 'cTHROW', name: 'Example' };
Expand Down Expand Up @@ -499,6 +543,10 @@ describe('grant.code', function() {
var err;

before(function(done) {
function issue(client, redirectURI, user, done) {
return done(null, 'xyz');
}

chai.oauth2orize.grant(code(issue))
.txn(function(txn) {
txn.client = { id: 'c123', name: 'Example' };
Expand All @@ -524,10 +572,12 @@ describe('grant.code', function() {

describe('decision handling with user response', function() {
function issue(client, redirectURI, user, ares, done) {
if (client.id == 'c123' && redirectURI == 'http://example.com/auth/callback' && user.id == 'u123' && ares.scope == 'foo') {
return done(null, 'xyz');
}
return done(new Error('something went wrong'));
if (client.id !== 'c123') { return done(new Error('incorrect client argument')); }
if (redirectURI !== 'http://example.com/auth/callback') { return done(new Error('incorrect redirectURI argument')); }
if (user.id !== 'u123') { return done(new Error('incorrect user argument')); }
if (ares.scope !== 'foo') { return done(new Error('incorrect ares argument')); }

return done(null, 'xyz');
}

describe('transaction with response scope', function() {
Expand Down Expand Up @@ -560,10 +610,13 @@ describe('grant.code', function() {

describe('decision handling with user response and client request', function() {
function issue(client, redirectURI, user, ares, areq, done) {
if (client.id == 'c123' && redirectURI == 'http://example.com/auth/callback' && user.id == 'u123' && ares.scope == 'foo' && areq.codeChallenge == 'hashed-s3cr1t') {
return done(null, 'xyz');
}
return done(new Error('something went wrong'));
if (client.id !== 'c123') { return done(new Error('incorrect client argument')); }
if (redirectURI !== 'http://example.com/auth/callback') { return done(new Error('incorrect redirectURI argument')); }
if (user.id !== 'u123') { return done(new Error('incorrect user argument')); }
if (ares.scope !== 'foo') { return done(new Error('incorrect ares argument')); }
if (areq.codeChallenge !== 'hashed-s3cr1t') { return done(new Error('incorrect areq argument')); }

return done(null, 'xyz');
}

describe('transaction with response scope', function() {
Expand Down Expand Up @@ -597,10 +650,7 @@ describe('grant.code', function() {

describe('decision handling with response mode', function() {
function issue(client, redirectURI, user, done) {
if (client.id == 'c123' && redirectURI == 'http://example.com/auth/callback' && user.id == 'u123') {
return done(null, 'xyz');
}
return done(new Error('something went wrong'));
return done(null, 'xyz');
}

var fooResponseMode = function(txn, res, params) {
Expand Down

0 comments on commit 82335ce

Please sign in to comment.