Move to es6

.eslintrc

@@ -34,6 +34,13 @@
     "no-console": [
       "error"
     ],
+    "no-var": [
+      "error"
+    ],
+    "prefer-const": ["error", {
+      "destructuring": "any",
+      "ignoreReadBeforeAssign": false
+    }],
     "no-unused-vars": [
       "error", 
       { 

lib/errors/access-denied-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/insufficient-scope-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/invalid-argument-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/invalid-client-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/invalid-grant-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/invalid-request-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/invalid-scope-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/invalid-token-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/oauth-error.js

@@ -3,15 +3,15 @@
 /**
  * Module dependencies.
  */
-var util = require('util');
-var http = require('http');
+const util = require('util');
+const http = require('http');
 /**
  * Constructor.
  */
 
 function OAuthError(messageOrError, properties) {
-  var message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
-  var error = messageOrError instanceof Error ? messageOrError : null;
+  let message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
+  const error = messageOrError instanceof Error ? messageOrError : null;
   if (properties == null || !Object.entries(properties).length ) {
     properties = {};
   }
@@ -26,7 +26,7 @@ function OAuthError(messageOrError, properties) {
   }
   this.code = this.status = this.statusCode = properties.code;
   this.message = message;
-  for (var key in properties) {
+  for (const key in properties) {
     if (key !== 'code') {
       this[key] = properties[key];
     }

lib/errors/server-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/unauthorized-client-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/unauthorized-request-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/unsupported-grant-type-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/errors/unsupported-response-type-error.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
-var OAuthError = require('./oauth-error');
-var util = require('util');
+const OAuthError = require('./oauth-error');
+const util = require('util');
 
 /**
  * Constructor.

lib/grant-types/abstract-grant-type.js

@@ -4,12 +4,12 @@
  * Module dependencies.
  */
 
-var InvalidArgumentError = require('../errors/invalid-argument-error');
-var InvalidScopeError = require('../errors/invalid-scope-error');
-var Promise = require('bluebird');
-var promisify = require('promisify-any').use(Promise);
-var is = require('../validator/is');
-var tokenUtil = require('../utils/token-util');
+const InvalidArgumentError = require('../errors/invalid-argument-error');
+const InvalidScopeError = require('../errors/invalid-scope-error');
+const Promise = require('bluebird');
+const promisify = require('promisify-any').use(Promise);
+const is = require('../validator/is');
+const tokenUtil = require('../utils/token-util');
 
 /**
  * Constructor.

lib/grant-types/authorization-code-grant-type.js

@@ -4,15 +4,15 @@
  * Module dependencies.
  */
 
-var AbstractGrantType = require('./abstract-grant-type');
-var InvalidArgumentError = require('../errors/invalid-argument-error');
-var InvalidGrantError = require('../errors/invalid-grant-error');
-var InvalidRequestError = require('../errors/invalid-request-error');
-var Promise = require('bluebird');
-var promisify = require('promisify-any').use(Promise);
-var ServerError = require('../errors/server-error');
-var is = require('../validator/is');
-var util = require('util');
+const AbstractGrantType = require('./abstract-grant-type');
+const InvalidArgumentError = require('../errors/invalid-argument-error');
+const InvalidGrantError = require('../errors/invalid-grant-error');
+const InvalidRequestError = require('../errors/invalid-request-error');
+const Promise = require('bluebird');
+const promisify = require('promisify-any').use(Promise);
+const ServerError = require('../errors/server-error');
+const is = require('../validator/is');
+const util = require('util');
 
 /**
  * Constructor.
@@ -138,7 +138,7 @@ AuthorizationCodeGrantType.prototype.validateRedirectUri = function(request, cod
     return;
   }
 
-  var redirectUri = request.body.redirect_uri || request.query.redirect_uri;
+  const redirectUri = request.body.redirect_uri || request.query.redirect_uri;
 
   if (!is.uri(redirectUri)) {
     throw new InvalidRequestError('Invalid request: `redirect_uri` is not a valid URI');
@@ -175,7 +175,7 @@ AuthorizationCodeGrantType.prototype.revokeAuthorizationCode = function(code) {
  */
 
 AuthorizationCodeGrantType.prototype.saveToken = function(user, client, authorizationCode, scope) {
-  var fns = [
+  const fns = [
     this.validateScope(user, client, scope),
     this.generateAccessToken(client, user, scope),
     this.generateRefreshToken(client, user, scope),
@@ -186,7 +186,7 @@ AuthorizationCodeGrantType.prototype.saveToken = function(user, client, authoriz
   return Promise.all(fns)
     .bind(this)
     .spread(function(scope, accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
-      var token = {
+      const token = {
         accessToken: accessToken,
         authorizationCode: authorizationCode,
         accessTokenExpiresAt: accessTokenExpiresAt,

lib/grant-types/client-credentials-grant-type.js

@@ -4,12 +4,12 @@
  * Module dependencies.
  */
 
-var AbstractGrantType = require('./abstract-grant-type');
-var InvalidArgumentError = require('../errors/invalid-argument-error');
-var InvalidGrantError = require('../errors/invalid-grant-error');
-var Promise = require('bluebird');
-var promisify = require('promisify-any').use(Promise);
-var util = require('util');
+const AbstractGrantType = require('./abstract-grant-type');
+const InvalidArgumentError = require('../errors/invalid-argument-error');
+const InvalidGrantError = require('../errors/invalid-grant-error');
+const Promise = require('bluebird');
+const promisify = require('promisify-any').use(Promise);
+const util = require('util');
 
 /**
  * Constructor.
@@ -54,7 +54,7 @@ ClientCredentialsGrantType.prototype.handle = function(request, client) {
     throw new InvalidArgumentError('Missing parameter: `client`');
   }
 
-  var scope = this.getScope(request);
+  const scope = this.getScope(request);
 
   return Promise.bind(this)
     .then(function() {
@@ -85,7 +85,7 @@ ClientCredentialsGrantType.prototype.getUserFromClient = function(client) {
  */
 
 ClientCredentialsGrantType.prototype.saveToken = function(user, client, scope) {
-  var fns = [
+  const fns = [
     this.validateScope(user, client, scope),
     this.generateAccessToken(client, user, scope),
     this.getAccessTokenExpiresAt(client, user, scope)
@@ -94,7 +94,7 @@ ClientCredentialsGrantType.prototype.saveToken = function(user, client, scope) {
   return Promise.all(fns)
     .bind(this)
     .spread(function(scope, accessToken, accessTokenExpiresAt) {
-      var token = {
+      const token = {
         accessToken: accessToken,
         accessTokenExpiresAt: accessTokenExpiresAt,
         scope: scope

lib/grant-types/password-grant-type.js

@@ -4,14 +4,14 @@
  * Module dependencies.
  */
 
-var AbstractGrantType = require('./abstract-grant-type');
-var InvalidArgumentError = require('../errors/invalid-argument-error');
-var InvalidGrantError = require('../errors/invalid-grant-error');
-var InvalidRequestError = require('../errors/invalid-request-error');
-var Promise = require('bluebird');
-var promisify = require('promisify-any').use(Promise);
-var is = require('../validator/is');
-var util = require('util');
+const AbstractGrantType = require('./abstract-grant-type');
+const InvalidArgumentError = require('../errors/invalid-argument-error');
+const InvalidGrantError = require('../errors/invalid-grant-error');
+const InvalidRequestError = require('../errors/invalid-request-error');
+const Promise = require('bluebird');
+const promisify = require('promisify-any').use(Promise);
+const is = require('../validator/is');
+const util = require('util');
 
 /**
  * Constructor.
@@ -56,7 +56,7 @@ PasswordGrantType.prototype.handle = function(request, client) {
     throw new InvalidArgumentError('Missing parameter: `client`');
   }
 
-  var scope = this.getScope(request);
+  const scope = this.getScope(request);
 
   return Promise.bind(this)
     .then(function() {
@@ -103,7 +103,7 @@ PasswordGrantType.prototype.getUser = function(request) {
  */
 
 PasswordGrantType.prototype.saveToken = function(user, client, scope) {
-  var fns = [
+  const fns = [
     this.validateScope(user, client, scope),
     this.generateAccessToken(client, user, scope),
     this.generateRefreshToken(client, user, scope),
@@ -114,7 +114,7 @@ PasswordGrantType.prototype.saveToken = function(user, client, scope) {
   return Promise.all(fns)
     .bind(this)
     .spread(function(scope, accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
-      var token = {
+      const token = {
         accessToken: accessToken,
         accessTokenExpiresAt: accessTokenExpiresAt,
         refreshToken: refreshToken,

lib/grant-types/refresh-token-grant-type.js

@@ -4,15 +4,15 @@
  * Module dependencies.
  */
 
-var AbstractGrantType = require('./abstract-grant-type');
-var InvalidArgumentError = require('../errors/invalid-argument-error');
-var InvalidGrantError = require('../errors/invalid-grant-error');
-var InvalidRequestError = require('../errors/invalid-request-error');
-var Promise = require('bluebird');
-var promisify = require('promisify-any').use(Promise);
-var ServerError = require('../errors/server-error');
-var is = require('../validator/is');
-var util = require('util');
+const AbstractGrantType = require('./abstract-grant-type');
+const InvalidArgumentError = require('../errors/invalid-argument-error');
+const InvalidGrantError = require('../errors/invalid-grant-error');
+const InvalidRequestError = require('../errors/invalid-request-error');
+const Promise = require('bluebird');
+const promisify = require('promisify-any').use(Promise);
+const ServerError = require('../errors/server-error');
+const is = require('../validator/is');
+const util = require('util');
 
 /**
  * Constructor.
@@ -142,7 +142,7 @@ RefreshTokenGrantType.prototype.revokeToken = function(token) {
  */
 
 RefreshTokenGrantType.prototype.saveToken = function(user, client, scope) {
-  var fns = [
+  const fns = [
     this.generateAccessToken(client, user, scope),
     this.generateRefreshToken(client, user, scope),
     this.getAccessTokenExpiresAt(),
@@ -152,7 +152,7 @@ RefreshTokenGrantType.prototype.saveToken = function(user, client, scope) {
   return Promise.all(fns)
     .bind(this)
     .spread(function(accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
-      var token = {
+      const token = {
         accessToken: accessToken,
         accessTokenExpiresAt: accessTokenExpiresAt,
         scope: scope