From 13b1360989d1311d26b2733d3ac531d75cf22052 Mon Sep 17 00:00:00 2001
From: bsears90 <bsears@vampeo.com>
Date: Fri, 30 Mar 2018 14:00:57 -0400
Subject: [PATCH] Fixed permission issue cleaned webhook

---
 middleware/auth.js       | 2 +-
 plugins/webhooks/main.js | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/middleware/auth.js b/middleware/auth.js
index a473899e..e421f7e3 100644
--- a/middleware/auth.js
+++ b/middleware/auth.js
@@ -1,6 +1,6 @@
 let Role = require("../models/role.js");
 let _ = require("lodash");
-let swaggerJSON = require("../api-docs/api-paths.json");
+let swaggerJSON = {...require("../api-docs/api-entity-paths.json"), ...require("../api-docs/api-paths.json")};
 
 
 //todo:  allow for multiple permissions
diff --git a/plugins/webhooks/main.js b/plugins/webhooks/main.js
index 29a9a7a6..244581b3 100644
--- a/plugins/webhooks/main.js
+++ b/plugins/webhooks/main.js
@@ -25,8 +25,11 @@ function* run(config, provide, channels) {
         let webhooks = await db("webhooks").where(true, true);
         let webhook_responses = await Promise.reduce(webhooks, async (responses, webhook) => {
 
-            let parsedEvent = Object.values(event).map(eventValue => entry)
-            let webhookRequest = fetch(webhook.endpoint_url, {method: "POST", body: JSON.stringify({event_name : eventName, event_data : event}), headers})
+            let parsedEvent = Object.entries(event).reduce((acc, [key, eventValue]) => {
+                acc[key] = eventValue.data ? eventValue.data : eventValue;
+                return acc;
+            }, {});
+            let webhookRequest = fetch(webhook.endpoint_url, {method: "POST", body: JSON.stringify({event_name : eventName, event_data : parsedEvent}), headers})
                 .then(response => {
                     if (!response.ok) {
                         console.error("error making webhook request", response.statusText);