Revert "Webhook should include addtional information in the call #12 (#…

…14)" (#15)

This reverts commit 2313d23.

get.js

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

package.json

@@ -3,26 +3,23 @@
   "version": "1.0.0",
   "description": "elastic.io webhook component",
   "scripts": {
-    "test": "mocha spec --recursive"
+    "test": "./node_modules/jasmine-node/bin/jasmine-node --test-dir spec"
   },
   "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": {
-    "eslint-plugin-mocha": "5.3.0",
-    "mocha": "6.1.4",
-    "nock": "10.0.6",
-    "sinon": "7.3.2",
-    "chai": "3.5.0"
+    "nock": "9.2.3",
+    "jasmine-node": "~1.14.5"
   }
 }

receive.js

@@ -1,36 +1,16 @@
 "use strict";
-const Q = require("q");
+var Q = require("q");
 
 exports.process = function (msg, conf) {
-    const msgId = msg.id;
+    let msgId = msg.id;
     console.log("Received new message with id", msgId);
     console.log(msg);
 
-    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);
+    if (msg.query && msg.body) {
+        msg.body._query = msg.query;
     }
 
-
-    let self = this;
+    var self = this;
 
     Q()
         .then(emitData)
@@ -51,5 +31,4 @@ exports.process = function (msg, conf) {
         console.log("Finished processing message:", msgId);
         self.emit('end');
     }
-};
-
+};

request.js

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

send.js

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