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

fix(all): Minor changes in PROD.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-07-19 07:53:02 -03:00
parent 182d6c4ac8
commit abe5f03801
4 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/admin.gbapp/services/GBAdminService.ts
View file

@ -224,9 +224,12 @@ export class GBAdminService implements IGBAdminService {
return obj.value;
}
public async acquireElevatedToken(instanceId: number): Promise<string> {
public async acquireElevatedToken(instanceId: number, root: boolean = false): Promise<string> {
if (root){
const minBoot = GBServer.globals.minBoot;
instanceId = minBoot.instance.instanceId;
}
let expiresOnV;
try {
expiresOnV = await this.getValue(instanceId, 'expiresOn');

6
packages/core.gbapp/services/GBDeployer.ts
View file

@ -104,7 +104,7 @@ export class GBDeployer implements IGBDeployer {
* Retrives token and initialize drive client API.
*/
public static async internalGetDriveClient(min: GBMinInstance) {
const token = await min.adminService.acquireElevatedToken(min.instance.instanceId);
const token = await min.adminService['acquireElevatedToken'](min.instance.instanceId, true);
const siteId = process.env.STORAGE_SITE_ID;
const libraryId = process.env.STORAGE_LIBRARY;
@ -209,7 +209,7 @@ export class GBDeployer implements IGBDeployer {
// Gets the access token to perform service operations.
const accessToken = await GBServer.globals.minBoot.adminService.acquireElevatedToken(bootInstance.instanceId);
const accessToken = await min.adminService['acquireElevatedToken'](min.instance.instanceId, true);
// Creates the MSFT application that will be associated to the bot.
@ -401,7 +401,7 @@ export class GBDeployer implements IGBDeployer {
// Connects to MSFT storage.
const token = await min.adminService.acquireElevatedToken(min.instance.instanceId);
const token = await min.adminService['acquireElevatedToken'](min.instance.instanceId, true);
const client = MicrosoftGraph.Client.init({
authProvider: done => {
done(null, token);

17
packages/core.gbapp/services/GBMinService.ts
View file

@ -1050,8 +1050,7 @@ export class GBMinService {
await this.processEventActivity(min, user, context, step);
}
} catch (error) {
const msg = `ERROR: ${error.message} ${error.stack} ${error.error ? error.error.body : ''} ${error.error ? (error.error.stack ? error.error.stack : '') : ''
}`;
const msg = `ERROR: ${error.message} ${error.stack} ${error.error ? error.error.body : ''} ${error.error ? (error.error.stack ? error.error.stack : '') : '' }`;
GBLog.error(msg);
await min.conversationalService.sendText(
@ -1477,7 +1476,21 @@ export class GBMinService {
// If there is a dialog in course, continue to the next step.
else if (step.activeDialog !== undefined) {
try {
await step.continueDialog();
} catch (error) {
const msg = `ERROR: ${error.message} ${error.stack} ${error.error ? error.error.body : ''} ${error.error ? (error.error.stack ? error.error.stack : '') : '' }`;
GBLog.error(msg);
await min.conversationalService.sendText(
min,
step,
Messages[step.context.activity.locale].very_sorry_about_error
);
await step.beginDialog('/ask', { isReturning: true });
}
} else {
const startDialog = user.hearOnDialog
? user.hearOnDialog

2
packages/security.gbapp/services/SecService.ts
View file

@ -179,7 +179,7 @@ export class SecService extends GBService {
await CollectionUtil.asyncForEach(list, async item => {
if (
item !== undefined &&
agentSystemId === undefined &&
!agentSystemId &&
item !== userSystemId &&
!(await this.isAgentSystemId(item))
) {