PR feedback

Author: campersau

src/Http/Http.Abstractions/src/Extensions/MapMiddleware.cs

@@ -55,7 +55,11 @@ public Task Invoke(HttpContext context)
 
             if (context.Request.Path.StartsWithSegments(_options.PathMatch, out var matchedPath, out var remainingPath))
             {
-                return InvokeCore(context, matchedPath, remainingPath);
+                if (!_options.PreserveMatchedPathSegment)
+                {
+                    return InvokeCore(context, matchedPath, remainingPath);
+                }
+                return _options.Branch!(context);
             }
             return _next(context);
         }
@@ -65,24 +69,18 @@ private async Task InvokeCore(HttpContext context, string matchedPath, string re
             var path = context.Request.Path;
             var pathBase = context.Request.PathBase;
 
-            if (!_options.PreserveMatchedPathSegment)
-            {
-                // Update the path
-                context.Request.PathBase = pathBase.Add(matchedPath);
-                context.Request.Path = remainingPath;
-            }
+            // Update the path
+            context.Request.PathBase = pathBase.Add(matchedPath);
+            context.Request.Path = remainingPath;
 
             try
             {
                 await _options.Branch!(context);
             }
             finally
             {
-                if (!_options.PreserveMatchedPathSegment)
-                {
-                    context.Request.PathBase = pathBase;
-                    context.Request.Path = path;
-                }
+                context.Request.PathBase = pathBase;
+                context.Request.Path = path;
             }
         }
     }

src/Middleware/HttpOverrides/src/HttpMethodOverrideMiddleware.cs

@@ -45,32 +45,32 @@ public Task Invoke(HttpContext context)
         {
             if (HttpMethods.IsPost(context.Request.Method))
             {
-                return InvokeCore(context);
+                if (_options.FormFieldName != null)
+                {
+                    if (context.Request.HasFormContentType)
+                    {
+                        return InvokeCore(context);
+                    }
+                }
+                else
+                {
+                    var xHttpMethodOverrideValue = context.Request.Headers[xHttpMethodOverride];
+                    if (!string.IsNullOrEmpty(xHttpMethodOverrideValue))
+                    {
+                        context.Request.Method = xHttpMethodOverrideValue;
+                    }
+                }
             }
             return _next(context);
         }
 
         private async Task InvokeCore(HttpContext context)
         {
-            if (_options.FormFieldName != null)
+            var form = await context.Request.ReadFormAsync();
+            var methodType = form[_options.FormFieldName!];
+            if (!string.IsNullOrEmpty(methodType))
             {
-                if (context.Request.HasFormContentType)
-                {
-                    var form = await context.Request.ReadFormAsync();
-                    var methodType = form[_options.FormFieldName];
-                    if (!string.IsNullOrEmpty(methodType))
-                    {
-                        context.Request.Method = methodType;
-                    }
-                }
-            }
-            else
-            {
-                var xHttpMethodOverrideValue = context.Request.Headers[xHttpMethodOverride];
-                if (!string.IsNullOrEmpty(xHttpMethodOverrideValue))
-                {
-                    context.Request.Method = xHttpMethodOverrideValue;
-                }
+                context.Request.Method = methodType;
             }
             await _next(context);
         }