FEAT: Fetch ModuleDefinition's Permission on Utilize for Reporting
This commit is contained in:
@@ -7,42 +7,55 @@ using Microsoft.AspNetCore.Http;
|
|||||||
using Oqtane.Enums;
|
using Oqtane.Enums;
|
||||||
using Oqtane.Infrastructure;
|
using Oqtane.Infrastructure;
|
||||||
using Oqtane.Models;
|
using Oqtane.Models;
|
||||||
|
using Oqtane.Repository;
|
||||||
using Oqtane.Security;
|
using Oqtane.Security;
|
||||||
using Oqtane.Shared;
|
using Oqtane.Shared;
|
||||||
using SZUAbsolventenverein.Module.ReportSystem.Models;
|
using SZUAbsolventenverein.Module.ReportSystem.Models;
|
||||||
|
using SZUAbsolventenverein.Module.ReportSystem.Permissions;
|
||||||
using SZUAbsolventenverein.Module.ReportSystem.Repository;
|
using SZUAbsolventenverein.Module.ReportSystem.Repository;
|
||||||
|
|
||||||
namespace SZUAbsolventenverein.Module.ReportSystem.Services
|
namespace SZUAbsolventenverein.Module.ReportSystem.Services
|
||||||
{
|
{
|
||||||
public class ServerReportSystemReportingService : IReportSystemReportingService, IReportingHandler
|
public class ServerReportSystemReportingService : IReportSystemReportingService, IReportingHandler
|
||||||
{
|
{
|
||||||
|
private readonly IModuleDefinitionRepository _moduleDefinitionRepository;
|
||||||
private readonly IReportingRepository _reportSystemRepository;
|
private readonly IReportingRepository _reportSystemRepository;
|
||||||
private readonly IUserPermissions _userPermissions;
|
private readonly IUserPermissions _userPermissions;
|
||||||
private readonly ILogManager _logger;
|
private readonly ILogManager _logger;
|
||||||
private readonly IHttpContextAccessor _accessor;
|
private readonly IHttpContextAccessor _accessor;
|
||||||
private readonly Alias _alias;
|
private readonly Alias _alias;
|
||||||
|
private readonly int _moduleDefinitionId;
|
||||||
|
|
||||||
public ServerReportSystemReportingService(IReportingRepository reportSystemRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
|
public ServerReportSystemReportingService(IModuleDefinitionRepository moduleDefinitionRepository, IReportingRepository reportSystemRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
|
||||||
{
|
{
|
||||||
|
_moduleDefinitionRepository = moduleDefinitionRepository;
|
||||||
_reportSystemRepository = reportSystemRepository;
|
_reportSystemRepository = reportSystemRepository;
|
||||||
_userPermissions = userPermissions;
|
_userPermissions = userPermissions;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_accessor = accessor;
|
_accessor = accessor;
|
||||||
_alias = tenantManager.GetAlias();
|
_alias = tenantManager.GetAlias();
|
||||||
|
|
||||||
|
ModuleDefinition md = moduleDefinitionRepository.GetModuleDefinitions(_alias.SiteId).ToList().Find(md => md.IsEnabled && md.Name == new ModuleInfo().ModuleDefinition.Name);
|
||||||
|
if (md == null)
|
||||||
|
{
|
||||||
|
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Reporting Module Not Found {ModuleName}", new ModuleInfo().ModuleDefinition.Name);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_moduleDefinitionId = md.ModuleDefinitionId;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<Reporting> CreateReportAsync(Reporting Reporting)
|
public Task<Reporting> CreateReportAsync(Reporting Reporting)
|
||||||
{
|
{
|
||||||
// true ||
|
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.ModuleDefinition, _moduleDefinitionId, PermissionNames.Utilize))
|
||||||
Console.WriteLine("HELP");
|
|
||||||
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.ModuleDefinition, 53, PermissionNames.Utilize))
|
|
||||||
{
|
{
|
||||||
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Reporting Updated {Reporting}", Reporting);
|
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Reporting created {Reporting}", Reporting);
|
||||||
return Task.FromResult(_reportSystemRepository.AddReporting(Reporting));
|
return Task.FromResult(_reportSystemRepository.AddReporting(Reporting));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Update Attempt {Reporting}", Reporting);
|
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting create attempt {Reporting}", Reporting);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -108,7 +121,10 @@ namespace SZUAbsolventenverein.Module.ReportSystem.Services
|
|||||||
// if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
|
// if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
|
||||||
{
|
{
|
||||||
Reporting reporting = await CreateReportAsync(new Reporting {ModuleId = reportable.ModuleID, EntityId = reportable.EntityID, Note = note, Reason = "Default Reason"});
|
Reporting reporting = await CreateReportAsync(new Reporting {ModuleId = reportable.ModuleID, EntityId = reportable.EntityID, Note = note, Reason = "Default Reason"});
|
||||||
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Reporting recieved {ReportingId}", reporting.ReportingID);
|
if (reporting != null)
|
||||||
|
{
|
||||||
|
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Reporting recieved {ReportingId}", reporting.ReportingID);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// else
|
// else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user