refactor: Remove util.inherits #70

lib/errors/access-denied-error.js

@@ -15,21 +15,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6749#section-4.1.2.1
  */
 
-function AccessDeniedError(message, properties) {
-  properties = Object.assign({
-    code: 400,
-    name: 'access_denied'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class AccessDeniedError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 400,
+				name: 'access_denied',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(AccessDeniedError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/insufficient-scope-error.js

@@ -15,21 +15,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6750.html#section-3.1
  */
 
-function InsufficientScopeError(message, properties) {
-  properties = Object.assign({
-    code: 403,
-    name: 'insufficient_scope'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class InsufficientScopeError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 403,
+				name: 'insufficient_scope',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InsufficientScopeError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-argument-error.js

@@ -11,21 +11,20 @@ const util = require('util');
  * Constructor.
  */
 
-function InvalidArgumentError(message, properties) {
-  properties = Object.assign({
-    code: 500,
-    name: 'invalid_argument'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class InvalidArgumentError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 500,
+				name: 'invalid_argument',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidArgumentError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-client-error.js

@@ -16,21 +16,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6749#section-5.2
  */
 
-function InvalidClientError(message, properties) {
-  properties = Object.assign({
-    code: 400,
-    name: 'invalid_client'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class InvalidClientError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 400,
+				name: 'invalid_client',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidClientError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-grant-error.js

@@ -17,21 +17,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6749#section-5.2
  */
 
-function InvalidGrantError(message, properties) {
-  properties = Object.assign({
-    code: 400,
-    name: 'invalid_grant'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class InvalidGrantError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 400,
+				name: 'invalid_grant',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidGrantError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-request-error.js

@@ -16,21 +16,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6749#section-4.2.2.1
  */
 
-function InvalidRequest(message, properties) {
-  properties = Object.assign({
-    code: 400,
-    name: 'invalid_request'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class InvalidRequest extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 400,
+				name: 'invalid_request',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidRequest, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-scope-error.js

@@ -15,21 +15,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6749#section-4.1.2.1
  */
 
-function InvalidScopeError(message, properties) {
-  properties = Object.assign({
-    code: 400,
-    name: 'invalid_scope'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class InvalidScopeError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 400,
+				name: 'invalid_scope',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidScopeError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-token-error.js

@@ -15,21 +15,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6750#section-3.1
  */
 
-function InvalidTokenError(message, properties) {
-  properties = Object.assign({
-    code: 401,
-    name: 'invalid_token'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class InvalidTokenError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 401,
+				name: 'invalid_token',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidTokenError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/oauth-error.js

@@ -9,33 +9,33 @@ const http = require('http');
  * Constructor.
  */
 
-function OAuthError(messageOrError, properties) {
-  let message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
-  const error = messageOrError instanceof Error ? messageOrError : null;
-  if (properties == null || !Object.entries(properties).length ) {
-    properties = {};
-  }
+class OAuthError extends Error {
+	constructor(messageOrError, properties) {
+		let message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
+		const error = messageOrError instanceof Error ? messageOrError : null;
+		if (properties == null || !Object.entries(properties).length) {
+			properties = {};
+		}
 
-  properties = Object.assign({ code: 500 }, properties);
+		properties = Object.assign({ code: 500 }, properties);
 
-  if (error) {
-    properties.inner = error;
-  }
-  if (!message || message.length === 0) {
-    message = http.STATUS_CODES[properties.code];
-  }
-  this.code = this.status = this.statusCode = properties.code;
-  this.message = message;
-  for (const key in properties) {
-    if (key !== 'code') {
-      this[key] = properties[key];
-    }
-  }
-  Error.captureStackTrace(this, OAuthError);
+		if (error) {
+			properties.inner = error;
+		}
+		if (!message || message.length === 0) {
+			message = http.STATUS_CODES[properties.code];
+		}
+		this.code = this.status = this.statusCode = properties.code;
+		this.message = message;
+		for (const key in properties) {
+			if (key !== 'code') {
+				this[key] = properties[key];
+			}
+		}
+		Error.captureStackTrace(this, OAuthError);
+	}
 }
 
-util.inherits(OAuthError, Error);
-
 /**
  * Export constructor.
  */

lib/errors/server-error.js

@@ -15,21 +15,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6749#section-4.1.2.1
  */
 
-function ServerError(message, properties) {
-  properties = Object.assign({
-    code: 503,
-    name: 'server_error'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class ServerError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 503,
+				name: 'server_error',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(ServerError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/unauthorized-client-error.js

@@ -15,21 +15,20 @@ const util = require('util');
  * @see https://tools.ietf.org/html/rfc6749#section-4.1.2.1
  */
 
-function UnauthorizedClientError(message, properties) {
-  properties = Object.assign({
-    code: 400,
-    name: 'unauthorized_client'
-  }, properties);
-
-  OAuthError.call(this, message, properties);
+class UnauthorizedClientError extends OAuthError {
+	constructor(message, properties) {
+		properties = Object.assign(
+			{
+				code: 400,
+				name: 'unauthorized_client',
+			},
+			properties
+		);
+
+		super(message, properties);
+	}
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(UnauthorizedClientError, OAuthError);
-
 /**
  * Export constructor.
  */