Added support for different form post content types

README.md

@@ -181,7 +181,7 @@ const searchResultsResource = await apiResource.invoke('search', {
 - [x] add tests for PATCH
 - [x] add tests for query parameterised DELETE, POST, PUT, PATCH
 - [x] add tests for path parameterised DELETE, POST, PUT, PATCH
-- [ ] add tests for POST forms
+- [x] add tests for POST forms
 - [ ] fix badges
 - [ ] add tests for PUT forms
 - [ ] add tests for PATCH forms

package.json

@@ -112,6 +112,7 @@
     "/dist/*.js.map"
   ],
   "dependencies": {
+    "@hapi/accept": "^5.0.1",
     "debug": "^4.2.0",
     "es6-promise": "^4.2.8",
     "http-link-header": "^1.0.2",

src/test/invoke-operation.feature

@@ -119,12 +119,12 @@ Feature: Invoke Operation
             | content-type | <CONTENT-TYPE> |
             | ping         | pong           |
 
-        @wip
         Examples:
             | METHOD | TYPE | CONTENT-TYPE                      |
             | POST   | body | application/x-www-form-urlencoded |
             | POST   | body | application/json                  |
 
+
     Scenario Outline: Invoke operation - POST body with extra context
         Given a resource with a "https://waychaser.io/rel/pong" operation with the "<METHOD>" method that returns the "<CONTENT-TYPE>" provided "ping" "<TYPE>" parameter and the content type
         When waychaser successfully loads that resource
@@ -135,9 +135,38 @@ Feature: Invoke Operation
             | content-type | <CONTENT-TYPE> |
             | ping         | pong           |
 
-        @wip
         Examples:
             | METHOD | TYPE | CONTENT-TYPE                      |
             | POST   | body | application/x-www-form-urlencoded |
             | POST   | body | application/json                  |
 
+    Scenario: Invoke operation - POST body x-www-form-urlencoded prefered
+        Given a resource with a "https://waychaser.io/rel/pong" operation with the "POST" method that returns the provided "ping" "body" parameter and the content type, accepting:
+            | CONENT-TYPE                       |
+            | application/x-www-form-urlencoded |
+            | application/json;q=0.5            |
+        When waychaser successfully loads that resource
+        And we invoke the "https://waychaser.io/rel/pong" operation with the input
+            | ping | pong |
+        Then resource returned will contain
+            | content-type | application/x-www-form-urlencoded |
+            | ping         | pong                              |
+
+    Scenario: Invoke operation - POST body json prefered
+        Given a resource with a "https://waychaser.io/rel/pong" operation with the "POST" method that returns the provided "ping" "body" parameter and the content type, accepting:
+            | CONENT-TYPE                             |
+            | application/x-www-form-urlencoded;q=0.5 |
+            | application/json                        |
+        When waychaser successfully loads that resource
+        And we invoke the "https://waychaser.io/rel/pong" operation with the input
+            | ping | pong |
+        Then resource returned will contain
+            | content-type | application/json |
+            | ping         | pong             |
+
+    Scenario: Invoke operation - POST body no preference
+        Given a resource with a "https://waychaser.io/rel/pong" operation with the "POST" method that returns the provided "ping" "body" parameter
+        When waychaser successfully loads that resource
+        And we invoke the "https://waychaser.io/rel/pong" operation with the input
+            | ping | pong |
+        Then resource returned will contain those values

src/test/resource.steps.js

@@ -47,7 +47,7 @@ Before(async function () {
     method,
     parameter,
     parameterType,
-    contentType
+    contentTypes
   ) {
     const dynamicRoute =
       parameterType === 'query' || parameterType === 'body'
@@ -66,17 +66,25 @@ Before(async function () {
         // logger.debug('SENDING', method, route, { ...request.query })
         logger.debug('RECEIVED BODY', method, route, { ...request.body })
         let responseBody = Object.assign(
-          { 'content-type': request.headers['content-type'] },
+          {
+            ...(contentTypes !== undefined && {
+              'content-type': request.headers['content-type']
+            })
+          },
           request.body
         )
         if (parameterType === 'query') {
           responseBody = request.query
         } else if (parameterType === 'path') {
           responseBody = request.params
         }
-        response.status(200).send(responseBody || {})
+        response.status(200).send(responseBody)
       })
 
+    const accept = (Array.isArray(contentTypes)
+      ? contentTypes
+      : [contentTypes]
+    ).join()
     const links = new LinkHeader()
     links.set({
       rel: relationship,
@@ -85,9 +93,9 @@ Before(async function () {
       ...(parameterType === 'body' && {
         'params*': { value: JSON.stringify({ [parameter]: {} }) }
       }),
-      ...(contentType !== undefined &&
-        contentType !== 'application/x-www-form-urlencoded' && {
-          'accept*': { value: contentType }
+      ...(contentTypes !== undefined &&
+        contentTypes !== 'application/x-www-form-urlencoded' && {
+          'accept*': { value: accept }
         })
     })
 
@@ -260,3 +268,23 @@ Given(
     )
   }
 )
+
+Given(
+  'a resource with a {string} operation with the {string} method that returns the provided {string} {string} parameter and the content type, accepting:',
+  async function (
+    relationship,
+    method,
+    parameter,
+    parameterType,
+    contentTypes
+  ) {
+    await this.createDynamicResourceRoute(
+      randomApiPath(),
+      relationship,
+      method,
+      parameter,
+      parameterType,
+      contentTypes.rows()
+    )
+  }
+)

src/waychaser.js

@@ -5,6 +5,7 @@ import Loki from 'lokijs'
 import logger from './util/logger'
 import { URI } from 'uri-template-lite'
 import qsStringify from 'qs-stringify'
+import Accept from '@hapi/accept'
 polyfill()
 
 /**
@@ -82,22 +83,24 @@ class Operation {
         this['params*']?.value ? JSON.stringify(body) : undefined
       }`
     )
+    const contentType = Accept.mediaType(
+      this['accept*']?.value || 'application/x-www-form-urlencoded',
+      ['application/x-www-form-urlencoded', 'application/json']
+    )
     return loadResource(
       invokeUrl,
       Object.assign(
         {
           method: this.method,
           ...(this['params*']?.value && {
             headers: {
-              // 'Content-Type': 'application/json'
-              'Content-Type':
-                this['accept*']?.value || 'application/x-www-form-urlencoded'
+              'Content-Type': contentType
             }
           }),
 
           ...(this['params*']?.value && {
             body:
-              this['accept*']?.value === 'application/json'
+              contentType === 'application/json'
                 ? JSON.stringify(body)
                 : qsStringify(body)
           })