diff --git a/Squidex.sln b/Squidex.sln index 6d8cfb71d..26a5f4eeb 100644 --- a/Squidex.sln +++ b/Squidex.sln @@ -30,10 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrate_00", "tools\Migrate EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Shared", "src\Squidex.Shared\Squidex.Shared.csproj", "{5E75AB7D-6F01-4313-AFF1-7F7128FFD71F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{C9809D59-6665-471E-AD87-5AC624C65892}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "users", "users", "{C0D540F0-9158-4528-BFD8-BEAE6EAE45EA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Users", "src\Squidex.Domain.Users\Squidex.Domain.Users.csproj", "{F7771E22-47BD-45C4-A133-FD7F1DE27CA0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Users.MongoDb", "src\Squidex.Domain.Users.MongoDb\Squidex.Domain.Users.MongoDb.csproj", "{27CF800D-890F-4882-BF05-44EC3233537D}" @@ -61,12 +57,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Apps.Entitie EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrate_01", "tools\Migrate_01\Migrate_01.csproj", "{A4823E14-C0E5-4A4D-B28F-27424C25C3C7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Tests", "tests\Squidex.Tests\Squidex.Tests.csproj", "{7E8CC864-4C6E-496F-A672-9F9AD8874835}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Web.Tests", "tests\Squidex.Web.Tests\Squidex.Web.Tests.csproj", "{7E8CC864-4C6E-496F-A672-9F9AD8874835}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{FB8BC3A2-2010-4C3C-A87D-D4A98C05EE52}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Extensions", "extensions\Squidex.Extensions\Squidex.Extensions.csproj", "{F3C41B82-6A67-409A-B7FE-54543EE4F38B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{7EDE8CF1-B1E4-4005-B154-834B944E0D7A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Web", "src\Squidex.Web\Squidex.Web.csproj", "{5B2D251F-46E3-486A-AE16-E3FE06B559ED}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -337,35 +337,47 @@ Global {F3C41B82-6A67-409A-B7FE-54543EE4F38B}.Release|x64.Build.0 = Release|Any CPU {F3C41B82-6A67-409A-B7FE-54543EE4F38B}.Release|x86.ActiveCfg = Release|Any CPU {F3C41B82-6A67-409A-B7FE-54543EE4F38B}.Release|x86.Build.0 = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|x64.ActiveCfg = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|x64.Build.0 = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|x86.ActiveCfg = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Debug|x86.Build.0 = Debug|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|Any CPU.Build.0 = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|x64.ActiveCfg = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|x64.Build.0 = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|x86.ActiveCfg = Release|Any CPU + {5B2D251F-46E3-486A-AE16-E3FE06B559ED}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {25F66C64-058A-4D44-BC0C-F12A054F9A91} = {C9809D59-6665-471E-AD87-5AC624C65892} + {25F66C64-058A-4D44-BC0C-F12A054F9A91} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {7FD0A92B-7862-4BB1-932B-B52A9CACB56B} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {FD0AFD44-7A93-4F9E-B5ED-72582392E435} = {C9809D59-6665-471E-AD87-5AC624C65892} + {FD0AFD44-7A93-4F9E-B5ED-72582392E435} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {6A811927-3C37-430A-90F4-503E37123956} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {D7166C56-178A-4457-B56A-C615C7450DEE} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {C1E5BBB6-6B6A-4DE5-B19D-0538304DE343} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {945871B1-77B8-43FB-B53C-27CF385AB756} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {B51126A8-0D75-4A79-867D-10724EC6AC84} = {94207AA6-4923-4183-A558-E0F8196B8CA3} {5E75AB7D-6F01-4313-AFF1-7F7128FFD71F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {C9809D59-6665-471E-AD87-5AC624C65892} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} - {C0D540F0-9158-4528-BFD8-BEAE6EAE45EA} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} - {F7771E22-47BD-45C4-A133-FD7F1DE27CA0} = {C0D540F0-9158-4528-BFD8-BEAE6EAE45EA} - {27CF800D-890F-4882-BF05-44EC3233537D} = {C0D540F0-9158-4528-BFD8-BEAE6EAE45EA} - {42184546-E3CB-4D4F-9495-43979B9C63B9} = {C0D540F0-9158-4528-BFD8-BEAE6EAE45EA} + {F7771E22-47BD-45C4-A133-FD7F1DE27CA0} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} + {27CF800D-890F-4882-BF05-44EC3233537D} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} + {42184546-E3CB-4D4F-9495-43979B9C63B9} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} {EF75E488-1324-4E18-A1BD-D3A05AE67B1F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {7931187E-A1E6-4F89-8BC8-20A1E445579F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {F0A83301-50A5-40EA-A1A2-07C7858F5A3F} = {C9809D59-6665-471E-AD87-5AC624C65892} - {6B3F75B6-5888-468E-BA4F-4FC725DAEF31} = {C9809D59-6665-471E-AD87-5AC624C65892} - {79FEF326-CA5E-4698-B2BA-C16A4580B4D5} = {C9809D59-6665-471E-AD87-5AC624C65892} - {AA003372-CD8D-4DBC-962C-F61E0C93CF05} = {C9809D59-6665-471E-AD87-5AC624C65892} - {7DA5B308-D950-4496-93D5-21D6C4D91644} = {C9809D59-6665-471E-AD87-5AC624C65892} + {F0A83301-50A5-40EA-A1A2-07C7858F5A3F} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {6B3F75B6-5888-468E-BA4F-4FC725DAEF31} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {79FEF326-CA5E-4698-B2BA-C16A4580B4D5} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {AA003372-CD8D-4DBC-962C-F61E0C93CF05} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {7DA5B308-D950-4496-93D5-21D6C4D91644} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {A4823E14-C0E5-4A4D-B28F-27424C25C3C7} = {94207AA6-4923-4183-A558-E0F8196B8CA3} + {7E8CC864-4C6E-496F-A672-9F9AD8874835} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} {F3C41B82-6A67-409A-B7FE-54543EE4F38B} = {FB8BC3A2-2010-4C3C-A87D-D4A98C05EE52} + {5B2D251F-46E3-486A-AE16-E3FE06B559ED} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {02F2E872-3141-44F5-BD6A-33CD84E9FE08} diff --git a/src/Squidex.Web/ApiController.cs b/src/Squidex.Web/ApiController.cs new file mode 100644 index 000000000..5eb10a7bf --- /dev/null +++ b/src/Squidex.Web/ApiController.cs @@ -0,0 +1,60 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; +using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; + +namespace Squidex.Web +{ + [Area("Api")] + [ApiController] + [ApiExceptionFilter] + [ApiModelValidation(false)] + public abstract class ApiController : Controller + { + protected ICommandBus CommandBus { get; } + + protected IAppEntity App + { + get + { + var appFeature = HttpContext.Features.Get(); + + if (appFeature == null) + { + throw new InvalidOperationException("Not in a app context."); + } + + return appFeature.App; + } + } + + protected Guid AppId + { + get { return App.Id; } + } + + protected ApiController(ICommandBus commandBus) + { + Guard.NotNull(commandBus, nameof(commandBus)); + + CommandBus = commandBus; + } + + public override void OnActionExecuting(ActionExecutingContext context) + { + if (!context.HttpContext.Request.PathBase.StartsWithSegments("/api")) + { + context.Result = new RedirectResult("/"); + } + } + } +} diff --git a/src/Squidex/Pipeline/ApiCostsAttribute.cs b/src/Squidex.Web/ApiCostsAttribute.cs similarity index 93% rename from src/Squidex/Pipeline/ApiCostsAttribute.cs rename to src/Squidex.Web/ApiCostsAttribute.cs index 07cc48f18..0b07afc23 100644 --- a/src/Squidex/Pipeline/ApiCostsAttribute.cs +++ b/src/Squidex.Web/ApiCostsAttribute.cs @@ -7,8 +7,9 @@ using System; using Microsoft.AspNetCore.Mvc; +using Squidex.Web.Pipeline; -namespace Squidex.Pipeline +namespace Squidex.Web { [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] public sealed class ApiCostsAttribute : ServiceFilterAttribute, IApiCostsFeature diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex.Web/ApiExceptionFilterAttribute.cs similarity index 99% rename from src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs rename to src/Squidex.Web/ApiExceptionFilterAttribute.cs index a681860ad..65c6e8ac0 100644 --- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs +++ b/src/Squidex.Web/ApiExceptionFilterAttribute.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Squidex.Infrastructure; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ApiExceptionFilterAttribute : ActionFilterAttribute, IExceptionFilter { diff --git a/src/Squidex/Pipeline/ApiModelValidationAttribute.cs b/src/Squidex.Web/ApiModelValidationAttribute.cs similarity index 98% rename from src/Squidex/Pipeline/ApiModelValidationAttribute.cs rename to src/Squidex.Web/ApiModelValidationAttribute.cs index 41bb86156..df1a5a994 100644 --- a/src/Squidex/Pipeline/ApiModelValidationAttribute.cs +++ b/src/Squidex.Web/ApiModelValidationAttribute.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Newtonsoft.Json; using Squidex.Infrastructure; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ApiModelValidationAttribute : ActionFilterAttribute { diff --git a/src/Squidex/Pipeline/ApiPermissionAttribute.cs b/src/Squidex.Web/ApiPermissionAttribute.cs similarity index 92% rename from src/Squidex/Pipeline/ApiPermissionAttribute.cs rename to src/Squidex.Web/ApiPermissionAttribute.cs index 48cd75e62..1df4fd5e2 100644 --- a/src/Squidex/Pipeline/ApiPermissionAttribute.cs +++ b/src/Squidex.Web/ApiPermissionAttribute.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using IdentityServer4.AccessTokenValidation; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; @@ -15,7 +14,7 @@ using Squidex.Infrastructure.Security; using Squidex.Infrastructure.Tasks; using Squidex.Shared.Identity; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ApiPermissionAttribute : AuthorizeAttribute, IAsyncActionFilter { @@ -28,7 +27,7 @@ namespace Squidex.Pipeline public ApiPermissionAttribute(params string[] ids) { - AuthenticationSchemes = IdentityServerAuthenticationDefaults.AuthenticationScheme; + AuthenticationSchemes = "Bearer"; permissionIds = ids; } diff --git a/src/Squidex/Pipeline/AssetRequestSizeLimitAttribute.cs b/src/Squidex.Web/AssetRequestSizeLimitAttribute.cs similarity index 98% rename from src/Squidex/Pipeline/AssetRequestSizeLimitAttribute.cs rename to src/Squidex.Web/AssetRequestSizeLimitAttribute.cs index 17236e81a..2cc5479c4 100644 --- a/src/Squidex/Pipeline/AssetRequestSizeLimitAttribute.cs +++ b/src/Squidex.Web/AssetRequestSizeLimitAttribute.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Squidex.Domain.Apps.Entities.Assets; -namespace Squidex.Pipeline +namespace Squidex.Web { [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)] public sealed class AssetRequestSizeLimitAttribute : Attribute, IFilterFactory, IOrderedFilter diff --git a/src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs b/src/Squidex.Web/CommandMiddlewares/ETagCommandMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs rename to src/Squidex.Web/CommandMiddlewares/ETagCommandMiddleware.cs index ef14a8bb0..0ebb669f3 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs +++ b/src/Squidex.Web/CommandMiddlewares/ETagCommandMiddleware.cs @@ -13,7 +13,7 @@ using Microsoft.Net.Http.Headers; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class ETagCommandMiddleware : ICommandMiddleware { diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs b/src/Squidex.Web/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs rename to src/Squidex.Web/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs index 4baf4b814..0bff3a6c5 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs +++ b/src/Squidex.Web/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs @@ -13,7 +13,7 @@ using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Security; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class EnrichWithActorCommandMiddleware : ICommandMiddleware { diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs b/src/Squidex.Web/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs rename to src/Squidex.Web/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs index f41214737..06e050784 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs +++ b/src/Squidex.Web/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs @@ -13,7 +13,7 @@ using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public sealed class EnrichWithAppIdCommandMiddleware : ICommandMiddleware { diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs b/src/Squidex.Web/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs similarity index 98% rename from src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs rename to src/Squidex.Web/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs index f2d5ae42b..672a16b74 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs +++ b/src/Squidex.Web/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs @@ -14,7 +14,7 @@ using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public sealed class EnrichWithSchemaIdCommandMiddleware : ICommandMiddleware { diff --git a/src/Squidex/Config/Constants.cs b/src/Squidex.Web/Constants.cs similarity index 94% rename from src/Squidex/Config/Constants.cs rename to src/Squidex.Web/Constants.cs index 84cd529e3..23535e548 100644 --- a/src/Squidex/Config/Constants.cs +++ b/src/Squidex.Web/Constants.cs @@ -5,9 +5,9 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using IdentityServer4.Models; +using Squidex.Infrastructure; -namespace Squidex.Config +namespace Squidex.Web { public static class Constants { @@ -33,7 +33,7 @@ namespace Squidex.Config public static readonly string InternalClientId = "squidex-internal"; - public static readonly string InternalClientSecret = "squidex-internal".Sha256(); + public static readonly string InternalClientSecret = "squidex-internal".Sha256Base64(); public static readonly string IdentityServerPrefix = "/identity-server"; } diff --git a/src/Squidex/Pipeline/ETagExtensions.cs b/src/Squidex.Web/ETagExtensions.cs similarity index 98% rename from src/Squidex/Pipeline/ETagExtensions.cs rename to src/Squidex.Web/ETagExtensions.cs index d9f1d726c..5ee961a9d 100644 --- a/src/Squidex/Pipeline/ETagExtensions.cs +++ b/src/Squidex.Web/ETagExtensions.cs @@ -11,7 +11,7 @@ using System.Text; using Squidex.Infrastructure; using Squidex.Infrastructure.Log; -namespace Squidex.Pipeline +namespace Squidex.Web { public static class ETagExtensions { diff --git a/src/Squidex/Pipeline/ETagFilter.cs b/src/Squidex.Web/ETagFilter.cs similarity index 98% rename from src/Squidex/Pipeline/ETagFilter.cs rename to src/Squidex.Web/ETagFilter.cs index d14561734..b76772ad3 100644 --- a/src/Squidex/Pipeline/ETagFilter.cs +++ b/src/Squidex.Web/ETagFilter.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ETagFilter : IAsyncActionFilter { diff --git a/src/Squidex/Pipeline/ETagOptions.cs b/src/Squidex.Web/ETagOptions.cs similarity index 94% rename from src/Squidex/Pipeline/ETagOptions.cs rename to src/Squidex.Web/ETagOptions.cs index c54288e77..8e832dbca 100644 --- a/src/Squidex/Pipeline/ETagOptions.cs +++ b/src/Squidex.Web/ETagOptions.cs @@ -5,7 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ETagOptions { diff --git a/src/Squidex/Pipeline/EntityCreatedDto.cs b/src/Squidex.Web/EntityCreatedDto.cs similarity index 80% rename from src/Squidex/Pipeline/EntityCreatedDto.cs rename to src/Squidex.Web/EntityCreatedDto.cs index 9b768e652..95738823d 100644 --- a/src/Squidex/Pipeline/EntityCreatedDto.cs +++ b/src/Squidex.Web/EntityCreatedDto.cs @@ -8,19 +8,15 @@ using System.ComponentModel.DataAnnotations; using Squidex.Infrastructure.Commands; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class EntityCreatedDto { - /// - /// Id of the created entity. - /// [Required] + [Display(Description = "Id of the created entity.")] public string Id { get; set; } - - /// - /// The new version of the entity. - /// + + [Display(Description = "The new version of the entity.")] public long Version { get; set; } public static EntityCreatedDto FromResult(EntityCreatedResult result) diff --git a/src/Squidex/Pipeline/ErrorDto.cs b/src/Squidex.Web/ErrorDto.cs similarity index 69% rename from src/Squidex/Pipeline/ErrorDto.cs rename to src/Squidex.Web/ErrorDto.cs index 535a9e602..2d3e8f6be 100644 --- a/src/Squidex/Pipeline/ErrorDto.cs +++ b/src/Squidex.Web/ErrorDto.cs @@ -7,24 +7,18 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class ErrorDto { - /// - /// Error message. - /// [Required] + [Display(Description = "Error message.")] public string Message { get; set; } - - /// - /// Detailed error messages. - /// + + [Display(Description = "Detailed error messages.")] public string[] Details { get; set; } - - /// - /// Status code of the http response. - /// + + [Display(Description = "Status code of the http response.")] public int? StatusCode { get; set; } = 400; } } diff --git a/src/Squidex/Pipeline/Extensions.cs b/src/Squidex.Web/Extensions.cs similarity index 96% rename from src/Squidex/Pipeline/Extensions.cs rename to src/Squidex.Web/Extensions.cs index 98f693727..b7f7594bf 100644 --- a/src/Squidex/Pipeline/Extensions.cs +++ b/src/Squidex.Web/Extensions.cs @@ -6,10 +6,9 @@ // ========================================================================== using System.Security.Claims; -using Squidex.Config; using Squidex.Infrastructure.Security; -namespace Squidex.Pipeline +namespace Squidex.Web { public static class Extensions { diff --git a/src/Squidex/Pipeline/FileCallbackResult.cs b/src/Squidex.Web/FileCallbackResult.cs similarity index 93% rename from src/Squidex/Pipeline/FileCallbackResult.cs rename to src/Squidex.Web/FileCallbackResult.cs index 5cc764a99..5ca752eea 100644 --- a/src/Squidex/Pipeline/FileCallbackResult.cs +++ b/src/Squidex.Web/FileCallbackResult.cs @@ -10,8 +10,9 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; +using Squidex.Web.Pipeline; -namespace Squidex.Pipeline +namespace Squidex.Web { public sealed class FileCallbackResult : FileResult { diff --git a/src/Squidex/Pipeline/IApiCostsFeature.cs b/src/Squidex.Web/IApiCostsFeature.cs similarity index 94% rename from src/Squidex/Pipeline/IApiCostsFeature.cs rename to src/Squidex.Web/IApiCostsFeature.cs index f4cfa1b97..9f1e380f5 100644 --- a/src/Squidex/Pipeline/IApiCostsFeature.cs +++ b/src/Squidex.Web/IApiCostsFeature.cs @@ -5,7 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -namespace Squidex.Pipeline +namespace Squidex.Web { public interface IApiCostsFeature { diff --git a/src/Squidex/Pipeline/IAppFeature.cs b/src/Squidex.Web/IAppFeature.cs similarity index 94% rename from src/Squidex/Pipeline/IAppFeature.cs rename to src/Squidex.Web/IAppFeature.cs index d8a23b925..a798da598 100644 --- a/src/Squidex/Pipeline/IAppFeature.cs +++ b/src/Squidex.Web/IAppFeature.cs @@ -7,7 +7,7 @@ using Squidex.Domain.Apps.Entities.Apps; -namespace Squidex.Pipeline +namespace Squidex.Web { public interface IAppFeature { diff --git a/src/Squidex/Pipeline/IGenerateEtag.cs b/src/Squidex.Web/IGenerateEtag.cs similarity index 94% rename from src/Squidex/Pipeline/IGenerateEtag.cs rename to src/Squidex.Web/IGenerateEtag.cs index e1f0c8789..6986f1acc 100644 --- a/src/Squidex/Pipeline/IGenerateEtag.cs +++ b/src/Squidex.Web/IGenerateEtag.cs @@ -7,7 +7,7 @@ using System; -namespace Squidex.Pipeline +namespace Squidex.Web { public interface IGenerateETag { diff --git a/src/Squidex/Pipeline/MeasureResultFilter.cs b/src/Squidex.Web/MeasureResultFilter.cs similarity index 97% rename from src/Squidex/Pipeline/MeasureResultFilter.cs rename to src/Squidex.Web/MeasureResultFilter.cs index 2d22afd65..de2220f32 100644 --- a/src/Squidex/Pipeline/MeasureResultFilter.cs +++ b/src/Squidex.Web/MeasureResultFilter.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Filters; using Squidex.Infrastructure.Log; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class MeasureResultFilter : IAsyncResultFilter, IAsyncActionFilter { diff --git a/src/Squidex/Areas/Api/Controllers/MyJsonInheritanceConverter.cs b/src/Squidex.Web/MyJsonInheritanceConverter.cs similarity index 98% rename from src/Squidex/Areas/Api/Controllers/MyJsonInheritanceConverter.cs rename to src/Squidex.Web/MyJsonInheritanceConverter.cs index ed16e20b3..ff3a1854e 100644 --- a/src/Squidex/Areas/Api/Controllers/MyJsonInheritanceConverter.cs +++ b/src/Squidex.Web/MyJsonInheritanceConverter.cs @@ -16,7 +16,7 @@ using Squidex.Infrastructure; #pragma warning disable RECS0108 // Warns about static fields in generic types -namespace Squidex.Areas.Api.Controllers +namespace Squidex.Web { public class MyJsonInheritanceConverter : JsonInheritanceConverter { diff --git a/src/Squidex/Pipeline/ActionContextLogAppender.cs b/src/Squidex.Web/Pipeline/ActionContextLogAppender.cs similarity index 93% rename from src/Squidex/Pipeline/ActionContextLogAppender.cs rename to src/Squidex.Web/Pipeline/ActionContextLogAppender.cs index 97c6060b3..8db6973d1 100644 --- a/src/Squidex/Pipeline/ActionContextLogAppender.cs +++ b/src/Squidex.Web/Pipeline/ActionContextLogAppender.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Infrastructure; using Squidex.Infrastructure.Log; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class ActionContextLogAppender : ILogAppender { @@ -57,9 +57,9 @@ namespace Squidex.Pipeline { w.WriteObject("routeValues", actionContext.ActionDescriptor.RouteValues, (routeValues, r) => { - foreach (var (key, val) in routeValues) + foreach (var kvp in routeValues) { - r.WriteProperty(key, val); + r.WriteProperty(kvp.Key, kvp.Value); } }); } diff --git a/src/Squidex/Pipeline/ApiCostsFilter.cs b/src/Squidex.Web/Pipeline/ApiCostsFilter.cs similarity index 98% rename from src/Squidex/Pipeline/ApiCostsFilter.cs rename to src/Squidex.Web/Pipeline/ApiCostsFilter.cs index 2dc93f326..0859a26c3 100644 --- a/src/Squidex/Pipeline/ApiCostsFilter.cs +++ b/src/Squidex.Web/Pipeline/ApiCostsFilter.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Security; using Squidex.Infrastructure.UsageTracking; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class ApiCostsFilter : IAsyncActionFilter, IFilterContainer { diff --git a/src/Squidex/Pipeline/ApiPermissionUnifier.cs b/src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs similarity index 97% rename from src/Squidex/Pipeline/ApiPermissionUnifier.cs rename to src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs index 98be130af..1751b1241 100644 --- a/src/Squidex/Pipeline/ApiPermissionUnifier.cs +++ b/src/Squidex.Web/Pipeline/ApiPermissionUnifier.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Authentication; using Squidex.Shared; using Squidex.Shared.Identity; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class ApiPermissionUnifier : IClaimsTransformation { diff --git a/src/Squidex/Pipeline/AppResolver.cs b/src/Squidex.Web/Pipeline/AppResolver.cs similarity index 99% rename from src/Squidex/Pipeline/AppResolver.cs rename to src/Squidex.Web/Pipeline/AppResolver.cs index 705bfae79..bafbbe24c 100644 --- a/src/Squidex/Pipeline/AppResolver.cs +++ b/src/Squidex.Web/Pipeline/AppResolver.cs @@ -17,7 +17,7 @@ using Squidex.Infrastructure.Security; using Squidex.Shared; using Squidex.Shared.Identity; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class AppResolver : IAsyncActionFilter { diff --git a/src/Squidex/Pipeline/CleanupHostMiddleware.cs b/src/Squidex.Web/Pipeline/CleanupHostMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/CleanupHostMiddleware.cs rename to src/Squidex.Web/Pipeline/CleanupHostMiddleware.cs index 504a5a455..82c98ad21 100644 --- a/src/Squidex/Pipeline/CleanupHostMiddleware.cs +++ b/src/Squidex.Web/Pipeline/CleanupHostMiddleware.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public class CleanupHostMiddleware { diff --git a/src/Squidex/Pipeline/EnforceHttpsMiddleware.cs b/src/Squidex.Web/Pipeline/EnforceHttpsMiddleware.cs similarity index 88% rename from src/Squidex/Pipeline/EnforceHttpsMiddleware.cs rename to src/Squidex.Web/Pipeline/EnforceHttpsMiddleware.cs index 4f4c6158e..499b683f2 100644 --- a/src/Squidex/Pipeline/EnforceHttpsMiddleware.cs +++ b/src/Squidex.Web/Pipeline/EnforceHttpsMiddleware.cs @@ -9,15 +9,14 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; -using Squidex.Config; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class EnforceHttpsMiddleware : IMiddleware { - private readonly IOptions urls; + private readonly IOptions urls; - public EnforceHttpsMiddleware(IOptions urls) + public EnforceHttpsMiddleware(IOptions urls) { this.urls = urls; } diff --git a/src/Squidex/Pipeline/FileCallbackResultExecutor.cs b/src/Squidex.Web/Pipeline/FileCallbackResultExecutor.cs similarity index 97% rename from src/Squidex/Pipeline/FileCallbackResultExecutor.cs rename to src/Squidex.Web/Pipeline/FileCallbackResultExecutor.cs index 5033af37f..fc8b011d7 100644 --- a/src/Squidex/Pipeline/FileCallbackResultExecutor.cs +++ b/src/Squidex.Web/Pipeline/FileCallbackResultExecutor.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.Extensions.Logging; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class FileCallbackResultExecutor : FileResultExecutorBase { diff --git a/src/Squidex/Pipeline/LocalCacheMiddleware.cs b/src/Squidex.Web/Pipeline/LocalCacheMiddleware.cs similarity index 97% rename from src/Squidex/Pipeline/LocalCacheMiddleware.cs rename to src/Squidex.Web/Pipeline/LocalCacheMiddleware.cs index 064e6a520..b9f050191 100644 --- a/src/Squidex/Pipeline/LocalCacheMiddleware.cs +++ b/src/Squidex.Web/Pipeline/LocalCacheMiddleware.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http; using Squidex.Infrastructure; using Squidex.Infrastructure.Caching; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class LocalCacheMiddleware : IMiddleware { diff --git a/src/Squidex/Pipeline/RequestLogPerformanceMiddleware.cs b/src/Squidex.Web/Pipeline/RequestLogPerformanceMiddleware.cs similarity index 98% rename from src/Squidex/Pipeline/RequestLogPerformanceMiddleware.cs rename to src/Squidex.Web/Pipeline/RequestLogPerformanceMiddleware.cs index 87915019a..c2e3c7006 100644 --- a/src/Squidex/Pipeline/RequestLogPerformanceMiddleware.cs +++ b/src/Squidex.Web/Pipeline/RequestLogPerformanceMiddleware.cs @@ -11,7 +11,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Security; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public sealed class RequestLogPerformanceMiddleware : IMiddleware { diff --git a/src/Squidex/Pipeline/UrlGenerator.cs b/src/Squidex.Web/Services/UrlGenerator.cs similarity index 92% rename from src/Squidex/Pipeline/UrlGenerator.cs rename to src/Squidex.Web/Services/UrlGenerator.cs index d2c1266e7..ef2bab32d 100644 --- a/src/Squidex/Pipeline/UrlGenerator.cs +++ b/src/Squidex.Web/Services/UrlGenerator.cs @@ -7,7 +7,6 @@ using System; using Microsoft.Extensions.Options; -using Squidex.Config; using Squidex.Domain.Apps.Core.ConvertContent; using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Entities.Apps; @@ -18,16 +17,16 @@ using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; -namespace Squidex.Pipeline +namespace Squidex.Web.Services { public sealed class UrlGenerator : IGraphQLUrlGenerator, IRuleUrlGenerator, IAssetUrlGenerator { private readonly IAssetStore assetStore; - private readonly MyUrlsOptions urlsOptions; + private readonly UrlsOptions urlsOptions; public bool CanGenerateAssetSourceUrl { get; } - public UrlGenerator(IOptions urlsOptions, IAssetStore assetStore, bool allowAssetSourceUrl) + public UrlGenerator(IOptions urlsOptions, IAssetStore assetStore, bool allowAssetSourceUrl) { this.assetStore = assetStore; this.urlsOptions = urlsOptions.Value; diff --git a/src/Squidex.Web/Squidex.Web.csproj b/src/Squidex.Web/Squidex.Web.csproj new file mode 100644 index 000000000..bbe645f13 --- /dev/null +++ b/src/Squidex.Web/Squidex.Web.csproj @@ -0,0 +1,23 @@ + + + netstandard2.0 + 7.3 + + + full + True + + + + + + + + + + ..\..\Squidex.ruleset + + + + + diff --git a/src/Squidex/Config/MyUrlsOptions.cs b/src/Squidex.Web/UrlsOptions.cs similarity index 93% rename from src/Squidex/Config/MyUrlsOptions.cs rename to src/Squidex.Web/UrlsOptions.cs index 32e4022c0..b45390301 100644 --- a/src/Squidex/Config/MyUrlsOptions.cs +++ b/src/Squidex.Web/UrlsOptions.cs @@ -7,9 +7,9 @@ using Squidex.Infrastructure; -namespace Squidex.Config +namespace Squidex.Web { - public sealed class MyUrlsOptions + public sealed class UrlsOptions { public bool EnforceHTTPS { get; set; } diff --git a/src/Squidex/Config/MyUsageOptions.cs b/src/Squidex.Web/UsageOptions.cs similarity index 89% rename from src/Squidex/Config/MyUsageOptions.cs rename to src/Squidex.Web/UsageOptions.cs index 339c665bc..c9502e38e 100644 --- a/src/Squidex/Config/MyUsageOptions.cs +++ b/src/Squidex.Web/UsageOptions.cs @@ -7,9 +7,9 @@ using Squidex.Domain.Apps.Entities.Apps.Services.Implementations; -namespace Squidex.Config +namespace Squidex.Web { - public class MyUsageOptions + public sealed class UsageOptions { public ConfigAppLimitsPlan[] Plans { get; set; } } diff --git a/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs index e0d01097e..9bd4f0b70 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs @@ -13,9 +13,8 @@ using Microsoft.AspNetCore.Authorization; using NSwag; using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; -using Squidex.Config; using Squidex.Infrastructure.Tasks; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Config.Swagger { diff --git a/src/Squidex/Areas/Api/Config/Swagger/SecurityProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/SecurityProcessor.cs index 9133a2e86..2b5b5b24c 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/SecurityProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/SecurityProcessor.cs @@ -9,19 +9,19 @@ using System.Collections.Generic; using Microsoft.Extensions.Options; using NSwag; using NSwag.SwaggerGeneration.Processors.Security; -using Squidex.Config; using Squidex.Pipeline.Swagger; +using Squidex.Web; namespace Squidex.Areas.Api.Config.Swagger { public class SecurityProcessor : SecurityDefinitionAppender { - public SecurityProcessor(IOptions urlOptions) + public SecurityProcessor(IOptions urlOptions) : base(Constants.SecurityDefinition, CreateOAuthSchema(urlOptions.Value)) { } - private static SwaggerSecurityScheme CreateOAuthSchema(MyUrlsOptions urlOptions) + private static SwaggerSecurityScheme CreateOAuthSchema(UrlsOptions urlOptions) { var securityScheme = new SwaggerSecurityScheme(); diff --git a/src/Squidex/Areas/Api/Config/Swagger/ThemeProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/ThemeProcessor.cs index b69e54972..bc5106af9 100644 --- a/src/Squidex/Areas/Api/Config/Swagger/ThemeProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/ThemeProcessor.cs @@ -10,8 +10,8 @@ using System.Threading.Tasks; using Microsoft.Extensions.Options; using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; -using Squidex.Config; using Squidex.Infrastructure.Tasks; +using Squidex.Web; namespace Squidex.Areas.Api.Config.Swagger { @@ -21,7 +21,7 @@ namespace Squidex.Areas.Api.Config.Swagger private readonly string url; - public ThemeProcessor(IOptions urlOptions) + public ThemeProcessor(IOptions urlOptions) { url = urlOptions.Value.BuildUrl("images/logo-white.png", false); } diff --git a/src/Squidex/Areas/Api/Controllers/ApiController.cs b/src/Squidex/Areas/Api/Controllers/ApiController.cs index e991604c3..03ccc89c1 100644 --- a/src/Squidex/Areas/Api/Controllers/ApiController.cs +++ b/src/Squidex/Areas/Api/Controllers/ApiController.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs index 085170779..f60427864 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs @@ -12,8 +12,8 @@ using Microsoft.Net.Http.Headers; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs index 571d9be66..d8af9f53b 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs @@ -13,8 +13,8 @@ using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs index 4165652f7..17ce8c320 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs @@ -13,8 +13,8 @@ using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs index a31267774..29783a09e 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs @@ -13,8 +13,8 @@ using Microsoft.Net.Http.Headers; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs index a8aacc1ba..e146c90b3 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs @@ -13,8 +13,8 @@ using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs index fb765658c..4219f42dd 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs @@ -16,9 +16,9 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Security; -using Squidex.Pipeline; using Squidex.Shared; using Squidex.Shared.Identity; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs index e2245fb41..7fe96d7bc 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs @@ -14,8 +14,8 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Security; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Apps.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs index a83185c66..9475c951d 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Log; -using Squidex.Pipeline; +using Squidex.Web; #pragma warning disable 1573 diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs index d467d6543..0d00940d3 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs @@ -23,8 +23,8 @@ using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Assets { diff --git a/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs index e0ce409c5..733a3ab18 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs @@ -12,7 +12,7 @@ using NodaTime; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Assets.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs index ba2dbe410..25c965033 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Backups { diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs index 3c433fbdb..0198fa186 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs @@ -15,8 +15,8 @@ using Squidex.Domain.Apps.Entities.Backup; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Tasks; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Backups { diff --git a/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs b/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs index d564e8d11..6ad1cf1c0 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs @@ -13,8 +13,8 @@ using Squidex.Domain.Apps.Entities.Backup; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Orleans; using Squidex.Infrastructure.Security; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Backups { diff --git a/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs b/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs index 281c63f67..5603ec207 100644 --- a/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs @@ -15,8 +15,8 @@ using Squidex.Domain.Apps.Entities.Comments; using Squidex.Domain.Apps.Entities.Comments.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Comments { diff --git a/src/Squidex/Areas/Api/Controllers/Contents/ContentSwaggerController.cs b/src/Squidex/Areas/Api/Controllers/Contents/ContentSwaggerController.cs index aaf2aadf3..c06a178c5 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/ContentSwaggerController.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/ContentSwaggerController.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.Contents.Generator; using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents { diff --git a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs index 4ea013deb..ec36149e1 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs @@ -20,9 +20,9 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.Contents.GraphQL; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; using Squidex.Shared.Identity; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents { diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs index 6f5812945..7809731b0 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs @@ -10,13 +10,13 @@ using System.Collections.Generic; using System.Linq; using NJsonSchema; using NSwag; -using Squidex.Config; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.GenerateJsonSchema; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Infrastructure; using Squidex.Pipeline.Swagger; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents.Generator { diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs index 0ab353afb..e2e7a8d2c 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs @@ -18,23 +18,23 @@ using NSwag.SwaggerGeneration; using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; using Squidex.Areas.Api.Config.Swagger; -using Squidex.Config; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Pipeline.Swagger; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents.Generator { public sealed class SchemasSwaggerGenerator { - private readonly MyUrlsOptions urlOptions; + private readonly UrlsOptions urlOptions; private readonly SwaggerDocumentSettings settings = new SwaggerDocumentSettings(); private SwaggerJsonSchemaGenerator schemaGenerator; private SwaggerDocument document; private JsonSchemaResolver schemaResolver; - public SchemasSwaggerGenerator(IOptions urlOptions, IEnumerable documentProcessors) + public SchemasSwaggerGenerator(IOptions urlOptions, IEnumerable documentProcessors) { this.urlOptions = urlOptions.Value; diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs b/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs index 12fdd6cb4..5e896298b 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs @@ -16,7 +16,7 @@ using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Reflection; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Contents.Models { diff --git a/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs index f8a2c9d0d..1369eb9c7 100644 --- a/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs +++ b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs @@ -13,8 +13,8 @@ using Squidex.Areas.Api.Controllers.EventConsumers.Models; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.Orleans; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.EventConsumers { diff --git a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs index e09a2aa94..bb5b5fc57 100644 --- a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs +++ b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs @@ -11,8 +11,8 @@ using Squidex.Areas.Api.Controllers.History.Models; using Squidex.Domain.Apps.Entities.History; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.History { diff --git a/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs index 77ca6fed2..85f5c5133 100644 --- a/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Net.Http.Headers; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Languages { diff --git a/src/Squidex/Areas/Api/Controllers/News/NewsController.cs b/src/Squidex/Areas/Api/Controllers/News/NewsController.cs index e80dc19b7..f163227f0 100644 --- a/src/Squidex/Areas/Api/Controllers/News/NewsController.cs +++ b/src/Squidex/Areas/Api/Controllers/News/NewsController.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.News.Models; using Squidex.Areas.Api.Controllers.News.Service; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.News { diff --git a/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs b/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs index c27e14477..22a0254ad 100644 --- a/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs +++ b/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs @@ -7,8 +7,8 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Ping { diff --git a/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs b/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs index 5b5a8fe65..9490a4f48 100644 --- a/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs +++ b/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs @@ -11,8 +11,8 @@ using Microsoft.Net.Http.Headers; using Squidex.Areas.Api.Controllers.Plans.Models; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Plans { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs index 50b4446e0..8f1da7b9e 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionConverter.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using Squidex.Domain.Apps.Core.Rules; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs index a782c9e2d..4ee256530 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs @@ -14,7 +14,7 @@ using Squidex.Domain.Apps.Core.Rules; using Squidex.Domain.Apps.Entities.Rules; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs index 7671db829..9ac6cd699 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs @@ -10,6 +10,7 @@ using System.Linq; using System.Runtime.Serialization; using Newtonsoft.Json; using Squidex.Domain.Apps.Core.Rules; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs index edecc7b6f..b657ef1cf 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs @@ -19,8 +19,8 @@ using Squidex.Domain.Apps.Entities.Rules.Commands; using Squidex.Domain.Apps.Entities.Rules.Repositories; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Rules { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs index afb21c6b9..02376143b 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Runtime.Serialization; using Newtonsoft.Json; using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Schemas.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs index 73794552f..f66d64d23 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs @@ -11,7 +11,7 @@ using NodaTime; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Schemas.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs index 048607c97..74a36f916 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs @@ -10,8 +10,8 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.Schemas.Models; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Schemas { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs index 777495ffd..1fb64ec83 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs @@ -15,8 +15,8 @@ using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Schemas { diff --git a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs index 86287b9b0..d7a7f4eaa 100644 --- a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs @@ -13,14 +13,13 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Squidex.Areas.Api.Controllers.Statistics.Models; -using Squidex.Config; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.UsageTracking; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Statistics { @@ -35,7 +34,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics private readonly IAppPlansProvider appPlansProvider; private readonly IAssetUsageTracker assetStatsRepository; private readonly IDataProtector dataProtector; - private readonly MyUrlsOptions urlsOptions; + private readonly UrlsOptions urlsOptions; public UsagesController( ICommandBus commandBus, @@ -44,7 +43,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics IAppPlansProvider appPlansProvider, IAssetUsageTracker assetStatsRepository, IDataProtectionProvider dataProtection, - IOptions urlsOptions) + IOptions urlsOptions) : base(commandBus) { this.usageTracker = usageTracker; diff --git a/src/Squidex/Areas/Api/Controllers/Translations/TranslationsController.cs b/src/Squidex/Areas/Api/Controllers/Translations/TranslationsController.cs index e5fbe040e..5fc5cd8e4 100644 --- a/src/Squidex/Areas/Api/Controllers/Translations/TranslationsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Translations/TranslationsController.cs @@ -10,8 +10,8 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.Translations.Models; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Translations; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Translations { diff --git a/src/Squidex/Config/MyUIOptions.cs b/src/Squidex/Areas/Api/Controllers/UI/MyUIOptions.cs similarity index 95% rename from src/Squidex/Config/MyUIOptions.cs rename to src/Squidex/Areas/Api/Controllers/UI/MyUIOptions.cs index 5ac51ece4..5d87d6df8 100644 --- a/src/Squidex/Config/MyUIOptions.cs +++ b/src/Squidex/Areas/Api/Controllers/UI/MyUIOptions.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; -namespace Squidex.Config +namespace Squidex.Areas.Api.Controllers.UI { public sealed class MyUIOptions { diff --git a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs index 635f620ac..1de619114 100644 --- a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs +++ b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs @@ -10,11 +10,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Orleans; using Squidex.Areas.Api.Controllers.UI.Models; -using Squidex.Config; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Orleans; -using Squidex.Pipeline; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.UI { diff --git a/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs b/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs index ef7e8cb65..7d547be14 100644 --- a/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs @@ -15,8 +15,8 @@ using Squidex.Domain.Users; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Security; -using Squidex.Pipeline; using Squidex.Shared; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Users { diff --git a/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs index ea9cc4de7..406510caf 100644 --- a/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs @@ -15,8 +15,8 @@ using Squidex.Areas.Api.Controllers.Users.Models; using Squidex.Domain.Users; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Log; -using Squidex.Pipeline; using Squidex.Shared.Users; +using Squidex.Web; namespace Squidex.Areas.Api.Controllers.Users { diff --git a/src/Squidex/Areas/Api/Startup.cs b/src/Squidex/Areas/Api/Startup.cs index 5d2cefaa6..55e2383fc 100644 --- a/src/Squidex/Areas/Api/Startup.cs +++ b/src/Squidex/Areas/Api/Startup.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Builder; using Squidex.Areas.Api.Config.Swagger; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Areas.Api { diff --git a/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs b/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs index ef07a13b6..8ede8a1bb 100644 --- a/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs +++ b/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs @@ -16,9 +16,9 @@ using Microsoft.AspNetCore.DataProtection.Repositories; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Squidex.Config; using Squidex.Domain.Users; using Squidex.Shared.Identity; +using Squidex.Web; namespace Squidex.Areas.IdentityServer.Config { diff --git a/src/Squidex/Areas/IdentityServer/Config/LazyClientStore.cs b/src/Squidex/Areas/IdentityServer/Config/LazyClientStore.cs index af60dc5e3..c4b619466 100644 --- a/src/Squidex/Areas/IdentityServer/Config/LazyClientStore.cs +++ b/src/Squidex/Areas/IdentityServer/Config/LazyClientStore.cs @@ -17,9 +17,9 @@ using Squidex.Config; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure; -using Squidex.Pipeline; using Squidex.Shared; using Squidex.Shared.Identity; +using Squidex.Web; namespace Squidex.Areas.IdentityServer.Config { @@ -29,7 +29,7 @@ namespace Squidex.Areas.IdentityServer.Config private readonly Dictionary staticClients = new Dictionary(StringComparer.OrdinalIgnoreCase); public LazyClientStore( - IOptions urlsOptions, + IOptions urlsOptions, IOptions identityOptions, IAppProvider appProvider) { @@ -89,7 +89,7 @@ namespace Squidex.Areas.IdentityServer.Config }; } - private void CreateStaticClients(IOptions urlsOptions, IOptions identityOptions) + private void CreateStaticClients(IOptions urlsOptions, IOptions identityOptions) { foreach (var client in CreateStaticClients(urlsOptions.Value, identityOptions.Value)) { @@ -97,7 +97,7 @@ namespace Squidex.Areas.IdentityServer.Config } } - private static IEnumerable CreateStaticClients(MyUrlsOptions urlsOptions, MyIdentityOptions identityOptions) + private static IEnumerable CreateStaticClients(UrlsOptions urlsOptions, MyIdentityOptions identityOptions) { var frontendId = Constants.FrontendClient; diff --git a/src/Squidex/Areas/IdentityServer/Startup.cs b/src/Squidex/Areas/IdentityServer/Startup.cs index e98f0aff3..d46ab509e 100644 --- a/src/Squidex/Areas/IdentityServer/Startup.cs +++ b/src/Squidex/Areas/IdentityServer/Startup.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Squidex.Areas.IdentityServer.Config; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Areas.IdentityServer { diff --git a/src/Squidex/Areas/OrleansDashboard/Startup.cs b/src/Squidex/Areas/OrleansDashboard/Startup.cs index d8b5da6f8..943057450 100644 --- a/src/Squidex/Areas/OrleansDashboard/Startup.cs +++ b/src/Squidex/Areas/OrleansDashboard/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Builder; using Orleans; using Squidex.Areas.OrleansDashboard.Middlewares; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Areas.OrleansDashboard { diff --git a/src/Squidex/Areas/Portal/Startup.cs b/src/Squidex/Areas/Portal/Startup.cs index 70490676a..88cc7646b 100644 --- a/src/Squidex/Areas/Portal/Startup.cs +++ b/src/Squidex/Areas/Portal/Startup.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Builder; using Squidex.Areas.Portal.Middlewares; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Areas.Portal { diff --git a/src/Squidex/Config/Authentication/IdentityServerServices.cs b/src/Squidex/Config/Authentication/IdentityServerServices.cs index bcf0b9916..deb1a9ad1 100644 --- a/src/Squidex/Config/Authentication/IdentityServerServices.cs +++ b/src/Squidex/Config/Authentication/IdentityServerServices.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Infrastructure; +using Squidex.Web; namespace Squidex.Config.Authentication { @@ -20,7 +21,7 @@ namespace Squidex.Config.Authentication { var apiScope = Constants.ApiScope; - var urlsOptions = config.GetSection("urls").Get(); + var urlsOptions = config.GetSection("urls").Get(); if (!string.IsNullOrWhiteSpace(urlsOptions.BaseUrl)) { diff --git a/src/Squidex/Config/Authentication/OidcServices.cs b/src/Squidex/Config/Authentication/OidcServices.cs index 9d344601b..533baa295 100644 --- a/src/Squidex/Config/Authentication/OidcServices.cs +++ b/src/Squidex/Config/Authentication/OidcServices.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.Extensions.DependencyInjection; +using Squidex.Web; namespace Squidex.Config.Authentication { diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index 0ae7ce401..5f9f788db 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.Options; using Migrate_01; using Migrate_01.Migrations; using Orleans; +using Squidex.Areas.Api.Controllers.UI; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.ConvertContent; using Squidex.Domain.Apps.Core.HandleRules; @@ -44,11 +45,11 @@ using Squidex.Domain.Apps.Entities.Tags; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; -using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.Migrations; using Squidex.Infrastructure.Orleans; -using Squidex.Pipeline; -using Squidex.Pipeline.CommandMiddlewares; +using Squidex.Web; +using Squidex.Web.CommandMiddlewares; +using Squidex.Web.Services; namespace Squidex.Config.Domain { @@ -59,7 +60,7 @@ namespace Squidex.Config.Domain var exposeSourceUrl = config.GetOptionalValue("assetStore:exposeSourceUrl", true); services.AddSingletonAs(c => new UrlGenerator( - c.GetRequiredService>(), + c.GetRequiredService>(), c.GetRequiredService(), exposeSourceUrl)) .As().As().As(); diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index 60c4d6333..f78858a8c 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -10,7 +10,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Infrastructure.Log; -using Squidex.Pipeline; +using Squidex.Web.Pipeline; namespace Squidex.Config.Domain { diff --git a/src/Squidex/Config/Domain/SubscriptionServices.cs b/src/Squidex/Config/Domain/SubscriptionServices.cs index f5f8ad07b..82e370e7b 100644 --- a/src/Squidex/Config/Domain/SubscriptionServices.cs +++ b/src/Squidex/Config/Domain/SubscriptionServices.cs @@ -12,6 +12,7 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Domain.Apps.Entities.Apps.Services.Implementations; using Squidex.Domain.Users; using Squidex.Infrastructure; +using Squidex.Web; namespace Squidex.Config.Domain { @@ -19,7 +20,7 @@ namespace Squidex.Config.Domain { public static void AddMySubscriptionServices(this IServiceCollection services, IConfiguration config) { - services.AddSingletonAs(c => c.GetRequiredService>()?.Value?.Plans.OrEmpty()); + services.AddSingletonAs(c => c.GetRequiredService>()?.Value?.Plans.OrEmpty()); services.AddSingletonAs() .AsOptional(); diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index a3d33227e..d30ed84a0 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -15,6 +15,7 @@ using OrleansDashboard; using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure; using Squidex.Infrastructure.Orleans; +using Squidex.Web; using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment; namespace Squidex.Config.Orleans diff --git a/src/Squidex/Config/Web/WebExtensions.cs b/src/Squidex/Config/Web/WebExtensions.cs index b50350723..badab15c3 100644 --- a/src/Squidex/Config/Web/WebExtensions.cs +++ b/src/Squidex/Config/Web/WebExtensions.cs @@ -17,8 +17,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Net.Http.Headers; using Squidex.Infrastructure.Json; -using Squidex.Pipeline; using Squidex.Pipeline.Robots; +using Squidex.Web.Pipeline; namespace Squidex.Config.Web { diff --git a/src/Squidex/Config/Web/WebServices.cs b/src/Squidex/Config/Web/WebServices.cs index b94410f97..ec55d161a 100644 --- a/src/Squidex/Config/Web/WebServices.cs +++ b/src/Squidex/Config/Web/WebServices.cs @@ -9,9 +9,10 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Config.Domain; -using Squidex.Pipeline; using Squidex.Pipeline.Plugins; using Squidex.Pipeline.Robots; +using Squidex.Web; +using Squidex.Web.Pipeline; namespace Squidex.Config.Web { diff --git a/src/Squidex/Pipeline/Swagger/NSwagHelper.cs b/src/Squidex/Pipeline/Swagger/NSwagHelper.cs index ccc236f1f..385a2b48f 100644 --- a/src/Squidex/Pipeline/Swagger/NSwagHelper.cs +++ b/src/Squidex/Pipeline/Swagger/NSwagHelper.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Http; using NJsonSchema; using NJsonSchema.Generation; using NSwag; -using Squidex.Config; +using Squidex.Web; namespace Squidex.Pipeline.Swagger { @@ -33,7 +33,7 @@ namespace Squidex.Pipeline.Swagger } } - public static SwaggerDocument CreateApiDocument(HttpContext context, MyUrlsOptions urlOptions, string appName) + public static SwaggerDocument CreateApiDocument(HttpContext context, UrlsOptions urlOptions, string appName) { var scheme = string.Equals(context.Request.Scheme, "http", StringComparison.OrdinalIgnoreCase) ? diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 6ee1e41d3..5cdd8b1bc 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -38,6 +38,7 @@ + diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index cc317832f..769c5774c 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -14,6 +14,7 @@ using Squidex.Areas.Api; using Squidex.Areas.Api.Config.Swagger; using Squidex.Areas.Api.Controllers.Contents; using Squidex.Areas.Api.Controllers.News; +using Squidex.Areas.Api.Controllers.UI; using Squidex.Areas.Frontend; using Squidex.Areas.IdentityServer; using Squidex.Areas.IdentityServer.Config; @@ -30,9 +31,9 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Diagnostics; using Squidex.Infrastructure.Translations; -using Squidex.Pipeline; using Squidex.Pipeline.Plugins; using Squidex.Pipeline.Robots; +using Squidex.Web; namespace Squidex { @@ -86,17 +87,17 @@ namespace Squidex config.GetSection("healthz:gc")); services.Configure( config.GetSection("etags")); + services.Configure( + config.GetSection("urls")); + services.Configure( + config.GetSection("usage")); services.Configure( config.GetSection("contentsController")); - services.Configure( - config.GetSection("urls")); services.Configure( config.GetSection("identity")); services.Configure( config.GetSection("ui")); - services.Configure( - config.GetSection("usage")); services.Configure( config.GetSection("news")); diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index 08771041a..09e72705c 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -295,48 +295,48 @@ /* * Enable password auth. Set this to false if you want to disable local login, leaving only 3rd party login options. */ - "allowPasswordAuth": true, - /* + "allowPasswordAuth": true, + /* * Initial admin user. */ - "adminEmail": "", - "adminPassword": "", - /* + "adminEmail": "", + "adminPassword": "", + /* * Client with all admin permissions. */ - "adminClientId": "", - "adminClientSecret": "", - /* + "adminClientId": "", + "adminClientSecret": "", + /* * Settings for Google auth (keep empty to disable). */ - "googleClient": "1006817248705-t3lb3ge808m9am4t7upqth79hulk456l.apps.googleusercontent.com", - "googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg", - /* + "googleClient": "1006817248705-t3lb3ge808m9am4t7upqth79hulk456l.apps.googleusercontent.com", + "googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg", + /* * Settings for Github auth (keep empty to disable). */ - "githubClient": "211ea00e726baf754c78", - "githubSecret": "d0a0d0fe2c26469ae20987ac265b3a339fd73132", - /* + "githubClient": "211ea00e726baf754c78", + "githubSecret": "d0a0d0fe2c26469ae20987ac265b3a339fd73132", + /* * Settings for Microsoft auth (keep empty to disable). */ - "microsoftClient": "b55da740-6648-4502-8746-b9003f29d5f1", - "microsoftSecret": "idWbANxNYEF4cB368WXJhjN", - /* + "microsoftClient": "b55da740-6648-4502-8746-b9003f29d5f1", + "microsoftSecret": "idWbANxNYEF4cB368WXJhjN", + /* * Settings for your custom oidc server. */ - "oidcName": "OIDC", - "oidcAuthority": "", - "oidcClient": "", - "oidcSecret": "", - /* + "oidcName": "OIDC", + "oidcAuthority": "", + "oidcClient": "", + "oidcSecret": "", + /* * Lock new users automatically, the administrator must unlock them. */ - "lockAutomatically": false, - /* + "lockAutomatically": false, + /* * The url to you privacy statements, if you host squidex by yourself. */ - "privacyUrl": "https://squidex.io/privacy" - }, + "privacyUrl": "https://squidex.io/privacy" + }, "news": { /* diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/ETagCommandMiddlewareTests.cs b/tests/Squidex.Web.Tests/CommandMiddlewares/ETagCommandMiddlewareTests.cs similarity index 98% rename from tests/Squidex.Tests/Pipeline/CommandMiddlewares/ETagCommandMiddlewareTests.cs rename to tests/Squidex.Web.Tests/CommandMiddlewares/ETagCommandMiddlewareTests.cs index 359147278..a9f8145fe 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/ETagCommandMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/CommandMiddlewares/ETagCommandMiddlewareTests.cs @@ -14,7 +14,7 @@ using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Infrastructure.Commands; using Xunit; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class ETagCommandMiddlewareTests { diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs similarity index 98% rename from tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs rename to tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs index 28977d34b..8ecdb1e15 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithActorCommandMiddlewareTests.cs @@ -16,7 +16,7 @@ using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Security; using Xunit; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class EnrichWithActorCommandMiddlewareTests { diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs similarity index 98% rename from tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs rename to tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs index 1d19f9baf..16398cc53 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs @@ -14,9 +14,10 @@ using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; +using Squidex.Web.Pipeline; using Xunit; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class EnrichWithAppIdCommandMiddlewareTests { diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs similarity index 98% rename from tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs rename to tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs index 6e2e99e9c..4513b51b6 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs @@ -20,9 +20,10 @@ using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; +using Squidex.Web.Pipeline; using Xunit; -namespace Squidex.Pipeline.CommandMiddlewares +namespace Squidex.Web.CommandMiddlewares { public class EnrichWithSchemaIdCommandMiddlewareTests { diff --git a/tests/Squidex.Tests/Pipeline/ApiCostsFilterTests.cs b/tests/Squidex.Web.Tests/Pipeline/ApiCostsFilterTests.cs similarity index 99% rename from tests/Squidex.Tests/Pipeline/ApiCostsFilterTests.cs rename to tests/Squidex.Web.Tests/Pipeline/ApiCostsFilterTests.cs index cbf7efab4..2ee909d51 100644 --- a/tests/Squidex.Tests/Pipeline/ApiCostsFilterTests.cs +++ b/tests/Squidex.Web.Tests/Pipeline/ApiCostsFilterTests.cs @@ -20,7 +20,7 @@ using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure.UsageTracking; using Xunit; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public class ApiCostsFilterTests { diff --git a/tests/Squidex.Tests/Pipeline/ETagFilterTests.cs b/tests/Squidex.Web.Tests/Pipeline/ETagFilterTests.cs similarity index 99% rename from tests/Squidex.Tests/Pipeline/ETagFilterTests.cs rename to tests/Squidex.Web.Tests/Pipeline/ETagFilterTests.cs index ec1ca4bfe..9a1e30abb 100644 --- a/tests/Squidex.Tests/Pipeline/ETagFilterTests.cs +++ b/tests/Squidex.Web.Tests/Pipeline/ETagFilterTests.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; using Xunit; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public class ETagFilterTests { diff --git a/tests/Squidex.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs b/tests/Squidex.Web.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs similarity index 95% rename from tests/Squidex.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs rename to tests/Squidex.Web.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs index 65388f017..090960922 100644 --- a/tests/Squidex.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs +++ b/tests/Squidex.Web.Tests/Pipeline/EnforceHttpsMiddlewareTests.cs @@ -7,17 +7,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Squidex.Config; using Squidex.Infrastructure.Tasks; using Xunit; using Options = Microsoft.Extensions.Options.Options; -namespace Squidex.Pipeline +namespace Squidex.Web.Pipeline { public class EnforceHttpsMiddlewareTests { private readonly RequestDelegate next; - private readonly MyUrlsOptions options = new MyUrlsOptions(); + private readonly UrlsOptions options = new UrlsOptions(); private readonly EnforceHttpsMiddleware sut; private bool isNextCalled; diff --git a/tests/Squidex.Tests/Squidex.Tests.csproj b/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj similarity index 94% rename from tests/Squidex.Tests/Squidex.Tests.csproj rename to tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj index cd75c2a1c..4332f6cfe 100644 --- a/tests/Squidex.Tests/Squidex.Tests.csproj +++ b/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj @@ -3,8 +3,7 @@ Exe netcoreapp2.2 2.2.0 - Squidex - $(NoWarn);NU1605 + Squidex.Web 7.3