new(admin.gbapp): /publish from Web or WhatsApp with associated auth.

DATABASE-CHANGES.md

@@ -49,11 +49,17 @@ ALTER TABLE dbo.GuaribasInstance ADD
 	activationCode nvarchar(16) NULL
 GO
 
-# 1.7.9
+#
 
 ALTER TABLE dbo.GuaribasInstance ADD
 	params nvarchar(4000) NULL
 GO
 
+#
+
+ALTER TABLE dbo.GuaribasInstance ADD
+	state nvarchar(16) NULL
+GO
+UPDATE dbo.GuaribasInstance SET state= 'active' 
 
 ```

package.json

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

packages/admin.gbapp/dialogs/AdminDialog.ts

@@ -76,6 +76,29 @@ export class AdminDialog extends IGBDialog {
 
     AdminDialog.setupSecurityDialogs(min);
 
+    min.dialogs.add(
+      new WaterfallDialog('/admin-auth', [
+        async step => {
+          const locale = step.context.activity.locale;
+          const prompt = Messages[locale].authenticate;
+
+          return await min.conversationalService.prompt(min, step, prompt);
+        },
+        async step => {
+          const locale = step.context.activity.locale;
+          const sensitive = step.result;
+
+          if (sensitive === process.env.ADMIN_PASS ) { // TODO: Per bot: min.instance.adminPass
+            await min.conversationalService.sendText(min, step, Messages[locale].welcome);
+
+            return await step.endDialog(true);
+
+          } else {
+            await min.conversationalService.sendText(min, step, Messages[locale].wrong_password);
+            return await step.replaceDialog('/admin-auth');
+          }
+        }]));
+
     min.dialogs.add(
       new WaterfallDialog('/admin', [
         async step => {
@@ -181,10 +204,27 @@ export class AdminDialog extends IGBDialog {
 
             let canPublish = AdminDialog.canPublish(min, from);
 
-            if (canPublish) {
+            if (!canPublish) {
+              await step.beginDialog('/admin-auth');
+            }
+            else {
+              step.next(true);
+            }
+          }
+          else {
+            await min.conversationalService.sendText(min, step, Messages[locale].publish_canceled);
+          }
+        },
+        async step => {
+          const locale = step.context.activity.locale;
+          if (!step.result) {
+            await min.conversationalService.sendText(min, step, Messages[locale].publish_must_be_admin);
+
+            return step.endDialog();
+          }
 
           const botId = min.instance.botId;
-              const locale = step.context.activity.locale;
+          
           await min.conversationalService.sendText(min, step, Messages[locale].working('Publishing'));
 
           step.activeDialog.state.options.args = (step.options as any).args;
@@ -227,11 +267,6 @@ export class AdminDialog extends IGBDialog {
             return await step.endDialog();
           }
 
-            } else {
-              await min.conversationalService.sendText(min, step, Messages[locale].publish_must_be_admin);
-            }
-          }
-          await min.conversationalService.sendText(min, step, Messages[locale].publish_canceled);
         }]));
   }
 

packages/core.gbapp/models/GBModel.ts

@@ -81,6 +81,9 @@ export class GuaribasInstance extends Model<GuaribasInstance>
   @Column
   public description: string;
 
+  @Column({ type: DataType.STRING(16) })
+  public state: string;
+
   @Column
   public version: string;
 

packages/core.gbapp/services/GBConversationalService.ts

@@ -529,6 +529,11 @@ export class GBConversationalService {
       return text;      
     }
 
+    if (text.length > 5000){
+      text = text.substr(0,4999);
+      GBLog.warn(`Text that bot will translate will be truncated due to MSFT service limitations.`);
+    }
+
     let options = {
       method: 'POST',
       baseUrl: endPoint,

packages/core.gbapp/services/GBCoreService.ts

@@ -215,7 +215,8 @@ export class GBCoreService implements IGBCoreService {
       return GuaribasInstance.findAll(options);
     }
     else {
-      return GuaribasInstance.findAll({});
+      const options = { where: { state: 'active' } };
+      return GuaribasInstance.findAll(options);
     }
   }
 
@@ -223,17 +224,25 @@ export class GBCoreService implements IGBCoreService {
    * Loads just one Bot instance by its internal Id.
    */
   public async loadInstanceById(instanceId: number): Promise<IGBInstance> {
-    const options = { where: { instanceId: instanceId } };
+    const options = { where: { instanceId: instanceId, state: 'active' } };
 
     return GuaribasInstance.findOne(options);
   }
+  /**
+   * Loads just one Bot instance.
+   */
+  public async loadInstanceByActivationCode(code: string): Promise<IGBInstance> {
 
+    let options = { where: { activationCode: code, state: 'active' } };
+
+    return await GuaribasInstance.findOne(options);
+  }
   /**
    * Loads just one Bot instance.
    */
   public async loadInstanceByBotId(botId: string): Promise<IGBInstance> {
     const options = { where: {} };
-    options.where = { botId: botId };
+    options.where = { botId: botId, state: 'active' };
 
     return await GuaribasInstance.findOne(options);
   }

packages/core.gbapp/services/GBMinService.ts

@@ -343,7 +343,12 @@ export class GBMinService {
     if (botId === '[default]' || botId === undefined) {
       botId = GBConfigService.get('BOT_ID');
     }
-    const instance = await this.core.loadInstanceByBotId(botId);
+    let instance = await this.core.loadInstanceByBotId(botId);
+
+    if (instance === null){
+      instance = await this.core.loadInstanceByActivationCode(botId);
+    }
+
     if (instance !== null) {
       const webchatTokenContainer = await this.getWebchatToken(instance);
       const speechToken = instance.speechKey != null ? await this.getSTSToken(instance) : null;