fix(core.gbapp): Check of previous bot name before creation.

.gitignore

@@ -21,3 +21,4 @@
 .env
 teste.sql
 poc/
+*.env

package.json

@@ -66,7 +66,7 @@
     "botbuilder-ai": "4.7.0",
     "botbuilder-dialogs": "4.7.0",
     "botframework-connector": "4.7.0",
-    "botlib": "1.5.6",
+    "botlib": "1.5.7",
     "cli-spinner": "0.2.10",
     "dotenv-extended": "2.7.1",
     "exceljs": "3.5.0",

packages/azuredeployer.gbapp/services/AzureDeployerService.ts

@@ -219,7 +219,8 @@ export class AzureDeployerService implements IGBInstallationDeployer {
     };
   }
 
-  public async botExists(botId, group) {
+  public async botExists(botId) {
+    const group = GBConfigService.get('CLOUD_GROUP');
     const baseUrl = `https://management.azure.com/`;
     const username = GBConfigService.get('CLOUD_USERNAME');
     const password = GBConfigService.get('CLOUD_PASSWORD');

packages/core.gbapp/services/GBDeployer.ts

@@ -174,9 +174,9 @@ export class GBDeployer implements IGBDeployer {
     return await this.deployBotFull(instance, GBServer.globals.publicAddress);
   }
 
-  public async botExists(instance: IGBInstance, group, publicAddress: string): Promise<boolean> {
+  public async botExists(botId: string): Promise<boolean> {
     const service = new AzureDeployerService(this);
-    return await service.botExists(instance.botId, group);
+    return await service.botExists(botId);
   }
   /**
    * Deploys a bot to the storage.
@@ -191,7 +191,7 @@ export class GBDeployer implements IGBDeployer {
     const group = GBConfigService.get('CLOUD_GROUP');
     const subscriptionId = GBConfigService.get('CLOUD_SUBSCRIPTIONID');
 
-    if (await service.botExists(instance.botId, group)) {
+    if (await service.botExists(instance.botId)) {
       await service.updateBot(
         instance.botId,
         group,
@@ -312,7 +312,7 @@ export class GBDeployer implements IGBDeployer {
 
     const group = GBConfigService.get('CLOUD_GROUP');
 
-    if (await service.botExists(botId, group)) {
+    if (await service.botExists(botId)) {
 
       await service.deleteBot(
         botId, group
@@ -408,7 +408,7 @@ export class GBDeployer implements IGBDeployer {
         return await service.undeployKbFromStorage(instance, this, p.packageId);
 
       case '.gbui':
-        
+
         break;
 
       case '.gbtheme':

packages/core.gbapp/services/GBMinService.ts

@@ -480,16 +480,19 @@ export class GBMinService {
     }
     else {
       const minBoot = GBServer.globals.minBoot as any;
-      min.whatsAppDirectLine =
-        new WhatsappDirectLine(
-          min,
-          min.botId,
-          min.instance.webchatKey,
-          minBoot.instance.whatsappServiceKey,
-          minBoot.instance.whatsappServiceNumber,
-          minBoot.instance.whatsappServiceUrl
-        );
-      await min.whatsAppDirectLine.setup(false);
+      if (minBoot.instance.whatsappServiceKey) {
+
+        min.whatsAppDirectLine =
+          new WhatsappDirectLine(
+            min,
+            min.botId,
+            min.instance.webchatKey,
+            minBoot.instance.whatsappServiceKey,
+            minBoot.instance.whatsappServiceNumber,
+            minBoot.instance.whatsappServiceUrl
+          );
+        await min.whatsAppDirectLine.setup(false);
+      }
     }
 
     min.userProfile = conversationState.createProperty('userProfile');

packages/core.gbapp/services/GBVMService.ts

@@ -218,7 +218,7 @@ export class GBVMService extends GBService {
     // Convert TS into JS.
     const tsfile: string = `${filename}.ts`;
     let tsCode: string = fs.readFileSync(tsfile, 'utf8');
-    tsCode = tsCode.replace(/export.*\n/gi, `export function ${mainName}(step:any) { let resolve = undefined;`);
+    tsCode = tsCode.replace(/export.*\n/gi, `export function ${mainName}(step:any) { let resolve;`);
     fs.writeFileSync(tsfile, tsCode);
 
     const tsc = new TSCompiler();

packages/whatsapp.gblib/services/WhatsappDirectLine.ts

@@ -244,7 +244,7 @@ export class WhatsappDirectLine extends GBService {
       }
       else {
         GBLog.info(`USER (${id}) TO AGENT ${user.userSystemId}: ${text}`);
-        this.sendToDeviceEx(user.agentSystemId, `${id}: ${text}`, locale);
+        this.sendToDeviceEx(user.agentSystemId, `Bot: ${this.min.instance.botId}\n${id}: ${text}`, locale);
       }
 
     }