Webhook should include addtional information in the call #12

get.js

@@ -1,4 +1,5 @@
-var request = require('./request.js');
+'use strict';
+const request = require('./request.js');
 
 exports.process = function (msg, conf, next) {
     request.get.call(this, msg, conf);

package.json

@@ -3,23 +3,26 @@
   "version": "1.0.0",
   "description": "elastic.io webhook component",
   "scripts": {
-    "test": "./node_modules/jasmine-node/bin/jasmine-node --test-dir spec"
+    "test": "mocha spec --recursive"
   },
   "engines": {
     "node": "6.4.0"
   },
   "author": "elastic.io GmbH",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "debug": "^3.1.0",
+    "debug": "3.1.0",
     "elasticio-sailor-nodejs": "2.2.1",
     "elasticio-node": "0.0.8",
     "node-uuid": "1.4.8",
     "request": "2.83.x",
-    "q": "^1.5.1"
+    "q": "1.5.1"
   },
   "devDependencies": {
-    "nock": "9.2.3",
-    "jasmine-node": "~1.14.5"
+    "eslint-plugin-mocha": "5.3.0",
+    "mocha": "6.1.4",
+    "nock": "10.0.6",
+    "sinon": "7.3.2",
+    "chai": "3.5.0"
   }
 }

receive.js

@@ -1,16 +1,36 @@
 "use strict";
-var Q = require("q");
+const Q = require("q");
 
 exports.process = function (msg, conf) {
-    let msgId = msg.id;
+    const msgId = msg.id;
     console.log("Received new message with id", msgId);
     console.log(msg);
 
-    if (msg.query && msg.body) {
-        msg.body._query = msg.query;
+    if (msg.body) {
+        if (msg.query) {
+            msg.body._query = msg.query;
+        }
+
+        if (msg.headers) {
+            msg.body._headers = msg.headers;
+        }
+        if (msg.method) {
+            msg.body.__method = msg.method;
+        }
+
+        if (msg.url) {
+            msg.body._url = msg.url;
+        }
+
+        if (msg.additionalUrlPath) {
+            msg.body._additionalUrlPath = msg.additionalUrlPath;
+        }
+
+        console.log('Updated body', msg.body);
     }
 
-    var self = this;
+
+    let self = this;
 
     Q()
         .then(emitData)
@@ -31,4 +51,5 @@ exports.process = function (msg, conf) {
         console.log("Finished processing message:", msgId);
         self.emit('end');
     }
-};
+};
+

request.js

@@ -1,16 +1,17 @@
-var request = require('request');
-var qs = require('querystring');
-var messages = require('elasticio-node').messages;
-var debug = require('debug')('webhook:request');
+'use strict';
+const request = require('request');
+const qs = require('querystring');
+const messages = require('elasticio-node').messages;
+const debug = require('debug')('webhook:request');
 
 exports.putOrPost = function putOrPost(method, msg, conf) {
     'use strict';
-    var uri = conf.uri;
-    var body = msg.body;
+    const uri = conf.uri;
+    const body = msg.body;
 
     debug('Request body: %j', body);
 
-    var requestSettings = buildRequestSettings(method, uri, conf.secret);
+    let requestSettings = buildRequestSettings(method, uri, conf.secret);
     requestSettings.body = JSON.stringify(body);
     requestSettings.headers['Content-Type'] = 'application/json;charset=UTF-8';
 
@@ -19,7 +20,7 @@ exports.putOrPost = function putOrPost(method, msg, conf) {
 
 exports.get = function get(msg, conf, next) {
     'use strict';
-    var uri = conf.uri;
+    let uri = conf.uri;
 
     // Check if URI ends in ?  If it doesn't add one.
     if (uri.charAt(uri.length - 1) !== '?') {
@@ -28,13 +29,13 @@ exports.get = function get(msg, conf, next) {
 
     uri += qs.stringify(msg.body);
 
-    var requestSettings = buildRequestSettings('GET', uri, conf.secret);
+    const requestSettings = buildRequestSettings('GET', uri, conf.secret);
     request(requestSettings, callback.bind(this));
 };
 
 function buildRequestSettings(method, uri, secret) {
     'use strict';
-    var requestSettings = {
+    let requestSettings = {
         uri: uri,
         method: method,
         headers: {}
@@ -56,7 +57,7 @@ function callback(err, response, body) {
         return;
     }
 
-    var sc = response.statusCode;
+    const sc = response.statusCode;
 
     if (sc >= 200 && sc <= 206) {
         this.emit('data', newMessage(response, body));
@@ -67,13 +68,13 @@ function callback(err, response, body) {
 }
 
 function newMessage(response, body) {
-    var headers = response.headers;
+    const headers = response.headers;
 
-    var contentType = headers['content-type'];
+    const contentType = headers['content-type'];
 
-    var msgBody = getJSONBody(contentType, body);
+    const msgBody = getJSONBody(contentType, body);
 
-    var msg = messages.newMessageWithBody(msgBody);
+    const msg = messages.newMessageWithBody(msgBody);
     msg.headers = headers;
 
     return msg;
@@ -89,3 +90,4 @@ function getJSONBody(contentType, body) {
         responseBody : body
     }
 }
+

send.js

@@ -1,5 +1,6 @@
-var request = require('./request.js');
-var DEFAULT_METHOD = 'POST';
+'use strict';
+const request = require('./request.js');
+const DEFAULT_METHOD = 'POST';
 
 exports.process = function(msg, conf) {
     request.putOrPost.call(this, conf.method || DEFAULT_METHOD, msg, conf);