From 7a6d14cf3aa28aadea4a0e1d1905f96046a45cc0 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Wed, 26 Jul 2023 13:27:15 -0300
Subject: [PATCH] fix(core.gbapp): FIX SSR errors and setOption impersonated.

---
 packages/basic.gblib/services/DialogKeywords.ts         | 2 +-
 packages/core.gbapp/services/GBConversationalService.ts | 6 ++++--
 packages/kb.gbapp/dialogs/AskDialog.ts                  | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/basic.gblib/services/DialogKeywords.ts b/packages/basic.gblib/services/DialogKeywords.ts
index 72828c30..62e32b3a 100644
--- a/packages/basic.gblib/services/DialogKeywords.ts
+++ b/packages/basic.gblib/services/DialogKeywords.ts
@@ -807,7 +807,7 @@ export class DialogKeywords {
       };
       min.cbMap[userId] = {};
       min.cbMap[userId]['promise'] = '!GBHEAR';
-
+        
       while (min.cbMap[userId].promise === '!GBHEAR') {
         await sleep(DEFAULT_HEAR_POLL_INTERVAL);
       }
diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts
index bb688ab5..f07a1171 100644
--- a/packages/core.gbapp/services/GBConversationalService.ts
+++ b/packages/core.gbapp/services/GBConversationalService.ts
@@ -875,12 +875,14 @@ export class GBConversationalService {
         });
       }
 
-      return await step.replaceDialog(`/${intent}`, step.activeDialog.state.options);
+      await step.replaceDialog(`/${intent}`, step.activeDialog.state.options);
+      return true;
+
     }
 
     GBLog.info(`NLP NOT called: score: ${score} > required (nlpScore): ${instanceScore}`);
 
-    return null;
+    return false;
   }
 
   public async getLanguage(min: GBMinInstance, text: string): Promise<string> {
diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts
index 598c616c..8332f128 100644
--- a/packages/kb.gbapp/dialogs/AskDialog.ts
+++ b/packages/kb.gbapp/dialogs/AskDialog.ts
@@ -195,7 +195,7 @@ export class AskDialog extends IGBDialog {
             await GBVMService.callVM(startDialog.toLowerCase().trim(), min, step, user, this.deployer, false);
           }
 
-          return step.endDialog();
+          return await step.endDialog();
         }
 
         const locale = step.context.activity.locale;
@@ -270,9 +270,9 @@ export class AskDialog extends IGBDialog {
 
         // Tries to answer by NLP.
 
-        let nextDialog = await min.conversationalService.routeNLP(step, min, text);
-        if (nextDialog) {
-          return nextDialog;
+        let handled = await min.conversationalService.routeNLP(step, min, text);
+        if (handled) {
+          return;
         }
 
         // Tries to answer by Reading Comprehension.