Tests for roles.

src/Squidex.Domain.Apps.Core.Model/Apps/Json/RolesConverter.cs

@@ -0,0 +1,39 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschränkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Newtonsoft.Json;
+using Squidex.Infrastructure.Json;
+using Squidex.Infrastructure.Security;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+
+namespace Squidex.Domain.Apps.Core.Apps.Json
+{
+    public sealed class RolesConverter : JsonClassConverter<Roles>
+    {
+        protected override void WriteValue(JsonWriter writer, Roles value, JsonSerializer serializer)
+        {
+            var json = new Dictionary<string, string[]>(value.Count);
+
+            foreach (var role in value)
+            {
+                json.Add(role.Key, role.Value.Permissions.ToIds().ToArray());
+            }
+
+            serializer.Serialize(writer, json);
+        }
+
+        protected override Roles ReadValue(JsonReader reader, Type objectType, JsonSerializer serializer)
+        {
+            var json = serializer.Deserialize<Dictionary<string, string[]>>(reader);
+
+            return new Roles(json.ToImmutableDictionary(x => x.Key, x => new Role(x.Key, new PermissionSet(x.Value))));
+        }
+    }
+}

src/Squidex.Infrastructure/Security/Permission.cs

@@ -16,7 +16,6 @@ namespace Squidex.Infrastructure.Security
         private const string Any = "*";
         private static readonly char[] MainSeparators = { '.' };
         private static readonly char[] AlternativeSeparators = { '|' };
-        private readonly string description;
         private readonly string id;
         private readonly Lazy<HashSet<string>[]> idParts;
 
@@ -25,17 +24,10 @@ namespace Squidex.Infrastructure.Security
             get { return id; }
         }
 
-        public string Description
+        public Permission(string id)
-        {
-            get { return description; }
-        }
-
-        public Permission(string id, string description = null)
         {
             Guard.NotNullOrEmpty(id, nameof(id));
 
-            this.description = description;
-
             this.id = id;
 
             idParts = new Lazy<HashSet<string>[]>(() => id

src/Squidex.Infrastructure/Security/PermissionSet.cs

@@ -29,6 +29,11 @@ namespace Squidex.Infrastructure.Security
         {
         }
 
+        public PermissionSet(IEnumerable<string> permissions)
+            : this(permissions?.Select(x => new Permission(x)))
+        {
+        }
+
         public PermissionSet(IEnumerable<Permission> permissions)
         {
             Guard.NotNull(permissions, nameof(permissions));

src/Squidex/Config/Domain/SerializationServices.cs

@@ -57,6 +57,7 @@ namespace Squidex.Config.Domain
                 new PropertiesBagConverter<EnvelopeHeaders>(),
                 new PropertiesBagConverter<PropertiesBag>(),
                 new RefTokenConverter(),
+                new RolesConverter(),
                 new RuleConverter(),
                 new SchemaConverter(FieldRegistry),
                 new StringEnumConverter());

tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/RolesJsonTests.cs

@@ -0,0 +1,30 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschränkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using FluentAssertions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Squidex.Domain.Apps.Core.Apps;
+using Xunit;
+
+namespace Squidex.Domain.Apps.Core.Model.Apps
+{
+    public class RolesJsonTests
+    {
+        private readonly JsonSerializer serializer = TestData.DefaultSerializer();
+
+        [Fact]
+        public void Should_serialize_and_deserialize()
+        {
+            var sut = Roles.CreateDefaults("my-app");
+
+            var serialized = JToken.FromObject(sut, serializer).ToObject<Roles>(serializer);
+
+            serialized.Should().BeEquivalentTo(sut);
+        }
+    }
+}

tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/RolesTests.cs

@@ -0,0 +1,31 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Squidex.Domain.Apps.Core.Apps;
+using Xunit;
+
+namespace Squidex.Domain.Apps.Core.Model.Apps
+{
+    public class RolesTests
+    {
+        [Fact]
+        public void Should_create_defaults()
+        {
+            var sut = Roles.CreateDefaults("my-app");
+
+            Assert.Equal(4, sut.Count);
+
+            foreach (var role in sut)
+            {
+                foreach (var permission in role.Value.Permissions)
+                {
+                    Assert.StartsWith("squidex.apps.my-app", permission.Id);
+                }
+            }
+        }
+    }
+}

tests/Squidex.Domain.Apps.Core.Tests/TestData.cs

@@ -42,6 +42,7 @@ namespace Squidex.Domain.Apps.Core
                     new NamedLongIdConverter(),
                     new NamedStringIdConverter(),
                     new RefTokenConverter(),
+                    new RolesConverter(),
                     new RuleConverter(),
                     new SchemaConverter(new FieldRegistry(typeNameRegistry)),
                     new StringEnumConverter()),

tests/Squidex.Infrastructure.Tests/Security/PermissionTests.cs

@@ -16,11 +16,10 @@ namespace Squidex.Infrastructure.Security
         [Fact]
         public void Should_generate_permissions()
         {
-            var sut = new Permission("app.contents", "App Contents");
+            var sut = new Permission("app.contents");
 
             Assert.Equal("app.contents", sut.ToString());
             Assert.Equal("app.contents", sut.Id);
-            Assert.Equal("App Contents", sut.Description);
         }
 
         [Fact]