Fix issue with all object handler hooks being global

lteacher · Mar 18, 2020 · 8e51fb9 · 8e51fb9
1 parent 6428640
commit 8e51fb9
Show file tree

Hide file tree

Showing 4 changed files with 2,399 additions and 38 deletions.
diff --git a/lib/handler-factory.js b/lib/handler-factory.js
@@ -122,14 +122,12 @@ class HandlerFactory {
    * A handler is just a regular function but it can return a promise
    */
   register(handlers, hooks) {
-    let isGlobal = true;
     let useKey = false;
 
     if (_.isPlainObject(handlers)) {
       useKey = true;
     } else if (!_.isArray(handlers)) {
       handlers = [handlers];
-      isGlobal = false;
     }
 
     _.forEach(handlers, (handler, key) => {
@@ -138,19 +136,10 @@ class HandlerFactory {
       this.registerByName(name, handler);
 
       // Setup the hooks for the handler if any
-      if (!isGlobal) {
-        if (hooks) {
-          _.forEach(_.keys(hooks), (order) => this[order](handler, hooks[order]));
-        }
-      }
-    });
-
-    // Setup the hooks for the global if any
-    if (isGlobal) {
       if (hooks) {
-        _.forEach(_.keys(hooks), (order) => this[order]('*', hooks[order]));
+        _.forEach(_.keys(hooks), (order) => this[order](handler, hooks[order]));
       }
-    }
+    });
   }
 
   registerByName(name, handler) {