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

fix(basic.gblib): Now BASIC only runs after auth.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2021-08-30 16:30:10 -03:00
parent 00b49d779d
commit dfb869e796
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
packages/basic.gblib/services/GBVMService.ts
View file

@ -187,11 +187,16 @@ export class GBVMService extends GBService {
tolist = this.getToLst;
headers = {};
hear gbLogin as login
${code}
`;
// Keywords from General Bots BASIC.
code = code.replace(/hear (\w+) as login/gi, ($0, $1) => {
return `${$1} = hear("login")`;
});
code = code.replace(/hear (\w+) as email/gi, ($0, $1) => {
return `${$1} = hear("email")`;
});
@ -547,7 +552,6 @@ export class GBVMService extends GBService {
return code;
}
private addHearDialog(min) {
min.dialogs.add(
new WaterfallDialog('/hear', [
@ -565,7 +569,22 @@ export class GBVMService extends GBService {
GBLog.info('BASIC: Asking for input (HEAR).');
}
return await min.conversationalService.prompt(min, step, null);
step.activeDialog.state.options = step.options;
if (step.activeDialog.state.options['kind'] === "login") {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
GBLog.info('BASIC: Authenticating beforing running General Bots BASIC code.');
return await step.beginDialog('/auth');
}
}
return await step.next(step.options);
},
async step => {
if (step.activeDialog.state.options['kind'] === "login") {
return await step.next(step.options);
} else {
return await min.conversationalService.prompt(min, step, null);
}
},
async step => {