accept url encoded form data #414

FastEndpoints · Mar 23, 2023 · afde256 · afde256
1 parent 93985ee
commit afde256
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
 
-    <Version>5.8.0.7-beta</Version>
+    <Version>5.8.0.8-beta</Version>
 
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>

diff --git a/Src/Library/Endpoint/Auxiliary/EndpointDefinition.cs b/Src/Library/Endpoint/Auxiliary/EndpointDefinition.cs
@@ -37,7 +37,7 @@ public sealed class EndpointDefinition
     public bool DoNotCatchExceptions { get; private set; }
     public EndpointSummary? EndpointSummary { get; private set; }
     public List<string>? EndpointTags { get; private set; }
-    public bool FormDataAllowed { get; private set; }
+    public string? FormDataContentType { get; private set; }
     public string? OverriddenRoutePrefix { get; private set; }
     public List<string>? PreBuiltUserPolicies { get; private set; }
     public Action<AuthorizationPolicyBuilder>? PolicyBuilder { get; private set; }
@@ -135,14 +135,15 @@ public void AllowAnonymous(string[] verbs)
     /// </param>
     public void AllowFileUploads(bool dontAutoBindFormData = false)
     {
-        FormDataAllowed = true;
+        FormDataContentType = "multipart/form-data";
         DontBindFormData = dontAutoBindFormData;
     }
 
     /// <summary>
-    /// enable multipart/form-data submissions
+    /// enable form-data submissions
     /// </summary>
-    public void AllowFormData() => FormDataAllowed = true;
+    /// <param name="urlEncoded">set to true to accept `application/x-www-form-urlencoded` content instead of `multipart/form-data` content.</param>
+    public void AllowFormData(bool urlEncoded = false) => FormDataContentType = urlEncoded ? "application/x-www-form-urlencoded" : "multipart/form-data";
 
     /// <summary>
     /// specify which authentication schemes to use for authenticating requests to this endpoint

diff --git a/Src/Library/Endpoint/Endpoint.Setup.cs b/Src/Library/Endpoint/Endpoint.Setup.cs
@@ -37,9 +37,10 @@ public abstract partial class Endpoint<TRequest, TResponse> : BaseEndpoint where
     protected void AllowFileUploads(bool dontAutoBindFormData = false) => Definition.AllowFileUploads(dontAutoBindFormData);
 
     /// <summary>
-    /// enable multipart/form-data submissions
+    /// enable form-data submissions
     /// </summary>
-    protected void AllowFormData() => Definition.AllowFormData();
+    /// <param name="urlEncoded">set to true to accept `application/x-www-form-urlencoded` content instead of `multipart/form-data` content.</param>
+    protected void AllowFormData(bool urlEncoded = false) => Definition.AllowFormData(urlEncoded);
 
     /// <summary>
     /// specify which authentication schemes to use for authenticating requests to this endpoint

diff --git a/Src/Library/Main/MainExtensions.cs b/Src/Library/Main/MainExtensions.cs
@@ -117,8 +117,8 @@ public static IEndpointRouteBuilder MapFastEndpoints(this IEndpointRouteBuilder
                     if (def.ResponseCacheSettings is not null)
                         hb.WithMetadata(def.ResponseCacheSettings);
 
-                    if (def.FormDataAllowed)
-                        hb.Accepts(def.ReqDtoType, "multipart/form-data");
+                    if (def.FormDataContentType is not null)
+                        hb.Accepts(def.ReqDtoType, def.FormDataContentType);
 
                     if (def.EndpointSummary?.ProducesMetas.Count > 0)
                     {

diff --git a/Src/Library/changelog.md b/Src/Library/changelog.md
@@ -1,5 +1,6 @@
 ### NEW
 - ability to submit a request DTO as multipart form data when integration testing endpoints that accept form data. #409
+- optional boolean argument `urlEncoded` for `AllowFormData()` method to accept `application/x-www-form-urlencoded` instead of `multipart/form-data` #414
 
 ### IMPROVEMENTS
 - ability to execute a non-concrete `ICommand` types #411