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

fix(basic.gblib): Allow MERGE keyword in storage #380. @othonlima

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-11-26 16:59:13 -03:00
parent dbdeecca50
commit 60a9e2f7e5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/core.gbapp/services/GBMinService.ts
View file

@ -552,7 +552,7 @@ export class GBMinService {
await this.adminService.setValue(instance.instanceId, await this.adminService.setValue(instance.instanceId,
`${tokenName}expiresOn`, token['expiresOn'] ? `${tokenName}expiresOn`, token['expiresOn'] ?
token['expiresOn'].toString(): token['expiresOn'].toString():
new Date (Date.now() + token['expires_in'])); new Date (Date.now() + token['expires_in']).toString());
await this.adminService.setValue(instance.instanceId, `${tokenName}AntiCSRFAttackState`, null); await this.adminService.setValue(instance.instanceId, `${tokenName}AntiCSRFAttackState`, null);

3
src/app.ts
View file

@ -160,8 +160,9 @@ export class GBServer {
if (proxy !== undefined) { if (proxy !== undefined) {
GBServer.globals.publicAddress = proxy; GBServer.globals.publicAddress = proxy;
} else { } else {
GBLog.info(`Establishing a development local proxy (proxy) on BOT_URL...`);
GBServer.globals.publicAddress = await core.ensureProxy(port); GBServer.globals.publicAddress = await core.ensureProxy(port);
process.env.BOT_URL = GBServer.globals.publicAddress;
GBLog.info(`Auto local proxy address defined at: ${process.env.BOT_URL}...`);
} }
} else { } else {
const serverAddress = process.env.BOT_URL; const serverAddress = process.env.BOT_URL;