refactor(lint): remove jscs, update eslint rules (#477), r=@vbudhram

.eslintrc

@@ -1,11 +1,7 @@
-{
-  "extends": "fxa/server",
-  "env": {
-    "mocha": true
-  },
-  "rules": {
-    "handle-callback-err": 0,
-    "complexity": [2, 10],
-    "semi": [2, "always"]
-  }
-}
+plugins:
+  - fxa
+extends: plugin:fxa/server
+
+rules:
+  handle-callback-err: 0
+  semi: [2, "always"]

.jscsrc

@@ -1,19 +0,0 @@
-{
-    "disallowKeywords": ["with", "eval"],
-    "disallowKeywordsOnNewLine": ["else"],
-    "disallowMultipleLineStrings": true,
-    "disallowSpaceAfterObjectKeys": true,
-    "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-"],
-    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
-    "maximumLineLength": 160,
-    "requireCapitalizedConstructors": true,
-    "requireCurlyBraces": ["for", "while", "do"],
-    "requireLineFeedAtFileEnd": true,
-    "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return"],
-    "requireSpaceAfterBinaryOperators": ["=", ",", "+", "-", "/", "*", "==", "===", "!=", "!=="],
-    "requireSpaceAfterPrefixUnaryOperators": ["~"],
-    "requireSpacesInConditionalExpression": true,
-    "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
-    "validateIndentation": 2,
-    "validateQuoteMarks": "'"
-}

Dockerfile-build

@@ -1,5 +1,7 @@
 FROM node:6.11.1-alpine
 
+RUN apk add --no-cache git
+
 RUN addgroup -g 10001 app && \
     adduser -D -G app -h /app -u 10001 app
 WORKDIR /app

bin/purge_expired_tokens.js

@@ -36,7 +36,7 @@ program
 
 program.parse(process.argv);
 
-if (!program.config) {
+if (! program.config) {
   program.config = 'dev';
 }
 
@@ -45,7 +45,7 @@ process.env.NODE_ENV = program.config;
 const db = require('../lib/db');
 const logger = require('../lib/logging')('bin.purge_expired_tokens');
 
-if (!program.pocketId) {
+if (! program.pocketId) {
   logger.error('invalid', { message: 'Required pocket client id!' });
   process.exit(1);
 }

grunttasks/jscs.js

@@ -1,16 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-module.exports = function (grunt) {
-  'use strict';
-
-  grunt.config('jscs', {
-    app: [
-      '<%= mainJsFiles %>'
-    ],
-    options: {
-      config: '.jscsrc'
-    }
-  });
-};

grunttasks/lint.js

@@ -8,7 +8,6 @@ module.exports = function (grunt) {
   'use strict';
 
   grunt.registerTask('lint', [
-    'eslint',
-    'jscs'
+    'eslint'
   ]);
 };

lib/auth.js

@@ -22,19 +22,19 @@ exports.strategy = function() {
     authenticate: function dogfoodStrategy(req, reply) {
       var auth = req.headers.authorization;
       logger.debug('check.auth', { header: auth });
-      if (!auth || auth.indexOf('Bearer ') !== 0) {
+      if (! auth || auth.indexOf('Bearer ') !== 0) {
         return reply(AppError.unauthorized('Bearer token not provided'));
       }
       var tok = auth.split(' ')[1];
 
-      if (!validators.HEX_STRING.test(tok)) {
+      if (! validators.HEX_STRING.test(tok)) {
         return reply(AppError.unauthorized('Illegal Bearer token'));
       }
 
       token.verify(tok).done(function tokenFound(details) {
         if (details.scope.indexOf(exports.SCOPE_CLIENT_MANAGEMENT) !== -1) {
           logger.debug('check.whitelist');
-          var blocked = !WHITELIST.some(function(re) {
+          var blocked = ! WHITELIST.some(function(re) {
             return re.test(details.email);
           });
           if (blocked) {

lib/auth_bearer.js

@@ -21,12 +21,12 @@ exports.strategy = function() {
       var auth = req.headers.authorization;
 
       logger.debug(authName + '.check', { header: auth });
-      if (!auth || auth.indexOf('Bearer ') !== 0) {
+      if (! auth || auth.indexOf('Bearer ') !== 0) {
         return reply(AppError.unauthorized('Bearer token not provided'));
       }
       var tok = auth.split(' ')[1];
 
-      if (!validators.HEX_STRING.test(tok)) {
+      if (! validators.HEX_STRING.test(tok)) {
         return reply(AppError.unauthorized('Illegal Bearer token'));
       }
 

lib/browserid.js

@@ -65,7 +65,7 @@ module.exports = function verifyAssertion(assertion) {
       d.reject(AppError.invalidAssertion());
     }
 
-    if (!body || body.status !== 'okay') {
+    if (! body || body.status !== 'okay') {
       return error('non-okay response', body);
     }
     var email = body.email;
@@ -84,7 +84,7 @@ module.exports = function verifyAssertion(assertion) {
     }
 
     var claims = body.idpClaims;
-    if (!claims || !claims['fxa-verifiedEmail']) {
+    if (! claims || ! claims['fxa-verifiedEmail']) {
       return error('incorrect idpClaims', claims);
     }
 

lib/config.js

@@ -383,7 +383,7 @@ if (Object.keys(oldKey).length) {
     'openid.key.kid must differ from oldKey');
   assert(oldKey.n, 'openid.oldKey.n is required');
   assert(oldKey.e, 'openid.oldKey.e is required');
-  assert(!oldKey.d, 'openid.oldKey.d is forbidden');
+  assert(! oldKey.d, 'openid.oldKey.d is forbidden');
 }
 
 module.exports = conf;

lib/db/index.js

@@ -38,7 +38,7 @@ function convertClientToConfigFormat(client) {
     if (key === 'hashedSecret' || key === 'hashedSecretPrevious') {
       out[key] = unbuf(client[key]);
     } else if (key === 'trusted' || key === 'canGrant') {
-      out[key] = !!client[key]; // db stores booleans as 0 or 1.
+      out[key] = !! client[key]; // db stores booleans as 0 or 1.
     } else if (typeof client[key] !== 'function') {
       out[key] = unbuf(client[key]);
     }
@@ -66,7 +66,7 @@ function preClients() {
       var REQUIRED_CLIENTS_KEYS = [ 'id', 'hashedSecret', 'name', 'imageUri',
                                     'redirectUri', 'trusted', 'canGrant' ];
       REQUIRED_CLIENTS_KEYS.forEach(function(key) {
-        if (!(key in c)) {
+        if (! (key in c)) {
           var data = { key: key, name: c.name || 'unknown' };
           logger.error('client.missing.keys', data);
           err = new Error('Client config has missing keys');
@@ -77,13 +77,13 @@ function preClients() {
       }
 
       // ensure booleans are boolean and not undefined
-      c.trusted = !!c.trusted;
-      c.canGrant = !!c.canGrant;
-      c.publicClient = !!c.publicClient;
+      c.trusted = !! c.trusted;
+      c.canGrant = !! c.canGrant;
+      c.publicClient = !! c.publicClient;
 
       // Modification of the database at startup in production and stage is
       // not preferred. This option will be set to false on those stacks.
-      if (!config.get('db.autoUpdateClients')) {
+      if (! config.get('db.autoUpdateClients')) {
         return P.resolve();
       }
 

lib/db/memory.js

@@ -80,7 +80,7 @@ const MAX_TTL = config.get('expiration.accessToken');
  * }
  */
 function MemoryStore() {
-  if (!(this instanceof MemoryStore)) {
+  if (! (this instanceof MemoryStore)) {
     return new MemoryStore();
   }
   this.clients = {};
@@ -96,7 +96,7 @@ MemoryStore.connect = function memoryConnect() {
 };
 
 function clone(obj) {
-  if (!obj) {
+  if (! obj) {
     return obj;
   }
   var clone = {};
@@ -131,19 +131,19 @@ MemoryStore.prototype = {
     client.createdAt = new Date();
     client.imageUri = client.imageUri || '';
     client.redirectUri = client.redirectUri || '';
-    client.canGrant = !!client.canGrant;
-    client.trusted = !!client.trusted;
+    client.canGrant = !! client.canGrant;
+    client.trusted = !! client.trusted;
     this.clients[hex] = client;
     client.hashedSecret = client.hashedSecret;
     client.hashedSecretPrevious = client.hashedSecretPrevious || '';
     return P.resolve(client);
   },
   updateClient: function updateClient(client) {
-    if (!client.id) {
+    if (! client.id) {
       return P.reject(new Error('Update client needs an id'));
     }
     var hex = unbuf(client.id);
-    if (!this.clients[hex]) {
+    if (! this.clients[hex]) {
       return P.reject(new Error('Client does not exist'));
     }
     var old = this.clients[hex];
@@ -316,11 +316,11 @@ MemoryStore.prototype = {
     return P.resolve(clone(this.refreshTokens[unbuf(token)]));
   },
   usedRefreshToken: function usedRefreshToken(token) {
-    if (!token) {
+    if (! token) {
       return P.reject(new Error('Update needs a token'));
     }
     var hex = unbuf(token);
-    if (!this.refreshTokens[hex]) {
+    if (! this.refreshTokens[hex]) {
       return P.reject(new Error('Token does not exist'));
     }
     var old = this.refreshTokens[hex];

lib/db/mysql/index.js

@@ -239,9 +239,9 @@ MysqlStore.prototype = {
       buf(client.hashedSecret),
       client.hashedSecretPrevious ? buf(client.hashedSecretPrevious) : null,
       client.redirectUri,
-      !!client.trusted,
-      !!client.canGrant,
-      !!client.publicClient
+      !! client.trusted,
+      !! client.canGrant,
+      !! client.publicClient
     ]).then(function() {
       logger.debug('registerClient.success', { id: hex(id) });
       client.id = id;
@@ -249,7 +249,7 @@ MysqlStore.prototype = {
     });
   },
   registerClientDeveloper: function regClientDeveloper(developerId, clientId) {
-    if (!developerId || !clientId) {
+    if (! developerId || ! clientId) {
       var err = new Error('Owner registration requires user and developer id');
       return P.reject(err);
     }
@@ -319,7 +319,7 @@ MysqlStore.prototype = {
     });
   },
   updateClient: function updateClient(client) {
-    if (!client.id) {
+    if (! client.id) {
       return P.reject(new Error('Update client needs an id'));
     }
     var secret = client.hashedSecret;
@@ -364,7 +364,7 @@ MysqlStore.prototype = {
       codeObj.email,
       codeObj.scope.join(' '),
       codeObj.authAt,
-      !!codeObj.offline,
+      !! codeObj.offline,
       hash,
       codeObj.codeChallengeMethod,
       codeObj.codeChallenge
@@ -650,7 +650,7 @@ MysqlStore.prototype = {
               needToSetMode = true;
             }
           });
-          if (!needToSetMode) {
+          if (! needToSetMode) {
             conn._fxa_initialized = true;
             return resolve(conn);
           }

lib/events.js

@@ -11,7 +11,7 @@ const HEX_STRING = require('./validators').HEX_STRING;
 
 var fxaEvents;
 
-if (!config.events.region || !config.events.queueUrl) {
+if (! config.events.region || ! config.events.queueUrl) {
   fxaEvents = {
     start: function start() {
       if (env.isProdLike()) {
@@ -28,7 +28,7 @@ if (!config.events.region || !config.events.queueUrl) {
     logger.verbose('data', message);
     if (message.event === 'delete') {
       var userId = message.uid.split('@')[0];
-      if (!HEX_STRING.test(userId)) {
+      if (! HEX_STRING.test(userId)) {
         message.del();
         return logger.warn('badDelete', { userId: userId });
       }

lib/routes/authorization.js

@@ -190,7 +190,7 @@ module.exports = {
     P.all([
       verify(req.payload.assertion).then(function(claims) {
         logger.info('time.browserid_verify', { ms: Date.now() - start });
-        if (!claims) {
+        if (! claims) {
           exitEarly = true;
           throw AppError.invalidAssertion();
         }
@@ -202,10 +202,10 @@ module.exports = {
           // assertion was invalid, we can just stop here
           return;
         }
-        if (!client) {
+        if (! client) {
           logger.debug('notFound', { id: req.payload.client_id });
           throw AppError.unknownClient(req.payload.client_id);
-        } else if (!client.trusted) {
+        } else if (! client.trusted) {
           var invalidScopes = detectInvalidScopes(scope.values(),
                                 UNTRUSTED_CLIENT_ALLOWED_SCOPES);
 
@@ -243,7 +243,7 @@ module.exports = {
 
         }
 
-        if (wantsGrant && !client.canGrant) {
+        if (wantsGrant && ! client.canGrant) {
           logger.warn('implicitGrant.notAllowed', {
             id: req.payload.client_id
           });

lib/routes/client/get.js

@@ -28,7 +28,7 @@ module.exports = {
   handler: function requestInfoEndpoint(req, reply) {
     var params = req.params;
     db.getClient(Buffer(params.client_id, 'hex')).then(function(client) {
-      if (!client) {
+      if (! client) {
         logger.debug('notFound', { id: params.client_id });
         throw AppError.unknownClient(params.client_id);
       }

lib/routes/client/register.js

@@ -46,8 +46,8 @@ module.exports = {
       name: payload.name,
       redirectUri: payload.redirect_uri,
       imageUri: payload.image_uri || '',
-      canGrant: !!payload.can_grant,
-      trusted: !!payload.trusted
+      canGrant: !! payload.can_grant,
+      trusted: !! payload.trusted
     };
     var developerEmail = req.auth.credentials.email;
     var developerId = null;

lib/routes/destroy.js

@@ -34,7 +34,7 @@ module.exports = {
     }
 
     db[getToken](token).then(function(tok) {
-      if (!tok) {
+      if (! tok) {
         throw AppError.invalidToken();
       }
       return db[removeToken](token);

lib/routes/redirect.js

@@ -36,7 +36,7 @@ module.exports = {
     if (! err) {
       delete req.query.action;
 
-      if (req.query.login_hint && !req.query.email) {
+      if (req.query.login_hint && ! req.query.email) {
         req.query.email = req.query.login_hint;
         delete req.query.login_hint;
       }

lib/routes/root.js

@@ -13,7 +13,7 @@ try {
   var info = require('../../config/version.json');
   commitHash = info.version.hash;
   source = info.version.source;
-} catch(e) {
+} catch (e) {
   /* ignore */
 }
 

lib/routes/token.js

@@ -228,7 +228,7 @@ function pkceHash(input) {
 }
 
 function validPublicClient(client) {
-  if (!client.publicClient) {
+  if (! client.publicClient) {
     logger.debug('client.notPublicClient', { id: client.id });
     throw AppError.notPublicClient(client.id);
   }
@@ -249,7 +249,7 @@ function getClientById(clientId) {
 
 function confirmPkceCode(code, pkceVerifier) {
   return db.getCode(buf(code)).then(function(codeObj) {
-    if (!codeObj) {
+    if (! codeObj) {
       logger.debug('code.notFound', { code: code });
       throw AppError.unknownCode(code);
     }
@@ -299,7 +299,7 @@ function confirmClientSecret(client, secret) {
 
 function confirmCode(id, code) {
   return db.getCode(buf(code)).then(function(codeObj) {
-    if (!codeObj) {
+    if (! codeObj) {
       logger.debug('code.notFound', { code: code });
       throw AppError.unknownCode(code);
     } else if (hex(codeObj.clientId) !== hex(id)) {
@@ -325,7 +325,7 @@ function confirmCode(id, code) {
 function confirmRefreshToken(params) {
   return db.getRefreshToken(encrypt.hash(params.refresh_token))
   .then(function(tokObj) {
-    if (!tokObj) {
+    if (! tokObj) {
       logger.debug('refresh_token.notFound', params.refresh_token);
       throw AppError.invalidToken();
     } else if (hex(tokObj.clientId) !== hex(params.client_id)) {
@@ -334,7 +334,7 @@ function confirmRefreshToken(params) {
         code: tokObj.clientId
       });
       throw AppError.invalidToken();
-    } else if (!Scope(tokObj.scope).has(params.scope)) {
+    } else if (! Scope(tokObj.scope).has(params.scope)) {
       logger.debug('refresh_token.invalidScopes', {
         allowed: tokObj.scope,
         requested: params.scope
@@ -380,7 +380,7 @@ function confirmJwt(params) {
       throw AppError.invalidAssertion();
     }
 
-    if (!Scope(client.scope).has(payload.scope)) {
+    if (! Scope(client.scope).has(payload.scope)) {
       logger.debug('jwt.invalid.scopes', {
         allowed: client.scope,
         requested: payload.scope
@@ -412,11 +412,11 @@ function confirmJwt(params) {
 }
 
 function _validateJwtSub(sub) {
-  if (!sub) {
+  if (! sub) {
     logger.debug('jwt.invalid.sub.missing');
     throw AppError.invalidAssertion();
   }
-  if (sub.length !== 32 || !HEX_STRING.test(sub)) {
+  if (sub.length !== 32 || ! HEX_STRING.test(sub)) {
     logger.debug('jwt.invalid.sub', sub);
     throw AppError.invalidAssertion();
   }

lib/scope.js

@@ -6,10 +6,10 @@
 function Scope(arr) {
   if (arr instanceof Scope) {
     return arr;
-  } else if (!(this instanceof Scope)) {
+  } else if (! (this instanceof Scope)) {
     return new Scope(arr);
   }
-  if (!arr) {
+  if (! arr) {
     arr = [];
   } else if (typeof arr === 'string') {
     arr = arr.split(/\s+/);
@@ -27,7 +27,7 @@ Scope.prototype = {
 
   has: function has(scope) {
     return Scope(scope).values().every(function(word) {
-      if (!word || word.lastIndexOf(':') === word.length - 1) {
+      if (! word || word.lastIndexOf(':') === word.length - 1) {
         return false;
       } else if (word in this._values || word + ':write' in this._values) {
         return true;

lib/server/index.js

@@ -70,7 +70,7 @@ exports.create = function createServer() {
   routes.forEach(function(route) {
     var method = route.method.toUpperCase();
     if (method !== 'GET' && method !== 'HEAD') {
-      if (!route.config.payload) {
+      if (! route.config.payload) {
         route.config.payload = {
           allow: ['application/json', 'application/x-www-form-urlencoded']
         };

lib/server/internal.js

@@ -64,7 +64,7 @@ exports.create = function createServer() {
   routes.forEach(function(route) {
     var method = route.method.toUpperCase();
     if (method !== 'GET' && method !== 'HEAD') {
-      if (!route.config.payload) {
+      if (! route.config.payload) {
         route.config.payload = {
           allow: ['application/json', 'application/x-www-form-urlencoded']
         };

lib/token.js

@@ -15,7 +15,7 @@ const TWENTY_FOUR_HOURS = 24 * 60 * 60 * 1000;
 exports.verify = function verify(token) {
   return db.getAccessToken(encrypt.hash(token))
   .then(function(token) {
-    if (!token) {
+    if (! token) {
       throw AppError.invalidToken();
     } else if (+token.expiresAt < Date.now()) {
       // We dug ourselves a bit of a hole with token expiry,

lib/unique.js

@@ -7,7 +7,7 @@ const crypto = require('crypto');
 const config = require('./config');
 
 function unique(length) {
-  return crypto.randomBytes(length);
+  return crypto.randomBytes(length); // eslint-disable-line fxa/async-crypto-random
 }
 
 function fn(configName) {

package.json

@@ -43,13 +43,12 @@
     "urijs": "^1.16.1"
   },
   "devDependencies": {
-    "eslint-config-fxa": "^1.8.0",
+    "eslint-plugin-fxa": "git://github.com/mozilla/eslint-plugin-fxa.git#41504c9dd30e8b52900c15b524946aa0428aef95",
     "grunt": "^1.0.1",
     "grunt-bump": "0.8.0",
     "grunt-conventional-changelog": "^1.1.0",
     "grunt-copyright": "^0.3.0",
-    "grunt-eslint": "^16.0.0",
-    "grunt-jscs": "^3.0.1",
+    "grunt-eslint": "18.0.0",
     "grunt-nodemon": "^0.4.0",
     "grunt-nsp": "2.3.1",
     "insist": "1.x",

scripts/.eslintrc

@@ -0,0 +1,8 @@
+plugins:
+  - fxa
+
+rules:
+  fxa/async-crypto-random: 0
+  fxa/no-new-buffer: 2
+  no-console: 0
+  handle-callback-err: 0

scripts/gen_keys.js

@@ -30,7 +30,7 @@ const oldKeyPath = './config/oldKey.json';
 
 try {
   var keysExist = fs.existsSync(keyPath) && fs.existsSync(oldKeyPath);
-  assert(!keysExist, 'keys already exists');
+  assert(! keysExist, 'keys already exists');
 } catch (e) {
   process.exit();
 }

scripts/generate-client-for-ops.js

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 if (process.argv.length !== 4) {
-  console.error(`Usage: node generate-client-for-ops.js "client-name" "client-redirect-url"`);
+  console.error('Usage: node generate-client-for-ops.js "client-name" "client-redirect-url"');
   process.exit(1);
 }
 

test/.eslintrc

@@ -0,0 +1,10 @@
+plugins:
+  - fxa
+extends: ../.eslintrc
+
+env:
+  mocha: true
+
+rules:
+  fxa/async-crypto-random: 0
+  fxa/no-new-buffer: 2

test/api.js

@@ -1130,7 +1130,7 @@ describe('/v1', function() {
               assertSecurityHeaders(res);
               assert.equal(res.result.token_type, 'bearer');
               assert(res.result.access_token);
-              assert(!res.result.refresh_token);
+              assert(! res.result.refresh_token);
               assert.equal(res.result.access_token.length,
                 config.get('unique.token') * 2);
               assert.equal(res.result.scope, 'foo bar');
@@ -2398,7 +2398,7 @@ describe('/v1', function() {
         var key = res.result.keys[0];
         assert(key.n);
         assert(key.e);
-        assert(!key.d);
+        assert(! key.d);
       });
     });
 
@@ -2411,7 +2411,7 @@ describe('/v1', function() {
 
         var keys = res.result.keys;
         assert.equal(keys.length, 2);
-        assert(!keys[1].d);
+        assert(! keys[1].d);
         assert.notEqual(keys[0].kid, keys[1].kid);
       });
     });

test/scope.js

@@ -36,14 +36,14 @@ describe('Scope', function() {
       var s1 = Scope('foo bar');
       assert(s1.has('foo'));
       assert(s1.has('bar'));
-      assert(!s1.has('baz'));
+      assert(! s1.has('baz'));
     });
 
     it('should work with another Scope object', function() {
       var s1 = Scope('foo bar');
       var s2 = Scope('bar');
       assert(s1.has(s2));
-      assert(!s2.has(s1));
+      assert(! s2.has(s1));
     });
 
     it('should allow sub-scopes', function() {
@@ -51,23 +51,23 @@ describe('Scope', function() {
       assert(s1.has('foo:dee'));
       assert(s1.has('bar:baz'));
       assert(s1.has('foo:mah:pa bar:baz:quux'));
-      assert(!s1.has('bar'));
+      assert(! s1.has('bar'));
 
-      assert(!s1.has('foo:write'));
-      assert(!s1.has('foo:dee:write'));
+      assert(! s1.has('foo:write'));
+      assert(! s1.has('foo:dee:write'));
 
       var s2 = Scope('foo bar baz:quux:write');
       assert(s2.has('foo bar baz:quux'));
 
-      assert(!s2.has('baz:write'));
-      assert(!s2.has('foo bar baz'));
+      assert(! s2.has('baz:write'));
+      assert(! s2.has('foo bar baz'));
 
       var s3 = Scope('foo:write');
       assert(s3.has('foo:bar'));
       assert(s3.has('foo:bar:write'));
 
-      assert(!s3.has('foo::write'));
-      assert(!s3.has('foo:write:::'));
+      assert(! s3.has('foo::write'));
+      assert(! s3.has('foo:write:::'));
 
     });
 

test/server.js

@@ -28,7 +28,7 @@ function checkVersionAndHeaders(path) {
       };
 
       Object.keys(res.headers).forEach(function(header) {
-        assert.ok(!other[header.toLowerCase()]);
+        assert.ok(! other[header.toLowerCase()]);
       });
     }).done(done, done);
   };

test/util.js

@@ -9,7 +9,7 @@ describe('util', function () {
   describe('base64URLEncode', function () {
     it('properly encodes', function () {
       var testBase64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
-        testBuffer = new Buffer(testBase64, 'base64'),
+        testBuffer = Buffer.from(testBase64, 'base64'),
         expectedBase64 = testBase64.replace('+', '-').replace('/', '_');
 
       assert.equal(util.base64URLEncode(testBuffer), expectedBase64);