Merge pull request #45 from codeforequity-at/bugfix/BOT-1212-connector-directline-check-json

BOT-1212-connector-directline-check-json - done

Author: Botium

README.md

@@ -166,6 +166,11 @@ _default: {}_
 
 JSON object holding the activity template used for sending activities to the bot.
 
+### DIRECTLINE3_ACTIVITY_VALIDATION
+_default: 'error'
+
+Set to 'warning' if you want to suppress activity validation errors.
+
 # Current Restrictions
 
 * Only HTTP Polling supported (WebSocket not available in Node.js)

index.js

@@ -19,7 +19,8 @@ const Capabilities = {
   DIRECTLINE3_BUTTON_VALUE_FIELD: 'DIRECTLINE3_BUTTON_VALUE_FIELD',
   DIRECTLINE3_HANDLE_ACTIVITY_TYPES: 'DIRECTLINE3_HANDLE_ACTIVITY_TYPES',
   DIRECTLINE3_ACTIVITY_VALUE_MAP: 'DIRECTLINE3_ACTIVITY_VALUE_MAP',
-  DIRECTLINE3_ACTIVITY_TEMPLATE: 'DIRECTLINE3_ACTIVITY_TEMPLATE'
+  DIRECTLINE3_ACTIVITY_TEMPLATE: 'DIRECTLINE3_ACTIVITY_TEMPLATE',
+  DIRECTLINE3_ACTIVITY_VALIDATION: 'DIRECTLINE3_ACTIVITY_VALIDATION'
 }
 
 const Defaults = {
@@ -29,6 +30,7 @@ const Defaults = {
   [Capabilities.DIRECTLINE3_BUTTON_TYPE]: 'event',
   [Capabilities.DIRECTLINE3_BUTTON_VALUE_FIELD]: 'name',
   [Capabilities.DIRECTLINE3_HANDLE_ACTIVITY_TYPES]: 'message',
+  [Capabilities.DIRECTLINE3_ACTIVITY_VALIDATION]: 'error',
   [Capabilities.DIRECTLINE3_ACTIVITY_VALUE_MAP]: {
     event: 'name'
   }
@@ -327,6 +329,18 @@ class BotiumConnectorDirectline3 {
         })
       }
 
+      // validating the activity
+      if (activity.text) {
+        if (_.isObject(activity.text)) {
+          const msg = `Activity is not correct. There is a JSON ${JSON.stringify(activity.text)} in text field. Check your capabilities`
+          if (this.caps.DIRECTLINE3_ACTIVITY_VALIDATION === 'error') {
+            reject(new Error(msg))
+          } else {
+            debug(msg)
+          }
+        }
+      }
+
       if (msg.media && msg.media.length > 0) {
         debug('Posting activity with attachments ', JSON.stringify(activity, null, 2))
         msg.sourceData = Object.assign(msg.sourceData || {}, { activity })