Revert "Re-run routing for implicit middlewares that require endpoints (#49732)"

This reverts commit e231c61.

Author: captainsafia

src/Antiforgery/src/AntiforgeryApplicationBuilderExtensions.cs

@@ -3,8 +3,6 @@
 
 using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Antiforgery.Internal;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -26,19 +24,6 @@ public static IApplicationBuilder UseAntiforgery(this IApplicationBuilder builde
         builder.VerifyAntiforgeryServicesAreRegistered();
 
         builder.Properties[AntiforgeryMiddlewareSetKey] = true;
-
-        // The anti-forgery middleware adds annotations to HttpContext.Items to indicate that it has run
-        // that will be validated by the EndpointsRoutingMiddleware later. To do this, we need to ensure
-        // that routing has run and set the endpoint feature on the HttpContext associated with the request.
-        if (builder.Properties.TryGetValue(RerouteHelper.GlobalRouteBuilderKey, out var routeBuilder) && routeBuilder is not null)
-        {
-            return builder.Use(next =>
-            {
-                var newNext = RerouteHelper.Reroute(builder, routeBuilder, next);
-                var antiforgery = builder.ApplicationServices.GetRequiredService<IAntiforgery>();
-                return new AntiforgeryMiddleware(antiforgery, newNext).Invoke;
-            });
-        }
         builder.UseMiddleware<AntiforgeryMiddleware>();
 
         return builder;

src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj

@@ -25,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)HttpExtensions.cs" LinkBase="Shared"/>
-    <Compile Include="$(SharedSourceRoot)Reroute.cs" LinkBase="Shared"/>
+    <Compile Include="$(SharedSourceRoot)HttpMethodExtensions.cs" LinkBase="Shared"/>
   </ItemGroup>
 </Project>

src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs

@@ -2101,9 +2101,6 @@ private static Expression BindComplexParameterFromFormItem(
             ArrayPoolSharedReturnMethod,
             formBuffer,
             Expression.Constant(false));
-        var conditionalReturnBufferExpr = Expression.IfThen(
-            Expression.NotEqual(formBuffer, Expression.Constant(null)),
-            returnBufferExpr);
 
         var parameterTypeNameConstant = Expression.Constant(TypeNameHelper.GetTypeDisplayName(parameter.ParameterType, fullName: false));
         var parameterNameConstant = Expression.Constant(parameter.Name);
@@ -2136,6 +2133,7 @@ private static Expression BindComplexParameterFromFormItem(
                     initializeReaderExpr,
                     setMaxRecursionDepthExpr,
                     Expression.Assign(formArgument, invokeMapMethodExpr)),
+<<<<<<< HEAD
                 conditionalReturnBufferExpr,
                 Expression.Catch(formDataMappingException, Expression.Block(
                     typeof(void),
@@ -2148,6 +2146,10 @@ private static Expression BindComplexParameterFromFormItem(
                         formDataMappingException,
                         Expression.Constant(factoryContext.ThrowOnBadRequest))
                 )))
+=======
+                returnBufferExpr),
+            formArgument
+>>>>>>> parent of e231c61c3a (Re-run routing for implicit middlewares that require endpoints (#49732))
         );
 
         factoryContext.ParamCheckExpressions.Add(bindAndCheckForm);

src/Http/Http.Extensions/src/RequestDelegateFactory.cs

@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Routing;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -24,20 +22,6 @@ public static IApplicationBuilder UseAuthentication(this IApplicationBuilder app
         ArgumentNullException.ThrowIfNull(app);
 
         app.Properties[AuthenticationMiddlewareSetKey] = true;
-
-        // The authentication middleware adds annotation to HttpContext.Items to indicate that it has run
-        // that will be validated by the EndpointsRoutingMiddleware later. To do this, we need to ensure
-        // that routing has run and set the endpoint feature on the HttpContext associated with the request.
-        if (app.Properties.TryGetValue(RerouteHelper.GlobalRouteBuilderKey, out var routeBuilder) && routeBuilder is not null)
-        {
-            return app.Use(next =>
-            {
-                var newNext = RerouteHelper.Reroute(app, routeBuilder, next);
-                var authenticationSchemeProvider = app.ApplicationServices.GetRequiredService<IAuthenticationSchemeProvider>();
-                return new AuthenticationMiddleware(newNext, authenticationSchemeProvider).Invoke;
-            });
-        }
-
         return app.UseMiddleware<AuthenticationMiddleware>();
     }
 }

src/Security/Authentication/Core/src/AuthAppBuilderExtensions.cs

@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)SecurityHelper\**\*.cs" />
-    <Compile Include="$(SharedSourceRoot)Reroute.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj

@@ -3,9 +3,7 @@
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authorization.Policy;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -32,24 +30,6 @@ public static IApplicationBuilder UseAuthorization(this IApplicationBuilder app)
         VerifyServicesRegistered(app);
 
         app.Properties[AuthorizationMiddlewareSetKey] = true;
-
-        // The authorization middleware adds annotation to HttpContext.Items to indicate that it has run
-        // that will be validated by the EndpointsRoutingMiddleware later. To do this, we need to ensure
-        // that routing has run and set the endpoint feature on the HttpContext associated with the request.
-        if (app.Properties.TryGetValue(RerouteHelper.GlobalRouteBuilderKey, out var routeBuilder) && routeBuilder is not null)
-        {
-            return app.Use(next =>
-            {
-                var newNext = RerouteHelper.Reroute(app, routeBuilder, next);
-                var authorizationPolicyProvider = app.ApplicationServices.GetRequiredService<IAuthorizationPolicyProvider>();
-                var logger = app.ApplicationServices.GetRequiredService<ILogger<AuthorizationMiddleware>>();
-                return new AuthorizationMiddlewareInternal(newNext,
-                    app.ApplicationServices,
-                    authorizationPolicyProvider,
-                    logger).Invoke;
-            });
-        }
-
         return app.UseMiddleware<AuthorizationMiddlewareInternal>();
     }
 

src/Security/Authorization/Policy/src/AuthorizationAppBuilderExtensions.cs

@@ -13,7 +13,6 @@
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)SecurityHelper\**\*.cs" />
     <Compile Include="..\..\..\..\Http\Routing\src\DataSourceDependentCache.cs" Link="DataSourceDependentCache.cs" />
-    <Compile Include="$(SharedSourceRoot)Reroute.cs" />
   </ItemGroup>
 
   <ItemGroup>