diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 3c6c8935..30c98e0a 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -238,11 +238,11 @@ export class AzureDeployerService implements IGBInstallationDeployer { } public async botExists(botId) { - const group = GBConfigService.get('CLOUD_GROUP'); + const baseUrl = `https://management.azure.com/`; const username = GBConfigService.get('CLOUD_USERNAME'); const password = GBConfigService.get('CLOUD_PASSWORD'); - const subscriptionId = GBConfigService.get('CLOUD_SUBSCRIPTIONID'); + const accessToken = await GBAdminService.getADALTokenFromUsername(username, password); const httpClient = new ServiceClient(); diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index 82a1774c..d8af8c50 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -690,10 +690,26 @@ export class KBService implements IGBKBService { ); GBLog.info(`Translated text(playMarkdown): ${text}.`); + + var renderer = new marked.Renderer(); + renderer.oldImage = renderer.image; + renderer.image = function (href, title, text) { + var videos = ['webm', 'mp4', 'mov']; + var filetype = href.split('.')[1]; + if (videos.indexOf(filetype) > -1) { + var out = '' + return out; + } else { + return renderer.oldImage(href, title, text); + } + }; + // Converts from Markdown to HTML. marked.setOptions({ - renderer: new marked.Renderer(), + renderer: renderer, gfm: true, tables: true, breaks: false,