From 602427ebc2d6de9ce7f7f51a6456d062e59735f8 Mon Sep 17 00:00:00 2001 From: simon-p-r Date: Sun, 30 Apr 2017 20:30:08 +0100 Subject: [PATCH] fixed broken tests and updated deps --- lib/index.js | 5 +++-- package.json | 8 ++++---- test/fixtures/test.token | 1 - test/index.js | 9 +++++---- 4 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 test/fixtures/test.token diff --git a/lib/index.js b/lib/index.js index bd9552f..af16673 100644 --- a/lib/index.js +++ b/lib/index.js @@ -162,13 +162,14 @@ exports.verify = (options, cb) => { }; -exports.verifySync = (options) => { +exports.verifySync = (options, type) => { const schema = internals.schema.verify; const result = Joi.validate(options, schema); if (result.error) { return false; - } + }; + const verifyOptions = result.value; const decoded = exports.decode(verifyOptions.signature); if (decoded === null) { diff --git a/package.json b/package.json index 96ab2cf..41475a2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "yajwt", - "version": "1.5.4", + "version": "1.5.5", "description": "yet another json web token library", "main": "lib/index.js", "directories": { @@ -17,7 +17,7 @@ "author": "simon-p-r", "license": "BSD-3-Clause", "dependencies": { - "basic-utils": "^1.7.3", + "basic-utils": "^1.7.4", "joi": "^10.4.1", "jws": "^3.1.4", "moment": "^2.18.1", @@ -25,7 +25,7 @@ }, "devDependencies": { "code": "^4.0.0", - "coveralls": "^2.13.0", - "lab": "^13.0.1" + "coveralls": "^2.13.1", + "lab": "^13.0.2" } } diff --git a/test/fixtures/test.token b/test/fixtures/test.token deleted file mode 100644 index 60e87a4..0000000 --- a/test/fixtures/test.token +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE0OTMzODA2MjgsIm5iZiI6MTQ2MTgzNDYyOCwiaWF0IjoxNDYxODQ0MTI4LCJpc3MiOiJBY21lIEx0ZCIsInN1YiI6Ik5ldyBzb2Z0d2FyZSIsImRvbWFpbk5hbWUiOiJleGFtcGxlLmNvbSIsInBvcnQiOjgwfQ.3jJiJgXsg9FBeIp5Kpd4TaVDwUGvJKoRD72WJFihHQ-eKL0fK_fVapEzi0yArQLKiHVsxgaAm1k3nJzKoWF5IQ1syp9xKZgrZY_w1FIeVk-os_XN1iQ7GK_VPnBiuIsFuN8qU_61_-0d9QdASqrTh35jpWL_kLNtgAYiS3T3SIN-JRvXv1-D8c0OfpfEHjO_nIGrA0788fO9UAIU8-ZViZoq9SRwSKG7x03PcxLPnwzIuWJt38YJern6fQmwcHjdit6DoQcEhvY1hci2DOgB5faCV-G3lfOtSgCwpJzuRj1F3AZWyV8KK9XQGvMutKmJ9QicOhTUYaIXKt6jyz3LOeslcIFajLT6byhl3MFDZkeAqlPbU1fidENbLUtpUfzfgnWWBgaMtRvEUSRQE3SHwlz57gUmxnNDYgyTSvmiWU7EWlh2PWnUqZKJxYY3O4KrFaLZgbYWOjjj132tA1S83OkWgAAt_ElxeghQ8A5atglFVXfJP0BaUKbSXIiGbY-xQl0tsWPqchX7vQA-3OscK8-KdjeF9YgYJ336_LxLHSxt-RgDuh62N-uzRGF5hpczvIh96i6t387LR0vw1UTulW-d8-9sS_iB2131bOLytN4qgtXfQ8TFv6UVatRgq1Bm8STS8PYmAMkT6hX4_ONL1cZ0iEFzPbZsWc6VgBLQfVQ \ No newline at end of file diff --git a/test/index.js b/test/index.js index 3216df2..ba1606f 100644 --- a/test/index.js +++ b/test/index.js @@ -10,7 +10,6 @@ const Path = require('path'); // fixtures const PrivateKey = Fs.readFileSync(Path.resolve(__dirname, './fixtures/private.pem')); const PublicKey = Fs.readFileSync(Path.resolve(__dirname, './fixtures/public.pem')); -const Token = Fs.readFileSync(Path.resolve(__dirname, './fixtures/test.token'), 'utf8'); // Set-up lab const lab = exports.lab = Lab.script(); @@ -40,7 +39,7 @@ const signingOptions = () => { // payload can be object, buffer or string payload: { exp: '365d', - nbf: Date.now(), + nbf: Date.now() - 10000, iat: '01-01-1990', host: Os.hostname(), port: 3000 @@ -169,7 +168,8 @@ describe('Jwt', () => { it('should verify a payload sync', (done) => { - const ops = verifyOptions(Token); + const result = Jwt.signSync(signingOptions()); + const ops = verifyOptions(result.token); const valid = Jwt.verifySync(ops); expect(valid).to.be.true(); done(); @@ -199,7 +199,8 @@ describe('Jwt', () => { it('should verify a payload async', (done) => { - const ops = verifyOptions(Token); + const result = Jwt.signSync(signingOptions()); + const ops = verifyOptions(result.token); Jwt.verify(ops, (err, decoded) => { expect(err).to.not.exist();