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

chore(VBA): Draft BASIC guide added.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2019-02-25 09:44:39 -03:00
parent 6780551ea6
commit fd39b1d6dc
5 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/azuredeployer.gbapp/dialogs/StartDialog.ts
View file

@ -48,9 +48,7 @@ const scanf = require('scanf');
* Handles command-line dialog for getting info for Boot Bot. * Handles command-line dialog for getting info for Boot Bot.
*/ */
export class StartDialog { export class StartDialog {
public static async createBaseInstance() { public static async createBaseInstance() {
// No .env so asks for cloud credentials to start a new farm. // No .env so asks for cloud credentials to start a new farm.
if (!fs.existsSync(`.env`)) { if (!fs.existsSync(`.env`)) {
@ -105,7 +103,7 @@ export class StartDialog {
} }
// Prepares the first instance on bot farm. // Prepares the first instance on bot farm.
const instance = new GuaribasInstance(); const instance: IGBInstance = {};
instance.botId = botId; instance.botId = botId;
instance.cloudUsername = username; instance.cloudUsername = username;
@ -165,7 +163,11 @@ cannot start or end with or contain consecutive dashes and having 4 to 42 charac
GBAdminService.GB_PROMPT GBAdminService.GB_PROMPT
}Due to this opened issue: https://github.com/Microsoft/botbuilder-tools/issues/550\n` }Due to this opened issue: https://github.com/Microsoft/botbuilder-tools/issues/550\n`
); );
process.stdout.write(`${GBAdminService.GB_PROMPT}Please enter your LUIS Authoring Key, get it here: https://www.luis.ai/user/settings and paste it to me:`); process.stdout.write(
`${
GBAdminService.GB_PROMPT
}Please enter your LUIS Authoring Key, get it here: https://www.luis.ai/user/settings and paste it to me:`
);
authoringKey = scanf('%s').replace(/(\n|\r)+$/, ''); authoringKey = scanf('%s').replace(/(\n|\r)+$/, '');
} }

3
packages/azuredeployer.gbapp/services/AzureDeployerService.ts
View file

@ -367,7 +367,7 @@ export class AzureDeployerService extends GBService {
subscriptionId subscriptionId
) { ) {
const instance = new GuaribasInstance(); const instance: IGBInstance = {};
instance.botId = title; instance.botId = title;
instance.cloudUsername = username; instance.cloudUsername = username;
@ -494,7 +494,6 @@ export class AzureDeployerService extends GBService {
const res = await httpClient.sendRequest(req); const res = await httpClient.sendRequest(req);
if (!(res.bodyAsJson as any).id) { if (!(res.bodyAsJson as any).id) {
reject(res.bodyAsText); reject(res.bodyAsText);
return; return;
} }

6
packages/core.gbapp/services/GBConfigService.ts
View file

@ -74,6 +74,12 @@ export class GBConfigService {
case 'CLOUD_LOCATION': case 'CLOUD_LOCATION':
value = undefined; value = undefined;
break; break;
case 'MARKETPLACE_ID':
value = undefined;
break;
case 'MARKETPLACE_SECRET':
value = undefined;
break;
case 'NLP_AUTHORING_KEY': case 'NLP_AUTHORING_KEY':
value = undefined; value = undefined;
break; break;

4
packages/core.gbapp/services/GBCoreService.ts
View file

@ -309,8 +309,8 @@ STORAGE_SYNC=true
*/ */
public async ensureInstances(instances: GuaribasInstance[], bootInstance: any, core: GBCoreService) { public async ensureInstances(instances: GuaribasInstance[], bootInstance: any, core: GBCoreService) {
if (!instances) { if (!instances) {
const saveInstance = new GuaribasInstance(bootInstance); const instance: IGBInstance = {};
await saveInstance.save(); await instance.save();
instances = await core.loadInstances(); instances = await core.loadInstances();
} }

3
src/app.ts
View file

@ -91,7 +91,6 @@ export class GBServer {
GBConfigService.init(); GBConfigService.init();
const core = new GBCoreService(); const core = new GBCoreService();
core.ensureAdminIsSecured();
const importer: GBImporter = new GBImporter(core); const importer: GBImporter = new GBImporter(core);
const deployer: GBDeployer = new GBDeployer(core, importer); const deployer: GBDeployer = new GBDeployer(core, importer);
@ -114,6 +113,8 @@ export class GBServer {
await core.initStorage(); await core.initStorage();
} }
core.ensureAdminIsSecured();
// Deploys system and user packages. // Deploys system and user packages.
logger.info(`Deploying packages...`); logger.info(`Deploying packages...`);