Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed issue with contentUrl for attachments. #1364

Merged
merged 2 commits into from
Mar 11, 2019
Merged

Fixed issue with contentUrl for attachments. #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ec1e01
Fixed issue with contentUrl for attachments.
tonyanziano Mar 8, 2019
0ec9970
Merge branch 'master' into toanzian/#1362-contenturl
a-b-r-o-w-n Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [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)
- [client] Do not render certain activities in webchat in PR [#1363](https://github.com/Microsoft/BotFramework-Emulator/pull/1363)
- [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
Expand Down
2 changes: 1 addition & 1 deletion packages/emulator/core/src/directLine/middleware/upload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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,
Expand Down