From 255a10bdc3bb541bab29526d32b45b0bba41b1db Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Mon, 25 Dec 2023 18:42:23 -0300
Subject: [PATCH] fix(core.gbapp): #387 adding /setupSecurity multiple tokens.
 Refresh token fix. @othonlima.

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

diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts
index b8078ea1..25cc9565 100644
--- a/packages/basic.gblib/services/GBVMService.ts
+++ b/packages/basic.gblib/services/GBVMService.ts
@@ -620,6 +620,7 @@ export class GBVMService extends GBService {
       };
 
       try{
+        await ensureTokens();
         ${code}
       }
       catch(e){
@@ -954,8 +955,8 @@ export class GBVMService extends GBService {
       try {
         let {token, expiresOn} = await sys.getCustomToken({pid, tokenName});
 
-        variables[token] = token;
-        variables[token + '_expiresOn'] = expiresOn;
+        variables[tokenName] = token;
+        variables[tokenName + '_expiresOn'] = expiresOn;
 
 
       } catch (error) {
diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts
index 0fd46b58..5d52ae3e 100644
--- a/packages/basic.gblib/services/SystemKeywords.ts
+++ b/packages/basic.gblib/services/SystemKeywords.ts
@@ -1670,10 +1670,10 @@ export class SystemKeywords {
     return res;
   }
 
-  public async getCustomToken({ pid, token: tokenName }) {
+  public async getCustomToken({ pid, tokenName }) {
 
     const { min } = await DialogKeywords.getProcessInfo(pid);
-    GBLogEx.info(min, `GET TOKEN: ${tokenName}`);
+    GBLogEx.info(min, `BASIC internal getCustomToken: ${tokenName}`);
 
     const token = await (min.adminService as any)['acquireElevatedToken']
       (min.instance.instanceId, false,