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

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +9 -9
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2c42fa5ace - Show all commits

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

@ -601,7 +601,7 @@ 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);
} }

16
packages/basic.gblib/services/SystemKeywords.ts
View file

@ -1594,18 +1594,18 @@ export class SystemKeywords {
return res; return res;
} }
public async getCustomToken({pid, tokenName}) :Promise<string>{ public async getCustomToken({pid, token}) :Promise<string>{
const { min, user, params, proc } = await DialogKeywords.getProcessInfo(pid); const { min } = await DialogKeywords.getProcessInfo(pid);
GBLogEx.info(min, `GET TOKEN: ${tokenName}`); GBLogEx.info(min, `GET TOKEN: ${token}`);
return await (min.adminService as any)['acquireElevatedToken'] return await (min.adminService as any)['acquireElevatedToken']
(min.instance.instanceId, false, (min.instance.instanceId, false,
tokenName, token,
min.core.getParam(min.instance, `${tokenName} Client ID`, null), min.core.getParam(min.instance, `${token} Client ID`, null),
min.core.getParam(min.instance, `${tokenName} Client Secret`, null), min.core.getParam(min.instance, `${token} Client Secret`, null),
min.core.getParam(min.instance, `${tokenName} Host`, null), min.core.getParam(min.instance, `${token} Host`, null),
min.core.getParam(min.instance, `${tokenName} Tenant`, null) min.core.getParam(min.instance, `${token} Tenant`, null)
); );
} }