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

fix(basic.gblib): Start of script error removed.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2021-03-02 20:53:12 -03:00
parent fe7f0d610f
commit 2820eacc59
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/admin.gbapp/dialogs/AdminDialog.ts
View file

@ -365,12 +365,15 @@ export class AdminDialog extends IGBDialog {
min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state);
const redirectUri = urlJoin(
min.instance.botEndpoint,
min.instance.botId,
'/token'
);
const url = `https://login.microsoftonline.com/${step.activeDialog.state.authenticatorTenant
}/oauth2/authorize?client_id=${min.instance.marketplaceId}&response_type=code&redirect_uri=${urlJoin(
min.instance.botEndpoint,
min.instance.botId,
'/token'
)}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
}/oauth2/authorize?client_id=${min.instance.marketplaceId
}&response_type=code&redirect_uri=${redirectUri
}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
await min.conversationalService.sendText(min, step, Messages[locale].consent(url));

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

@ -261,7 +261,7 @@ export class GBVMService extends GBService {
});
code = code.replace(/(exit)/gi, () => {
return `resolve();\n`;
return `if(resolve) {resolve();}\n`;
});
code = code.replace(/(show menu)/gi, () => {