From 9ec1e013c4fba455d2699d3f9927f666af54e595 Mon Sep 17 00:00:00 2001 From: Tony Anziano Date: Fri, 8 Mar 2019 14:53:40 -0800 Subject: [PATCH] Fixed issue with contentUrl for attachments. --- CHANGELOG.md | 1 + packages/emulator/core/src/directLine/middleware/upload.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a36d5456d..a10d0a058 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [client] Modified 'Open Bot' dialog text in PR [#1330](https://github.com/Microsoft/BotFramework-Emulator/pull/1330) - [client] Allow text to be selected in webchat in PR [#1351](https://github.com/Microsoft/BotFramework-Emulator/pull/1351) - [client] Pass along user name to webchat in PR [#1353](https://github.com/Microsoft/BotFramework-Emulator/pull/1353) +- [core] Fixed issue with contentUrl for attachments in PR [#1364](https://github.com/Microsoft/BotFramework-Emulator/pull/1364) ## v4.3.0 - 2019 - 03 - 04 ### Added diff --git a/packages/emulator/core/src/directLine/middleware/upload.ts b/packages/emulator/core/src/directLine/middleware/upload.ts index a1ef88409..b63effd41 100644 --- a/packages/emulator/core/src/directLine/middleware/upload.ts +++ b/packages/emulator/core/src/directLine/middleware/upload.ts @@ -81,6 +81,7 @@ export default function upload(botEmulator: BotEmulator) { uploads = [uploads]; } if (uploads && uploads.length) { + const serviceUrl = await botEmulator.getServiceUrl(botEndpoint.botUrl); activity.attachments = []; uploads.forEach(upload1 => { const name = (upload1 as any).name || 'file.dat'; @@ -95,7 +96,6 @@ export default function upload(botEmulator: BotEmulator) { thumbnailBase64: contentBase64, }; const attachmentId = botEmulator.facilities.attachments.uploadAttachment(attachmentData); - const serviceUrl = botEmulator.getServiceUrl(botEndpoint.botUrl); const attachment: Attachment = { name, contentType: type,