From 6b05405705f0e224ed342c0e90628c8ac4f68c0d Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Fri, 4 Feb 2022 18:50:19 -0300 Subject: [PATCH] fix(all): Enable https in place. --- packages/basic.gblib/services/ScheduleServices.ts | 11 +++++------ packages/core.gbapp/services/GBCoreService.ts | 2 +- src/app.ts | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/basic.gblib/services/ScheduleServices.ts b/packages/basic.gblib/services/ScheduleServices.ts index 05be6f3d..4436cfa1 100644 --- a/packages/basic.gblib/services/ScheduleServices.ts +++ b/packages/basic.gblib/services/ScheduleServices.ts @@ -107,16 +107,15 @@ export class ScheduleServices extends GBService { * Load all cached schedule from BASIC SET SCHEDULE keyword. */ public async loadSchedules(min: GBMinInstance) { - GBLog.info(`Loading instances from storage...`); + let schedules; try { const options = { where: { instanceId: min.instance.instanceId } }; schedules = await GuaribasSchedule.findAll(options); - if (process.env.ENDPOINT_UPDATE === 'true') { - await CollectionUtil.asyncForEach(schedules, async item => { - this.ScheduleItem(item, min); - }); - } + GBLog.info(`Loading schedules for ${min.instance.botId}...`); + await CollectionUtil.asyncForEach(schedules, async item => { + this.ScheduleItem(item, min); + }); } catch (error) { throw new Error(`Cannot schedule: ${error.message}.`); } diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index 2e9f7341..5b88ec4d 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -628,7 +628,7 @@ ENDPOINT_UPDATE=true value = params ? params[name] : defaultValue; } if (typeof defaultValue === 'boolean') { - return new Boolean(value ? value.toLowerCase() === 'true' : defaultValue); + return new Boolean(value ? value.toString().toLowerCase() === 'true' : defaultValue); } if (typeof defaultValue === 'string') { return value ? value : defaultValue; diff --git a/src/app.ts b/src/app.ts index e5ffd671..f2cc1b09 100644 --- a/src/app.ts +++ b/src/app.ts @@ -121,7 +121,7 @@ export class GBServer { - if (process.env.NODE_ENV === 'development') { + if (process.env.NODE_ENV === 'development' && !process.env.BOT_URL) { const proxy = GBConfigService.get('REVERSE_PROXY'); if (proxy !== undefined) { GBServer.globals.publicAddress = proxy;