botium-core 1.15.3 → 1.15.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "botium-core",
-  "version": "1.15.3",
+  "version": "1.15.5",
   "description": "The Selenium for Chatbots",
   "main": "index.js",
   "module": "dist/botium-es.js",

package/src/containers/plugins/SimpleRestContainer.js

@@ -262,9 +262,8 @@ module.exports = class SimpleRestContainer {
       if (requestOptions.body) {
         debug('Request.form and request.body are mutually exclusive')
       }
+      requestOptions.headers['Content-Type'] = 'application/x-www-form-urlencoded'
       requestOptions.body = new URLSearchParams(requestOptions.form).toString()
-      // it is set automatically by fetch
-      // requestOptions.headers['Content-Type'] = 'application/x-www-form-urlencoded'
       delete requestOptions.form
     }
 
@@ -551,7 +550,8 @@ module.exports = class SimpleRestContainer {
           fetch(requestOptions.uri, requestOptions).then(async (bodyRaw) => {
             let body
             try {
-              if (bodyRaw.headers.get('content-type').includes('application/json')) {
+              const contentType = bodyRaw.headers.get('content-type')
+              if (contentType && contentType.includes('application/json')) {
                 try {
                   body = await bodyRaw.json()
                 } catch (err) {
@@ -710,9 +710,9 @@ module.exports = class SimpleRestContainer {
       }
     }
     this._addRequestOptions(requestOptions)
-    this._fetchify(requestOptions)
     await executeHook(this.caps, this.requestHook, Object.assign({ requestOptions }, this.view))
     this._addRequestCookies(requestOptions)
+    this._fetchify(requestOptions)
 
     return requestOptions
   }

package/src/scripting/logichook/userinput/MediaInput.js

@@ -158,7 +158,8 @@ module.exports = class MediaInput {
       const baseDir = this._getBaseDir(convo)
       return args.reduce((e, arg) => {
         if (this._isWildcard(arg)) {
-          const mediaFiles = globSync(arg, { cwd: baseDir })
+          // we need to escape brackets to find files
+          const mediaFiles = globSync(arg.replace(/[()[\]{}]/g, '\\$&'), { cwd: baseDir })
           mediaFiles.forEach(mf => {
             e.push({
               name: 'MEDIA',

package/test/connectors/simplerest.spec.js

@@ -139,8 +139,9 @@ const _assertHook = async (myCaps) => {
   const request = await container.pluginInstance._buildRequest(msg)
 
   assert.exists(request.body)
-  assert.exists(request.body.bodyFieldRequestHook)
-  assert.equal(request.body.bodyFieldRequestHook, 1)
+  const body = JSON.parse(request.body)
+  assert.exists(body.bodyFieldRequestHook)
+  assert.equal(body.bodyFieldRequestHook, 1)
 
   assert.exists(container.pluginInstance.view)
   assert.exists(container.pluginInstance.view.context)
@@ -382,9 +383,8 @@ describe('connectors.simplerest', function () {
         [Capabilities.SIMPLEREST_RESPONSE_JSONPATH]: ['$.status']
       }
       const scope = nock('https://mock2.com')
-        .post('/endpointForm', (body) => {
-          return body === 'formparam1=valueparam1%2B-%25'
-        })
+        .post('/endpointForm', 'formparam1=valueparam1%2B-%25')
+        .matchHeader('Content-Type', 'application/x-www-form-urlencoded')
         .reply(200, {
           status: 'ok'
         })