From c3714d55f360921e9c047850c19cb437ae2560e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= <zoltan.lehoczky@lombiq.com>
Date: Thu, 11 Jul 2024 22:46:53 +0200
Subject: [PATCH] Trying to set up Swagger in the Web app

---
 src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj   |  2 ++
 src/OrchardCore.Cms.Web/Program.cs                   | 12 ++++++++++--
 .../OrchardCore.Tenants/OrchardCore.Tenants.csproj   |  2 --
 .../OrchardCore.Tenants/Startup.cs                   |  8 --------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj b/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj
index 0e377c8ab93..5f970a0ec03 100644
--- a/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj
+++ b/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj
@@ -10,6 +10,7 @@
     <RazorRuntimeCompilation>false</RazorRuntimeCompilation>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <OpenApiGenerateDocumentsOnBuild>false</OpenApiGenerateDocumentsOnBuild>
   </PropertyGroup>
   <!-- For Unit Tests-->
   <ItemGroup>
@@ -28,6 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Condition="'$(RazorRuntimeCompilation)' == 'true'" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/OrchardCore.Cms.Web/Program.cs b/src/OrchardCore.Cms.Web/Program.cs
index f5e06716d21..54c01d5ea77 100644
--- a/src/OrchardCore.Cms.Web/Program.cs
+++ b/src/OrchardCore.Cms.Web/Program.cs
@@ -1,3 +1,4 @@
+using Microsoft.OpenApi.Models;
 using OrchardCore.Logging;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -5,13 +6,20 @@
 builder.Host.UseNLogHost();
 
 builder.Services
-    .AddOrchardCms()
-    .AddSetupFeatures("OrchardCore.AutoSetup");
+    .AddOrchardCms(orchardCoreBuilder =>
+    {
+        orchardCoreBuilder.ApplicationServices.AddSwaggerGen(c =>
+        {
+            c.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
+        });
+    });
 
 var app = builder.Build();
 
 if (!app.Environment.IsDevelopment())
 {
+    app.UseSwagger();
+
     app.UseExceptionHandler("/Error");
 }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj b/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj
index 5e09ed091c1..1fb833662eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj
@@ -8,7 +8,6 @@
 
     Provides features to manage tenants from the Admin UI</Description>
     <PackageTags>$(PackageTags) OrchardCoreCMS</PackageTags>
-    <OpenApiGenerateDocumentsOnBuild>false</OpenApiGenerateDocumentsOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,7 +32,6 @@
 
   <ItemGroup>
     <PackageReference Include="NJsonSchema" />
-    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs
index 7562f962499..b9b1539d223 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
-using Microsoft.OpenApi.Models;
 using OrchardCore.Deployment;
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.Environment.Shell;
@@ -75,11 +74,6 @@ public override void ConfigureServices(IServiceCollection services)
             {
                 return serviceProvider.GetRequiredService<ITenantFileProvider>();
             });
-
-            services.AddSwaggerGen(c =>
-            {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
-            });
         }
 
         public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
@@ -98,8 +92,6 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
                     ctx.Context.Response.Headers[HeaderNames.CacheControl] = $"public, max-age={TimeSpan.FromDays(30).TotalSeconds}, s-max-age={TimeSpan.FromDays(365.25).TotalSeconds}";
                 }
             });
-
-            app.UseSwagger();
         }
 
         private static string GetContentRoot(ShellOptions shellOptions, ShellSettings shellSettings) =>