GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(core.gbapp): Custom boot dialog only available to boot bot.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2020-03-09 14:19:17 -03:00
parent efea36f1cc
commit 946a66b692
3 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/core.gbapp/dialogs/WelcomeDialog.ts
View file

@ -57,7 +57,8 @@ export class WelcomeDialog extends IGBDialog {
min.dialogs.add(new WaterfallDialog('/', [
async step => {
if (GBServer.globals.entryPointDialog !== null)
if (GBServer.globals.entryPointDialog !== null &&
min.instance.botId === process.env.BOT_ID)
{
return step.replaceDialog(GBServer.globals.entryPointDialog);
}

1
packages/core.gbapp/services/GBDeployer.ts
View file

@ -178,7 +178,6 @@ export class GBDeployer {
instance.adminPass = GBAdminService.getRndPassword();
instance.title = botId;
await this.core.saveInstance(instance);
return await this.deployBotFull(instance, GBServer.globals.publicAddress);

29
packages/sharepoint.gblib/services/SharePointService.ts
View file

@ -36,32 +36,7 @@
'use strict';
import { HttpHeaders, HttpMethods, ServiceClient, WebResource } from '@azure/ms-rest-js';
import { CognitiveServicesManagementClient } from 'azure-arm-cognitiveservices';
import { ResourceManagementClient, SubscriptionClient } from 'azure-arm-resource';
import { SearchManagementClient } from 'azure-arm-search';
import { SqlManagementClient } from 'azure-arm-sql';
import { WebSiteManagementClient } from 'azure-arm-website';
//tslint:disable-next-line:no-submodule-imports
import { AppServicePlan, Site, SiteConfigResource, SiteLogsConfig, SiteSourceControl } from 'azure-arm-website/lib/models';
import { GBLog, IGBInstallationDeployer, IGBInstance } from 'botlib';
import { GBAdminService } from '../../admin.gbapp/services/GBAdminService';
import { GBCorePackage } from '../../core.gbapp';
import { GBConfigService } from '../../core.gbapp/services/GBConfigService';
import { GBDeployer } from '../../core.gbapp/services/GBDeployer';
const MicrosoftGraph = require("@microsoft/microsoft-graph-client");
const Spinner = require('cli-spinner').Spinner;
// tslint:disable-next-line: no-submodule-imports
import * as simplegit from 'simple-git/promise';
const git = simplegit();
// tslint:disable-next-line:no-submodule-imports
import { CognitiveServicesAccount } from 'azure-arm-cognitiveservices/lib/models';
import urlJoin = require('url-join');
const iconUrl = 'https://github.com/pragmatismo-io/BotServer/blob/master/docs/images/generalbots-logo-squared.png';
const publicIp = require('public-ip');
const WebSiteResponseTimeout = 900;
const { sppull } = require("sppull");
/**
* Service facade for SharePoint Online.
@ -69,7 +44,6 @@ const WebSiteResponseTimeout = 900;
export class GBSharePointService {
public async downloadFolder(localPath: string, siteUrl: string, folderUrl: string, username: string, password: string) {
const { sppull } = require("sppull");
const context = {
siteUrl: siteUrl,
@ -87,4 +61,5 @@ export class GBSharePointService {
return await sppull(context, options);
}
}