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

fix(all): Fix in bot proxy outdated columns.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-09-04 16:10:08 -03:00
parent 51caf5f575
commit 841588ca95
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/admin.gbapp/dialogs/AdminDialog.ts
View file

@ -421,7 +421,7 @@ export class AdminDialog extends IGBDialog {
min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state); min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state);
const redirectUri = urlJoin(min.instance.botEndpoint, min.instance.botId, '/token'); const redirectUri = urlJoin(process.env.BOT_URL, min.instance.botId, '/token');
const url = `https://login.microsoftonline.com/${step.activeDialog.state.authenticatorTenant}/oauth2/authorize?client_id=${min.instance.marketplaceId}&response_type=code&redirect_uri=${redirectUri}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`; const url = `https://login.microsoftonline.com/${step.activeDialog.state.authenticatorTenant}/oauth2/authorize?client_id=${min.instance.marketplaceId}&response_type=code&redirect_uri=${redirectUri}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
await min.conversationalService.sendText(min, step, Messages[locale].consent(url)); await min.conversationalService.sendText(min, step, Messages[locale].consent(url));

2
packages/azuredeployer.gbapp/services/AzureDeployerService.ts
View file

@ -455,7 +455,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
}; };
GBLog.info(`Deploying Bot...`); GBLog.info(`Deploying Bot...`);
instance.botEndpoint = this.defaultEndPoint; instance.botEndpoint = 'TODO: remove this column.';
instance = await this.internalDeployBot( instance = await this.internalDeployBot(
instance, instance,

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

@ -542,7 +542,7 @@ export class GBMinService {
authenticationContext.acquireTokenWithAuthorizationCode( authenticationContext.acquireTokenWithAuthorizationCode(
req.query.code, req.query.code,
urlJoin(instance.botEndpoint, min.instance.botId, '/token'), urlJoin(process.env.BOT_URL, min.instance.botId, '/token'),
resource, resource,
instance.marketplaceId, instance.marketplaceId,
instance.marketplacePassword, instance.marketplacePassword,
@ -561,7 +561,7 @@ export class GBMinService {
// Inform the home for default .gbui after finishing token retrival. // Inform the home for default .gbui after finishing token retrival.
res.redirect(min.instance.botEndpoint); res.redirect(process.env.BOT_URL);
} }
} }
); );
@ -581,7 +581,7 @@ export class GBMinService {
); );
authorizationUrl = `${authorizationUrl}?response_type=code&client_id=${ authorizationUrl = `${authorizationUrl}?response_type=code&client_id=${
min.instance.marketplaceId min.instance.marketplaceId
}&redirect_uri=${urlJoin(min.instance.botEndpoint, min.instance.botId, 'token')}`; }&redirect_uri=${urlJoin(process.env.BOT_URL, min.instance.botId, 'token')}`;
GBLog.info(`HandleOAuthRequests: ${authorizationUrl}.`); GBLog.info(`HandleOAuthRequests: ${authorizationUrl}.`);
res.redirect(authorizationUrl); res.redirect(authorizationUrl);
}); });