From 11f993b374be396731ffebeb7c7c7ba2e56fb70d Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 11 Oct 2018 18:22:48 +0200 Subject: [PATCH] Swagger fixes. --- .../Areas/Api/Config/Swagger/SwaggerExtensions.cs | 3 +-- .../Areas/Api/Config/Swagger/SwaggerServices.cs | 1 - .../Config/Swagger/XmlResponseTypesProcessor.cs | 5 ++--- .../Areas/Api/Config/Swagger/XmlTagProcessor.cs | 15 +-------------- .../Api/Controllers/Apps/AppClientsController.cs | 3 +-- .../Controllers/Apps/AppContributorsController.cs | 3 +-- .../Controllers/Apps/AppLanguagesController.cs | 3 +-- .../Api/Controllers/Apps/AppPatternsController.cs | 3 +-- .../Areas/Api/Controllers/Apps/AppsController.cs | 3 +-- .../Controllers/Assets/AssetContentController.cs | 3 +-- .../Api/Controllers/Assets/AssetsController.cs | 2 +- .../Backups/BackupContentController.cs | 3 +-- .../Api/Controllers/Backups/BackupsController.cs | 3 +-- .../Api/Controllers/History/HistoryController.cs | 3 +-- .../Controllers/Languages/LanguagesController.cs | 3 +-- .../Areas/Api/Controllers/Ping/PingController.cs | 3 +-- .../Api/Controllers/Plans/AppPlansController.cs | 6 ++---- .../Api/Controllers/Rules/RulesController.cs | 3 +-- .../Controllers/Schemas/SchemaFieldsController.cs | 3 +-- .../Api/Controllers/Schemas/SchemasController.cs | 3 +-- .../Controllers/Statistics/UsagesController.cs | 3 +-- .../Areas/Api/Controllers/UI/UIController.cs | 3 +-- .../Api/Controllers/Users/UsersController.cs | 3 +-- 23 files changed, 24 insertions(+), 59 deletions(-) diff --git a/src/Squidex/Areas/Api/Config/Swagger/SwaggerExtensions.cs b/src/Squidex/Areas/Api/Config/Swagger/SwaggerExtensions.cs index 1cdea31b5..07e0f2c6f 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/SwaggerExtensions.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/SwaggerExtensions.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System.Reflection; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; @@ -20,7 +19,7 @@ namespace Squidex.Areas.Api.Config.Swagger { var urlOptions = app.ApplicationServices.GetService>().Value; - app.UseSwagger(typeof(SwaggerExtensions).GetTypeInfo().Assembly, settings => + app.UseSwaggerWithApiExplorer(settings => { settings.AddAssetODataParams(); settings.ConfigureNames(); diff --git a/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs b/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs index e4367b418..44e95ba0d 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs @@ -106,7 +106,6 @@ namespace Squidex.Areas.Api.Config.Swagger settings.GeneratorSettings.DocumentProcessors.Add(new RuleActionProcessor()); settings.GeneratorSettings.DocumentProcessors.Add(new XmlTagProcessor()); - settings.GeneratorSettings.OperationProcessors.Add(new XmlTagProcessor()); settings.GeneratorSettings.OperationProcessors.Add(new XmlResponseTypesProcessor()); return settings; diff --git a/src/Squidex/Areas/Api/Config/Swagger/XmlResponseTypesProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/XmlResponseTypesProcessor.cs index aa3598de7..0c3d8f00f 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/XmlResponseTypesProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/XmlResponseTypesProcessor.cs @@ -43,7 +43,7 @@ namespace Squidex.Areas.Api.Config.Swagger response.Description = match.Groups["Description"].Value; - if (string.Equals(statusCode, "200", StringComparison.OrdinalIgnoreCase)) + if (statusCode == "200" || statusCode == "204") { hasOkResponse = true; } @@ -72,8 +72,7 @@ namespace Squidex.Areas.Api.Config.Swagger private static void RemoveOkResponse(SwaggerOperation operation) { if (operation.Responses.TryGetValue("200", out var response) && - response.Description != null && - response.Description.Contains("=>")) + response.Description?.Contains("=>") == true) { operation.Responses.Remove("200"); } diff --git a/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs index 6e63a03fb..42da7bfe4 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs @@ -16,7 +16,7 @@ using Squidex.Infrastructure.Tasks; namespace Squidex.Areas.Api.Config.Swagger { - public sealed class XmlTagProcessor : IOperationProcessor, IDocumentProcessor + public sealed class XmlTagProcessor : IDocumentProcessor { public Task ProcessAsync(DocumentProcessorContext context) { @@ -47,18 +47,5 @@ namespace Squidex.Areas.Api.Config.Swagger return TaskHelper.Done; } - - public Task ProcessAsync(OperationProcessorContext context) - { - var tagAttribute = context.MethodInfo.DeclaringType.GetTypeInfo().GetCustomAttribute(); - - if (tagAttribute != null) - { - context.OperationDescription.Operation.Tags.Clear(); - context.OperationDescription.Operation.Tags.Add(tagAttribute.Name); - } - - return TaskHelper.True; - } } } diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs index dff6510a1..1257d0e43 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure.Commands; @@ -23,7 +22,7 @@ namespace Squidex.Areas.Api.Controllers.Apps [ApiExceptionFilter] [AppApi] [MustBeAppEditor] - [SwaggerTag(nameof(Apps))] + [ApiExplorerSettings(GroupName = nameof(Apps))] public sealed class AppClientsController : ApiController { public AppClientsController(ICommandBus commandBus) diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs index edd1a33f1..4fcaa1a4c 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Apps.Services; @@ -23,7 +22,7 @@ namespace Squidex.Areas.Api.Controllers.Apps [ApiExceptionFilter] [AppApi] [MustBeAppOwner] - [SwaggerTag(nameof(Apps))] + [ApiExplorerSettings(GroupName = nameof(Apps))] public sealed class AppContributorsController : ApiController { private readonly IAppPlansProvider appPlansProvider; diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs index a2bcfdab4..b075f9968 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs @@ -8,7 +8,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure; @@ -23,7 +22,7 @@ namespace Squidex.Areas.Api.Controllers.Apps [ApiAuthorize] [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(Apps))] + [ApiExplorerSettings(GroupName = nameof(Apps))] public sealed class AppLanguagesController : ApiController { public AppLanguagesController(ICommandBus commandBus) diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs index 228a9061d..a57c8bff2 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs @@ -9,7 +9,6 @@ using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure.Commands; @@ -24,7 +23,7 @@ namespace Squidex.Areas.Api.Controllers.Apps [MustBeAppDeveloper] [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(Apps))] + [ApiExplorerSettings(GroupName = nameof(Apps))] public sealed class AppPatternsController : ApiController { public AppPatternsController(ICommandBus commandBus) diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs index 21ec8ad64..9030c316a 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs @@ -9,7 +9,6 @@ using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities.Apps.Commands; @@ -25,7 +24,7 @@ namespace Squidex.Areas.Api.Controllers.Apps /// [ApiAuthorize] [ApiExceptionFilter] - [SwaggerTag(nameof(Apps))] + [ApiExplorerSettings(GroupName = nameof(Apps))] public sealed class AppsController : ApiController { private readonly IAppProvider appProvider; diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs index d443cc17a..bd91cfa81 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs @@ -9,7 +9,6 @@ using System; using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; @@ -24,7 +23,7 @@ namespace Squidex.Areas.Api.Controllers.Assets /// [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(Assets))] + [ApiExplorerSettings(GroupName = nameof(Assets))] public sealed class AssetContentController : ApiController { private readonly IAssetStore assetStore; diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs index ece13037b..8008cb779 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs @@ -33,7 +33,7 @@ namespace Squidex.Areas.Api.Controllers.Assets [ApiAuthorize] [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(Assets))] + [ApiExplorerSettings(GroupName = nameof(Assets))] public sealed class AssetsController : ApiController { private readonly IAssetQueryService assetQuery; diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs index 0db366eef..09ddfe0ed 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs @@ -7,7 +7,6 @@ using System; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; using Squidex.Pipeline; @@ -19,7 +18,7 @@ namespace Squidex.Areas.Api.Controllers.Backups /// [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(Backups))] + [ApiExplorerSettings(GroupName = nameof(Backups))] public class BackupContentController : ApiController { private readonly IAssetStore assetStore; diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs index dc05949d1..2b8fa73e9 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs @@ -10,7 +10,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Orleans; using Squidex.Areas.Api.Controllers.Backups.Models; using Squidex.Domain.Apps.Entities.Backup; @@ -27,7 +26,7 @@ namespace Squidex.Areas.Api.Controllers.Backups [ApiExceptionFilter] [AppApi] [MustBeAppOwner] - [SwaggerTag(nameof(Backups))] + [ApiExplorerSettings(GroupName = nameof(Backups))] public class BackupsController : ApiController { private readonly IGrainFactory grainFactory; diff --git a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs index c908e8888..75a55c06e 100644 --- a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs +++ b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.History.Models; using Squidex.Domain.Apps.Entities.History.Repositories; using Squidex.Infrastructure.Commands; @@ -23,7 +22,7 @@ namespace Squidex.Areas.Api.Controllers.History [ApiExceptionFilter] [AppApi] [MustBeAppEditor] - [SwaggerTag(nameof(History))] + [ApiExplorerSettings(GroupName = nameof(History))] public sealed class HistoryController : ApiController { private readonly IHistoryEventRepository historyEventRepository; diff --git a/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs index e36ef7dc0..7e8fea639 100644 --- a/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs @@ -7,7 +7,6 @@ using System.Linq; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Pipeline; @@ -19,7 +18,7 @@ namespace Squidex.Areas.Api.Controllers.Languages /// [ApiAuthorize] [ApiExceptionFilter] - [SwaggerTag(nameof(Languages))] + [ApiExplorerSettings(GroupName = nameof(Languages))] public sealed class LanguagesController : ApiController { public LanguagesController(ICommandBus commandBus) diff --git a/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs b/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs index 6a497a432..8df454a9f 100644 --- a/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs +++ b/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs @@ -6,7 +6,6 @@ // ========================================================================== using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Infrastructure.Commands; using Squidex.Pipeline; @@ -16,7 +15,7 @@ namespace Squidex.Areas.Api.Controllers.Ping /// Makes a ping request. /// [ApiExceptionFilter] - [SwaggerTag(nameof(Ping))] + [ApiExplorerSettings(GroupName = nameof(Ping))] public sealed class PingController : ApiController { public PingController(ICommandBus commandBus) diff --git a/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs b/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs index 2fc575f5e..5998e0b12 100644 --- a/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs +++ b/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Plans.Models; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure.Commands; @@ -21,7 +20,7 @@ namespace Squidex.Areas.Api.Controllers.Plans [ApiAuthorize] [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(Plans))] + [ApiExplorerSettings(GroupName = nameof(Plans))] public sealed class AppPlansController : ApiController { private readonly IAppPlansProvider appPlansProvider; @@ -66,8 +65,7 @@ namespace Squidex.Areas.Api.Controllers.Plans /// The name of the app. /// Plan object that needs to be changed. /// - /// 201 => Redirected to checkout page. - /// 204 => Plan changed. + /// 200 => Plan changed or redirect url returned. /// 400 => Plan not owned by user. /// 404 => App not found. /// diff --git a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs index 1170416ce..28ee52be9 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs @@ -11,7 +11,6 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using NodaTime; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Rules.Models; using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities.Rules.Commands; @@ -29,7 +28,7 @@ namespace Squidex.Areas.Api.Controllers.Rules [ApiAuthorize] [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(Rules))] + [ApiExplorerSettings(GroupName = nameof(Rules))] [MustBeAppDeveloper] public sealed class RulesController : ApiController { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs index 0299cee87..a57e6a5a8 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Schemas.Models; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure.Commands; @@ -22,7 +21,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas [ApiExceptionFilter] [AppApi] [MustBeAppDeveloper] - [SwaggerTag(nameof(Schemas))] + [ApiExplorerSettings(GroupName = nameof(Schemas))] public sealed class SchemaFieldsController : ApiController { public SchemaFieldsController(ICommandBus commandBus) diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs index 16ad59a2d..ed2490360 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs @@ -9,7 +9,6 @@ using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Schemas.Models; using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities.Schemas; @@ -25,7 +24,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas [ApiAuthorize] [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(Schemas))] + [ApiExplorerSettings(GroupName = nameof(Schemas))] public sealed class SchemasController : ApiController { private readonly IAppProvider appProvider; diff --git a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs index 30eff2da8..0f8f3b6a3 100644 --- a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs @@ -10,7 +10,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Statistics.Models; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Domain.Apps.Entities.Assets.Repositories; @@ -27,7 +26,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics [ApiExceptionFilter] [AppApi] [MustBeAppEditor] - [SwaggerTag(nameof(Statistics))] + [ApiExplorerSettings(GroupName = nameof(Statistics))] public sealed class UsagesController : ApiController { private readonly IUsageTracker usageTracker; diff --git a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs index b15859cfc..ef6e2d51d 100644 --- a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs +++ b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using NSwag.Annotations; using Orleans; using Squidex.Areas.Api.Controllers.UI.Models; using Squidex.Config; @@ -25,7 +24,7 @@ namespace Squidex.Areas.Api.Controllers.UI [ApiAuthorize] [ApiExceptionFilter] [AppApi] - [SwaggerTag(nameof(UI))] + [ApiExplorerSettings(GroupName = nameof(UI))] public sealed class UIController : ApiController { private readonly MyUIOptions uiOptions; diff --git a/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs index 607f2047c..48660c06d 100644 --- a/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs @@ -12,7 +12,6 @@ using System.Net.Http; using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Users.Models; using Squidex.Domain.Users; using Squidex.Infrastructure.Commands; @@ -26,7 +25,7 @@ namespace Squidex.Areas.Api.Controllers.Users /// Readonly API to retrieve information about squidex users. /// [ApiExceptionFilter] - [SwaggerTag(nameof(Users))] + [ApiExplorerSettings(GroupName = nameof(Users))] public sealed class UsersController : ApiController { private static readonly byte[] AvatarBytes;