Fix default visibility of OData endpoints

Author: commonsensesoftware

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/ODataApiDescriptionProvider.cs

@@ -97,6 +97,12 @@ public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )
         ArgumentNullException.ThrowIfNull( context );
 
         var results = context.Results;
+
+        if ( results.Count == 0 )
+        {
+            return;
+        }
+
         var visited = new HashSet<ApiDescription>( capacity: results.Count, new ApiDescriptionComparer() );
 
         for ( var i = results.Count - 1; i >= 0; i-- )

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/ODataApplicationModelProvider.cs

@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+#pragma warning disable CA1812
+
+namespace Asp.Versioning.ApiExplorer;
+
+using Asp.Versioning.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+internal sealed class ODataApplicationModelProvider : IApplicationModelProvider
+{
+    public int Order => 0;
+
+    public void OnProvidersExecuted( ApplicationModelProviderContext context ) { }
+
+    public void OnProvidersExecuting( ApplicationModelProviderContext context )
+    {
+        ArgumentNullException.ThrowIfNull( context );
+
+        var application = context.Result;
+        var controllers = application.Controllers;
+        var odata = new ODataControllerSpecification();
+        var convention = new ApiVisibilityConvention();
+
+        for ( var i = 0; i < controllers.Count; i++ )
+        {
+            var controller = controllers[i];
+
+            if ( !odata.IsSatisfiedBy( controller ) )
+            {
+                continue;
+            }
+
+            var actions = controller.Actions;
+
+            for ( var j = 0; j < actions.Count; j++ )
+            {
+                convention.Apply( actions[j] );
+            }
+        }
+    }
+}

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/DependencyInjection/IApiVersioningBuilderExtensions.cs

@@ -8,7 +8,9 @@ namespace Microsoft.Extensions.DependencyInjection;
 using Asp.Versioning.ApiExplorer;
 using Asp.Versioning.Conventions;
 using Asp.Versioning.OData;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using static Microsoft.Extensions.DependencyInjection.ServiceDescriptor;
@@ -59,6 +61,7 @@ private static void AddApiExplorerServices( IApiVersioningBuilder builder )
         builder.Services.AddModelConfigurationsAsServices();
         services.TryAddSingleton<IModelTypeBuilder, DefaultModelTypeBuilder>();
         services.TryAddSingleton<IOptionsFactory<ODataApiExplorerOptions>, ODataApiExplorerOptionsFactory>();
+        services.TryAddEnumerable( Transient<IApplicationModelProvider, Asp.Versioning.ApiExplorer.ODataApplicationModelProvider>() );
         services.TryAddEnumerable( Transient<IApiDescriptionProvider, PartialODataDescriptionProvider>() );
         services.TryAddEnumerable( Transient<IApiDescriptionProvider, ODataApiDescriptionProvider>() );
         services.TryAddEnumerable( Transient<IModelConfiguration, ImplicitModelBoundSettingsConvention>() );