Misc refactor

trayio · Jun 28, 2019 · b918c9b · b918c9b
1 parent 6176319
commit b918c9b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/lib/addMethod/globalize/afterFailure.js b/lib/addMethod/globalize/afterFailure.js
@@ -4,6 +4,7 @@
 var when = require('when');
 var _    = require('lodash');
 
+var localOnly = require('./localOnly');
 
 module.exports = function (config, body, params, res) {
   var threadneedle = this;
@@ -13,7 +14,7 @@ module.exports = function (config, body, params, res) {
 
     // Run global promise first
     .then(function () {
-        if (_.isFunction(threadneedle._globalOptions.afterFailure) && !require('./localOnly')(config, 'afterFailure')) {
+        if (_.isFunction(threadneedle._globalOptions.afterFailure) && !localOnly(config, 'afterFailure')) {
             return when(threadneedle._globalOptions.afterFailure(body, params, res));
         }
     })

diff --git a/lib/addMethod/globalize/afterHeaders.js b/lib/addMethod/globalize/afterHeaders.js
@@ -4,6 +4,7 @@
 var when = require('when');
 var _ = require('lodash');
 
+var localOnly = require('./localOnly');
 
 module.exports = function (config, error, body, params, res) {
 	var threadneedle = this;
@@ -13,7 +14,7 @@ module.exports = function (config, error, body, params, res) {
 
 		// Run global promise first
 		.then(function () {
-			if (_.isFunction(threadneedle._globalOptions.afterHeaders) && !require('./localOnly')(config, 'afterHeaders')) {
+			if (_.isFunction(threadneedle._globalOptions.afterHeaders) && !localOnly(config, 'afterHeaders')) {
 				return when(threadneedle._globalOptions.afterHeaders(error, params, body, res));
 			}
 		})

diff --git a/lib/addMethod/globalize/afterSuccess.js b/lib/addMethod/globalize/afterSuccess.js
@@ -4,6 +4,7 @@
 var when = require('when');
 var _    = require('lodash');
 
+var localOnly = require('./localOnly');
 
 module.exports = function (config, body, params, res) {
   var threadneedle = this;
@@ -13,7 +14,7 @@ module.exports = function (config, body, params, res) {
 
     // Run global promise first
     .then(function () {
-        if (_.isFunction(threadneedle._globalOptions.afterSuccess) && !require('./localOnly')(config, 'afterSuccess')) {
+        if (_.isFunction(threadneedle._globalOptions.afterSuccess) && !localOnly(config, 'afterSuccess')) {
         return when(threadneedle._globalOptions.afterSuccess(body, params, res));
         }
     })

diff --git a/lib/addMethod/globalize/before.js b/lib/addMethod/globalize/before.js
@@ -8,6 +8,7 @@
 var when = require('when');
 var _    = require('lodash');
 
+var localOnly = require('./localOnly');
 
 module.exports = function (config, params) {
   var threadneedle = this;
@@ -17,7 +18,7 @@ module.exports = function (config, params) {
 
     // Run global promise first
     .then(function () {
-        if (_.isFunction(threadneedle._globalOptions.before) && !require('./localOnly')(config, 'before')) {
+        if (_.isFunction(threadneedle._globalOptions.before) && !localOnly(config, 'before')) {
             return when(threadneedle._globalOptions.before(params));
         }
     })

diff --git a/lib/addMethod/globalize/beforeRequest.js b/lib/addMethod/globalize/beforeRequest.js
@@ -4,6 +4,7 @@
 var when = require('when');
 var _    = require('lodash');
 
+var localOnly = require('./localOnly');
 
 module.exports = function (config, request, params) {
   var threadneedle = this;
@@ -13,7 +14,7 @@ module.exports = function (config, request, params) {
 
     // Run global promise first
     .then(function () {
-      if (_.isFunction(threadneedle._globalOptions.beforeRequest) && !require('./localOnly')(config, 'beforeRequest')) {
+      if (_.isFunction(threadneedle._globalOptions.beforeRequest) && !localOnly(config, 'beforeRequest')) {
         return when(threadneedle._globalOptions.beforeRequest(request, params));
       }
     })