GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(core.gbapp): #387 adding /setupSecurity multiple tokens. Refresh token fix. @othonlima.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-12-12 15:07:49 -03:00
parent ab87996d60
commit 46265b31d5
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
packages/basic.gblib/services/GBVMService.ts
View file

@ -550,8 +550,9 @@ export class GBVMService extends GBService {
// Defines local utility BASIC functions. // Defines local utility BASIC functions.
const ubound = (gbarray) => { const ubound = (gbarray) => {
let length = 0;
if (gbarray){ if (gbarray){
let length = gbarray.length; length = gbarray.length;
if (length > 0){ if (length > 0){
if(gbarray[0].gbarray){ if(gbarray[0].gbarray){
return length - 1; return length - 1;
@ -602,7 +603,7 @@ export class GBVMService extends GBService {
// Setups refresh token mechanism. // Setups refresh token mechanism.
const tokens = this.tokens ? this.tokens.split(',') : []; const tokens = this.tokens ? this.tokens.split(',') : [];
const interval = 60000; // 1 hour. const interval = 60000 * 60;
for(i in tokens) { for(i in tokens) {
@ -612,7 +613,6 @@ export class GBVMService extends GBService {
const waitAndRefreshToken = async (token) => { const waitAndRefreshToken = async (token) => {
await timeout(interval); await timeout(interval);
global[i] = await sys.getCustomToken({pid, token}); global[i] = await sys.getCustomToken({pid, token});
console.log('Token refreshed: '+ i + global[i]);
if (!tokenStops[token]) { if (!tokenStops[token]) {
await waitAndRefreshToken(token); await waitAndRefreshToken(token);
} }
@ -622,21 +622,27 @@ export class GBVMService extends GBService {
})(token); })(token);
} }
${code} try{
${code}
// Closes handles if any.
await wa.closeHandles({pid: pid});
await sys.closeHandles({pid: pid});
// Signals token refresh job to stop.
for(let i in tokens) {
const token = tokens[i];
tokenStops[token] = true;
} }
catch(e){
console.log(e);
}
finally{
// Signals token refresh jobs to stop.
for(let i in tokens) {
const token = tokens[i];
tokenStops[token] = true;
}
// Closes handles if any.
await wa.closeHandles({pid: pid});
await sys.closeHandles({pid: pid});
}
})(); })();
`; `;