From 60a9e2f7e55c7b27d4b6a3a5ce5bdf6838ea7798 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Sun, 26 Nov 2023 16:59:13 -0300
Subject: [PATCH] fix(basic.gblib): Allow MERGE keyword in storage #380.
 @othonlima

---
 packages/core.gbapp/services/GBMinService.ts | 2 +-
 src/app.ts                                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 3fcd326c..62d848b4 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -552,7 +552,7 @@ export class GBMinService {
         await this.adminService.setValue(instance.instanceId, 
           `${tokenName}expiresOn`, token['expiresOn'] ?
           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);
 
 
diff --git a/src/app.ts b/src/app.ts
index 06b72372..29ff8893 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -160,8 +160,9 @@ export class GBServer {
             if (proxy !== undefined) {
               GBServer.globals.publicAddress = proxy;
             } else {
-              GBLog.info(`Establishing a development local proxy (proxy) on BOT_URL...`);
               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 {
             const serverAddress = process.env.BOT_URL;