From 9ed492236764ae3798a9f4f33edbbd46c4c8a573 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Tue, 13 Mar 2018 06:46:58 -0400
Subject: [PATCH] move console api call into console

---
 lib/modules/webserver/server.js |  4 ++++
 package.json                    | 15 +--------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/modules/webserver/server.js b/lib/modules/webserver/server.js
index e9f4c1fc2..0cb56c9b5 100644
--- a/lib/modules/webserver/server.js
+++ b/lib/modules/webserver/server.js
@@ -8,6 +8,7 @@ require('http-shutdown').extend();
 var express = require('express');
 let path = require('path');
 var expressWebSocket = require('express-ws');
+var bodyParser = require('body-parser');
 
 class Server {
   constructor(options) {
@@ -65,6 +66,9 @@ class Server {
     this.app.use('/coverage', coverage);
     this.app.use(coverageStyle);
 
+    app.use(bodyParser.json()); // support json encoded bodies
+    app.use(bodyParser.urlencoded({ extended: true })); // support encoded bodies
+
     expressWebSocket(this.app);
 
     this.app.ws('/logs', function(ws, req) {
diff --git a/package.json b/package.json
index d26292491..437a3374c 100644
--- a/package.json
+++ b/package.json
@@ -54,8 +54,8 @@
     "eth-ens-namehash": "2.0.8",
     "eth-lib": "0.2.8",
     "babel-plugin-webpack-aliases": "^1.1.3",
+    "body-parser": "^1.18.2",
     "ethereumjs-wallet": "0.6.0",
-<<<<<<< HEAD
     "express": "4.16.3",
     "express-ws": "4.0.0",
     "file-loader": "2.0.0",
@@ -72,19 +72,6 @@
     "http-proxy": "1.17.0",
     "http-shutdown": "1.2.0",
     "i18n": "0.8.3",
-=======
-    "express": "^4.16.2",
-    "express-ws": "^3.0.0",
-    "file-loader": "^1.1.5",
-    "finalhandler": "^1.1.1",
-    "follow-redirects": "^1.2.4",
-    "fs-extra": "^2.0.0",
-    "ganache-cli": "^6.1.6",
-    "glob": "^7.1.2",
-    "globule": "^1.1.0",
-    "hard-source-webpack-plugin": "^0.11.1",
-    "http-proxy": "^1.17.0",
->>>>>>> add 2nd endpoint to webserver; use express
     "handlebars": "^4.0.11",
     "ipfs-api": "17.2.4",
     "is-valid-domain": "0.0.5",