Browse Source

Code unified.

pull/363/head
Sebastian Stehle 7 years ago
parent
commit
ac35373647
  1. 4
      src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs
  2. 4
      src/Squidex/Areas/Api/Controllers/UI/UIController.cs
  3. 11
      src/Squidex/Areas/Api/Controllers/Users/Models/UserDto.cs
  4. 4
      src/Squidex/Areas/Api/Controllers/Users/Models/UsersDto.cs

4
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 public sealed class EventConsumerDto : Resource
{ {
private static readonly Permission EventsManagePermission = new Permission(Permissions.AdminEventsManage);
public bool IsStopped { get; set; } public bool IsStopped { get; set; }
public bool IsResetting { get; set; } public bool IsResetting { get; set; }
@ -36,7 +34,7 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers.Models
private EventConsumerDto CreateLinks(ApiController controller) private EventConsumerDto CreateLinks(ApiController controller)
{ {
if (controller.HasPermission(EventsManagePermission)) if (controller.HasPermission(Permissions.AdminEventsManage))
{ {
var values = new { name = Name }; var values = new { name = Name };

4
src/Squidex/Areas/Api/Controllers/UI/UIController.cs

@ -27,9 +27,7 @@ namespace Squidex.Areas.Api.Controllers.UI
private readonly MyUIOptions uiOptions; private readonly MyUIOptions uiOptions;
private readonly IGrainFactory grainFactory; private readonly IGrainFactory grainFactory;
public UIController(ICommandBus commandBus, public UIController(ICommandBus commandBus, IOptions<MyUIOptions> uiOptions, IGrainFactory grainFactory)
IOptions<MyUIOptions> uiOptions,
IGrainFactory grainFactory)
: base(commandBus) : base(commandBus)
{ {
this.uiOptions = uiOptions.Value; this.uiOptions = uiOptions.Value;

11
src/Squidex/Areas/Api/Controllers/Users/Models/UserDto.cs

@ -11,15 +11,12 @@ using Squidex.Infrastructure.Reflection;
using Squidex.Infrastructure.Security; using Squidex.Infrastructure.Security;
using Squidex.Shared.Users; using Squidex.Shared.Users;
using Squidex.Web; using Squidex.Web;
using AllPermissions = Squidex.Shared.Permissions;
namespace Squidex.Areas.Api.Controllers.Users.Models namespace Squidex.Areas.Api.Controllers.Users.Models
{ {
public sealed class UserDto : Resource 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> /// <summary>
/// The id of the user. /// The id of the user.
/// </summary> /// </summary>
@ -75,18 +72,18 @@ namespace Squidex.Areas.Api.Controllers.Users.Models
if (!controller.IsUser(Id)) 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)); 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)); 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)); AddPutLink("update", controller.Url<UserManagementController>(c => nameof(c.PutUser), values));
} }

4
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 public sealed class UsersDto : Resource
{ {
private static readonly Permission CreatePermissions = new Permission(Permissions.AdminUsersCreate);
/// <summary> /// <summary>
/// The total number of users. /// The total number of users.
/// </summary> /// </summary>
@ -43,7 +41,7 @@ namespace Squidex.Areas.Api.Controllers.Users.Models
{ {
AddSelfLink(controller.Url<UserManagementController>(c => nameof(c.GetUsers))); 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))); AddPostLink("create", controller.Url<UserManagementController>(c => nameof(c.PostUser)));
} }

Loading…
Cancel
Save