domaindrivendev · martincostello · Sep 30, 2024
diff --git a/src/Swashbuckle.AspNetCore.ReDoc/PublicAPI/PublicAPI.Unshipped.txt b/src/Swashbuckle.AspNetCore.ReDoc/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1,2 @@
+Swashbuckle.AspNetCore.ReDoc.ReDocOptions.JsonSerializerOptions.get -> System.Text.Json.JsonSerializerOptions
+Swashbuckle.AspNetCore.ReDoc.ReDocOptions.JsonSerializerOptions.set -> void
diff --git a/src/Swashbuckle.AspNetCore.ReDoc/ReDocMiddleware.cs b/src/Swashbuckle.AspNetCore.ReDoc/ReDocMiddleware.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -39,15 +40,25 @@ public ReDocMiddleware(
 
             _staticFileMiddleware = CreateStaticFileMiddleware(next, hostingEnv, loggerFactory, options);
 
-            _jsonSerializerOptions = new JsonSerializerOptions();
-
-#if NET6_0_OR_GREATER
-            _jsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
+            if (options.JsonSerializerOptions != null)
+            {
+                _jsonSerializerOptions = options.JsonSerializerOptions;
+            }
+#if !NET6_0_OR_GREATER
+            else
+            {
+                _jsonSerializerOptions = new JsonSerializerOptions()
+                {
+#if NET5_0_OR_GREATER
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
 #else
-            _jsonSerializerOptions.IgnoreNullValues = true;
+                    IgnoreNullValues = true,
+#endif
+                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                    Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase, false) }
+                };
+            }
 #endif
-            _jsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
-            _jsonSerializerOptions.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase, false));
         }
 
         public async Task Invoke(HttpContext httpContext)
@@ -82,7 +93,7 @@ public async Task Invoke(HttpContext httpContext)
             await _staticFileMiddleware.Invoke(httpContext);
         }
 
-        private StaticFileMiddleware CreateStaticFileMiddleware(
+        private static StaticFileMiddleware CreateStaticFileMiddleware(
             RequestDelegate next,
             IWebHostEnvironment hostingEnv,
             ILoggerFactory loggerFactory,
@@ -97,10 +108,14 @@ private StaticFileMiddleware CreateStaticFileMiddleware(
             return new StaticFileMiddleware(next, hostingEnv, Options.Create(staticFileOptions), loggerFactory);
         }
 
-        private void RespondWithRedirect(HttpResponse response, string location)
+        private static void RespondWithRedirect(HttpResponse response, string location)
         {
-            response.StatusCode = 301;
+            response.StatusCode = StatusCodes.Status301MovedPermanently;
+#if NET6_0_OR_GREATER
+            response.Headers.Location = location;
+#else
             response.Headers["Location"] = location;
+#endif
         }
 
         private async Task RespondWithFile(HttpResponse response, string fileName)
@@ -138,14 +153,35 @@ private async Task RespondWithFile(HttpResponse response, string fileName)
             }
         }
 
-        private IDictionary<string, string> GetIndexArguments()
+#if NET5_0_OR_GREATER
+        [UnconditionalSuppressMessage(
+            "AOT",
+            "IL2026:RequiresUnreferencedCode",
+            Justification = "Method is only called if the user provides their own custom JsonSerializerOptions.")]
+        [UnconditionalSuppressMessage(
+            "AOT",
+            "IL3050:RequiresDynamicCode",
+            Justification = "Method is only called if the user provides their own custom JsonSerializerOptions.")]
+#endif
+        private Dictionary<string, string> GetIndexArguments()
         {
+            string configObject = null;
+
+#if NET6_0_OR_GREATER
+            if (_jsonSerializerOptions is null)
+            {
+                configObject = JsonSerializer.Serialize(_options.ConfigObject, ReDocOptionsJsonContext.Default.ConfigObject);
+            }
+#endif
+
+            configObject ??= JsonSerializer.Serialize(_options.ConfigObject, _jsonSerializerOptions);
+
             return new Dictionary<string, string>()
             {
                 { "%(DocumentTitle)", _options.DocumentTitle },
                 { "%(HeadContent)", _options.HeadContent },
                 { "%(SpecUrl)", _options.SpecUrl },
-                { "%(ConfigObject)", JsonSerializer.Serialize(_options.ConfigObject, _jsonSerializerOptions) }
+                { "%(ConfigObject)", configObject },
             };
         }
     }

diff --git a/src/Swashbuckle.AspNetCore.ReDoc/ReDocOptions.cs b/src/Swashbuckle.AspNetCore.ReDoc/ReDocOptions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Swashbuckle.AspNetCore.ReDoc
@@ -32,7 +33,15 @@ public class ReDocOptions
         /// </summary>
         public string SpecUrl { get; set; } = null;
 
+        /// <summary>
+        /// Gets or sets the <see cref="ConfigObject"/> to use.
+        /// </summary>
         public ConfigObject ConfigObject { get; set; } = new ConfigObject();
+
+        /// <summary>
+        /// Gets or sets the optional <see cref="System.Text.Json.JsonSerializerOptions"/> to use.
+        /// </summary>
+        public JsonSerializerOptions JsonSerializerOptions { get; set; }
     }
 
     public class ConfigObject

diff --git a/src/Swashbuckle.AspNetCore.ReDoc/ReDocOptionsJsonContext.cs b/src/Swashbuckle.AspNetCore.ReDoc/ReDocOptionsJsonContext.cs
@@ -0,0 +1,45 @@
+#if NET6_0_OR_GREATER
+using System;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace Swashbuckle.AspNetCore.ReDoc;
+
+[JsonSerializable(typeof(ConfigObject))]
+// These primitive types are declared for common types that may be used with ConfigObject.AdditionalItems. See https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2884.
+[JsonSerializable(typeof(bool))]
+[JsonSerializable(typeof(byte))]
+[JsonSerializable(typeof(sbyte))]
+[JsonSerializable(typeof(short))]
+[JsonSerializable(typeof(ushort))]
+[JsonSerializable(typeof(int))]
+[JsonSerializable(typeof(int?))]
+[JsonSerializable(typeof(uint))]
+[JsonSerializable(typeof(long))]
+[JsonSerializable(typeof(ulong))]
+[JsonSerializable(typeof(float))]
+[JsonSerializable(typeof(double))]
+[JsonSerializable(typeof(decimal))]
+[JsonSerializable(typeof(char))]
+[JsonSerializable(typeof(string))]
+[JsonSerializable(typeof(DateTime))]
+[JsonSerializable(typeof(DateTimeOffset))]
+[JsonSerializable(typeof(TimeSpan))]
+[JsonSerializable(typeof(JsonArray))]
+[JsonSerializable(typeof(JsonObject))]
+[JsonSerializable(typeof(JsonDocument))]
+#if NET7_0_OR_GREATER
+[JsonSerializable(typeof(DateOnly))]
+[JsonSerializable(typeof(TimeOnly))]
+#endif
+#if NET8_0_OR_GREATER
+[JsonSerializable(typeof(Half))]
+[JsonSerializable(typeof(Int128))]
+[JsonSerializable(typeof(UInt128))]
+#endif
+[JsonSourceGenerationOptions(
+    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+internal sealed partial class ReDocOptionsJsonContext : JsonSerializerContext;
+#endif
diff --git a/src/Swashbuckle.AspNetCore.ReDoc/Swashbuckle.AspNetCore.ReDoc.csproj b/src/Swashbuckle.AspNetCore.ReDoc/Swashbuckle.AspNetCore.ReDoc.csproj
@@ -10,6 +10,10 @@
     <SignAssembly>true</SignAssembly>
     <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <EnableAotAnalyzer>true</EnableAotAnalyzer>
+    <IsAotCompatible>true</IsAotCompatible>
+  </PropertyGroup>
 
   <ItemGroup>
     <None Remove="index.css" />

diff --git a/src/Swashbuckle.AspNetCore.SwaggerUI/SwaggerUIMiddleware.cs b/src/Swashbuckle.AspNetCore.SwaggerUI/SwaggerUIMiddleware.cs
@@ -22,7 +22,7 @@
 
 namespace Swashbuckle.AspNetCore.SwaggerUI
 {
-    public partial class SwaggerUIMiddleware
+    public class SwaggerUIMiddleware
     {
         private const string EmbeddedFileNamespace = "Swashbuckle.AspNetCore.SwaggerUI.node_modules.swagger_ui_dist";
 
@@ -110,8 +110,12 @@ private static StaticFileMiddleware CreateStaticFileMiddleware(
 
         private static void RespondWithRedirect(HttpResponse response, string location)
         {
-            response.StatusCode = 301;
+            response.StatusCode = StatusCodes.Status301MovedPermanently;
+#if NET6_0_OR_GREATER
+            response.Headers.Location = location;
+#else
             response.Headers["Location"] = location;
+#endif
         }
 
         private async Task RespondWithFile(HttpResponse response, string fileName)

diff --git a/test/Swashbuckle.AspNetCore.IntegrationTests/ReDocIntegrationTests.cs b/test/Swashbuckle.AspNetCore.IntegrationTests/ReDocIntegrationTests.cs
@@ -1,5 +1,8 @@
-using System.Net;
+using System;
+using System.Net;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Swashbuckle.AspNetCore.ReDoc;
 using Xunit;
 using ReDocApp = ReDoc;
 
@@ -80,5 +83,71 @@ public async Task RedocMiddleware_CanBeConfiguredMultipleTimes(string htmlUrl, s
             Assert.Equal(HttpStatusCode.OK, jsResponse.StatusCode);
             Assert.Contains(swaggerPath, content);
         }
+
+        [Fact]
+        public void ReDocOptions_Extensions()
+        {
+            // Arrange
+            var options = new ReDocOptions();
+
+            // Act and Assert
+            Assert.NotNull(options.IndexStream);
+            Assert.Null(options.JsonSerializerOptions);
+            Assert.Null(options.SpecUrl);
+            Assert.Equal("API Docs", options.DocumentTitle);
+            Assert.Equal(string.Empty, options.HeadContent);
+            Assert.Equal("api-docs", options.RoutePrefix);
+
+            Assert.NotNull(options.ConfigObject);
+            Assert.NotNull(options.ConfigObject.AdditionalItems);
+            Assert.Empty(options.ConfigObject.AdditionalItems);
+            Assert.Null(options.ConfigObject.ScrollYOffset);
+            Assert.Equal("all", options.ConfigObject.ExpandResponses);
+            Assert.False(options.ConfigObject.DisableSearch);
+            Assert.False(options.ConfigObject.HideDownloadButton);
+            Assert.False(options.ConfigObject.HideHostname);
+            Assert.False(options.ConfigObject.HideLoading);
+            Assert.False(options.ConfigObject.NativeScrollbars);
+            Assert.False(options.ConfigObject.NoAutoAuth);
+            Assert.False(options.ConfigObject.OnlyRequiredInSamples);
+            Assert.False(options.ConfigObject.PathInMiddlePanel);
+            Assert.False(options.ConfigObject.RequiredPropsFirst);
+            Assert.False(options.ConfigObject.SortPropsAlphabetically);
+            Assert.False(options.ConfigObject.UntrustedSpec);
+
+            // Act
+            options.DisableSearch();
+            options.EnableUntrustedSpec();
+            options.ExpandResponses("response");
+            options.HideDownloadButton();
+            options.HideHostname();
+            options.HideLoading();
+            options.InjectStylesheet("custom.css", "screen and (max-width: 700px)");
+            options.NativeScrollbars();
+            options.NoAutoAuth();
+            options.OnlyRequiredInSamples();
+            options.PathInMiddlePanel();
+            options.RequiredPropsFirst();
+            options.ScrollYOffset(42);
+            options.SortPropsAlphabetically();
+            options.SpecUrl("spec.json");
+
+            // Assert
+            Assert.Equal("<link href='custom.css' rel='stylesheet' media='screen and (max-width: 700px)' type='text/css' />" + Environment.NewLine, options.HeadContent);
+            Assert.Equal("spec.json", options.SpecUrl);
+            Assert.Equal("response", options.ConfigObject.ExpandResponses);
+            Assert.Equal(42, options.ConfigObject.ScrollYOffset);
+            Assert.True(options.ConfigObject.DisableSearch);
+            Assert.True(options.ConfigObject.HideDownloadButton);
+            Assert.True(options.ConfigObject.HideHostname);
+            Assert.True(options.ConfigObject.HideLoading);
+            Assert.True(options.ConfigObject.NativeScrollbars);
+            Assert.True(options.ConfigObject.NoAutoAuth);
+            Assert.True(options.ConfigObject.OnlyRequiredInSamples);
+            Assert.True(options.ConfigObject.PathInMiddlePanel);
+            Assert.True(options.ConfigObject.RequiredPropsFirst);
+            Assert.True(options.ConfigObject.SortPropsAlphabetically);
+            Assert.True(options.ConfigObject.UntrustedSpec);
+        }
     }
 }
diff --git a/test/WebSites/WebApi.Aot/Program.cs b/test/WebSites/WebApi.Aot/Program.cs
@@ -1,8 +1,12 @@
 using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Routing.Constraints;
 using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateSlimBuilder(args);
 
+builder.Services.Configure<RouteOptions>(
+    options => options.SetParameterPolicy<RegexInlineRouteConstraint>("regex"));
+
 builder.Services.ConfigureHttpJsonOptions(options =>
 {
     options.SerializerOptions.TypeInfoResolverChain.Insert(0, AppJsonSerializerContext.Default);
@@ -41,6 +45,8 @@
 
 app.UseSwagger();
 app.UseSwaggerUI();
+app.UseReDoc();
+
 app.MapSwagger();
 
 app.Run();

diff --git a/test/WebSites/WebApi.Aot/WebApi.Aot.csproj b/test/WebSites/WebApi.Aot/WebApi.Aot.csproj
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Swashbuckle.AspNetCore.ReDoc\Swashbuckle.AspNetCore.ReDoc.csproj" />
     <ProjectReference Include="..\..\..\src\Swashbuckle.AspNetCore.SwaggerGen\Swashbuckle.AspNetCore.SwaggerGen.csproj" />
     <ProjectReference Include="..\..\..\src\Swashbuckle.AspNetCore.SwaggerUI\Swashbuckle.AspNetCore.SwaggerUI.csproj" />
   </ItemGroup>