fix(core): fix _findNode check

botpress · Jul 23, 2018 · 85795a4 · 85795a4
1 parent bdd769b
commit 85795a4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/core/botpress/src/dialog/engine.js b/packages/core/botpress/src/dialog/engine.js
@@ -423,7 +423,7 @@ bp.dialogEngine.onBeforeSessionTimeout((ctx, next) => {
       this._trace('>>', 'FLOW', `"${nodeName}"`, context, null)
       context = this._gotoSubflow(nodeName, context)
       switchedFlow = true
-    } else if (/^#/.test(nodeName)) {
+    } else if (nodeName && nodeName[0] === '#') {
       // e.g. '#success'
       this._trace('<<', 'FLOW', `"${nodeName}"`, context, null)
       context = this._gotoPreviousFlow(nodeName, context)
@@ -465,7 +465,6 @@ bp.dialogEngine.onBeforeSessionTimeout((ctx, next) => {
          Current flow: ${context.currentFlow.name}
          Current node: ${context.node}`
         )
-        return this._endFlow(stateId)
       }
 
       await this._setContext(stateId, context)
@@ -670,10 +669,11 @@ bp.dialogEngine.onBeforeSessionTimeout((ctx, next) => {
         name = _.first(chunks)
         try {
           args = JSON.parse(argsStr)
+          const actionCtx = { state: userState, s: userState, event: event, e: event }
           args = _.mapValues(args, value => {
             if (_.isString(value) && value.startsWith('{{') && value.endsWith('}}')) {
               const key = value.substr(2, value.length - 4)
-              return _.get({ state: userState, s: userState, event: event, e: event }, key)
+              return _.get(actionCtx, key)
             }
             return value
           })
@@ -744,7 +744,7 @@ bp.dialogEngine.onBeforeSessionTimeout((ctx, next) => {
 
     const node = _.find(flow.nodes, { name: nodeName })
 
-    if (throwIfNotFound && !nodeName) {
+    if (throwIfNotFound && !node) {
       throw new Error(`Could not find node "${nodeName}" in flow "${flow.name}"`)
     }