Loop the modules properties without prototype methods. Fixes #1687 (#…

…1694)

CHANGELOG.md

@@ -1 +1,2 @@
 * Added support for managing the Realtime Database setting `strictTriggerValidation`.
+* Fixes trigger parser to not rely on prototype methods (#1687).

src/extractTriggers.js

@@ -5,28 +5,24 @@
 
 var extractTriggers = function(mod, triggers, prefix) {
   prefix = prefix || "";
-  for (var funcName in mod) {
-    if (mod.hasOwnProperty(funcName)) {
-      var child = mod[funcName];
-      if (typeof child === "function" && child.__trigger && typeof child.__trigger === "object") {
-        if (funcName.indexOf("-") >= 0) {
-          throw new Error(
-            'Function name "' + funcName + '" is invalid. Function names cannot contain dashes.'
-          );
-        }
+  for (var funcName of Object.keys(mod)) {
+    var child = mod[funcName];
+    if (typeof child === "function" && child.__trigger && typeof child.__trigger === "object") {
+      if (funcName.indexOf("-") >= 0) {
+        throw new Error(
+          'Function name "' + funcName + '" is invalid. Function names cannot contain dashes.'
+        );
+      }
 
-        var trigger = {};
-        for (var key in child.__trigger) {
-          if (child.__trigger.hasOwnProperty(key)) {
-            trigger[key] = child.__trigger[key];
-          }
-        }
-        trigger.name = prefix + funcName;
-        trigger.entryPoint = trigger.name.replace(/-/g, ".");
-        triggers.push(trigger);
-      } else if (typeof child === "object") {
-        extractTriggers(child, triggers, prefix + funcName + "-");
+      var trigger = {};
+      for (var key of Object.keys(child.__trigger)) {
+        trigger[key] = child.__trigger[key];
       }
+      trigger.name = prefix + funcName;
+      trigger.entryPoint = trigger.name.replace(/-/g, ".");
+      triggers.push(trigger);
+    } else if (typeof child === "object") {
+      extractTriggers(child, triggers, prefix + funcName + "-");
     }
   }
 };