Fixed merge conflicts; Added new contributor

README.md

@@ -3,10 +3,10 @@
 Koa middleware that validates JSON Web Tokens and sets `ctx.state.user`
 (by default) if a valid token is provided.
 
-This module lets you authenticate HTTP requests using JSON Web Tokens 
+This module lets you authenticate HTTP requests using JSON Web Tokens
 in your [Koa](http://koajs.com/) (node.js) applications.
 
-See [this article](http://blog.auth0.com/2014/01/07/angularjs-authentication-with-cookies-vs-token/) 
+See [this article](http://blog.auth0.com/2014/01/07/angularjs-authentication-with-cookies-vs-token/)
 for a good introduction.
 
 ## Install
@@ -16,9 +16,9 @@ for a good introduction.
 ## Usage
 
 The JWT authentication middleware authenticates callers using a JWT
-token.  If the token is valid, `ctx.state.user` (by default) will be set 
-with the JSON object decoded to be used by later middleware for 
-authorization and access control. 
+token.  If the token is valid, `ctx.user` (by default) will be set
+with the JSON object decoded to be used by later middleware for
+authorization and access control.
 
 ## Example
 
@@ -66,7 +66,7 @@ app.listen(3000);
 
 
 Alternatively, you can add the `passthrough` option to always yield next,
-even if no valid Authorization header was found: 
+even if no valid Authorization header was found:
 ```js
 app.use(jwt({ secret: 'shared-secret', passthrough: true }));
 ```
@@ -88,7 +88,7 @@ app.use(jwt({ secret:   'shared-secret',
 If the JWT has an expiration (`exp`), it will be checked.
 
 
-This module also support tokens signed with public/private key pairs. Instead 
+This module also support tokens signed with public/private key pairs. Instead
 of a secret, you can specify a Buffer with the public key:
 ```js
 var publicKey = fs.readFileSync('/path/to/public.pub');
@@ -97,7 +97,7 @@ app.use(jwt({ secret: publicKey }));
 
 ## Related Modules
 
-- [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) — JSON Web Token signing 
+- [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) — JSON Web Token signing
 and verification
 
 Note that koa-jwt exports the `sign`, `verify` and `decode` functions from the above module as a convenience.
@@ -124,6 +124,7 @@ This code is largely based on [express-jwt](https://github.com/auth0/express-jwt
 - [soygul] (https://github.com/soygul)
 - [tunnckoCore] (https://github.com/tunnckoCore)
 - [getuliojr] (https://github.com/getuliojr)
+- [cesarandreu] (https://github.com/cesarandreu)
 
 ## License
 

index.js

@@ -19,7 +19,7 @@ module.exports = function(opts) {
       if (parts.length == 2) {
         scheme = parts[0];
         credentials = parts[1];
-          
+
         if (/^Bearer$/i.test(scheme)) {
           token = credentials;
         }

test.js

@@ -53,7 +53,7 @@ describe('failure tests', function () {
   it('should throw if authorization header is not valid jwt', function(done) {
     var secret = 'shhhhhh';
     var token = koajwt.sign({foo: 'bar'}, secret);
-    
+
     var app = koa();
 
     app.use(koajwt({ secret: 'different-shhhh', debug: true }));
@@ -69,7 +69,7 @@ describe('failure tests', function () {
   it('should throw if audience is not expected', function(done) {
     var secret = 'shhhhhh';
     var token = koajwt.sign({foo: 'bar', aud: 'expected-audience'}, secret);
-    
+
     var app = koa();
 
     app.use(koajwt({ secret: 'shhhhhh', audience: 'not-expected-audience', debug: true }));
@@ -84,7 +84,7 @@ describe('failure tests', function () {
   it('should throw if token is expired', function(done) {
     var secret = 'shhhhhh';
     var token = koajwt.sign({foo: 'bar', exp: 1382412921 }, secret);
-    
+
     var app = koa();
 
     app.use(koajwt({ secret: 'shhhhhh', debug: true }));
@@ -99,7 +99,7 @@ describe('failure tests', function () {
   it('should throw if token issuer is wrong', function(done) {
     var secret = 'shhhhhh';
     var token = koajwt.sign({foo: 'bar', iss: 'http://foo' }, secret);
-    
+
     var app = koa();
 
     app.use(koajwt({ secret: 'shhhhhh', issuer: 'http://wrong', debug: true }));
@@ -141,7 +141,7 @@ describe('success tests', function () {
 
     var secret = 'shhhhhh';
     var token = koajwt.sign({foo: 'bar'}, secret);
-    
+
     var app = koa();
 
     app.use(koajwt({ secret: secret }));
@@ -165,7 +165,7 @@ describe('success tests', function () {
 
     var secret = 'shhhhhh';
     var token = koajwt.sign({foo: 'bar'}, secret);
-    
+
     var app = koa();
 
     app.use(koajwt({ secret: secret, key: 'jwtdata' }));