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

new(admin.gbapp): /publish now reads Can Publish from .gbot besides .env.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2021-08-19 08:02:56 -03:00
parent b11653c607
commit f9ab5b3437
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,7 @@ export class AdminDialog extends IGBDialog {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) { if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth'); return await step.beginDialog('/auth');
} }
else{ else {
return await step.next(step.options); return await step.next(step.options);
} }
}, },
@ -110,7 +110,7 @@ export class AdminDialog extends IGBDialog {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) { if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth'); return await step.beginDialog('/auth');
} }
else{ else {
return await step.next(step.options); return await step.next(step.options);
} }
}, },
@ -201,7 +201,7 @@ export class AdminDialog extends IGBDialog {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) { if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth'); return await step.beginDialog('/auth');
} }
else{ else {
return await step.next(step.options); return await step.next(step.options);
} }
}, },
@ -237,10 +237,11 @@ export class AdminDialog extends IGBDialog {
min.dialogs.add( min.dialogs.add(
new WaterfallDialog('/publish', [ new WaterfallDialog('/publish', [
async step => { async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) { if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth'); return await step.beginDialog('/auth');
} }
else{ else {
return await step.next(step.options); return await step.next(step.options);
} }
}, },
@ -351,7 +352,14 @@ export class AdminDialog extends IGBDialog {
*/ */
public static canPublish(min: GBMinInstance, phone: string): Boolean { public static canPublish(min: GBMinInstance, phone: string): Boolean {
if (process.env.SECURITY_CAN_PUBLISH !== undefined) { if (process.env.SECURITY_CAN_PUBLISH !== undefined) {
const list = process.env.SECURITY_CAN_PUBLISH.split(';'); let list = process.env.SECURITY_CAN_PUBLISH.split(';');
const canPublish =
min.core.getParam(min.instance, 'Can Publish', null);
if (canPublish) {
list = list.concat(canPublish.split(';'));
}
let result = list.includes(phone); let result = list.includes(phone);
if (!result && min.instance.params) { if (!result && min.instance.params) {
@ -369,7 +377,7 @@ export class AdminDialog extends IGBDialog {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) { if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth'); return await step.beginDialog('/auth');
} }
else{ else {
return await step.next(step.options); return await step.next(step.options);
} }
}, },