From ef092d9fbe48f547862fd1f9c51fec939b72cc49 Mon Sep 17 00:00:00 2001 From: Orel Date: Thu, 19 Jan 2017 17:35:07 +0300 Subject: [PATCH 1/2] Before filter controller support break next performance handlers --- lib/updateProcessors/MessageUpdateProcessor.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/updateProcessors/MessageUpdateProcessor.js b/lib/updateProcessors/MessageUpdateProcessor.js index 72a5203..980a982 100755 --- a/lib/updateProcessors/MessageUpdateProcessor.js +++ b/lib/updateProcessors/MessageUpdateProcessor.js @@ -54,7 +54,20 @@ class MessageUpdateProcessor extends BaseUpdateProcessor { controller.controller.localization = this._dataSource.localization try { - controller.controller[controller.handler](controller.controller.before(scope)) + let beforeMiddlewareValue = controller.controller.before(scope) + let controllerHandler = controller.controller[controller.handler] + + if (beforeMiddlewareValue === false) { + if (typeof controller.controller.rejected !== 'undefined') { + controller.controller.rejected(null, scope) + } + } else if (beforeMiddlewareValue instanceof Promise) { + beforeMiddlewareValue + .then(scope => controllerHandler(scope)) + .catch(err => controller.controller.rejected(err, scope)) + } else { + controllerHandler(beforeMiddlewareValue) + } } catch (e) { this._dataSource.logger.error({ @@ -71,7 +84,7 @@ class MessageUpdateProcessor extends BaseUpdateProcessor { }) } - scope = null + //scope = null return } From 401e41ae8defe9249aa4715aad8b472c6f0d071e Mon Sep 17 00:00:00 2001 From: Orel Date: Sat, 21 Jan 2017 11:59:52 +0300 Subject: [PATCH 2/2] Fix --- lib/updateProcessors/MessageUpdateProcessor.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/updateProcessors/MessageUpdateProcessor.js b/lib/updateProcessors/MessageUpdateProcessor.js index 980a982..3b33c86 100755 --- a/lib/updateProcessors/MessageUpdateProcessor.js +++ b/lib/updateProcessors/MessageUpdateProcessor.js @@ -55,7 +55,6 @@ class MessageUpdateProcessor extends BaseUpdateProcessor { try { let beforeMiddlewareValue = controller.controller.before(scope) - let controllerHandler = controller.controller[controller.handler] if (beforeMiddlewareValue === false) { if (typeof controller.controller.rejected !== 'undefined') { @@ -63,10 +62,10 @@ class MessageUpdateProcessor extends BaseUpdateProcessor { } } else if (beforeMiddlewareValue instanceof Promise) { beforeMiddlewareValue - .then(scope => controllerHandler(scope)) + .then(scope => controller.controller[controller.handler](scope)) .catch(err => controller.controller.rejected(err, scope)) } else { - controllerHandler(beforeMiddlewareValue) + controller.controller[controller.handler](beforeMiddlewareValue) } } catch (e) {