Skip to content

Commit 9460888

Browse files
author
daniel.santos
committed
refactor: Remove util.inherits #70 
1 parent 3a7e198 commit 9460888

18 files changed

+536
-554
lines changed

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
@@ -16,17 +15,17 @@ const util = require('util');
1615
*/
1716

1817
class AccessDeniedError extends OAuthError {
19-
constructor(message, properties) {
20-
properties = Object.assign(
21-
{
22-
code: 400,
23-
name: 'access_denied',
24-
},
25-
properties
26-
);
18+
constructor(message, properties) {
19+
properties = Object.assign(
20+
{
21+
code: 400,
22+
name: 'access_denied',
23+
},
24+
properties
25+
);
2726

28-
super(message, properties);
29-
}
27+
super(message, properties);
28+
}
3029
}
3130

3231
/**

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
@@ -16,17 +15,17 @@ const util = require('util');
1615
*/
1716

1817
class InsufficientScopeError extends OAuthError {
19-
constructor(message, properties) {
20-
properties = Object.assign(
21-
{
22-
code: 403,
23-
name: 'insufficient_scope',
24-
},
25-
properties
26-
);
18+
constructor(message, properties) {
19+
properties = Object.assign(
20+
{
21+
code: 403,
22+
name: 'insufficient_scope',
23+
},
24+
properties
25+
);
2726

28-
super(message, properties);
29-
}
27+
super(message, properties);
28+
}
3029
}
3130

3231
/**

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
1211
*/
1312

1413
class InvalidArgumentError extends OAuthError {
15-
constructor(message, properties) {
16-
properties = Object.assign(
17-
{
18-
code: 500,
19-
name: 'invalid_argument',
20-
},
21-
properties
22-
);
14+
constructor(message, properties) {
15+
properties = Object.assign(
16+
{
17+
code: 500,
18+
name: 'invalid_argument',
19+
},
20+
properties
21+
);
2322

24-
super(message, properties);
25-
}
23+
super(message, properties);
24+
}
2625
}
2726

2827
/**

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
@@ -17,17 +16,17 @@ const util = require('util');
1716
*/
1817

1918
class InvalidClientError extends OAuthError {
20-
constructor(message, properties) {
21-
properties = Object.assign(
22-
{
23-
code: 400,
24-
name: 'invalid_client',
25-
},
26-
properties
27-
);
19+
constructor(message, properties) {
20+
properties = Object.assign(
21+
{
22+
code: 400,
23+
name: 'invalid_client',
24+
},
25+
properties
26+
);
2827

29-
super(message, properties);
30-
}
28+
super(message, properties);
29+
}
3130
}
3231

3332
/**

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
@@ -18,17 +17,17 @@ const util = require('util');
1817
*/
1918

2019
class InvalidGrantError extends OAuthError {
21-
constructor(message, properties) {
22-
properties = Object.assign(
23-
{
24-
code: 400,
25-
name: 'invalid_grant',
26-
},
27-
properties
28-
);
20+
constructor(message, properties) {
21+
properties = Object.assign(
22+
{
23+
code: 400,
24+
name: 'invalid_grant',
25+
},
26+
properties
27+
);
2928

30-
super(message, properties);
31-
}
29+
super(message, properties);
30+
}
3231
}
3332

3433
/**

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
@@ -17,17 +16,17 @@ const util = require('util');
1716
*/
1817

1918
class InvalidRequest extends OAuthError {
20-
constructor(message, properties) {
21-
properties = Object.assign(
22-
{
23-
code: 400,
24-
name: 'invalid_request',
25-
},
26-
properties
27-
);
19+
constructor(message, properties) {
20+
properties = Object.assign(
21+
{
22+
code: 400,
23+
name: 'invalid_request',
24+
},
25+
properties
26+
);
2827

29-
super(message, properties);
30-
}
28+
super(message, properties);
29+
}
3130
}
3231

3332
/**

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
@@ -16,17 +15,17 @@ const util = require('util');
1615
*/
1716

1817
class InvalidScopeError extends OAuthError {
19-
constructor(message, properties) {
20-
properties = Object.assign(
21-
{
22-
code: 400,
23-
name: 'invalid_scope',
24-
},
25-
properties
26-
);
18+
constructor(message, properties) {
19+
properties = Object.assign(
20+
{
21+
code: 400,
22+
name: 'invalid_scope',
23+
},
24+
properties
25+
);
2726

28-
super(message, properties);
29-
}
27+
super(message, properties);
28+
}
3029
}
3130

3231
/**

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
@@ -16,17 +15,17 @@ const util = require('util');
1615
*/
1716

1817
class InvalidTokenError extends OAuthError {
19-
constructor(message, properties) {
20-
properties = Object.assign(
21-
{
22-
code: 401,
23-
name: 'invalid_token',
24-
},
25-
properties
26-
);
18+
constructor(message, properties) {
19+
properties = Object.assign(
20+
{
21+
code: 401,
22+
name: 'invalid_token',
23+
},
24+
properties
25+
);
2726

28-
super(message, properties);
29-
}
27+
super(message, properties);
28+
}
3029
}
3130

3231
/**

‎lib/errors/oauth-error.js‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,36 @@
33
/**
44
* Module dependencies.
55
*/
6-
const util = require('util');
76
const http = require('http');
87
/**
98
* Constructor.
109
*/
1110

1211
class OAuthError extends Error {
13-
constructor(messageOrError, properties) {
14-
let message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
15-
const error = messageOrError instanceof Error ? messageOrError : null;
16-
if (properties == null || !Object.entries(properties).length) {
17-
properties = {};
18-
}
12+
constructor(messageOrError, properties) {
13+
let message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
14+
const error = messageOrError instanceof Error ? messageOrError : null;
15+
if (properties == null || !Object.entries(properties).length) {
16+
properties = {};
17+
}
1918

20-
properties = Object.assign({ code: 500 }, properties);
19+
properties = Object.assign({ code: 500 }, properties);
2120

22-
if (error) {
23-
properties.inner = error;
24-
}
25-
if (!message || message.length === 0) {
26-
message = http.STATUS_CODES[properties.code];
27-
}
28-
this.code = this.status = this.statusCode = properties.code;
29-
this.message = message;
30-
for (const key in properties) {
31-
if (key !== 'code') {
32-
this[key] = properties[key];
33-
}
34-
}
35-
Error.captureStackTrace(this, OAuthError);
36-
}
21+
if (error) {
22+
properties.inner = error;
23+
}
24+
if (!message || message.length === 0) {
25+
message = http.STATUS_CODES[properties.code];
26+
}
27+
this.code = this.status = this.statusCode = properties.code;
28+
this.message = message;
29+
for (const key in properties) {
30+
if (key !== 'code') {
31+
this[key] = properties[key];
32+
}
33+
}
34+
Error.captureStackTrace(this, OAuthError);
35+
}
3736
}
3837

3938
/**

‎lib/errors/server-error.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
const OAuthError = require('./oauth-error');
8-
const util = require('util');
98

109
/**
1110
* Constructor.
@@ -16,17 +15,17 @@ const util = require('util');
1615
*/
1716

1817
class ServerError extends OAuthError {
19-
constructor(message, properties) {
20-
properties = Object.assign(
21-
{
22-
code: 503,
23-
name: 'server_error',
24-
},
25-
properties
26-
);
18+
constructor(message, properties) {
19+
properties = Object.assign(
20+
{
21+
code: 503,
22+
name: 'server_error',
23+
},
24+
properties
25+
);
2726

28-
super(message, properties);
29-
}
27+
super(message, properties);
28+
}
3029
}
3130

3231
/**

0 commit comments

Comments
 (0)