From 387b3407f3d646b3435b3d59a551a443bfb7e0bb Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Thu, 26 Nov 2020 11:25:04 -0300
Subject: [PATCH] fix(core.gbapp): Language instance acquisition fixed.

---
 packages/core.gbapp/services/GBConversationalService.ts | 6 +++++-
 packages/core.gbapp/services/GBCoreService.ts           | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts
index 97f0d1c4..272982ef 100644
--- a/packages/core.gbapp/services/GBConversationalService.ts
+++ b/packages/core.gbapp/services/GBConversationalService.ts
@@ -532,8 +532,12 @@ export class GBConversationalService {
   }
 
   public async getLanguage(min: GBMinInstance, text: string): Promise<string> {
+    const key = min.core.getParam<string>(min.instance, 'textAnalyticsKey', null);
+    if (!key) {
+      return process.env.DEFAULT_USER_LANGUAGE;
+    }
     return await AzureText.getLocale(
-      min.core.getParam<string>(min.instance, 'textAnalyticsKey', null),
+      key,
       min.core.getParam<string>(min.instance, 'textAnalyticsEndpoint', null),
       text
     );
diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts
index 53fcc22b..01d2ca80 100644
--- a/packages/core.gbapp/services/GBCoreService.ts
+++ b/packages/core.gbapp/services/GBCoreService.ts
@@ -594,7 +594,9 @@ STORAGE_SYNC=true
       value = instance['dataValues'][name];
       if (value === null) {
         const minBoot = GBServer.globals.minBoot as any;
-        value = minBoot.instance.datavalues[name];
+        if (minBoot.instance && minBoot.instance.datavalues){
+          value = minBoot.instance.datavalues[name];
+        }        
       }
     }