From 4c48639b71d7e3cb3c9e859008aa0ca2b8366bc8 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sun, 10 Dec 2023 20:43:54 -0300 Subject: [PATCH] fix(basic.gblib): Allow MERGE keyword in storage #380. @othonlima --- packages/basic.gblib/services/GBVMService.ts | 4 ++-- packages/basic.gblib/services/SystemKeywords.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts index f8e15835..59b35b39 100644 --- a/packages/basic.gblib/services/GBVMService.ts +++ b/packages/basic.gblib/services/GBVMService.ts @@ -592,7 +592,7 @@ export class GBVMService extends GBService { // Setups refresh token mechanism. console.log(1); console.log(this.tokens); - const tokens = this.tokens??.split(','); + const tokens = this.tokens ? this.tokens.split(',') : []; const interval = 60000; // 1 hour. for(i in tokens) { @@ -890,7 +890,6 @@ export class GBVMService extends GBService { let variables = []; - // These variables will be automatically be available as normal BASIC variables. try { @@ -957,6 +956,7 @@ export class GBVMService extends GBService { }); sandbox['tokens'] = tokensList.join(','); + console.log(sandbox['tokens']); sandbox['variables'] = variables; sandbox['id'] = sys.getRandomId(); sandbox['username'] = await dk.userName({ pid }); diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts index e75497e5..5e95cbdc 100644 --- a/packages/basic.gblib/services/SystemKeywords.ts +++ b/packages/basic.gblib/services/SystemKeywords.ts @@ -1610,7 +1610,6 @@ export class SystemKeywords { } - static aa; /** * Calls any REST API by using GET HTTP method. *