From 25091573a0be5397c24fc1656f3060252c16cdd9 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Mon, 27 May 2019 12:16:30 -0300
Subject: [PATCH] fix(core.gbapp): Self-replication on Azure

---
 packages/core.gbapp/services/GBCoreService.ts     | 1 +
 packages/core.gbapp/services/GBImporterService.ts | 4 ++++
 packages/core.gbapp/services/GBMinService.ts      | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts
index aa8cd4439..ef166609b 100644
--- a/packages/core.gbapp/services/GBCoreService.ts
+++ b/packages/core.gbapp/services/GBCoreService.ts
@@ -221,6 +221,7 @@ export class GBCoreService implements IGBCoreService {
   public async writeEnv(instance: IGBInstance) {
     const env = `ADDITIONAL_DEPLOY_PATH=
 ADMIN_PASS=${instance.adminPass}
+BOT_ID=${instance.botId}
 CLOUD_SUBSCRIPTIONID=${instance.cloudSubscriptionId}
 CLOUD_LOCATION=${instance.cloudLocation}
 CLOUD_GROUP=${instance.botId}
diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts
index c993be0f3..dd1079ea8 100644
--- a/packages/core.gbapp/services/GBImporterService.ts
+++ b/packages/core.gbapp/services/GBImporterService.ts
@@ -40,6 +40,7 @@ import { IGBCoreService, IGBInstance } from 'botlib';
 import fs = require('fs');
 import urlJoin = require('url-join');
 import { GuaribasInstance } from '../models/GBModel';
+import { GBConfigService } from './GBConfigService';
 
 /**
  * Handles the importing of packages.
@@ -56,6 +57,9 @@ export class GBImporter {
     if (botId === undefined) {
       botId = packageJson.botId;
     }
+    if (botId === undefined) {
+      botId = GBConfigService.get('BOT_ID');
+    }
     const instance = await this.core.loadInstance(botId);
 
     return await this.createOrUpdateInstanceInternal(instance, botId, localPath, packageJson);
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 6b8ae69a1..87b1b2998 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -232,7 +232,7 @@ export class GBMinService {
    */
   private async sendInstanceToClient(req, bootInstance: IGBInstance, res: any, webchatToken: any) {
     let botId = req.params.botId;
-    if (botId === '[default]') {
+    if (botId === '[default]'|| botId === undefined) {
       botId = GBConfigService.get('BOT_ID');
     }
     const instance = await this.core.loadInstance(botId);