Configure container for unversioned route. Fixed #553

Author: Chris Martinez

ApiVersioning.sln

@@ -357,4 +357,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A38B7FA-17BC-4D3C-977F-7379653DC67C}
 	EndGlobalSection
-EndGlobal
+EndGlobal

src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Extensions/IRouteBuilderExtensions.cs

@@ -127,7 +127,13 @@ IEnumerable<IODataRoutingConvention> ConfigureRoutingConventions( IEdmModel mode
                 routeCollection.Add( new ODataRouteMapping( route, apiVersion, rootContainer ) );
             }
 
-            builder.AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch( routeName, routePrefix, unversionedConstraints, inlineConstraintResolver );
+            builder.AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch(
+                routeName,
+                routePrefix,
+                unversionedConstraints,
+                inlineConstraintResolver,
+                builder.ConfigureDefaultServices( container => configureAction?.Invoke( container ) ) );
+
             NotifyRoutesMapped();
 
             return odataRoutes;
@@ -278,7 +284,13 @@ IEnumerable<IODataRoutingConvention> NewRouteConventions( IServiceProvider servi
                 routeCollection.Add( new ODataRouteMapping( route, apiVersion, rootContainer ) );
             }
 
-            builder.AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch( routeName, routePrefix, unversionedConstraints, inlineConstraintResolver );
+            builder.AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch(
+                routeName,
+                routePrefix,
+                unversionedConstraints,
+                inlineConstraintResolver,
+                builder.ConfigureDefaultServices( _ => { } ) );
+
             NotifyRoutesMapped();
 
             return odataRoutes;
@@ -340,13 +352,13 @@ IEnumerable<IODataRoutingConvention> NewRoutingConventions( IServiceProvider ser
             var routeCollection = builder.ServiceProvider.GetRequiredService<IODataRouteCollectionProvider>();
             var perRouteContainer = builder.ServiceProvider.GetRequiredService<IPerRouteContainer>();
             var inlineConstraintResolver = builder.ServiceProvider.GetRequiredService<IInlineConstraintResolver>();
-            var preConfigureAction = builder.ConfigureDefaultServices(
+            var perConfigureAction = builder.ConfigureDefaultServices(
                 container =>
                 {
                     container.AddService( Singleton, typeof( IEnumerable<IODataRoutingConvention> ), NewRoutingConventions );
                     configureAction?.Invoke( container );
                 } );
-            var rootContainer = perRouteContainer.CreateODataRootContainer( routeName, preConfigureAction );
+            var rootContainer = perRouteContainer.CreateODataRootContainer( routeName, perConfigureAction );
             var router = rootContainer.GetService<IRouter>() ?? builder.DefaultHandler;
 
             builder.ConfigurePathHandler( rootContainer );
@@ -357,7 +369,7 @@ IEnumerable<IODataRoutingConvention> NewRoutingConventions( IServiceProvider ser
             builder.ConfigureBatchHandler( rootContainer, route );
             builder.Routes.Add( route );
             routeCollection.Add( new ODataRouteMapping( route, apiVersion, rootContainer ) );
-            builder.AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch( routeName, routePrefix, apiVersion, inlineConstraintResolver );
+            builder.AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch( routeName, routePrefix, apiVersion, inlineConstraintResolver, perConfigureAction );
             NotifyRoutesMapped();
 
             return route;
@@ -484,7 +496,7 @@ IEnumerable<IODataRoutingConvention> NewRoutingConventions( IServiceProvider ser
             builder.ConfigureBatchHandler( rootContainer, route );
             builder.Routes.Add( route );
             routeCollection.Add( new ODataRouteMapping( route, apiVersion, rootContainer ) );
-            builder.AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch( routeName, routePrefix, apiVersion, inlineConstraintResolver );
+            builder.AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch( routeName, routePrefix, apiVersion, inlineConstraintResolver, configureAction );
             NotifyRoutesMapped();
 
             return route;
@@ -552,22 +564,25 @@ static void AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch(
             string routeName,
             string routePrefix,
             IEnumerable<IRouteConstraint> unversionedConstraints,
-            IInlineConstraintResolver inlineConstraintResolver )
+            IInlineConstraintResolver inlineConstraintResolver,
+            Action<IContainerBuilder> configureAction )
         {
             routeName += UnversionedRouteSuffix;
 
             var constraint = new UnversionedODataPathRouteConstraint( unversionedConstraints );
             var route = new ODataRoute( builder.DefaultHandler, routeName, routePrefix, constraint, inlineConstraintResolver );
 
             builder.Routes.Add( route );
+            builder.ServiceProvider.GetRequiredService<IPerRouteContainer>().CreateODataRootContainer( routeName, configureAction );
         }
 
         static void AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch(
             this IRouteBuilder builder,
             string routeName,
             string routePrefix,
             ApiVersion apiVersion,
-            IInlineConstraintResolver inlineConstraintResolver )
+            IInlineConstraintResolver inlineConstraintResolver,
+            Action<IContainerBuilder> configureAction )
         {
             routeName += UnversionedRouteSuffix;
 
@@ -576,6 +591,7 @@ static void AddRouteToRespondWithBadRequestWhenAtLeastOneRouteCouldMatch(
             var route = new ODataRoute( builder.DefaultHandler, routeName, routePrefix, constraint, inlineConstraintResolver );
 
             builder.Routes.Add( route );
+            builder.ServiceProvider.GetRequiredService<IPerRouteContainer>().CreateODataRootContainer( routeName, configureAction );
         }
 
         static IRouteConstraint MakeVersionedODataRouteConstraint( ApiVersion apiVersion, ref string versionedRouteName )

src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/UnversionedODataPathRouteConstraint.cs

@@ -66,6 +66,9 @@ public bool Match( HttpContext httpContext, IRouter route, string routeKey, Rout
                 return false;
             }
 
+            // delete the request container because ODataPathRouteConstraint will try to create it resulting in an exception
+            // ODataPathRouteConstraint cleans itself up afterward
+            // REF: https://github.com/OData/WebApi/blob/master/src/Microsoft.AspNetCore.OData/Routing/ODataPathRouteConstraint.cs#L53
             httpContext.Request.DeleteRequestContainer( true );
 
             // by evaluating the remaining unversioned constraints, this will ultimately determine whether 400 or 404