.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 before_install: npm i -g npm@1.4.28
 node_js:
-  - 0.8
-  - 0.10
+  - "5"
+  - "4"

CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file starting from version **v4.0.0**.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.0 - 2016-04-27
+
+ - verify unsigned tokens ([ec880791c10ed5ef7c8df7bf28ebb95c810479ed](https://github.com/auth0/node-jsonwebtoken/commit/ec880791c10ed5ef7c8df7bf28ebb95c810479ed))
+
 ## 6.0.1 - 2016-04-27
 
 This was an immediate change after publishing 6.0.0.

README.md

@@ -30,7 +30,6 @@ encoded private key for RSA and ECDSA.
 * `expiresIn`: expressed in seconds or a string describing a time span [rauchg/ms](https://github.com/rauchg/ms.js). Eg: `60`, `"2 days"`, `"10h"`, `"7d"`
 * `notBefore`: expressed in seconds or a string describing a time span [rauchg/ms](https://github.com/rauchg/ms.js). Eg: `60`, `"2 days"`, `"10h"`, `"7d"`
 * `audience`
-* `subject`
 * `issuer`
 * `jwtid`
 * `subject`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonwebtoken",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "JSON Web Token implementation (symmetric and asymmetric)",
   "main": "index.js",
   "scripts": {

sign.js

@@ -93,10 +93,12 @@ module.exports = function(payload, secretOrPrivateKey, options, callback) {
 
   Object.keys(options_to_payload).forEach(function (key) {
     var claim = options_to_payload[key];
-    if (typeof options[key] !== 'undefined' && typeof payload[claim] !== 'undefined') {
-      throw new Error('Bad "options.' + key + '" option. The payload already has an "' + claim + '" property.');
+    if (typeof options[key] !== 'undefined') {
+      if (typeof payload[claim] !== 'undefined') {
+        throw new Error('Bad "options.' + key + '" option. The payload already has an "' + claim + '" property.');
+      }
+      payload[claim] = options[key];
     }
-    payload[claim] = options[key];
   });
 
   var encoding = options.encoding || 'utf8';

test/issue_196.tests.js

@@ -0,0 +1,15 @@
+var expect = require('chai').expect;
+var jwt = require('./..');
+var atob = require('atob');
+
+describe('issue 196', function () {
+  function b64_to_utf8 (str) {
+    return decodeURIComponent(escape(atob( str )));
+  }
+
+  it('should use issuer provided in payload.iss', function () {
+    var token = jwt.sign({ iss: 'foo' }, 'shhhhh');
+    var decoded_issuer = JSON.parse(b64_to_utf8(token.split('.')[1])).iss;
+    expect(decoded_issuer).to.equal('foo');
+  });
+});