Merge pull request #3889 from bernarden/bug/fixing-documentation-generation-for-swagger

Adds xml documentation generation. Better error handling when xml documentation is missing.

src/Ombi/Extensions/StartupExtensions.cs

@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.JsonPatch.Operations;
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
@@ -15,8 +11,6 @@ using Microsoft.OpenApi.Models;
 using Ombi.Config;
 using Ombi.Helpers;
 using Ombi.Models.Identity;
-using Swashbuckle.AspNetCore.Swagger;
-using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Ombi
 {
@@ -26,7 +20,7 @@ namespace Ombi
         {
             services.AddSwaggerGen(c =>
             {
-                c.SwaggerDoc("v1", new OpenApiInfo()
+                c.SwaggerDoc("v1", new OpenApiInfo
                 {
                     Version = "v1",
                     Title = "Ombi Api V1",
@@ -37,9 +31,6 @@ namespace Ombi
                     }
                 });
 
-
-
-
                 c.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme
                 {
                     Description = "API Key provided by Ombi. Example: \"ApiKey: {token}\"",
@@ -47,25 +38,32 @@ namespace Ombi
                     In = ParameterLocation.Header,
                     Type = SecuritySchemeType.ApiKey
                 });
+
                 c.CustomSchemaIds(x => x.FullName);
-                var basePath = Path.GetDirectoryName(AppContext.BaseDirectory);
-                var xmlPath = Path.Combine(basePath, "Swagger.xml");
+
                 try
+                {
+                    string basePath = Path.GetDirectoryName(AppContext.BaseDirectory);
+                    string assemblyName = Assembly.GetExecutingAssembly().GetName().Name;
+                    string xmlPath = Path.Combine(basePath ?? string.Empty, $"{assemblyName}.xml");
+                    if (File.Exists(xmlPath))
                     {
                         c.IncludeXmlComments(xmlPath);
                     }
+                    else
+                    {
+                        Console.WriteLine($"Swagger failed to find documentation file at '{xmlPath}'.");
+                    }
+                }
                 catch (Exception e)
                 {
                     Console.WriteLine(e);
                 }
 
-
                 c.DescribeAllParametersInCamelCase();
             });
         }
 
-      
-
         public static void AddAppSettingsValues(this IServiceCollection services, IConfigurationRoot configuration)
         {
             services.Configure<ApplicationSettings>(configuration.GetSection("ApplicationSettings"));
@@ -78,13 +76,10 @@ namespace Ombi
 
         public static void AddJwtAuthentication(this IServiceCollection services, IConfigurationRoot configuration)
         {
-            var tokenOptions = configuration.GetSection("TokenAuthentication");
-
             var tokenValidationParameters = new TokenValidationParameters
             {
                 ValidateIssuerSigningKey = true,
                 IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(StartupSingleton.Instance.SecurityKey)),
-
                 RequireExpirationTime = true,
                 ValidateLifetime = true,
                 ValidAudience = "Ombi",
@@ -92,11 +87,13 @@ namespace Ombi
                 ClockSkew = TimeSpan.Zero,
             };
 
-            services.AddAuthentication(options =>
+            services
+                .AddAuthentication(options =>
                 {
                     options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
                     options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-            }).AddJwtBearer(x =>
+                })
+                .AddJwtBearer(x =>
                 {
                     x.Audience = "Ombi";
                     x.TokenValidationParameters = tokenValidationParameters;
@@ -114,11 +111,11 @@ namespace Ombi
                                 // Read the token out of the query string
                                 context.Token = accessToken;
                             }
+
                             return Task.CompletedTask;
                         }
                     };
                 });
-
         }
     }
 }

src/Ombi/Ombi.csproj

@@ -14,6 +14,7 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit> <!--https://docs.microsoft.com/en-us/dotnet/core/whats-new/dotnet-core-3-0#tiered-compilation-->
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup>