From 2c42fa5aceb8ce373417ed06133684ab96b25fbb Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sun, 10 Dec 2023 21:08:27 -0300 Subject: [PATCH] fix(basic.gblib): Allow MERGE keyword in storage #380. @othonlima --- packages/basic.gblib/services/GBVMService.ts | 2 +- packages/basic.gblib/services/SystemKeywords.ts | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts index af67fb4d..05ad4cee 100644 --- a/packages/basic.gblib/services/GBVMService.ts +++ b/packages/basic.gblib/services/GBVMService.ts @@ -601,7 +601,7 @@ export class GBVMService extends GBService { const waitAndRefreshToken = async (token) => { await timeout(interval); global[i] = await sys.getCustomToken({pid, token}); - + console.log('Token refreshed: '+ i + global[i]); if (!tokenStops[token]) { await waitAndRefreshToken(token); } diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts index 5e95cbdc..7981f49c 100644 --- a/packages/basic.gblib/services/SystemKeywords.ts +++ b/packages/basic.gblib/services/SystemKeywords.ts @@ -1594,18 +1594,18 @@ export class SystemKeywords { return res; } - public async getCustomToken({pid, tokenName}) :Promise{ + public async getCustomToken({pid, token}) :Promise{ - const { min, user, params, proc } = await DialogKeywords.getProcessInfo(pid); - GBLogEx.info(min, `GET TOKEN: ${tokenName}`); + const { min } = await DialogKeywords.getProcessInfo(pid); + GBLogEx.info(min, `GET TOKEN: ${token}`); return await (min.adminService as any)['acquireElevatedToken'] (min.instance.instanceId, false, - tokenName, - min.core.getParam(min.instance, `${tokenName} Client ID`, null), - min.core.getParam(min.instance, `${tokenName} Client Secret`, null), - min.core.getParam(min.instance, `${tokenName} Host`, null), - min.core.getParam(min.instance, `${tokenName} Tenant`, null) + token, + min.core.getParam(min.instance, `${token} Client ID`, null), + min.core.getParam(min.instance, `${token} Client Secret`, null), + min.core.getParam(min.instance, `${token} Host`, null), + min.core.getParam(min.instance, `${token} Tenant`, null) ); }