Add support for encoding option to jws.decode, and fix forwarding of …

lib/verify-stream.js

@@ -66,9 +66,9 @@ function jwsDecode(jwsSig, opts) {
   if (!header)
     return null;
 
-  var payload = payloadFromJWS(jwsSig);
+  var payload = payloadFromJWS(jwsSig, opts.encoding);
   if (header.typ === 'JWT' || opts.json)
-    payload = JSON.parse(payload, opts.encoding);
+    payload = JSON.parse(payload);
 
   return {
     header: header,
@@ -100,7 +100,7 @@ util.inherits(VerifyStream, Stream);
 VerifyStream.prototype.verify = function verify() {
   try {
     var valid = jwsVerify(this.signature.buffer, this.algorithm, this.key.buffer);
-    var obj = jwsDecode(this.signature.buffer, this.encoding);
+    var obj = jwsDecode(this.signature.buffer, {encoding: this.encoding});
     this.emit('done', valid, obj);
     this.emit('data', valid);
     this.emit('end');

readme.md

@@ -83,6 +83,10 @@ Note that the `"alg"` value from the signature header is ignored.
 (Synchronous) Returns the decoded header, decoded payload, and signature
 parts of the JWS Signature.
 
+Options:
+
+* `encoding` (Optional, defaults to 'utf8')
+
 Returns an object with three properties, e.g.
 ```js
 { header: { alg: 'HS256' },

test/jws.test.js

@@ -301,6 +301,20 @@ test('jws.decode: with invalid json in body', function (t) {
   t.end();
 });
 
+test('jws.decode supports encoding option', function (t) {
+  const payloadString = 'åäöí';
+  const encoding = 'latin1';
+  const jwsObj = jws.sign({
+    header: { alg: 'HS256' },
+    payload: payloadString, 
+    secret: 'shhh', 
+    encoding: encoding
+  });
+  const parts = jws.decode(jwsObj, {encoding: encoding});
+  t.same(parts.payload, payloadString, 'should match payload');
+  t.end();
+});
+
 test('jws.verify: missing or invalid algorithm', function (t) {
   const header = Buffer.from('{"something":"not an algo"}').toString('base64');
   const payload = Buffer.from('sup').toString('base64');
@@ -316,7 +330,6 @@ test('jws.verify: missing or invalid algorithm', function (t) {
   t.end();
 });
 
-
 test('jws.isValid', function (t) {
   const valid = jws.sign({ header: { alg: 'HS256' }, payload: 'hi', secret: 'shhh' });
   const invalid = (function(){