Fixed Versioned OData Route Constraint (#9)

Updated to ensure that the matched metadata or service document routes also match the correct EDM and that controllers are implicitly matched when allowed.  This fixes #7 and fixes #8.

Author: commonsensesoftware

src/Microsoft.AspNet.OData.Versioning/Web.OData/Routing/VersionedODataPathRouteConstraint.cs

@@ -153,19 +153,25 @@ public override bool Match( HttpRequestMessage request, IHttpRoute route, string
 
             var requestedVersion = request.GetRequestedApiVersion() ?? GetApiVersionFromRoutePrefix( request, route );
 
-            if ( requestedVersion == null )
+            if ( requestedVersion != null )
             {
-                if ( IsServiceDocumentOrMetadataRoute( values ) )
-                {
-                    var defaultApiVersion = request.GetConfiguration().GetDefaultApiVersion();
-                    request.SetRequestedApiVersion( defaultApiVersion );
-                    return base.Match( request, route, parameterName, values, routeDirection );
-                }
+                return ApiVersion == requestedVersion && base.Match( request, route, parameterName, values, routeDirection );
+            }
+
+            var options = request.GetApiVersioningOptions();
 
+            if ( options.DefaultApiVersion != ApiVersion )
+            {
                 return false;
             }
 
-            return ApiVersion == requestedVersion && base.Match( request, route, parameterName, values, routeDirection );
+            if ( options.AssumeDefaultVersionWhenUnspecified || IsServiceDocumentOrMetadataRoute( values ) )
+            {
+                request.SetRequestedApiVersion( ApiVersion );
+                return base.Match( request, route, parameterName, values, routeDirection );
+            }
+
+            return false;
         }
     }
 }

test/Microsoft.AspNet.OData.Versioning.Tests/Web.OData/Routing/VersionedODataPathRouteConstraintTest.cs

@@ -92,21 +92,50 @@ public void match_should_be_true_when_api_version_is_requested_in_query_string(
         }
 
         [Theory]
-        [InlineData( "http://localhost", null )]
-        [InlineData( "http://localhost/$metadata", "$metadata" )]
-        public void match_should_return_true_for_service_and_metadata_document( string requestUri, string odataPath )
+        [InlineData( "http://localhost", null, "1.0", true )]
+        [InlineData( "http://localhost", null, "2.0", false )]
+        [InlineData( "http://localhost/$metadata", "$metadata", "1.0", true )]
+        [InlineData( "http://localhost/$metadata", "$metadata", "2.0", false )]
+        public void match_should_return_expected_result_for_service_and_metadata_document( string requestUri, string odataPath, string apiVersionValue, bool expected )
         {
             // arrange
+            var apiVersion = Parse( apiVersionValue );
             var model = EmptyModel;
             var request = new HttpRequestMessage( Get, requestUri );
             var values = new Dictionary<string, object>() { { "odataPath", odataPath } };
-            var constraint = NewVersionedODataPathRouteConstraint( request, model, Default );
+            var constraint = NewVersionedODataPathRouteConstraint( request, model, apiVersion );
 
             // act
             var result = constraint.Match( request, null, null, values, UriResolution );
 
             // assert
-            result.Should().BeTrue();
+            result.Should().Be( expected );
+        }
+
+        [Theory]
+        [InlineData( true, true )]
+        [InlineData( false, false )]
+        public void match_should_return_expected_result_when_controller_is_implicitly_versioned( bool allowImplicitVersioning, bool expected )
+        {
+            // arrange
+            var apiVersion = new ApiVersion( 2, 0 );
+            var model = TestModel;
+            var request = new HttpRequestMessage( Get, $"http://localhost/Tests(1)" );
+            var values = new Dictionary<string, object>() { { "odataPath", "Tests(1)" } };
+            var constraint = NewVersionedODataPathRouteConstraint( request, model, apiVersion );
+
+            request.GetConfiguration().AddApiVersioning(
+                o =>
+                {
+                    o.DefaultApiVersion = apiVersion;
+                    o.AssumeDefaultVersionWhenUnspecified = allowImplicitVersioning;
+                } );
+
+            // act
+            var result = constraint.Match( request, null, null, values, UriResolution );
+
+            // assert
+            result.Should().Be( expected );
         }
 
         [Theory]