From b741fb6bb5212288247dd3a198770f2b41307eed Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Tue, 19 May 2020 14:59:07 -0300 Subject: [PATCH] new(admin.gbapp): Publish dialog. --- package.json | 2 +- packages/admin.gbapp/dialogs/AdminDialog.ts | 9 ++++++--- packages/admin.gbapp/strings.ts | 12 ++++++++++-- packages/boot.gbot/settings.json | 4 ++-- packages/core.gbapp/services/GBMinService.ts | 5 ++++- packages/core.gbapp/strings.ts | 10 ++-------- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 74e8669a..37b822dc 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "botbuilder-ai": "4.7.0", "botbuilder-dialogs": "4.7.0", "botframework-connector": "4.7.0", - "botlib": "1.5.2", + "botlib": "1.5.3", "cli-spinner": "0.2.10", "dotenv-extended": "2.7.1", "exceljs": "3.5.0", diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts index e1dd4a18..5bb20f70 100644 --- a/packages/admin.gbapp/dialogs/AdminDialog.ts +++ b/packages/admin.gbapp/dialogs/AdminDialog.ts @@ -178,8 +178,12 @@ export class AdminDialog extends IGBDialog { if (AdminDialog.isIntentYes(locale, step.result)) { let from = step.context.activity.from.id; + + let canPublish = process.env.SECURITY_CAN_PUBLISH? + AdminDialog.canSendBroadcast(from): + true; // TODO: Disable all can publish from web. - if (AdminDialog.canSendBroadcast(from)) { + if (canPublish) { const botId = min.instance.botId; const locale = step.context.activity.locale; @@ -227,8 +231,7 @@ export class AdminDialog extends IGBDialog { if (!step.activeDialog.state.options.confirm) { return await step.replaceDialog('/ask', { isReturning: true }); } - else - { + else { return await step.endDialog(); } diff --git a/packages/admin.gbapp/strings.ts b/packages/admin.gbapp/strings.ts index 2bede1af..d4114720 100644 --- a/packages/admin.gbapp/strings.ts +++ b/packages/admin.gbapp/strings.ts @@ -18,7 +18,11 @@ export const Messages = { enter_authenticator_authority_host_url: 'Enter the Authority Host URL (eg.: https://login.microsoftonline.com): ', enter_authenticator_client_id: `Enter the Client Id GUID: Get from [this url](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredAppsPreview)`, - enter_authenticator_client_secret: 'Enter the Client Secret:' + enter_authenticator_client_secret: 'Enter the Client Secret:', + publish_must_be_admin: 'Seu telefone precisa estar com privilégios administrativos para realizar publicação.', + publish_success: 'Publicação realizada.', + publish_type_yes: 'Por favor, digite *Sim* para continuar com a publicação.', + publish_canceled: 'Publicação cancelada.', }, 'pt-BR': { authenticate: 'Please, authenticate:', @@ -39,6 +43,10 @@ export const Messages = { enter_authenticator_authority_host_url: 'Enter the Authority Host URL (eg.: https://login.microsoftonline.com): ', enter_authenticator_client_id: `Enter the Client Id GUID: Get from [this url](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredAppsPreview)`, - enter_authenticator_client_secret: 'Enter the Client Secret:' + enter_authenticator_client_secret: 'Enter the Client Secret:', + publish_must_be_admin: 'Seu telefone precisa estar com privilégios administrativos para realizar publicação.', + publish_success: 'Publicação realizada.', + publish_type_yes: 'Por favor, digite *Sim* para continuar com a publicação.', + publish_canceled: 'Publicação cancelada.', } }; diff --git a/packages/boot.gbot/settings.json b/packages/boot.gbot/settings.json index ab007217..6917287f 100644 --- a/packages/boot.gbot/settings.json +++ b/packages/boot.gbot/settings.json @@ -1,7 +1,7 @@ { "enabledAdmin": "true", - "searchScore": ".15", - "nlpScore": ".40", + "searchScore": ".45", + "nlpScore": ".80", "nlpVsSearch": ".4", "autoPackageSync": "gbdialog, gbot, gbtheme" } diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 2ddf3a3c..f6e100cb 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -245,8 +245,11 @@ export class GBMinService { // Serves individual URL for each bot user interface. if (process.env.DISABLE_WEB !== 'true') { const uiUrl = `/${instance.botId}`; + const uiUrlAlt = `/${instance.activationCode}`; GBServer.globals.server.use(uiUrl, express.static(urlJoin(GBDeployer.deployFolder, GBMinService.uiPackage, 'build'))); - GBLog.info(`Bot UI ${GBMinService.uiPackage} accessible at: ${uiUrl}.`); + GBServer.globals.server.use(uiUrlAlt, express.static(urlJoin(GBDeployer.deployFolder, GBMinService.uiPackage, 'build'))); + + GBLog.info(`Bot UI ${GBMinService.uiPackage} accessible at: ${uiUrl} and ${uiUrlAlt}.`); } // Clients get redirected here in order to create an OAuth authorize url and redirect them to AAD. diff --git a/packages/core.gbapp/strings.ts b/packages/core.gbapp/strings.ts index 80319359..16497667 100644 --- a/packages/core.gbapp/strings.ts +++ b/packages/core.gbapp/strings.ts @@ -12,10 +12,7 @@ export const Messages = { whats_email: "What's your E-mail address?", validation_enter_valid_email: "Please enter a valid e-mail." , affirmative_sentences: /^(sim|s|positivo|afirmativo|claro|evidente|sem dúvida|confirmo|confirmar|confirmado|uhum)/i, - publish_must_be_admin: 'Seu telefone precisa estar com privilégios administrativos para realizar publicação.', - publish_success: 'Publicação realizada.', - publish_type_yes: 'Por favor, digite *Sim* para continuar com a publicação.', - publish_canceled: 'Publicação cancelada.', + }, 'pt-BR': { show_video: 'Vou te mostrar um vídeo. Por favor, aguarde...', @@ -28,9 +25,6 @@ export const Messages = { whats_email: "Qual seu e-mail?", validation_enter_valid_email: "Por favor digite um email válido.", affirmative_sentences: /^(sim|s|positivo|afirmativo|claro|evidente|sem dúvida|confirmo|confirmar|confirmado|uhum)/i, - publish_must_be_admin: 'Seu telefone precisa estar com privilégios administrativos para realizar publicação.', - publish_success: 'Publicação realizada.', - publish_type_yes: 'Por favor, digite *Sim* para continuar com a publicação.', - publish_canceled: 'Publicação cancelada.', + } };