Uninstall body-parser since its now included in express

lib/http/service.js

@@ -24,13 +24,24 @@ module.exports = (container) => {
     next();
   });
 
+  // apache request commonlog.
+  const morgan = require('morgan');
+  service.use(morgan('common'));
+
+  // version path rewrite must happen as a part of Express middleware.
+  // IMPORTANT: This must run BEFORE body parsing middleware so that route
+  // matching works correctly on the rewritten paths.
+  const { versionParser, fieldKeyParser } = require('./middleware');
+  service.use(versionParser);
+  service.use(fieldKeyParser);
+
   // automatically parse JSON if it is marked as such. otherwise, just pull the
   // plain-text body contents.
-  const bodyParser = require('body-parser');
+  const express = require('express');
 
   // use a default json limit except for URLs that explicitly need a larger limit.
-  const defaultJsonLimit = bodyParser.json({ type: 'application/json', limit: '250kb' });
-  const largeJsonLimit = bodyParser.json({ type: 'application/json', limit: '100mb' });
+  const defaultJsonLimit = express.json({ type: 'application/json', limit: '250kb' });
+  const largeJsonLimit = express.json({ type: 'application/json', limit: '100mb' });
   const largeJsonUrlMatch = match('/:apiVersion/projects/:id/datasets/:name/entities');
   // only apply body-parser middleware to request types which should have a body.
   service.patch('/*', defaultJsonLimit);
@@ -41,15 +52,6 @@ module.exports = (container) => {
     return defaultJsonLimit(req, res, next);
   });
 
-  // apache request commonlog.
-  const morgan = require('morgan');
-  service.use(morgan('common'));
-
-  // version path rewrite must happen as a part of Express middleware.
-  const { versionParser, fieldKeyParser } = require('./middleware');
-  service.use(versionParser);
-  service.use(fieldKeyParser);
-
   const cookieParser = require('cookie-parser');
   service.use(cookieParser());
 

lib/resources/submissions.js

@@ -51,8 +51,8 @@ const multipartErrorHandler = (err, req, res, next) => {
 };
 
 // formbody things:
-const bodyParser = require('body-parser');
-const formParser = bodyParser.urlencoded({ extended: false });
+const express = require('express');
+const formParser = express.urlencoded({ extended: false });
 
 // util funcs for openRosaSubmission below, mostly just moving baked logic/data off for perf.
 const missingXmlProblem = Problem.user.missingMultipartField({ field: XML_SUBMISSION_FILE });