tom-microservice 3.5.1 → 3.5.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "tom-microservice",
   "description": "Tom creates customers, subscriptions plans & send notifications.",
   "homepage": "https://tom.js.org",
-  "version": "3.5.1",
+  "version": "3.5.3",
   "main": "src",
   "bin": {
     "tom": "bin/index.js"
@@ -41,12 +41,12 @@
   "dependencies": {
     "acho": "~4.0.6",
     "beauty-error": "~1.2.15",
-    "body-parser": "~1.20.2",
     "cors": "~2.8.5",
     "country-vat": "~1.0.8",
     "emittery": "~0.13.1",
     "got": "~11.8.6",
     "helmet": "~6.1.2",
+    "http-body": "~1.0.4",
     "http-compression": "~1.0.5",
     "import-modules": "~2.1.0",
     "is-buffer": "~2.0.5",

package/src/routes.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { get, eq, forEach } = require('lodash')
-const bodyParser = require('body-parser')
+const { buffer, text } = require('http-body')
 const requestIp = require('request-ip')
 const toQuery = require('to-query')()
 const Router = require('router-http')
@@ -12,12 +12,26 @@ const createTom = require('.')
 
 const { TOM_API_KEY, TOM_ALLOWED_ORIGIN, NODE_ENV } = process.env
 
-const isTest = NODE_ENV === 'test'
+const UNAUTHENTICATED_PATHS = [
+  '/',
+  '/robots.txt',
+  '/favicon.ico',
+  '/ping',
+  '/payment/webhook'
+]
+
+const getBody = async req => {
+  if (req.path === '/payment/webhook') return buffer(req)
+  const body = await text(req)
+  if (body === '') return body
+  try {
+    return JSON.parse(body)
+  } catch (_) {
+    return body
+  }
+}
 
-const jsonBodyParser = bodyParser.json()
-const urlEncodedBodyParser = bodyParser.urlencoded({ extended: true })
-const rawBodyParser = bodyParser.raw({ type: 'application/json' })
-const isWebhook = req => req.path.endsWith('webhook')
+const isTest = NODE_ENV === 'test'
 
 const finalhandler = (error, req, res) => {
   const hasError = error !== undefined
@@ -52,32 +66,18 @@ const createRouter = () => {
         ]
       })
     )
-    .use((req, res, next) =>
-      isWebhook(req) ? rawBodyParser(req, res, next) : next()
-    )
-    .use((req, res, next) =>
-      isWebhook(req) ? next() : urlEncodedBodyParser(req, res, next)
-    )
-    .use((req, res, next) =>
-      isWebhook(req) ? next() : jsonBodyParser(req, res, next)
-    )
-    .use((req, res, next) => {
+    .use(async (req, res, next) => {
       req.query = toQuery(req.url)
       req.ipAddress = requestIp.getClientIp(req)
+      req.body = await getBody(req)
       next()
     })
 
   if (!isTest) router.use(require('morgan')('tiny'))
 
-  router
-    .get('/', (req, res) => send(res, 204))
-    .get('/robots.txt', (req, res) => send(res, 204))
-    .get('/favicon.ico', (req, res) => send(res, 204))
-    .get('/ping', (req, res) => send(res, 200, 'pong'))
-
   if (TOM_API_KEY) {
     router.use((req, res, next) => {
-      if (req.path.endsWith('webhook')) return next()
+      if (UNAUTHENTICATED_PATHS.includes(req.path)) return next()
       const apiKey = get(req, 'headers.x-api-key')
       return eq(apiKey, TOM_API_KEY)
         ? next()
@@ -91,6 +91,12 @@ const createRouter = () => {
     })
   }
 
+  router
+    .get('/', (req, res) => send(res, 204))
+    .get('/robots.txt', (req, res) => send(res, 204))
+    .get('/favicon.ico', (req, res) => send(res, 204))
+    .get('/ping', (req, res) => send(res, 200, 'pong'))
+
   return router
 }