refactor(deps): remove util.inherits #70

 Merge pull request #109 from dsschiramm/development
Thanks to @dsschiramm

Author: jankapunkt

lib/errors/access-denied-error.js

@@ -5,7 +5,6 @@
  */
 
 const OAuthError = require('./oauth-error');
-const util = require('util');
 
 /**
  * Constructor.
@@ -15,21 +14,18 @@ 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);
+class AccessDeniedError extends OAuthError {
+  constructor(message, properties) {
+    properties = {
+      code: 400,
+      name: 'access_denied',
+      ...properties
+    };
 
-  OAuthError.call(this, message, properties);
+    super(message, properties);
+  }
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(AccessDeniedError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/insufficient-scope-error.js

@@ -5,7 +5,6 @@
  */
 
 const OAuthError = require('./oauth-error');
-const util = require('util');
 
 /**
  * Constructor.
@@ -15,21 +14,18 @@ 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);
+class InsufficientScopeError extends OAuthError {
+  constructor(message, properties) {
+    properties = {
+      code: 403,
+      name: 'insufficient_scope',
+      ...properties
+    };
 
-  OAuthError.call(this, message, properties);
+    super(message, properties);
+  }
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InsufficientScopeError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-argument-error.js

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

lib/errors/invalid-client-error.js

@@ -5,7 +5,6 @@
  */
 
 const OAuthError = require('./oauth-error');
-const util = require('util');
 
 /**
  * Constructor.
@@ -16,21 +15,18 @@ 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);
+class InvalidClientError extends OAuthError {
+  constructor(message, properties) {
+    properties = {
+      code: 400,
+      name: 'invalid_client',
+      ...properties
+    };
 
-  OAuthError.call(this, message, properties);
+    super(message, properties);
+  }
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidClientError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-grant-error.js

@@ -5,7 +5,6 @@
  */
 
 const OAuthError = require('./oauth-error');
-const util = require('util');
 
 /**
  * Constructor.
@@ -17,21 +16,18 @@ 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);
+class InvalidGrantError extends OAuthError {
+  constructor(message, properties) {
+    properties = {
+      code: 400,
+      name: 'invalid_grant',
+      ...properties
+    };
 
-  OAuthError.call(this, message, properties);
+    super(message, properties);
+  }
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidGrantError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-request-error.js

@@ -5,7 +5,6 @@
  */
 
 const OAuthError = require('./oauth-error');
-const util = require('util');
 
 /**
  * Constructor.
@@ -16,21 +15,18 @@ 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);
+class InvalidRequest extends OAuthError {
+  constructor(message, properties) {
+    properties = {
+      code: 400,
+      name: 'invalid_request',
+      ...properties
+    };
 
-  OAuthError.call(this, message, properties);
+    super(message, properties);
+  }
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidRequest, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-scope-error.js

@@ -5,7 +5,6 @@
  */
 
 const OAuthError = require('./oauth-error');
-const util = require('util');
 
 /**
  * Constructor.
@@ -15,21 +14,18 @@ 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);
+class InvalidScopeError extends OAuthError {
+  constructor(message, properties) {
+    properties = {
+      code: 400,
+      name: 'invalid_scope',
+      ...properties
+    };
 
-  OAuthError.call(this, message, properties);
+    super(message, properties);
+  }
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidScopeError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/invalid-token-error.js

@@ -5,7 +5,6 @@
  */
 
 const OAuthError = require('./oauth-error');
-const util = require('util');
 
 /**
  * Constructor.
@@ -15,21 +14,18 @@ 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);
+class InvalidTokenError extends OAuthError {
+  constructor(message, properties) {
+    properties = {
+      code: 401,
+      name: 'invalid_token',
+      ...properties
+    };
 
-  OAuthError.call(this, message, properties);
+    super(message, properties);
+  }
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(InvalidTokenError, OAuthError);
-
 /**
  * Export constructor.
  */

lib/errors/oauth-error.js

@@ -3,39 +3,43 @@
 /**
  * Module dependencies.
  */
-const util = require('util');
 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) {
+    super(messageOrError, properties);
 
-  properties = Object.assign({ code: 500 }, properties);
+    let message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
+    const error = messageOrError instanceof Error ? messageOrError : null;
 
-  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];
+    if (properties == null || !Object.entries(properties).length) {
+      properties = {};
+    }
+
+    properties = { 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);
 }
 
-util.inherits(OAuthError, Error);
-
 /**
  * Export constructor.
  */