From ac35373647a58def03f910044e6c65b18353647f Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Mon, 17 Jun 2019 09:34:23 +0200
Subject: [PATCH] Code unified.

---
 .../EventConsumers/Models/EventConsumerDto.cs         |  4 +---
 src/Squidex/Areas/Api/Controllers/UI/UIController.cs  |  4 +---
 .../Areas/Api/Controllers/Users/Models/UserDto.cs     | 11 ++++-------
 .../Areas/Api/Controllers/Users/Models/UsersDto.cs    |  4 +---
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs b/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs
index 86ce40203..5f856602c 100644
--- a/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs
+++ b/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs
@@ -15,8 +15,6 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers.Models
 {
     public sealed class EventConsumerDto : Resource
     {
-        private static readonly Permission EventsManagePermission = new Permission(Permissions.AdminEventsManage);
-
         public bool IsStopped { get; set; }
 
         public bool IsResetting { get; set; }
@@ -36,7 +34,7 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers.Models
 
         private EventConsumerDto CreateLinks(ApiController controller)
         {
-            if (controller.HasPermission(EventsManagePermission))
+            if (controller.HasPermission(Permissions.AdminEventsManage))
             {
                 var values = new { name = Name };
 
diff --git a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs
index e66c8feb8..e07d9f23e 100644
--- a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs
+++ b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs
@@ -27,9 +27,7 @@ namespace Squidex.Areas.Api.Controllers.UI
         private readonly MyUIOptions uiOptions;
         private readonly IGrainFactory grainFactory;
 
-        public UIController(ICommandBus commandBus,
-            IOptions<MyUIOptions> uiOptions,
-            IGrainFactory grainFactory)
+        public UIController(ICommandBus commandBus, IOptions<MyUIOptions> uiOptions, IGrainFactory grainFactory)
             : base(commandBus)
         {
             this.uiOptions = uiOptions.Value;
diff --git a/src/Squidex/Areas/Api/Controllers/Users/Models/UserDto.cs b/src/Squidex/Areas/Api/Controllers/Users/Models/UserDto.cs
index bdc37fa82..b91b0b5ba 100644
--- a/src/Squidex/Areas/Api/Controllers/Users/Models/UserDto.cs
+++ b/src/Squidex/Areas/Api/Controllers/Users/Models/UserDto.cs
@@ -11,15 +11,12 @@ using Squidex.Infrastructure.Reflection;
 using Squidex.Infrastructure.Security;
 using Squidex.Shared.Users;
 using Squidex.Web;
+using AllPermissions = Squidex.Shared.Permissions;
 
 namespace Squidex.Areas.Api.Controllers.Users.Models
 {
     public sealed class UserDto : Resource
     {
-        private static readonly Permission LockPermission = new Permission(Shared.Permissions.AdminUsersLock);
-        private static readonly Permission UnlockPermission = new Permission(Shared.Permissions.AdminUsersUnlock);
-        private static readonly Permission UpdatePermission = new Permission(Shared.Permissions.AdminUsersUpdate);
-
         /// <summary>
         /// The id of the user.
         /// </summary>
@@ -75,18 +72,18 @@ namespace Squidex.Areas.Api.Controllers.Users.Models
 
             if (!controller.IsUser(Id))
             {
-                if (controller.HasPermission(LockPermission) && !IsLocked)
+                if (controller.HasPermission(AllPermissions.AdminUsersLock) && !IsLocked)
                 {
                     AddPutLink("lock", controller.Url<UserManagementController>(c => nameof(c.LockUser), values));
                 }
 
-                if (controller.HasPermission(UnlockPermission) && IsLocked)
+                if (controller.HasPermission(AllPermissions.AdminUsersUnlock) && IsLocked)
                 {
                     AddPutLink("unlock", controller.Url<UserManagementController>(c => nameof(c.UnlockUser), values));
                 }
             }
 
-            if (controller.HasPermission(UpdatePermission))
+            if (controller.HasPermission(AllPermissions.AdminUsersUpdate))
             {
                 AddPutLink("update", controller.Url<UserManagementController>(c => nameof(c.PutUser), values));
             }
diff --git a/src/Squidex/Areas/Api/Controllers/Users/Models/UsersDto.cs b/src/Squidex/Areas/Api/Controllers/Users/Models/UsersDto.cs
index 662dc7f0b..41edc45f6 100644
--- a/src/Squidex/Areas/Api/Controllers/Users/Models/UsersDto.cs
+++ b/src/Squidex/Areas/Api/Controllers/Users/Models/UsersDto.cs
@@ -16,8 +16,6 @@ namespace Squidex.Areas.Api.Controllers.Users.Models
 {
     public sealed class UsersDto : Resource
     {
-        private static readonly Permission CreatePermissions = new Permission(Permissions.AdminUsersCreate);
-
         /// <summary>
         /// The total number of users.
         /// </summary>
@@ -43,7 +41,7 @@ namespace Squidex.Areas.Api.Controllers.Users.Models
         {
             AddSelfLink(controller.Url<UserManagementController>(c => nameof(c.GetUsers)));
 
-            if (controller.HasPermission(CreatePermissions))
+            if (controller.HasPermission(Permissions.AdminUsersCreate))
             {
                 AddPostLink("create", controller.Url<UserManagementController>(c => nameof(c.PostUser)));
             }