avoid node v8 features

Author: felixheck

package.json

@@ -33,8 +33,7 @@
   "scripts": {
     "start": "NODE_ENV=test npm test -- -w",
     "lint": "standard",
-    "test:cmd": "node --harmony node_modules/.bin/ava test/**/*.spec.js --timeout=30s",
-    "test": "NODE_ENV=test nyc --check-coverage --lines 80 npm run test:cmd",
+    "test": "NODE_ENV=test nyc --check-coverage --lines 80 ava test/**/*.spec.js --timeout=30s",
     "coverage": "nyc report --reporter=lcov",
     "ci.coverage": "nyc report --reporter=text-lcov | coveralls"
   },

src/index.js

@@ -32,7 +32,7 @@ function handleKeycloakValidation (tkn, reply) {
       return invalidate()
     }
 
-    const { expiresIn, ...credentials } = tkn.getData(internals.userInfoFields)
+    const { expiresIn, credentials } = tkn.getData(internals.userInfoFields)
     const userData = { credentials }
 
     cache.set(tkn.get(), userData, expiresIn)

src/token.js

@@ -106,9 +106,10 @@ function token (field) {
     const content = getContent()
 
     return {
-      scope: getScope(content),
       expiresIn: getExpiration(content),
-      ...getUserInfo(content, userInfoFields)
+      credentials: Object.assign({
+        scope: getScope(content)
+      }, getUserInfo(content, userInfoFields))
     }
   }
 

test/token.spec.js

@@ -63,21 +63,21 @@ test('get user data of token', (t) => {
 
   t.truthy(data)
   t.is(data.expiresIn, 4000)
-  t.is(data.sub, fixtures.content.userData.sub)
-  t.falsy(data.name)
-  t.deepEqual(data.scope.sort(), ['editor', 'other-app:creator', 'realm:admin'])
+  t.is(data.credentials.sub, fixtures.content.userData.sub)
+  t.falsy(data.credentials.name)
+  t.deepEqual(data.credentials.scope.sort(), ['editor', 'other-app:creator', 'realm:admin'])
 })
 
-test('get user data of token', (t) => {
+test('get user data of token – additional fields', (t) => {
   const jwt = `bearer ${fixtures.jwt.userData}`
   const tkn = token(jwt)
   const data = tkn.getData(['name'])
 
   t.truthy(data)
   t.is(data.expiresIn, 4000)
-  t.is(data.sub, fixtures.content.userData.sub)
-  t.is(data.name, fixtures.content.userData.name)
-  t.deepEqual(data.scope.sort(), ['editor', 'other-app:creator', 'realm:admin'])
+  t.is(data.credentials.sub, fixtures.content.userData.sub)
+  t.is(data.credentials.name, fixtures.content.userData.name)
+  t.deepEqual(data.credentials.scope.sort(), ['editor', 'other-app:creator', 'realm:admin'])
 })
 
 test('get user data of token – default expiration', (t) => {
@@ -87,5 +87,5 @@ test('get user data of token – default expiration', (t) => {
 
   t.truthy(data)
   t.is(data.expiresIn, 60000)
-  t.deepEqual(data.scope.sort(), ['editor', 'other-app:creator', 'realm:admin'])
+  t.deepEqual(data.credentials.scope.sort(), ['editor', 'other-app:creator', 'realm:admin'])
 })