Skip to content

Commit 1f88d0e

Browse files
jankapunktjankapunkt
authored
build (core): move codebase to ES 6 #58
Moves all variables from `var` to either `let` or `const`
2 parents ad45e44 + b67db9c commit 1f88d0e

File tree

62 files changed

+1382
-1373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1382
-1373
lines changed

‎.eslintrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
"no-console": [
3535
"error"
3636
],
37+
"no-var": [
38+
"error"
39+
],
40+
"prefer-const": ["error", {
41+
"destructuring": "any",
42+
"ignoreReadBeforeAssign": false
43+
}],
3744
"no-unused-vars": [
3845
"error",
3946
{

‎lib/errors/access-denied-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/insufficient-scope-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/invalid-argument-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/invalid-client-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/invalid-grant-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/invalid-request-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/invalid-scope-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/invalid-token-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/oauth-error.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
/**
44
* Module dependencies.
55
*/
6-
var util = require('util');
7-
var http = require('http');
6+
const util = require('util');
7+
const http = require('http');
88
/**
99
* Constructor.
1010
*/
1111

1212
function OAuthError(messageOrError, properties) {
13-
var message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
14-
var error = messageOrError instanceof Error ? messageOrError : null;
13+
let message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
14+
const error = messageOrError instanceof Error ? messageOrError : null;
1515
if (properties == null || !Object.entries(properties).length ) {
1616
properties = {};
1717
}
@@ -26,7 +26,7 @@ function OAuthError(messageOrError, properties) {
2626
}
2727
this.code = this.status = this.statusCode = properties.code;
2828
this.message = message;
29-
for (var key in properties) {
29+
for (const key in properties) {
3030
if (key !== 'code') {
3131
this[key] = properties[key];
3232
}

‎lib/errors/server-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/unauthorized-client-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

‎lib/errors/unauthorized-request-error.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var OAuthError = require('./oauth-error');
8-
var util = require('util');
7+
const OAuthError = require('./oauth-error');
8+
const util = require('util');
99

1010
/**
1111
* Constructor.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* Module dependencies.
55
*/
66

7-
var InvalidArgumentError = require('../errors/invalid-argument-error');
8-
var InvalidScopeError = require('../errors/invalid-scope-error');
9-
var Promise = require('bluebird');
10-
var promisify = require('promisify-any').use(Promise);
11-
var is = require('../validator/is');
12-
var tokenUtil = require('../utils/token-util');
7+
const InvalidArgumentError = require('../errors/invalid-argument-error');
8+
const InvalidScopeError = require('../errors/invalid-scope-error');
9+
const Promise = require('bluebird');
10+
const promisify = require('promisify-any').use(Promise);
11+
const is = require('../validator/is');
12+
const tokenUtil = require('../utils/token-util');
1313

1414
/**
1515
* Constructor.

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* Module dependencies.
55
*/
66

7-
var AbstractGrantType = require('./abstract-grant-type');
8-
var InvalidArgumentError = require('../errors/invalid-argument-error');
9-
var InvalidGrantError = require('../errors/invalid-grant-error');
10-
var InvalidRequestError = require('../errors/invalid-request-error');
11-
var Promise = require('bluebird');
12-
var promisify = require('promisify-any').use(Promise);
13-
var ServerError = require('../errors/server-error');
14-
var is = require('../validator/is');
15-
var util = require('util');
7+
const AbstractGrantType = require('./abstract-grant-type');
8+
const InvalidArgumentError = require('../errors/invalid-argument-error');
9+
const InvalidGrantError = require('../errors/invalid-grant-error');
10+
const InvalidRequestError = require('../errors/invalid-request-error');
11+
const Promise = require('bluebird');
12+
const promisify = require('promisify-any').use(Promise);
13+
const ServerError = require('../errors/server-error');
14+
const is = require('../validator/is');
15+
const util = require('util');
1616

1717
/**
1818
* Constructor.
@@ -138,7 +138,7 @@ AuthorizationCodeGrantType.prototype.validateRedirectUri = function(request, cod
138138
return;
139139
}
140140

141-
var redirectUri = request.body.redirect_uri || request.query.redirect_uri;
141+
const redirectUri = request.body.redirect_uri || request.query.redirect_uri;
142142

143143
if (!is.uri(redirectUri)) {
144144
throw new InvalidRequestError('Invalid request: `redirect_uri` is not a valid URI');
@@ -175,7 +175,7 @@ AuthorizationCodeGrantType.prototype.revokeAuthorizationCode = function(code) {
175175
*/
176176

177177
AuthorizationCodeGrantType.prototype.saveToken = function(user, client, authorizationCode, scope) {
178-
var fns = [
178+
const fns = [
179179
this.validateScope(user, client, scope),
180180
this.generateAccessToken(client, user, scope),
181181
this.generateRefreshToken(client, user, scope),
@@ -186,7 +186,7 @@ AuthorizationCodeGrantType.prototype.saveToken = function(user, client, authoriz
186186
return Promise.all(fns)
187187
.bind(this)
188188
.spread(function(scope, accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
189-
var token = {
189+
const token = {
190190
accessToken: accessToken,
191191
authorizationCode: authorizationCode,
192192
accessTokenExpiresAt: accessTokenExpiresAt,

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* Module dependencies.
55
*/
66

7-
var AbstractGrantType = require('./abstract-grant-type');
8-
var InvalidArgumentError = require('../errors/invalid-argument-error');
9-
var InvalidGrantError = require('../errors/invalid-grant-error');
10-
var Promise = require('bluebird');
11-
var promisify = require('promisify-any').use(Promise);
12-
var util = require('util');
7+
const AbstractGrantType = require('./abstract-grant-type');
8+
const InvalidArgumentError = require('../errors/invalid-argument-error');
9+
const InvalidGrantError = require('../errors/invalid-grant-error');
10+
const Promise = require('bluebird');
11+
const promisify = require('promisify-any').use(Promise);
12+
const util = require('util');
1313

1414
/**
1515
* Constructor.
@@ -54,7 +54,7 @@ ClientCredentialsGrantType.prototype.handle = function(request, client) {
5454
throw new InvalidArgumentError('Missing parameter: `client`');
5555
}
5656

57-
var scope = this.getScope(request);
57+
const scope = this.getScope(request);
5858

5959
return Promise.bind(this)
6060
.then(function() {
@@ -85,7 +85,7 @@ ClientCredentialsGrantType.prototype.getUserFromClient = function(client) {
8585
*/
8686

8787
ClientCredentialsGrantType.prototype.saveToken = function(user, client, scope) {
88-
var fns = [
88+
const fns = [
8989
this.validateScope(user, client, scope),
9090
this.generateAccessToken(client, user, scope),
9191
this.getAccessTokenExpiresAt(client, user, scope)
@@ -94,7 +94,7 @@ ClientCredentialsGrantType.prototype.saveToken = function(user, client, scope) {
9494
return Promise.all(fns)
9595
.bind(this)
9696
.spread(function(scope, accessToken, accessTokenExpiresAt) {
97-
var token = {
97+
const token = {
9898
accessToken: accessToken,
9999
accessTokenExpiresAt: accessTokenExpiresAt,
100100
scope: scope

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
* Module dependencies.
55
*/
66

7-
var AbstractGrantType = require('./abstract-grant-type');
8-
var InvalidArgumentError = require('../errors/invalid-argument-error');
9-
var InvalidGrantError = require('../errors/invalid-grant-error');
10-
var InvalidRequestError = require('../errors/invalid-request-error');
11-
var Promise = require('bluebird');
12-
var promisify = require('promisify-any').use(Promise);
13-
var is = require('../validator/is');
14-
var util = require('util');
7+
const AbstractGrantType = require('./abstract-grant-type');
8+
const InvalidArgumentError = require('../errors/invalid-argument-error');
9+
const InvalidGrantError = require('../errors/invalid-grant-error');
10+
const InvalidRequestError = require('../errors/invalid-request-error');
11+
const Promise = require('bluebird');
12+
const promisify = require('promisify-any').use(Promise);
13+
const is = require('../validator/is');
14+
const util = require('util');
1515

1616
/**
1717
* Constructor.
@@ -56,7 +56,7 @@ PasswordGrantType.prototype.handle = function(request, client) {
5656
throw new InvalidArgumentError('Missing parameter: `client`');
5757
}
5858

59-
var scope = this.getScope(request);
59+
const scope = this.getScope(request);
6060

6161
return Promise.bind(this)
6262
.then(function() {
@@ -103,7 +103,7 @@ PasswordGrantType.prototype.getUser = function(request) {
103103
*/
104104

105105
PasswordGrantType.prototype.saveToken = function(user, client, scope) {
106-
var fns = [
106+
const fns = [
107107
this.validateScope(user, client, scope),
108108
this.generateAccessToken(client, user, scope),
109109
this.generateRefreshToken(client, user, scope),
@@ -114,7 +114,7 @@ PasswordGrantType.prototype.saveToken = function(user, client, scope) {
114114
return Promise.all(fns)
115115
.bind(this)
116116
.spread(function(scope, accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
117-
var token = {
117+
const token = {
118118
accessToken: accessToken,
119119
accessTokenExpiresAt: accessTokenExpiresAt,
120120
refreshToken: refreshToken,

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* Module dependencies.
55
*/
66

7-
var AbstractGrantType = require('./abstract-grant-type');
8-
var InvalidArgumentError = require('../errors/invalid-argument-error');
9-
var InvalidGrantError = require('../errors/invalid-grant-error');
10-
var InvalidRequestError = require('../errors/invalid-request-error');
11-
var Promise = require('bluebird');
12-
var promisify = require('promisify-any').use(Promise);
13-
var ServerError = require('../errors/server-error');
14-
var is = require('../validator/is');
15-
var util = require('util');
7+
const AbstractGrantType = require('./abstract-grant-type');
8+
const InvalidArgumentError = require('../errors/invalid-argument-error');
9+
const InvalidGrantError = require('../errors/invalid-grant-error');
10+
const InvalidRequestError = require('../errors/invalid-request-error');
11+
const Promise = require('bluebird');
12+
const promisify = require('promisify-any').use(Promise);
13+
const ServerError = require('../errors/server-error');
14+
const is = require('../validator/is');
15+
const util = require('util');
1616

1717
/**
1818
* Constructor.
@@ -142,7 +142,7 @@ RefreshTokenGrantType.prototype.revokeToken = function(token) {
142142
*/
143143

144144
RefreshTokenGrantType.prototype.saveToken = function(user, client, scope) {
145-
var fns = [
145+
const fns = [
146146
this.generateAccessToken(client, user, scope),
147147
this.generateRefreshToken(client, user, scope),
148148
this.getAccessTokenExpiresAt(),
@@ -152,7 +152,7 @@ RefreshTokenGrantType.prototype.saveToken = function(user, client, scope) {
152152
return Promise.all(fns)
153153
.bind(this)
154154
.spread(function(accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
155-
var token = {
155+
const token = {
156156
accessToken: accessToken,
157157
accessTokenExpiresAt: accessTokenExpiresAt,
158158
scope: scope

0 commit comments

Comments
 (0)