Merge branch 'feature/plugins' of github.com:Squidex/squidex into feature/plugins

src/Squidex.Web/ApiExceptionFilterAttribute.cs

@@ -7,6 +7,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Security;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
@@ -60,7 +61,7 @@ namespace Squidex.Web
 
         private static IActionResult OnValidationException(ValidationException ex)
         {
-            return ErrorResult(400, new ErrorDto { Message = ex.Summary, Details = ex.Errors?.ToArray(e => e.Message) });
+            return ErrorResult(400, new ErrorDto { Message = ex.Summary, Details = ToDetails(ex) });
         }
 
         private static IActionResult ErrorResult(int statusCode, ErrorDto error)
@@ -89,5 +90,20 @@ namespace Squidex.Web
                 context.Result = result;
             }
         }
+
+        private static string[] ToDetails(ValidationException ex)
+        {
+            return ex.Errors?.ToArray(e =>
+            {
+                if (e.PropertyNames?.Any() == true)
+                {
+                    return $"{string.Join(", ", e.PropertyNames)}: {e.Message}";
+                }
+                else
+                {
+                    return e.Message;
+                }
+            });
+        }
     }
 }

src/Squidex/Areas/Api/Controllers/Rules/Models/RuleElementPropertyDto.cs

@@ -6,6 +6,7 @@
 // ==========================================================================
 
 using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
 using Squidex.Domain.Apps.Core.HandleRules;
 
 namespace Squidex.Areas.Api.Controllers.Rules.Models

src/Squidex/Config/Domain/SerializationServices.cs

@@ -25,6 +25,8 @@ namespace Squidex.Config.Domain
     {
         private static JsonSerializerSettings ConfigureJson(JsonSerializerSettings settings, TypeNameHandling typeNameHandling)
         {
+            settings.Converters.Add(new StringEnumConverter());
+
             settings.ContractResolver = new ConverterContractResolver(
                 new AppClientsConverter(),
                 new AppContributorsConverter(),

tests/Squidex.Web.Tests/ApiCostsAttributeTests.cs

@@ -0,0 +1,22 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Xunit;
+
+namespace Squidex.Web
+{
+    public class ApiCostsAttributeTests
+    {
+        [Fact]
+        public void Should_assign_weight()
+        {
+            var sut = new ApiCostsAttribute(10.5);
+
+            Assert.Equal(10.5, sut.Weight);
+        }
+    }
+}

tests/Squidex.Web.Tests/ApiExceptionFilterAttributeTests.cs

@@ -0,0 +1,122 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using System;
+using System.Collections.Generic;
+using System.Security;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Squidex.Infrastructure;
+using Xunit;
+
+namespace Squidex.Web
+{
+    public class ApiExceptionFilterAttributeTests
+    {
+        private readonly ApiExceptionFilterAttribute sut = new ApiExceptionFilterAttribute();
+
+        [Fact]
+        public void Should_generate_404_for_DomainObjectNotFoundException()
+        {
+            var context = E(new DomainObjectNotFoundException("1", typeof(object)));
+
+            sut.OnException(context);
+
+            Assert.IsType<NotFoundResult>(context.Result);
+        }
+
+        [Fact]
+        public void Should_generate_400_for_ValidationException()
+        {
+            var ex = new ValidationException("NotAllowed",
+                new ValidationError("Error1"),
+                new ValidationError("Error2", "P"),
+                new ValidationError("Error3", "P1", "P2"));
+
+            var context = E(ex);
+
+            sut.OnException(context);
+
+            var result = context.Result as ObjectResult;
+
+            Assert.Equal(400, result.StatusCode);
+            Assert.Equal(400, (result.Value as ErrorDto)?.StatusCode);
+
+            Assert.Equal(ex.Summary, (result.Value as ErrorDto).Message);
+
+            Assert.Equal(new string[] { "Error1", "P: Error2", "P1, P2: Error3" }, (result.Value as ErrorDto).Details);
+        }
+
+        [Fact]
+        public void Should_generate_400_for_DomainException()
+        {
+            var context = E(new DomainException("NotAllowed"));
+
+            sut.OnException(context);
+
+            Validate(400, context);
+        }
+
+        [Fact]
+        public void Should_generate_412_for_DomainObjectVersionException()
+        {
+            var context = E(new DomainObjectVersionException("1", typeof(object), 1, 2));
+
+            sut.OnException(context);
+
+            Validate(412, context);
+        }
+
+        [Fact]
+        public void Should_generate_403_for_DomainForbiddenException()
+        {
+            var context = E(new DomainForbiddenException("Forbidden"));
+
+            sut.OnException(context);
+
+            Validate(403, context);
+        }
+
+        [Fact]
+        public void Should_generate_403_for_SecurityException()
+        {
+            var context = E(new SecurityException("Forbidden"));
+
+            sut.OnException(context);
+
+            Validate(403, context);
+        }
+
+        private static ExceptionContext E(Exception exception)
+        {
+            var httpContext = new DefaultHttpContext();
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor
+            {
+                FilterDescriptors = new List<FilterDescriptor>()
+            });
+
+            return new ExceptionContext(actionContext, new List<IFilterMetadata>())
+            {
+                Exception = exception
+            };
+        }
+
+        private static void Validate(int statusCode, ExceptionContext context)
+        {
+            var result = context.Result as ObjectResult;
+
+            Assert.Equal(statusCode, result.StatusCode);
+            Assert.Equal(statusCode, (result.Value as ErrorDto)?.StatusCode);
+
+            Assert.Equal(context.Exception.Message, (result.Value as ErrorDto).Message);
+        }
+    }
+}