Skip to content

Support file uploading without multipart/form-data #2068

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
alexeyzimarev merged 4 commits into from
May 3, 2023
Merged

Support file uploading without multipart/form-data #2068

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
707f22b
Support file uploading without multipart/form-data
RomanSoloweow Apr 22, 2023
a98f963
AlwaysSingleFileAsContent flag
RomanSoloweow Apr 22, 2023
91f2524
ValidateParameters method
RomanSoloweow Apr 23, 2023
1799a42
ValidateParameters tests
RomanSoloweow Apr 23, 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
89 changes: 58 additions & 31 deletions src/RestSharp/Request/RequestContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,66 @@ public RequestContent(RestClient client, RestRequest request) {
_parameters = new RequestParameters(_request.Parameters.Union(_client.DefaultParameters));
}

public HttpContent BuildContent() {
AddFiles();
var postParameters = _parameters.GetContentParameters(_request.Method).ToArray();
AddBody(postParameters.Length > 0);
AddPostParameters(postParameters);
public HttpContent BuildContent()
{
if (_request.AlwaysMultipartFormData && _request.AlwaysSingleFileAsContent)
throw new ArgumentException("Failed to put file as content because flag AlwaysMultipartFormData enabled");

var postParameters = _parameters.GetContentParameters(_request.Method).ToArray();
var postParametersExists = postParameters.Length > 0;
var bodyParametersExists = _request.TryGetBodyParameter(out var bodyParameter);
var filesExists = _request.Files.Any();

if (filesExists)
AddFiles(postParametersExists, bodyParametersExists);

if (bodyParametersExists)
AddBody(postParametersExists, bodyParameter!);

if (postParametersExists)
AddPostParameters(postParameters);

AddHeaders();

return Content!;
}

void AddFiles() {
if (!_request.HasFiles() && !_request.AlwaysMultipartFormData) return;

var mpContent = CreateMultipartFormDataContent();

foreach (var file in _request.Files) {
var stream = file.GetFile();
_streams.Add(stream);
var fileContent = new StreamContent(stream);

fileContent.Headers.ContentType = file.ContentType.AsMediaTypeHeaderValue;

var dispositionHeader = file.Options.DisableFilenameEncoding
? ContentDispositionHeaderValue.Parse($"form-data; name=\"{file.Name}\"; filename=\"{file.FileName}\"")
: new ContentDispositionHeaderValue("form-data") { Name = $"\"{file.Name}\"", FileName = $"\"{file.FileName}\"" };
if (!file.Options.DisableFileNameStar) dispositionHeader.FileNameStar = file.FileName;
fileContent.Headers.ContentDisposition = dispositionHeader;

mpContent.Add(fileContent);
}

Content = mpContent;

void AddFiles(bool postParametersExists, bool bodyParametersExists)
{
// File uploading without multipart/form-data
if (_request.AlwaysSingleFileAsContent && _request.Files.Count == 1)
{
if (postParametersExists) throw new ArgumentException("Failed to put file as content because added post parameters");
if (bodyParametersExists) throw new ArgumentException("Failed to put file as content because added body parameters");

var fileParameter = _request.Files.First();
Content = ToStreamContent(fileParameter);
return;
}

var mpContent = new MultipartFormDataContent(GetOrSetFormBoundary());

foreach (var fileParameter in _request.Files)
mpContent.Add(ToStreamContent(fileParameter));

Content = mpContent;
}

StreamContent ToStreamContent(FileParameter fileParameter)
{
var stream = fileParameter.GetFile();
_streams.Add(stream);
var streamContent = new StreamContent(stream);

streamContent.Headers.ContentType = fileParameter.ContentType.AsMediaTypeHeaderValue;

var dispositionHeader = fileParameter.Options.DisableFilenameEncoding
? ContentDispositionHeaderValue.Parse($"form-data; name=\"{fileParameter.Name}\"; filename=\"{fileParameter.FileName}\"")
: new ContentDispositionHeaderValue("form-data") { Name = $"\"{fileParameter.Name}\"", FileName = $"\"{fileParameter.FileName}\"" };
if (!fileParameter.Options.DisableFileNameStar) dispositionHeader.FileNameStar = fileParameter.FileName;
streamContent.Headers.ContentDisposition = dispositionHeader;

return streamContent;
}

HttpContent Serialize(BodyParameter body) {
Expand Down Expand Up @@ -117,9 +145,8 @@ MultipartFormDataContent CreateMultipartFormDataContent() {
return mpContent;
}

void AddBody(bool hasPostParameters) {
if (!_request.TryGetBodyParameter(out var bodyParameter)) return;

void AddBody(bool hasPostParameters, BodyParameter bodyParameter)
{
var bodyContent = Serialize(bodyParameter);

// we need to send the body
Expand Down
7 changes: 6 additions & 1 deletion src/RestSharp/Request/RestRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ public RestRequest(Uri resource, Method method = Method.Get)
/// Always send a multipart/form-data request - even when no Files are present.
/// </summary>
public bool AlwaysMultipartFormData { get; set; }


/// <summary>
/// Always send a file as request content without multipart/form-data request - even when the request contains only one file parameter
/// </summary>
public bool AlwaysSingleFileAsContent { get; set; }

/// <summary>
/// When set to true, parameter values in a multipart form data requests will be enclosed in
/// quotation marks. Default is false. Enable it if the remote endpoint requires parameters
Expand Down