Skip to content
Open
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
11 changes: 6 additions & 5 deletions lib/strategy.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
*/
var passport = require('passport-strategy')
, util = require('util')
, lookup = require('./utils').lookup;
, lookup = require('./utils').lookup
, coalesce = require('./utils').coalesce;


/**
Expand Down Expand Up @@ -68,10 +69,10 @@ util.inherits(Strategy, passport.Strategy);
*/
Strategy.prototype.authenticate = function(req, options) {
options = options || {};
var username = lookup(req.body, this._usernameField) || lookup(req.query, this._usernameField);
var password = lookup(req.body, this._passwordField) || lookup(req.query, this._passwordField);
if (!username || !password) {
var username = coalesce(lookup(req.body, this._usernameField), lookup(req.query, this._usernameField));
var password = coalesce(lookup(req.body, this._passwordField), lookup(req.query, this._passwordField));

if (username === null || password === null) {
return this.fail({ message: options.badRequestMessage || 'Missing credentials' }, 400);
}

Expand Down
10 changes: 10 additions & 0 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,13 @@ exports.lookup = function(obj, field) {
}
return null;
};

exports.coalesce = function() {
var len = arguments.length;
for (var i=0; i<len; i++) {
if (arguments[i] !== null && arguments[i] !== undefined) {
return arguments[i];
}
}
return null;
};
39 changes: 38 additions & 1 deletion test/strategy.normal.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,5 +187,42 @@ describe('Strategy', function() {
expect(status).to.equal(400);
});
});


describe('handling a with a blank username and password', function() {
var strategy = new Strategy(function(username, password, done) {
if (username == '' && password == '') {
return done(null, { id: '1234' }, { scope: 'read' });
}
return done(null, false);
});

var user
, info;

before(function(done) {
chai.passport(strategy)
.success(function(u, i) {
user = u;
info = i;
done();
})
.req(function(req) {
req.body = {};
req.body.username = '';
req.body.password = '';
})
.authenticate();
});

it('should supply user', function() {
expect(user).to.be.an.object;
expect(user.id).to.equal('1234');
});

it('should supply info', function() {
expect(info).to.be.an.object;
expect(info.scope).to.equal('read');
});
});

});