Changed error handling logic to stop after error has been handled (#497)

* Changed error handling logic to stop after error has been handled
middyjs · Apr 14, 2020 · c6c80a9 · c6c80a9
1 parent 2931123
commit c6c80a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/__tests__/middy.js b/src/__tests__/middy.js
@@ -276,7 +276,7 @@ describe('🛵  Middy test suite', () => {
     })
   })
 
-  test('If theres an error and one error middleware handles the error, the next error middlewares is executed', (endTest) => {
+  test('If theres is an error and one error middleware handles the error, the next error middlewares should not be executed', (endTest) => {
     const expectedResponse = { message: 'error handled' }
 
     const onErrorMiddleware1 = jest.fn((handler, next) => {
@@ -297,7 +297,7 @@ describe('🛵  Middy test suite', () => {
     handler({}, {}, (err, response) => {
       expect(err).toBeNull()
       expect(onErrorMiddleware1).toBeCalled()
-      expect(onErrorMiddleware2).toBeCalled()
+      expect(onErrorMiddleware2).not.toHaveBeenCalled()
       expect(response).toBe(expectedResponse)
 
       endTest()

diff --git a/src/middy.js b/src/middy.js
@@ -102,8 +102,14 @@ const runErrorMiddlewares = (middlewares, instance, done) => {
 
       const nextMiddleware = stack.shift()
 
-      if (nextMiddleware) {
-        const retVal = nextMiddleware(instance, runNext)
+      if (nextMiddleware && !instance.__handledError) {
+        const retVal = nextMiddleware(instance, (retCallBackError) => {
+          if (!retCallBackError) {
+            done()
+          } else {
+            runNext(retCallBackError)
+          }
+        })
 
         if (retVal) {
           if (!isPromise(retVal)) {