Another attempt with redirects

src/Squidex.Core/Contents/ContentData.cs

@@ -12,6 +12,7 @@ using System.Linq;
 using Newtonsoft.Json.Linq;
 using Squidex.Core.Schemas;
 using Squidex.Infrastructure;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Core.Contents

src/Squidex.Core/Schemas/Field.cs

@@ -14,6 +14,7 @@ using Microsoft.OData.Edm.Library;
 using Newtonsoft.Json.Linq;
 using NJsonSchema;
 using Squidex.Infrastructure;
+
 // ReSharper disable InvertIf
 // ReSharper disable ConvertIfStatementToReturnStatement
 // ReSharper disable ConvertIfStatementToConditionalTernaryExpression

src/Squidex.Core/Schemas/Json/SchemaJsonSerializer.cs

@@ -12,6 +12,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Squidex.Infrastructure;
+
 // ReSharper disable UseObjectOrCollectionInitializer
 
 namespace Squidex.Core.Schemas.Json

src/Squidex.Core/Schemas/Schema.cs

@@ -16,6 +16,7 @@ using Newtonsoft.Json.Linq;
 using NJsonSchema;
 using Squidex.Core.Contents;
 using Squidex.Infrastructure;
+
 // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
 // ReSharper disable InvertIf
 

src/Squidex.Core/Schemas/StringFieldProperties.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using Squidex.Infrastructure;
 using System.Collections.Immutable;
+
 // ReSharper disable ObjectCreationAsStatement
 
 namespace Squidex.Core.Schemas

src/Squidex.Core/Schemas/Validators/PatternValidator.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Squidex.Infrastructure.Tasks;
+
 // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
 // ReSharper disable InvertIf
 

src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventStore.cs

@@ -16,6 +16,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Driver;
 using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Infrastructure.Reflection;
+
 // ReSharper disable ClassNeverInstantiated.Local
 // ReSharper disable UnusedMember.Local
 // ReSharper disable InvertIf

src/Squidex.Infrastructure.MongoDb/RefTokenSerializer.cs

@@ -8,6 +8,7 @@
 
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Serializers;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Infrastructure.MongoDb

src/Squidex.Infrastructure.RabbitMq/RabbitMqEventBus.cs

@@ -12,6 +12,7 @@ using Newtonsoft.Json;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using Squidex.Infrastructure.CQRS.Events;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Infrastructure.RabbitMq

src/Squidex.Infrastructure/CQRS/Commands/LogExceptionHandler.cs

@@ -8,6 +8,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Infrastructure.CQRS.Commands

src/Squidex.Infrastructure/CQRS/Events/EventDataFormatter.cs

@@ -8,7 +8,6 @@
 
 using System;
 using Newtonsoft.Json;
-// ReSharper disable InconsistentNaming
 
 namespace Squidex.Infrastructure.CQRS.Events
 {

src/Squidex.Infrastructure/CQRS/Events/EventReceiver.cs

@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+
 // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
 // ReSharper disable InvertIf
 

src/Squidex.Infrastructure/CollectionExtensions.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
 // ReSharper disable InvertIf
 // ReSharper disable LoopCanBeConvertedToQuery
 

src/Squidex.Infrastructure/Dispatching/ActionContextDispatcherFactory.cs

@@ -8,6 +8,7 @@
 
 using System;
 using System.Reflection;
+
 // ReSharper disable UnusedMember.Local
 
 namespace Squidex.Infrastructure.Dispatching

src/Squidex.Infrastructure/Dispatching/ActionDispatcherFactory.cs

@@ -8,6 +8,7 @@
 
 using System;
 using System.Reflection;
+
 // ReSharper disable UnusedMember.Local
 
 namespace Squidex.Infrastructure.Dispatching

src/Squidex.Infrastructure/Dispatching/FuncContextDispatcherFactory.cs

@@ -8,6 +8,7 @@
 
 using System;
 using System.Reflection;
+
 // ReSharper disable UnusedMember.Local
 
 namespace Squidex.Infrastructure.Dispatching

src/Squidex.Infrastructure/Dispatching/FuncDispatcherFactory.cs

@@ -8,6 +8,7 @@
 
 using System;
 using System.Reflection;
+
 // ReSharper disable once UnusedMember.Local
 
 namespace Squidex.Infrastructure.Dispatching

src/Squidex.Infrastructure/EnumExtensions.cs

@@ -8,6 +8,7 @@
 
 using System;
 using System.Text.RegularExpressions;
+
 // ReSharper disable ObjectCreationAsStatement
 
 namespace Squidex.Infrastructure

src/Squidex.Infrastructure/Guard.cs

@@ -12,6 +12,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Infrastructure

src/Squidex.Infrastructure/Language.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+
 // ReSharper disable ConvertIfStatementToReturnStatement
 
 namespace Squidex.Infrastructure

src/Squidex.Infrastructure/Reflection/SimpleMapper.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+
 // ReSharper disable StaticMemberInGenericType
 
 namespace Squidex.Infrastructure.Reflection

src/Squidex.Read.MongoDb/Contents/MongoContentEntity.cs

@@ -18,6 +18,7 @@ using Squidex.Core.Schemas;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.MongoDb;
 using Squidex.Read.Contents;
+
 // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
 // ReSharper disable InvertIf
 

src/Squidex.Read.MongoDb/Contents/Visitors/FilterBuilder.cs

@@ -9,6 +9,7 @@
 using Microsoft.OData.Core.UriParser;
 using MongoDB.Driver;
 using Squidex.Core.Schemas;
+
 // ReSharper disable ConvertIfStatementToReturnStatement
 
 namespace Squidex.Read.MongoDb.Contents.Visitors

src/Squidex.Read.MongoDb/Contents/Visitors/FilterVisitor.cs

@@ -14,6 +14,7 @@ using Microsoft.OData.Core.UriParser.Visitors;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using Squidex.Core.Schemas;
+
 // ReSharper disable SwitchStatementMissingSomeCases
 // ReSharper disable ConvertIfStatementToSwitchStatement
 

src/Squidex.Read.MongoDb/Contents/Visitors/PropertyVisitor.cs

@@ -13,6 +13,7 @@ using Microsoft.OData.Core.UriParser.Semantic;
 using Microsoft.OData.Core.UriParser.Visitors;
 using MongoDB.Driver;
 using Squidex.Core.Schemas;
+
 // ReSharper disable InvertIf
 // ReSharper disable RedundantIfElseBlock
 

src/Squidex.Read.MongoDb/Contents/Visitors/SortBuilder.cs

@@ -11,6 +11,7 @@ using Microsoft.OData.Core.UriParser;
 using Microsoft.OData.Core.UriParser.Semantic;
 using MongoDB.Driver;
 using Squidex.Core.Schemas;
+
 // ReSharper disable RedundantIfElseBlock
 // ReSharper disable ConvertIfStatementToReturnStatement
 // ReSharper disable ConvertIfStatementToConditionalTernaryExpression

src/Squidex.Read.MongoDb/History/ParsedHistoryEvent.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using Squidex.Infrastructure;
 using Squidex.Read.History;
+
 // ReSharper disable LoopCanBeConvertedToQuery
 
 namespace Squidex.Read.MongoDb.History

src/Squidex.Read.MongoDb/Utils/EntityMapper.cs

@@ -12,6 +12,7 @@ using MongoDB.Driver;
 using Squidex.Events;
 using Squidex.Infrastructure.CQRS;
 using Squidex.Infrastructure.MongoDb;
+
 // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
 // ReSharper disable SuspiciousTypeConversion.Global
 

src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs

@@ -15,6 +15,7 @@ using Squidex.Infrastructure.CQRS;
 using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Read.Apps.Repositories;
 using Squidex.Read.Utils;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Read.Apps.Services.Implementations

src/Squidex.Read/History/HistoryEventsCreatorBase.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS;
 using Squidex.Infrastructure.CQRS.Events;
+
 // ReSharper disable ConvertIfStatementToReturnStatement
 
 namespace Squidex.Read.History

src/Squidex.Read/Schemas/SchemaHistoryEventsCreator.cs

@@ -13,6 +13,7 @@ using Squidex.Infrastructure.CQRS;
 using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Read.History;
 using Squidex.Read.Schemas.Services;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Read.Schemas

src/Squidex.Read/Schemas/Services/Implementations/CachingSchemaProvider.cs

@@ -16,6 +16,7 @@ using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Read.Schemas.Repositories;
 using Squidex.Read.Utils;
 using Squidex.Events;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Read.Schemas.Services.Implementations

src/Squidex.Write/Apps/AppClients.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using Squidex.Infrastructure;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Write.Apps

src/Squidex.Write/Apps/AppContributors.cs

@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Squidex.Core.Apps;
 using Squidex.Infrastructure;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Write.Apps

src/Squidex.Write/Apps/AppDomainObject.cs

@@ -17,6 +17,7 @@ using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Infrastructure.Dispatching;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Write.Apps.Commands;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Write.Apps

src/Squidex.Write/Apps/AppLanguages.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using Squidex.Infrastructure;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Write.Apps

src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs

@@ -16,6 +16,7 @@ using NSwag;
 using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors;
 using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors.Contexts;
 using Squidex.Controllers.Api;
+
 // ReSharper disable UseObjectOrCollectionInitializer
 
 namespace Squidex.Config.Swagger

src/Squidex/Config/Web/WebUsages.cs

@@ -9,13 +9,23 @@
 using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Net.Http.Headers;
+using Squidex.Pipeline;
+
 // ReSharper disable InvertIf
 
 namespace Squidex.Config.Web
 {
     public static class WebUsages
     {
+        public static void UseMyForwardingRules(this IApplicationBuilder app)
+        {
+            app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All, RequireHeaderSymmetry = false });
+
+            app.UseMiddleware<EnforceHttpsMiddleware>();
+        }
+
         public static void UseMyCachedStaticFiles(this IApplicationBuilder app)
         {
             app.UseStaticFiles(new StaticFileOptions

src/Squidex/Controllers/Api/Schemas/Models/Converters/JsonInheritanceConverter.cs

@@ -13,6 +13,7 @@ using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NJsonSchema.Annotations;
+
 // ReSharper disable ConvertIfStatementToReturnStatement
 
 namespace Squidex.Controllers.Api.Schemas.Models.Converters

src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs

@@ -24,6 +24,7 @@ using Squidex.Infrastructure;
 using Squidex.Pipeline.Swagger;
 using Squidex.Read.Apps;
 using Squidex.Read.Schemas;
+
 // ReSharper disable InvertIf
 // ReSharper disable SuggestBaseTypeForParameter
 // ReSharper disable PrivateFieldCanBeConvertedToLocalVariable

src/Squidex/Pipeline/SingleUrlsMiddleware.cs → src/Squidex/Pipeline/EnforceHttpsMiddleware.cs

@@ -9,24 +9,21 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Squidex.Config;
 
 namespace Squidex.Pipeline
 {
-    public sealed class SingleUrlsMiddleware
+    public sealed class EnforceHttpsMiddleware
     {
         private readonly RequestDelegate next;
         private readonly IOptions<MyUrlsOptions> urls;
-        private readonly ILogger<SingleUrlsMiddleware> logger;
 
-        public SingleUrlsMiddleware(RequestDelegate next, ILoggerFactory factory, IOptions<MyUrlsOptions> urls)
+        public EnforceHttpsMiddleware(RequestDelegate next, IOptions<MyUrlsOptions> urls)
         {
             this.next = next;
-            this.urls = urls;
 
-            logger = factory.CreateLogger<SingleUrlsMiddleware>();
+            this.urls = urls;
         }
 
         public async Task Invoke(HttpContext context)
@@ -37,19 +34,11 @@ namespace Squidex.Pipeline
             }
             else
             {
-                var currentUrl = string.Concat(context.Request.Scheme, "://", context.Request.Host, context.Request.Path);
-
                 var hostName = context.Request.Host.ToString().ToLowerInvariant();
-                if (hostName.StartsWith("www."))
-                {
-                    hostName = hostName.Substring(4);
-                }
-
-                var newUrl = string.Concat("https://", hostName, context.Request.Path);
 
-                if (!string.Equals(newUrl, currentUrl, StringComparison.OrdinalIgnoreCase))
+                if (!string.Equals(context.Request.Scheme, "https", StringComparison.OrdinalIgnoreCase))
                 {
-                    logger.LogError("Invalid url: {0} instead {1}", currentUrl, newUrl);
+                    var newUrl = string.Concat("https://", hostName, context.Request.Path);
 
                     context.Response.Redirect(newUrl + context.Request.QueryString, true);
                 }

src/Squidex/Program.cs

@@ -13,6 +13,7 @@ using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Squidex.Infrastructure;
+
 // ReSharper disable InvertIf
 
 namespace Squidex

src/Squidex/Startup.cs

@@ -14,7 +14,6 @@ using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -23,7 +22,7 @@ using Squidex.Config.Domain;
 using Squidex.Config.Identity;
 using Squidex.Config.Swagger;
 using Squidex.Config.Web;
-using Squidex.Pipeline;
+
 // ReSharper disable ConvertClosureToMethodGroup
 // ReSharper disable AccessToModifiedClosure
 
@@ -102,8 +101,7 @@ namespace Squidex
 
             app.TestExternalSystems();
 
-            app.UseForwardedHeaders();
+            app.UseMyForwardingRules();
-            app.UseMiddleware<SingleUrlsMiddleware>();
 
             MapAndUseIdentity(app);
             MapAndUseApi(app);

tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectFactoryTests.cs

@@ -10,6 +10,7 @@ using System;
 using Moq;
 using Squidex.Infrastructure.CQRS.Events;
 using Xunit;
+
 // ReSharper disable ConvertToLambdaExpression
 
 namespace Squidex.Infrastructure.CQRS.Commands

tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectRepositoryTests.cs

@@ -14,6 +14,7 @@ using Squidex.Infrastructure.CQRS.Events;
 using Xunit;
 using System.Collections.Generic;
 using System.Linq;
+
 // ReSharper disable ImplicitlyCapturedClosure
 // ReSharper disable PrivateFieldCanBeConvertedToLocalVariable
 

tests/Squidex.Infrastructure.Tests/CQRS/DomainObjectTest.cs

@@ -10,6 +10,7 @@ using System;
 using Squidex.Infrastructure.CQRS.Events;
 using Xunit;
 using System.Linq;
+
 // ReSharper disable ConvertToConstant.Local
 
 namespace Squidex.Infrastructure.CQRS

tests/Squidex.Infrastructure.Tests/DispatchingTests.cs

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Squidex.Infrastructure.Dispatching;
 using Squidex.Infrastructure.Tasks;
 using Xunit;
+
 // ReSharper disable UnusedMethodReturnValue.Local
 // ReSharper disable UnusedParameter.Local
 // ReSharper disable UnusedMember.Local

tests/Squidex.Infrastructure.Tests/PropertiesBagTests.cs

@@ -14,6 +14,7 @@ using Newtonsoft.Json;
 using NodaTime;
 using Squidex.Infrastructure.Json;
 using Xunit;
+
 // ReSharper disable PossibleInvalidOperationException
 // ReSharper disable UnusedParameter.Local
 

tests/Squidex.Infrastructure.Tests/RefTokenTests.cs

@@ -10,6 +10,7 @@ using System;
 using Newtonsoft.Json;
 using Squidex.Infrastructure.Json;
 using Xunit;
+
 // ReSharper disable RedundantCast
 
 namespace Squidex.Infrastructure

tests/Squidex.Infrastructure.Tests/Reflection/ReflectionExtensionTests.cs

@@ -8,6 +8,7 @@
 
 using System.Linq;
 using Xunit;
+
 // ReSharper disable UnusedMember.Local
 
 namespace Squidex.Infrastructure.Reflection

tests/Squidex.Infrastructure.Tests/Reflection/SimpleMapperTests.cs

@@ -8,6 +8,7 @@
 
 using System;
 using Xunit;
+
 // ReSharper disable UnusedParameter.Local
 
 namespace Squidex.Infrastructure.Reflection

tests/Squidex.Read.Tests/Apps/CachingAppProviderTests.cs

@@ -19,6 +19,7 @@ using Squidex.Read.Apps.Repositories;
 using Squidex.Read.Apps.Services.Implementations;
 using Squidex.Read.MongoDb.Apps;
 using Xunit;
+
 // ReSharper disable ConvertToConstant.Local
 // ReSharper disable UnusedParameter.Local
 

tests/Squidex.Read.Tests/Schemas/CachingSchemaProviderTests.cs

@@ -20,6 +20,7 @@ using Squidex.Read.Schemas.Repositories;
 using Squidex.Read.Schemas.Services.Implementations;
 using Squidex.Read.MongoDb.Schemas;
 using Xunit;
+
 // ReSharper disable ConvertToConstant.Local
 // ReSharper disable UnusedParameter.Local
 

tests/Squidex.Write.Tests/Apps/AppCommandHandlerTests.cs

@@ -19,6 +19,7 @@ using Squidex.Read.Users.Repositories;
 using Squidex.Write.Apps.Commands;
 using Squidex.Write.Utils;
 using Xunit;
+
 // ReSharper disable ImplicitlyCapturedClosure
 // ReSharper disable ConvertToConstant.Local
 

tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs

@@ -16,6 +16,7 @@ using Squidex.Infrastructure.CQRS;
 using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Write.Apps.Commands;
 using Xunit;
+
 // ReSharper disable ConvertToConstant.Local
 
 namespace Squidex.Write.Apps

tests/Squidex.Write.Tests/Contents/ContentCommandHandlerTests.cs

@@ -20,6 +20,7 @@ using Squidex.Read.Schemas.Services;
 using Squidex.Write.Contents.Commands;
 using Squidex.Write.Utils;
 using Xunit;
+
 // ReSharper disable ConvertToConstant.Local
 
 namespace Squidex.Write.Contents

tests/Squidex.Write.Tests/Contents/ContentDomainObjectTests.cs

@@ -16,6 +16,7 @@ using Squidex.Infrastructure.CQRS;
 using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Write.Contents.Commands;
 using Xunit;
+
 // ReSharper disable ConvertToConstant.Local
 
 namespace Squidex.Write.Contents

tests/Squidex.Write.Tests/Schemas/SchemaCommandHandlerTests.cs

@@ -17,6 +17,7 @@ using Squidex.Read.Schemas.Services;
 using Squidex.Write.Schemas.Commands;
 using Squidex.Write.Utils;
 using Xunit;
+
 // ReSharper disable ConvertToConstant.Local
 
 namespace Squidex.Write.Schemas

tests/Squidex.Write.Tests/Schemas/SchemaDomainObjectTests.cs

@@ -16,6 +16,7 @@ using Squidex.Infrastructure.CQRS;
 using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Write.Schemas.Commands;
 using Xunit;
+
 // ReSharper disable ConvertToConstant.Local
 
 namespace Squidex.Write.Schemas