From 2f3756d0d7d1ad7f7bd9ae812e839d7fd882eb22 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Thu, 2 Apr 2020 21:07:23 -0300
Subject: [PATCH] fix(core.gbapp): Fix in startup code in blank.

---
 package-lock.json                                | 16 ++++++++--------
 package.json                                     |  3 ++-
 .../core.gbapp/services/GBImporterService.ts     |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0ec1db2a..217d5770 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -69,11 +69,6 @@
         "uuid": "^3.3.2"
       },
       "dependencies": {
-        "node-fetch": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
-        },
         "tslib": {
           "version": "1.11.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
@@ -3229,9 +3224,9 @@
       }
     },
     "botlib": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.4.3.tgz",
-      "integrity": "sha512-XLE6ZarAYomTfTsOsU+UeK38ec/yTgJTakNFUqzxz51srpLC35HitKH2crUr6tHv3d6Q4wfTinhclRv+1HBONA==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.4.5.tgz",
+      "integrity": "sha512-y9HvVNCpMwwJbFvfXyBStHDJ/u+ujiw0PXVcehesWQY8K7zh+rsFHDIJg5rj1ocbAuR0LhkFTcKh3ZAZcin9SQ==",
       "requires": {
         "async": "3.1.0",
         "botbuilder": "4.7.0",
@@ -9434,6 +9429,11 @@
         "semver": "^5.7.0"
       }
     },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
     "node-modules-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
diff --git a/package.json b/package.json
index 97bc7bff..02117bc5 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "João Ferreira <joao.parana@gmail.com>",
     "Jorge Ramos <jramos@pobox.com>",
     "PH <ph.an@outlook.com>",
-    "Dário Vieira <dario.junior3@gmail.com>"  ],
+    "Dário Vieira <dario.junior3@gmail.com>"
+  ],
   "engines": {
     "node": "=10.15.2"
   },
diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts
index 04d68ac8..6135fed3 100644
--- a/packages/core.gbapp/services/GBImporterService.ts
+++ b/packages/core.gbapp/services/GBImporterService.ts
@@ -63,9 +63,10 @@ export class GBImporter {
     }
     const instance = await this.core.loadInstance(botId);
 
-    if (instance.botId === undefined || instance.botId === null) {
+    if (instance != null || instance.botId === null) {
       console.log(`Null BotId after load instance with botId: ${botId}.`);
     }
+    
     return await this.createOrUpdateInstanceInternal(instance, botId, localPath, settingsJson);
   }