Handled unregistered IUrlHelperFactory. Fixes dotnet#673

alexsiilvaa · Oct 24, 2020 · cb95c4f · cb95c4f
1 parent 261564c
commit cb95c4f
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/...e.Mvc.Versioning/Microsoft.Extensions.DependencyInjection/IServiceCollectionExtensions.cs b/...e.Mvc.Versioning/Microsoft.Extensions.DependencyInjection/IServiceCollectionExtensions.cs
@@ -99,21 +99,32 @@ static object CreateInstance( this IServiceProvider services, ServiceDescriptor
 
         static ServiceDescriptor WithUrlHelperFactoryDecorator( IServiceCollection services )
         {
-            var descriptor = services.First( sd => sd.ServiceType == typeof( IUrlHelperFactory ) );
-            var factory = ActivatorUtilities.CreateFactory( typeof( ApiVersionUrlHelperFactory ), new[] { typeof( IUrlHelperFactory ) } );
+            var descriptor = services.FirstOrDefault( sd => sd.ServiceType == typeof( IUrlHelperFactory ) );
+            var lifetime = ServiceLifetime.Singleton;
+            Func<IServiceProvider, object> instantiate = sp => new UrlHelperFactory();
+
+            if ( descriptor != null )
+            {
+                lifetime = descriptor.Lifetime;
+                instantiate = sp => sp.CreateInstance( descriptor );
+            }
 
             IUrlHelperFactory NewFactory( IServiceProvider serviceProvider )
             {
-                var decorated = serviceProvider.CreateInstance( descriptor! );
+                var decorated = instantiate( serviceProvider );
                 var options = serviceProvider.GetRequiredService<IOptions<ApiVersioningOptions>>().Value;
-                var instance = options.ApiVersionReader.VersionsByUrlSegment() ?
-                    factory( serviceProvider, new[] { decorated } ) :
-                    decorated;
+                var instance = decorated;
+
+                if ( options.ApiVersionReader.VersionsByUrlSegment() )
+                {
+                    var factory = ActivatorUtilities.CreateFactory( typeof( ApiVersionUrlHelperFactory ), new[] { typeof( IUrlHelperFactory ) } );
+                    instance = factory( serviceProvider, new[] { decorated } );
+                }
 
                 return (IUrlHelperFactory) instance;
             }
 
-            return Describe( typeof( IUrlHelperFactory ), NewFactory, descriptor.Lifetime );
+            return Describe( typeof( IUrlHelperFactory ), NewFactory, lifetime );
         }
     }
 }