Merge pull request #1481 from tomkerkhove/ignoreExistingOptions-for-b…

…ackwards-compat Provide capability to ignore existing SwaggerOptions/SwaggerUiOptions
domaindrivendev · Mar 20, 2020 · e33dba2 · e33dba2
2 parents 4e473ec + 2f89e26
commit e33dba2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/src/Swashbuckle.AspNetCore.ReDoc/ReDocBuilderExtensions.cs b/src/Swashbuckle.AspNetCore.ReDoc/ReDocBuilderExtensions.cs
@@ -11,8 +11,16 @@ public static IApplicationBuilder UseReDoc(
             this IApplicationBuilder app,
             Action<ReDocOptions> setupAction = null)
         {
-            var options = app.ApplicationServices.GetService<IOptions<ReDocOptions>>()?.Value ?? new ReDocOptions();
-            setupAction?.Invoke(options);
+            var options = new ReDocOptions();
+            if (setupAction != null)
+            {
+                setupAction(options);
+            }
+            else
+            {
+                options = app.ApplicationServices.GetRequiredService<IOptions<ReDocOptions>>().Value;
+            }
+
             app.UseMiddleware<ReDocMiddleware>(options);
 
             return app;

diff --git a/src/Swashbuckle.AspNetCore.Swagger/DependencyInjection/SwaggerBuilderExtensions.cs b/src/Swashbuckle.AspNetCore.Swagger/DependencyInjection/SwaggerBuilderExtensions.cs
@@ -11,8 +11,16 @@ public static IApplicationBuilder UseSwagger(
             this IApplicationBuilder app,
             Action<SwaggerOptions> setupAction = null)
         {
-            var options = app.ApplicationServices.GetService<IOptions<SwaggerOptions>>()?.Value ?? new SwaggerOptions();
-            setupAction?.Invoke(options);
+            SwaggerOptions options = new SwaggerOptions();
+            if (setupAction != null)
+            {
+                setupAction(options);
+            }
+            else
+            {
+                options = app.ApplicationServices.GetRequiredService<IOptions<SwaggerOptions>>().Value;
+            }
+
             app.UseMiddleware<SwaggerMiddleware>(options);
 
             return app;

diff --git a/src/Swashbuckle.AspNetCore.SwaggerUI/SwaggerUIBuilderExtensions.cs b/src/Swashbuckle.AspNetCore.SwaggerUI/SwaggerUIBuilderExtensions.cs
@@ -11,8 +11,16 @@ public static IApplicationBuilder UseSwaggerUI(
             this IApplicationBuilder app,
             Action<SwaggerUIOptions> setupAction = null)
         {
-            var options = app.ApplicationServices.GetService<IOptions<SwaggerUIOptions>>()?.Value ?? new SwaggerUIOptions();
-            setupAction?.Invoke(options);
+            var options = new SwaggerUIOptions();
+            if (setupAction != null)
+            {
+                setupAction(options);
+            }
+            else
+            {
+                options = app.ApplicationServices.GetRequiredService<IOptions<SwaggerUIOptions>>().Value;
+            }
+
             app.UseMiddleware<SwaggerUIMiddleware>(options);
 
             return app;