diff --git a/src/Squidex.Core/Squidex.Core.csproj b/src/Squidex.Core/Squidex.Core.csproj index 8080fb0ce..4e751cfad 100644 --- a/src/Squidex.Core/Squidex.Core.csproj +++ b/src/Squidex.Core/Squidex.Core.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj b/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj index 68d07fc7b..724d33104 100644 --- a/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj +++ b/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj @@ -11,6 +11,6 @@ - + diff --git a/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj b/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj index ab4e5369b..6b175a123 100644 --- a/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj +++ b/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Squidex/Config/Swagger/SwaggerServices.cs b/src/Squidex/Config/Swagger/SwaggerServices.cs index 75ac816fd..8eb5836fc 100644 --- a/src/Squidex/Config/Swagger/SwaggerServices.cs +++ b/src/Squidex/Config/Swagger/SwaggerServices.cs @@ -26,13 +26,13 @@ namespace Squidex.Config.Swagger { services.AddSingleton(typeof(SwaggerOwinSettings), s => { - var options = s.GetService>().Value; + var urlOptions = s.GetService>().Value; var settings = new SwaggerOwinSettings { Title = "Squidex API Specification", IsAspNetCore = false } - .ConfigurePaths() + .ConfigurePaths(urlOptions) .ConfigureSchemaSettings() - .ConfigureIdentity(options); + .ConfigureIdentity(urlOptions); return settings; }); @@ -50,13 +50,17 @@ namespace Squidex.Config.Swagger return settings; } - private static SwaggerOwinSettings ConfigurePaths(this SwaggerOwinSettings settings) + private static SwaggerOwinSettings ConfigurePaths(this SwaggerOwinSettings settings, MyUrlsOptions urlOptions) { settings.SwaggerRoute = $"{Constants.ApiPrefix}/swagger/v1/swagger.json"; settings.PostProcess = document => { document.BasePath = Constants.ApiPrefix; + document.Info.ExtensionData = new Dictionary + { + ["x-logo"] = new { url = urlOptions.BuildUrl("images/logo-white.png", false), backgroundColor = "#3f83df" } + }; }; settings.MiddlewareBasePath = Constants.ApiPrefix; diff --git a/src/Squidex/Controllers/Api/Schemas/SchemasController.cs b/src/Squidex/Controllers/Api/Schemas/SchemasController.cs index e6b9cd0f9..a1e933331 100644 --- a/src/Squidex/Controllers/Api/Schemas/SchemasController.cs +++ b/src/Squidex/Controllers/Api/Schemas/SchemasController.cs @@ -42,7 +42,7 @@ namespace Squidex.Controllers.Api.Schemas } /// - /// Get app schemas. + /// Get schemas. /// /// /// 200 => Schemas returned. diff --git a/src/Squidex/Controllers/ContentApi/ContentsController.cs b/src/Squidex/Controllers/ContentApi/ContentsController.cs index 4f6cf483f..16094c4dc 100644 --- a/src/Squidex/Controllers/ContentApi/ContentsController.cs +++ b/src/Squidex/Controllers/ContentApi/ContentsController.cs @@ -13,6 +13,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Primitives; +using NSwag.Annotations; using Squidex.Controllers.Api; using Squidex.Controllers.ContentApi.Models; using Squidex.Core.Contents; @@ -30,6 +31,7 @@ namespace Squidex.Controllers.ContentApi [Authorize(Roles = SquidexRoles.AppEditor)] [ApiExceptionFilter] [ServiceFilter(typeof(AppFilterAttribute))] + [SwaggerIgnore] public class ContentsController : ControllerBase { private readonly ISchemaProvider schemas; diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 16f3012af..3a56acdc1 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -32,9 +32,9 @@ - + - + @@ -56,12 +56,12 @@ - + - + - - + + diff --git a/tests/RunCoverage.ps1 b/tests/RunCoverage.ps1 index c95c806c1..3303a8a1a 100644 --- a/tests/RunCoverage.ps1 +++ b/tests/RunCoverage.ps1 @@ -50,6 +50,6 @@ New-Item -ItemType directory -Path $reportsFolder -output:"$workingFolder\$reportsFolder\Read.xml" ` -oldStyle -&"$userProfile\.nuget\packages\ReportGenerator\2.5.2\tools\ReportGenerator.exe" ` +&"$userProfile\.nuget\packages\ReportGenerator\2.5.5\tools\ReportGenerator.exe" ` -reports:"$workingFolder\$reportsFolder\*.xml" ` -targetdir:"$workingFolder\$reportsFolder\Output" \ No newline at end of file diff --git a/tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj b/tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj index c8adff1a5..99050d467 100644 --- a/tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj +++ b/tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj index 5bc0fe25e..dd2c8f2ad 100644 --- a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj +++ b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj b/tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj index cf8496346..2771f70ad 100644 --- a/tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj +++ b/tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj @@ -13,11 +13,11 @@ - + - - - + + + diff --git a/tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj b/tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj index acad1fcf1..14516ca32 100644 --- a/tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj +++ b/tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj @@ -12,11 +12,11 @@ - + - - - + + +