diff --git a/Client/Modules/SZUAbsolventenverein.Module.AdminModules/Send.razor b/Client/Modules/SZUAbsolventenverein.Module.AdminModules/Send.razor index 35a259b..e47e1cf 100644 --- a/Client/Modules/SZUAbsolventenverein.Module.AdminModules/Send.razor +++ b/Client/Modules/SZUAbsolventenverein.Module.AdminModules/Send.razor @@ -29,6 +29,15 @@ + @if(userCount != null) + { +
+ +
+ @userCount +
+
+ }

@@ -49,12 +58,7 @@ new Stylesheet("_content/SZUAbsolventenverein.Module.AdminModules/Module.css") }; - private List roles = new List - { - new Role { RoleId = 1, Name = "Admin" }, - new Role { RoleId = 2, Name = "User" }, - new Role { RoleId = 3, Name = "Imported" }, - }; + private List roles = new List(); private int _selectedRoleId = -1; private int selectedRoleId @@ -88,7 +92,9 @@ ef.ModuleId = ModuleState.ModuleId; ef.Content = _richText; - userCount = await AdminModulesService.GetUsercountInRole(ef); + ef = await AdminModulesService.PostUsercountInRole(ef); + userCount = ef.UserCount; + StateHasChanged(); } protected override async Task OnInitializedAsync() @@ -108,6 +114,7 @@ _modifiedby = AdminModules.ModifiedBy; _modifiedon = AdminModules.ModifiedOn; } + roles = await AdminModulesService.GetRoles(ModuleState.ModuleId); } } catch (Exception ex) diff --git a/Client/Services/AdminModulesService.cs b/Client/Services/AdminModulesService.cs index b6cb81a..0a8e562 100644 --- a/Client/Services/AdminModulesService.cs +++ b/Client/Services/AdminModulesService.cs @@ -1,10 +1,12 @@ -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; using Oqtane.Models; using Oqtane.Services; using Oqtane.Shared; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Reflection; +using System.Threading.Tasks; using SZUAbsolventenverein.Module.AdminModules.Models; namespace SZUAbsolventenverein.Module.AdminModules.Services @@ -21,7 +23,10 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services Task DeleteAdminModulesAsync(int AdminModulesId, int ModuleId); - Task GetUsercountInRole(Models.EmailFields EmailFields); + Task> GetRoles(int ModuleId); + + Task PostUsercountInRole(Models.EmailFields EmailFields); + Task SendMassNotification(Models.EmailFields EmailFields); } @@ -39,7 +44,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services public async Task GetAdminModulesAsync(int AdminModulesId, int ModuleId) { - return await GetJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/{AdminModulesId}/{ModuleId}", EntityNames.Module, ModuleId)); + return await GetJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/get/{AdminModulesId}/{ModuleId}", EntityNames.Module, ModuleId)); } public async Task AddAdminModulesAsync(Models.AdminModules AdminModules) @@ -56,10 +61,14 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services { await DeleteAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/{AdminModulesId}/{ModuleId}", EntityNames.Module, ModuleId)); } - - public async Task GetUsercountInRole(EmailFields EmailFields) + public async Task> GetRoles(int ModuleId) { - return await GetJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/roles/{EmailFields.AdminModulesId}", EntityNames.Module, EmailFields.ModuleId)); + return await GetJsonAsync>(CreateAuthorizationPolicyUrl($"{Apiurl}/roles?moduleid={ModuleId}", EntityNames.Module, ModuleId)); + } + + public async Task PostUsercountInRole(EmailFields EmailFields) + { + return await PostJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/roles/{EmailFields.AdminModulesId}", EntityNames.Module, EmailFields.ModuleId), EmailFields); } public async Task SendMassNotification(EmailFields EmailFields) diff --git a/Server/Controllers/AdminModulesController.cs b/Server/Controllers/AdminModulesController.cs index fd24ab5..2b71f6a 100644 --- a/Server/Controllers/AdminModulesController.cs +++ b/Server/Controllers/AdminModulesController.cs @@ -9,6 +9,8 @@ using SZUAbsolventenverein.Module.AdminModules.Services; using Oqtane.Controllers; using System.Net; using System.Threading.Tasks; +using SZUAbsolventenverein.Module.AdminModules.Models; +using Oqtane.Models; namespace SZUAbsolventenverein.Module.AdminModules.Controllers { @@ -41,7 +43,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Controllers } // GET api//5 - [HttpGet("{id}/{moduleid}")] + [HttpGet("get/{id}/{moduleid}")] [Authorize(Policy = PolicyNames.ViewModule)] public async Task Get(int id, int moduleid) { @@ -111,21 +113,39 @@ namespace SZUAbsolventenverein.Module.AdminModules.Controllers } } - // GET api//5/roles - [HttpGet("roles/{id}")] + // GET api//roles + [HttpGet("roles")] + [Authorize(Policy = PolicyNames.ViewModule)] + public async Task> GetRoles(string moduleid) + { + int ModuleId; + if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId)) + { + return await _AdminModulesService.GetRoles(ModuleId); + } + else + { + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized AdminModules Get Attempt {ModuleId}", moduleid); + HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; + return null; + } + } + + // Post api//roles/5 + [HttpPost("roles/{id}")] [Authorize(Policy = PolicyNames.EditModule)] - public async Task GetUserCount(int id, [FromBody] Models.EmailFields EmailFields) + public async Task PostUserCount(int id, [FromBody] EmailFields EmailFields) { if (ModelState.IsValid && EmailFields.AdminModulesId == id && IsAuthorizedEntityId(EntityNames.Module, EmailFields.ModuleId)) { - return await _AdminModulesService.GetUsercountInRole(EmailFields); + return await _AdminModulesService.PostUsercountInRole(EmailFields); } else { _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized AdminModules Put Attempt {AdminModules}", EmailFields); HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; EmailFields = null; - return -1; + return null; } } } diff --git a/Server/Services/AdminModulesService.cs b/Server/Services/AdminModulesService.cs index 018cf2b..480f783 100644 --- a/Server/Services/AdminModulesService.cs +++ b/Server/Services/AdminModulesService.cs @@ -6,6 +6,7 @@ using Oqtane.Models; using Oqtane.Repository; using Oqtane.Security; using Oqtane.Shared; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; @@ -108,11 +109,27 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services return Task.CompletedTask; } - public Task GetUsercountInRole(EmailFields EmailFields) + public Task> GetRoles(int ModuleId) + { + if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View)) + { + List role = new List(); + role.AddRange(_roleRepository.GetRoles(_alias.SiteId)); + return Task.FromResult(role); + } + else + { + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized AdminModules Get Roles Attempt {ModuleId}", ModuleId); + return null; + } + } + + public Task PostUsercountInRole(EmailFields EmailFields) { if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, EmailFields.ModuleId, PermissionNames.View)) { - return Task.FromResult(_userRoleRepository.GetUserRoles(EmailFields.Role.Name, _alias.SiteId).Where(ur => ur.Role == EmailFields.Role).Select(ur => ur.UserId).Distinct().Count()); + EmailFields ef = new EmailFields { UserCount = _userRoleRepository.GetUserRoles(EmailFields.Role.Name, _alias.SiteId).Select(ur => ur.UserId).Distinct().Count() }; + return Task.FromResult(ef); } else { @@ -125,7 +142,12 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services { if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, EmailFields.ModuleId, PermissionNames.View)) { - _userRoleRepository.GetUserRoles(_accessor.HttpContext.User.UserId(), _alias.SiteId).Where(ur => ur.Role == EmailFields.Role).Select(ur => ur.UserId); + IEnumerable userids = _userRoleRepository.GetUserRoles(_accessor.HttpContext.User.UserId(), _alias.SiteId).Select(ur => ur.UserId).AsEnumerable(); + foreach (int userid in userids) + { + User user = _userRepository.GetUser(userid); + } + return null; } else diff --git a/Shared/Models/EmailFields.cs b/Shared/Models/EmailFields.cs index 517de37..707e77d 100644 --- a/Shared/Models/EmailFields.cs +++ b/Shared/Models/EmailFields.cs @@ -11,5 +11,6 @@ namespace SZUAbsolventenverein.Module.AdminModules.Models public int ModuleId { get; set; } public Role Role { get; set; } public string Content { get; set; } + public int UserCount { get; set; } } }