From efa5e0fd035b46619d53bb693781918d7bd12f15 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Tue, 26 Dec 2023 11:28:06 -0300
Subject: [PATCH] fix(core.gbapp): #387 adding /setupSecurity multiple tokens.
 Refresh token fix. @othonlima.

---
 packages/basic.gblib/services/GBVMService.ts    | 7 +++----
 packages/basic.gblib/services/SystemKeywords.ts | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts
index e2797c32..128050e8 100644
--- a/packages/basic.gblib/services/GBVMService.ts
+++ b/packages/basic.gblib/services/GBVMService.ts
@@ -605,7 +605,7 @@ export class GBVMService extends GBService {
       const ensureTokens = async () => {
         const tokens = this.tokens ? this.tokens.split(',') : [];
         
-        for(tokenName in tokens) { 
+        for(i in tokens) { 
           const expiresOn = new Date(global[tokenName + "_expiresOn"]);
 
           if (expiresOn.getTime() > new Date().getTime()) {
@@ -619,8 +619,7 @@ export class GBVMService extends GBService {
       };
 
       try{
-        await ensureTokens();
-        ${code}
+        ${code} // ISSUE: #339, tabify this.
       }
       catch(e){
         console.log(e);
@@ -959,7 +958,7 @@ export class GBVMService extends GBService {
 
 
       } catch (error) {
-        variables[t] = 'ERROR: Configure /setupSecurity before using token variables.';
+        variables[t] = `${error}: Configure /setupSecurity before using token variables.`;
       }
     });
 
diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts
index 5d52ae3e..f465f4cd 100644
--- a/packages/basic.gblib/services/SystemKeywords.ts
+++ b/packages/basic.gblib/services/SystemKeywords.ts
@@ -1683,7 +1683,7 @@ export class SystemKeywords {
         min.core.getParam(min.instance, `${tokenName} Host`, null),
         min.core.getParam(min.instance, `${tokenName} Tenant`, null)
       );
-    const expiresOn = await min.adminService.getValue(min.instanceId, `${tokenName}expiresOn`);
+    const expiresOn = await min.adminService.getValue(min.instance.instanceId, `${tokenName}expiresOn`);
 
     return { token, expiresOn };
   }