Diplomarbeit-Absolventenverein/Module.AdminModules
6
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Add functionality to list roles and fetch the usercount inside that role

Browse Source 
closes: #1
This commit is contained in:
Konstantin Hintermayer
2025-10-15 13:13:34 +02:00
parent 2c3df4c338
commit e1e05eea9b
5 changed files with 84 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Client/Modules/SZUAbsolventenverein.Module.AdminModules/Send.razor
View File

@@ -29,6 +29,15 @@
</InputSelect>
</div>
</div>
@if(userCount != null)
{
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="userCount" HelpText="Anzahl an Benutzern in der gew<65>hlten Rolle" ResourceKey="Users">Users in Role: </Label>
<div class="col-sm-9" id="userCount">
@userCount
</div>
</div>
}
</div>
<p></p>
<button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button>
@@ -49,12 +58,7 @@
new Stylesheet("_content/SZUAbsolventenverein.Module.AdminModules/Module.css")
};
private List<Role> roles = new List<Role>
{
new Role { RoleId = 1, Name = "Admin" },
new Role { RoleId = 2, Name = "User" },
new Role { RoleId = 3, Name = "Imported" },
};
private List<Role> roles = new List<Role>();
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)

27
Client/Services/AdminModulesService.cs
View File

@@ -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<int> GetUsercountInRole(Models.EmailFields EmailFields);
Task<List<Role>> GetRoles(int ModuleId);
Task<Models.EmailFields> PostUsercountInRole(Models.EmailFields EmailFields);
Task<Models.EmailFields> SendMassNotification(Models.EmailFields EmailFields);
}
@@ -39,7 +44,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services
public async Task<Models.AdminModules> GetAdminModulesAsync(int AdminModulesId, int ModuleId)
{
return await GetJsonAsync<Models.AdminModules>(CreateAuthorizationPolicyUrl($"{Apiurl}/{AdminModulesId}/{ModuleId}", EntityNames.Module, ModuleId));
return await GetJsonAsync<Models.AdminModules>(CreateAuthorizationPolicyUrl($"{Apiurl}/get/{AdminModulesId}/{ModuleId}", EntityNames.Module, ModuleId));
}
public async Task<Models.AdminModules> 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<int> GetUsercountInRole(EmailFields EmailFields)
public async Task<List<Role>> GetRoles(int ModuleId)
{
return await GetJsonAsync<int>(CreateAuthorizationPolicyUrl($"{Apiurl}/roles/{EmailFields.AdminModulesId}", EntityNames.Module, EmailFields.ModuleId));
return await GetJsonAsync<List<Role>>(CreateAuthorizationPolicyUrl($"{Apiurl}/roles?moduleid={ModuleId}", EntityNames.Module, ModuleId));
}
public async Task<EmailFields> PostUsercountInRole(EmailFields EmailFields)
{
return await PostJsonAsync<EmailFields>(CreateAuthorizationPolicyUrl($"{Apiurl}/roles/{EmailFields.AdminModulesId}", EntityNames.Module, EmailFields.ModuleId), EmailFields);
}
public async Task<Models.EmailFields> SendMassNotification(EmailFields EmailFields)

32
Server/Controllers/AdminModulesController.cs
View File

@@ -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/<controller>/5
[HttpGet("{id}/{moduleid}")]
[HttpGet("get/{id}/{moduleid}")]
[Authorize(Policy = PolicyNames.ViewModule)]
public async Task<Models.AdminModules> Get(int id, int moduleid)
{
@@ -111,21 +113,39 @@ namespace SZUAbsolventenverein.Module.AdminModules.Controllers
}
}
// GET api/<controller>/5/roles
[HttpGet("roles/{id}")]
// GET api/<controller>/roles
[HttpGet("roles")]
[Authorize(Policy = PolicyNames.ViewModule)]
public async Task<List<Role>> 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/<controller>/roles/5
[HttpPost("roles/{id}")]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task<int> GetUserCount(int id, [FromBody] Models.EmailFields EmailFields)
public async Task<EmailFields> 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;
}
}
}

28
Server/Services/AdminModulesService.cs
View File

@@ -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<int> GetUsercountInRole(EmailFields EmailFields)
public Task<List<Role>> GetRoles(int ModuleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
{
List<Role> role = new List<Role>();
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<EmailFields> 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<int> 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

1
Shared/Models/EmailFields.cs
View File

@@ -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; }
}
}