Skip to content

fix: csharp get file name from content disposition #17183

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

Merged
wing328 merged 2 commits into from
Nov 27, 2023
Merged

fix: csharp get file name from content disposition #17183

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
34e70aa
fix: chsarp get file name from content disposition
fghpdf Nov 25, 2023
f65d5c3
update samples
wing328 Nov 26, 2023
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
17 changes: 15 additions & 2 deletions modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,25 @@ namespace {{packageName}}.Client
headers.Add(responseHeader.Key + "=" + ClientUtils.ParameterToString(responseHeader.Value));
}

// RFC 2183 & RFC 2616
var fileNameRegex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$", RegexOptions.IgnoreCase);
if (type == typeof(byte[])) // return byte array
{
return await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
}
else if (type == typeof(FileParameter))
{
if (headers != null) {
foreach (var header in headers)
{
var match = fileNameRegex.Match(header.ToString());
if (match.Success)
{
string fileName = ClientUtils.SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", ""));
return new FileParameter(fileName, await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
}
}
}
return new FileParameter(await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
}

Expand All @@ -122,10 +135,10 @@ namespace {{packageName}}.Client
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
? Path.GetTempPath()
: _configuration.TempFolderPath;
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");

foreach (var header in headers)
{
var match = regex.Match(header.ToString());
var match = fileNameRegex.Match(header.ToString());
if (match.Success)
{
string fileName = filePath + ClientUtils.SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", ""));
Expand Down
17 changes: 15 additions & 2 deletions .../client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,25 @@ internal async Task<object> Deserialize(HttpResponseMessage response, Type type)
headers.Add(responseHeader.Key + "=" + ClientUtils.ParameterToString(responseHeader.Value));
}

// RFC 2183 & RFC 2616
var fileNameRegex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$", RegexOptions.IgnoreCase);
if (type == typeof(byte[])) // return byte array
{
return await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
}
else if (type == typeof(FileParameter))
{
if (headers != null) {
foreach (var header in headers)
{
var match = fileNameRegex.Match(header.ToString());
if (match.Success)
{
string fileName = ClientUtils.SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", ""));
return new FileParameter(fileName, await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
}
}
}
return new FileParameter(await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
}

Expand All @@ -125,10 +138,10 @@ internal async Task<object> Deserialize(HttpResponseMessage response, Type type)
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
? Path.GetTempPath()
: _configuration.TempFolderPath;
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");

foreach (var header in headers)
{
var match = regex.Match(header.ToString());
var match = fileNameRegex.Match(header.ToString());
if (match.Success)
{
string fileName = filePath + ClientUtils.SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", ""));
Expand Down