Merge branch 'master' of https://github.com/mprinc/node-jsonwebtoken into mprinc-master

Author: jfromaniello

index.js

@@ -38,7 +38,7 @@ module.exports.sign = function(payload, secretOrPrivateKey, options) {
 };
 
 module.exports.verify = function(jwtString, secretOrPublicKey, options, callback) {
-  if ((typeof options === 'function') && !callback) callback = options;
+  if ((typeof options === 'function') && !callback) callback = options, options = null;
   if (!options) options = {};
 
   if (!jwtString)

test/jwt.hs.tests.js

@@ -15,6 +15,16 @@ describe('HS256', function() {
       expect(token.split('.')).to.have.length(3);
     });
 
+    it('should without options', function(done) {
+      var callback = function(err, decoded) {
+    	assert.ok(decoded.foo);
+        assert.equal('bar', decoded.foo);
+        done();
+      };
+      callback.issuer = "shouldn't affect";
+      jwt.verify(token, secret, callback );
+    });
+
     it('should validate with secret', function(done) {
       jwt.verify(token, secret, function(err, decoded) {
         assert.ok(decoded.foo);