yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v8: Fix package download (#4968)

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2019-04-30 20:47:37 +02:00
committed by Sebastiaan Janssen
parent 5fd423dbb6
commit f05915ef08
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
View File

@@ -384,6 +384,8 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
// Get the filename from the x-filename header or default to "download.bin"
var filename = headers['x-filename'] || 'download.bin';
filename = decodeURIComponent(filename);
// Determine the content type from the header or default to "application/octet-stream"
var contentType = headers['content-type'] || octetStreamMime;

13
src/Umbraco.Web/Editors/PackageController.cs
View File

@@ -5,6 +5,8 @@ using System.Linq;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using System.Web;
using System.Web.Http;
using Semver;
using Umbraco.Core.IO;
@@ -94,6 +96,8 @@ namespace Umbraco.Web.Editors
var fileName = Path.GetFileName(package.PackagePath);
var encoding = Encoding.UTF8;
var response = new HttpResponseMessage
{
Content = new StreamContent(File.OpenRead(fullPath))
@@ -102,15 +106,18 @@ namespace Umbraco.Web.Editors
{
ContentDisposition = new ContentDispositionHeaderValue("attachment")
{
FileName = fileName
FileName = HttpUtility.UrlEncode(fileName, encoding)
},
ContentType = new MediaTypeHeaderValue( "application/octet-stream")
ContentType = new MediaTypeHeaderValue("application/octet-stream")
{
CharSet = encoding.WebName
}
}
}
};
// Set custom header so umbRequestHelper.downloadFile can save the correct filename
response.Headers.Add("x-filename", fileName);
response.Headers.Add("x-filename", HttpUtility.UrlEncode(fileName, encoding));
return response;
}