Issue jembi#1100: Request matching should include HTTP methods

package.json

@@ -1,7 +1,7 @@
 {
   "name": "openhim-core",
   "description": "The OpenHIM core application that provides logging and routing of http requests",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "main": "./lib/server.js",
   "bin": {
     "openhim-core": "./bin/openhim-core.js"
@@ -57,7 +57,7 @@
     "koa-bodyparser": "^4.3.0",
     "koa-compress": "3.0.0",
     "koa-route": "3.2.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
     "moment": "^2.25.3",
     "moment-timezone": "^0.5.31",
     "mongodb": "^3.5.7",

src/middleware/requestMatching.js

@@ -73,6 +73,12 @@ function matchUrlPattern (channel, ctx) {
   return pat.test(ctx.request.path)
 }
 
+function matchMethod(channel, ctx) {
+    let found = channel.methods.find(method => ctx.request.method.toUpperCase() === method);
+    if(found) return true;
+    return false;
+}
+
 function matchContentTypes (channel, ctx) {
   if ((channel.matchContentTypes != null ? channel.matchContentTypes.length : undefined) > 0) {
     if (ctx.request.header && ctx.request.header['content-type']) {
@@ -96,6 +102,7 @@ function matchContentTypes (channel, ctx) {
 // eslint-disable-next-line
 let matchFunctions = [
   matchUrlPattern,
+  matchMethod,
   matchContent,
   matchContentTypes
 ]

test/unit/requestMatchingTest.js

@@ -113,6 +113,22 @@ describe('Request Matching middleware', () => {
     })
   })
 
+  describe('.matchMethod', () => {
+      let matchMethod = requestMatching.__get__('matchMethod')
+      let channel = { methods: ['GET', 'POST', 'DELETE'] }
+
+      it('should match a request http method', () => {
+          let actual = matchMethod(channel, { request: { method: 'GET'}})
+          return actual.should.be.true()
+      })
+
+      it('should reject request with excluded method', () => {
+          // PUT is not included in the channel definition
+          let actual = matchMethod(channel, { request: { method: 'PUT'}})
+          return actual.should.be.false()
+      })
+  })
+
   describe('.matchContentTypes', () => {
     it('should match correct content types', () => {
       const matchContentTypes = requestMatching.__get__('matchContentTypes')