Skip to content

Commit 3a7e198

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

18 files changed

+686
-718
lines changed

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@ const util = require('util');
1515
* @see https://tools.ietf.org/html/rfc6749#section-4.1.2.1
1616
*/
1717

18-
function AccessDeniedError(message, properties) {
19-
properties = Object.assign({
20-
code: 400,
21-
name: 'access_denied'
22-
}, properties);
23-
24-
OAuthError.call(this, message, properties);
18+
class AccessDeniedError extends OAuthError {
19+
constructor(message, properties) {
20+
properties = Object.assign(
21+
{
22+
code: 400,
23+
name: 'access_denied',
24+
},
25+
properties
26+
);
27+
28+
super(message, properties);
29+
}
2530
}
2631

27-
/**
28-
* Inherit prototype.
29-
*/
30-
31-
util.inherits(AccessDeniedError, OAuthError);
32-
3332
/**
3433
* Export constructor.
3534
*/

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@ const util = require('util');
1515
* @see https://tools.ietf.org/html/rfc6750.html#section-3.1
1616
*/
1717

18-
function InsufficientScopeError(message, properties) {
19-
properties = Object.assign({
20-
code: 403,
21-
name: 'insufficient_scope'
22-
}, properties);
23-
24-
OAuthError.call(this, message, properties);
18+
class InsufficientScopeError extends OAuthError {
19+
constructor(message, properties) {
20+
properties = Object.assign(
21+
{
22+
code: 403,
23+
name: 'insufficient_scope',
24+
},
25+
properties
26+
);
27+
28+
super(message, properties);
29+
}
2530
}
2631

27-
/**
28-
* Inherit prototype.
29-
*/
30-
31-
util.inherits(InsufficientScopeError, OAuthError);
32-
3332
/**
3433
* Export constructor.
3534
*/

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,20 @@ const util = require('util');
1111
* Constructor.
1212
*/
1313

14-
function InvalidArgumentError(message, properties) {
15-
properties = Object.assign({
16-
code: 500,
17-
name: 'invalid_argument'
18-
}, properties);
19-
20-
OAuthError.call(this, message, properties);
14+
class InvalidArgumentError extends OAuthError {
15+
constructor(message, properties) {
16+
properties = Object.assign(
17+
{
18+
code: 500,
19+
name: 'invalid_argument',
20+
},
21+
properties
22+
);
23+
24+
super(message, properties);
25+
}
2126
}
2227

23-
/**
24-
* Inherit prototype.
25-
*/
26-
27-
util.inherits(InvalidArgumentError, OAuthError);
28-
2928
/**
3029
* Export constructor.
3130
*/

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@ const util = require('util');
1616
* @see https://tools.ietf.org/html/rfc6749#section-5.2
1717
*/
1818

19-
function InvalidClientError(message, properties) {
20-
properties = Object.assign({
21-
code: 400,
22-
name: 'invalid_client'
23-
}, properties);
24-
25-
OAuthError.call(this, message, properties);
19+
class InvalidClientError extends OAuthError {
20+
constructor(message, properties) {
21+
properties = Object.assign(
22+
{
23+
code: 400,
24+
name: 'invalid_client',
25+
},
26+
properties
27+
);
28+
29+
super(message, properties);
30+
}
2631
}
2732

28-
/**
29-
* Inherit prototype.
30-
*/
31-
32-
util.inherits(InvalidClientError, OAuthError);
33-
3433
/**
3534
* Export constructor.
3635
*/

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,20 @@ const util = require('util');
1717
* @see https://tools.ietf.org/html/rfc6749#section-5.2
1818
*/
1919

20-
function InvalidGrantError(message, properties) {
21-
properties = Object.assign({
22-
code: 400,
23-
name: 'invalid_grant'
24-
}, properties);
25-
26-
OAuthError.call(this, message, properties);
20+
class InvalidGrantError extends OAuthError {
21+
constructor(message, properties) {
22+
properties = Object.assign(
23+
{
24+
code: 400,
25+
name: 'invalid_grant',
26+
},
27+
properties
28+
);
29+
30+
super(message, properties);
31+
}
2732
}
2833

29-
/**
30-
* Inherit prototype.
31-
*/
32-
33-
util.inherits(InvalidGrantError, OAuthError);
34-
3534
/**
3635
* Export constructor.
3736
*/

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@ const util = require('util');
1616
* @see https://tools.ietf.org/html/rfc6749#section-4.2.2.1
1717
*/
1818

19-
function InvalidRequest(message, properties) {
20-
properties = Object.assign({
21-
code: 400,
22-
name: 'invalid_request'
23-
}, properties);
24-
25-
OAuthError.call(this, message, properties);
19+
class InvalidRequest extends OAuthError {
20+
constructor(message, properties) {
21+
properties = Object.assign(
22+
{
23+
code: 400,
24+
name: 'invalid_request',
25+
},
26+
properties
27+
);
28+
29+
super(message, properties);
30+
}
2631
}
2732

28-
/**
29-
* Inherit prototype.
30-
*/
31-
32-
util.inherits(InvalidRequest, OAuthError);
33-
3433
/**
3534
* Export constructor.
3635
*/

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@ const util = require('util');
1515
* @see https://tools.ietf.org/html/rfc6749#section-4.1.2.1
1616
*/
1717

18-
function InvalidScopeError(message, properties) {
19-
properties = Object.assign({
20-
code: 400,
21-
name: 'invalid_scope'
22-
}, properties);
23-
24-
OAuthError.call(this, message, properties);
18+
class InvalidScopeError extends OAuthError {
19+
constructor(message, properties) {
20+
properties = Object.assign(
21+
{
22+
code: 400,
23+
name: 'invalid_scope',
24+
},
25+
properties
26+
);
27+
28+
super(message, properties);
29+
}
2530
}
2631

27-
/**
28-
* Inherit prototype.
29-
*/
30-
31-
util.inherits(InvalidScopeError, OAuthError);
32-
3332
/**
3433
* Export constructor.
3534
*/

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@ const util = require('util');
1515
* @see https://tools.ietf.org/html/rfc6750#section-3.1
1616
*/
1717

18-
function InvalidTokenError(message, properties) {
19-
properties = Object.assign({
20-
code: 401,
21-
name: 'invalid_token'
22-
}, properties);
23-
24-
OAuthError.call(this, message, properties);
18+
class InvalidTokenError extends OAuthError {
19+
constructor(message, properties) {
20+
properties = Object.assign(
21+
{
22+
code: 401,
23+
name: 'invalid_token',
24+
},
25+
properties
26+
);
27+
28+
super(message, properties);
29+
}
2530
}
2631

27-
/**
28-
* Inherit prototype.
29-
*/
30-
31-
util.inherits(InvalidTokenError, OAuthError);
32-
3332
/**
3433
* Export constructor.
3534
*/

‎lib/errors/oauth-error.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@ const http = require('http');
99
* Constructor.
1010
*/
1111

12-
function OAuthError(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-
}
12+
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+
}
1819

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

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);
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+
}
3537
}
3638

37-
util.inherits(OAuthError, Error);
38-
3939
/**
4040
* Export constructor.
4141
*/

‎lib/errors/server-error.js‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@ const util = require('util');
1515
* @see https://tools.ietf.org/html/rfc6749#section-4.1.2.1
1616
*/
1717

18-
function ServerError(message, properties) {
19-
properties = Object.assign({
20-
code: 503,
21-
name: 'server_error'
22-
}, properties);
23-
24-
OAuthError.call(this, message, properties);
18+
class ServerError extends OAuthError {
19+
constructor(message, properties) {
20+
properties = Object.assign(
21+
{
22+
code: 503,
23+
name: 'server_error',
24+
},
25+
properties
26+
);
27+
28+
super(message, properties);
29+
}
2530
}
2631

27-
/**
28-
* Inherit prototype.
29-
*/
30-
31-
util.inherits(ServerError, OAuthError);
32-
3332
/**
3433
* Export constructor.
3534
*/

0 commit comments

Comments
 (0)