Add functionality to list roles and fetch the usercount inside that role
closes: #1
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user