Skip to content

Do not add both [Multipart] and "Content-Type: multipart/form-data" #693

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
christianhelle merged 1 commit into from
Jun 3, 2025
Merged

Do not add both [Multipart] and "Content-Type: multipart/form-data" #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/Refitter.Core/RefitInterfaceGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private string GenerateInterfaceBody(out string? dynamicQuerystringParameters)
this.docGenerator.AppendMethodDocumentation(operationModel, IsApiResponseType(returnType), hasDynamicQuerystringParameter, hasApizrRequestOptionsParameter, code);
GenerateObsoleteAttribute(operation, code);
GenerateForMultipartFormData(operationModel, code);
GenerateHeaders(operations, operation, code);
GenerateHeaders(operations, operation, operationModel, code);

code.AppendLine($"{Separator}{Separator}[{verb}(\"{kv.Key}\")]")
.AppendLine($"{Separator}{Separator}{returnType} {operationName}({parametersString});")
Expand All @@ -85,7 +85,7 @@ private string GenerateInterfaceBody(out string? dynamicQuerystringParameters)
this.docGenerator.AppendMethodDocumentation(operationModel, IsApiResponseType(returnType), false, hasApizrRequestOptionsParameter, code);
GenerateObsoleteAttribute(operation, code);
GenerateForMultipartFormData(operationModel, code);
GenerateHeaders(operations, operation, code);
GenerateHeaders(operations, operation, operationModel, code);

parametersString = string.Join(", ", parameters.Where(parameter => !parameter.Contains("?")));

Expand Down Expand Up @@ -182,6 +182,7 @@ protected static void GenerateForMultipartFormData(CSharpOperationModel operatio
protected void GenerateHeaders(
KeyValuePair<string, OpenApiOperation> operations,
OpenApiOperation operation,
CSharpOperationModel operationModel,
StringBuilder code)
{
var headers = new List<string>();
Expand Down Expand Up @@ -211,7 +212,7 @@ protected void GenerateHeaders(
uniqueContentTypes.FirstOrDefault(c => c.Equals("application/json", StringComparison.OrdinalIgnoreCase)) ??
uniqueContentTypes.FirstOrDefault();

if (!string.IsNullOrWhiteSpace(contentType))
if (!string.IsNullOrWhiteSpace(contentType) && !operationModel.Consumes.Contains("multipart/form-data"))
{
headers.Add($"\"Content-Type: {contentType}\"");
}
Expand Down
4 changes: 2 additions & 2 deletions src/Refitter.Core/RefitMultipleInterfaceByTagGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public override IEnumerable<GeneratedCode> GenerateCode()
this.docGenerator.AppendMethodDocumentation(operationModel, IsApiResponseType(returnType), hasDynamicQuerystringParameter, hasApizrRequestOptionsParameter, sb);
GenerateObsoleteAttribute(operation, sb);
GenerateForMultipartFormData(operationModel, sb);
GenerateHeaders(operations, operation, sb);
GenerateHeaders(operations, operation, operationModel, sb);

sb.AppendLine($"{Separator}{Separator}[{verb}(\"{op.PathItem.Key}\")]")
.AppendLine($"{Separator}{Separator}{returnType} {operationName}({parametersString});")
Expand All @@ -95,7 +95,7 @@ public override IEnumerable<GeneratedCode> GenerateCode()
this.docGenerator.AppendMethodDocumentation(operationModel, IsApiResponseType(returnType), false, hasApizrRequestOptionsParameter, sb);
GenerateObsoleteAttribute(operation, sb);
GenerateForMultipartFormData(operationModel, sb);
GenerateHeaders(operations, operation, sb);
GenerateHeaders(operations, operation, operationModel, sb);

parametersString = string.Join(", ", parameters.Where(parameter => !parameter.Contains("?")));

Expand Down
4 changes: 2 additions & 2 deletions src/Refitter.Core/RefitMultipleInterfaceGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public override IEnumerable<GeneratedCode> GenerateCode()
this.docGenerator.AppendMethodDocumentation(operationModel, IsApiResponseType(returnType), hasDynamicQuerystringParameter, hasApizrRequestOptionsParameter, code);
GenerateObsoleteAttribute(operation, code);
GenerateForMultipartFormData(operationModel, code);
GenerateHeaders(operations, operation, code);
GenerateHeaders(operations, operation, operationModel, code);

code.AppendLine($"{Separator}{Separator}[{verb}(\"{kv.Key}\")]")
.AppendLine($"{Separator}{Separator}{returnType} {methodName}({parametersString});")
Expand All @@ -69,7 +69,7 @@ public override IEnumerable<GeneratedCode> GenerateCode()
this.docGenerator.AppendMethodDocumentation(operationModel, IsApiResponseType(returnType), false, hasApizrRequestOptionsParameter, code);
GenerateObsoleteAttribute(operation, code);
GenerateForMultipartFormData(operationModel, code);
GenerateHeaders(operations, operation, code);
GenerateHeaders(operations, operation, operationModel, code);

parametersString = string.Join(", ", parameters.Where(parameter => !parameter.Contains("?")));

Expand Down
1 change: 1 addition & 0 deletions src/Refitter.Tests/Examples/MultiPartFormDataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public async Task Generated_Code_Contains_MultiPart_Attribute()
{
string generateCode = await GenerateCode();
generateCode.Should().Contain("[Multipart]");
generateCode.Should().NotContain("Content-Type: multipart/form-data");
}

[Fact]
Expand Down