Fix casing for constructor params
This commit is contained in:
parent
303bdf3be2
commit
425b4e1c67
@ -10,20 +10,20 @@ namespace Oqtane.Modules.HtmlText.Services
|
||||
{
|
||||
public class HtmlTextService : ServiceBase, IHtmlTextService
|
||||
{
|
||||
private readonly HttpClient http;
|
||||
private readonly SiteState sitestate;
|
||||
private readonly NavigationManager NavigationManager;
|
||||
private readonly HttpClient _http;
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public HtmlTextService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public HtmlTextService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
http = http;
|
||||
sitestate = sitestate;
|
||||
NavigationManager = NavigationManager;
|
||||
_http = http;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
{
|
||||
get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "HtmlText"); }
|
||||
get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "HtmlText"); }
|
||||
}
|
||||
|
||||
public async Task<HtmlTextInfo> GetHtmlTextAsync(int ModuleId)
|
||||
@ -32,7 +32,7 @@ namespace Oqtane.Modules.HtmlText.Services
|
||||
try
|
||||
{
|
||||
// exception handling is required because GetJsonAsync() returns an error if no content exists for the ModuleId ( https://github.com/aspnet/AspNetCore/issues/14041 )
|
||||
htmltext = await http.GetJsonAsync<HtmlTextInfo>(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
|
||||
htmltext = await _http.GetJsonAsync<HtmlTextInfo>(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
|
||||
}
|
||||
catch
|
||||
{
|
||||
@ -43,17 +43,17 @@ namespace Oqtane.Modules.HtmlText.Services
|
||||
|
||||
public async Task AddHtmlTextAsync(HtmlTextInfo htmltext)
|
||||
{
|
||||
await http.PostJsonAsync(apiurl + "?entityid=" + htmltext.ModuleId.ToString(), htmltext);
|
||||
await _http.PostJsonAsync(apiurl + "?entityid=" + htmltext.ModuleId.ToString(), htmltext);
|
||||
}
|
||||
|
||||
public async Task UpdateHtmlTextAsync(HtmlTextInfo htmltext)
|
||||
{
|
||||
await http.PutJsonAsync(apiurl + "/" + htmltext.HtmlTextId.ToString() + "?entityid=" + htmltext.ModuleId.ToString(), htmltext);
|
||||
await _http.PutJsonAsync(apiurl + "/" + htmltext.HtmlTextId.ToString() + "?entityid=" + htmltext.ModuleId.ToString(), htmltext);
|
||||
}
|
||||
|
||||
public async Task DeleteHtmlTextAsync(int ModuleId)
|
||||
{
|
||||
await http.DeleteAsync(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
|
||||
await _http.DeleteAsync(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -17,11 +17,11 @@ namespace Oqtane.Providers
|
||||
private readonly SiteState _siteState;
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
|
||||
public IdentityAuthenticationStateProvider(NavigationManager NavigationManager, SiteState sitestate, IServiceProvider provider)
|
||||
public IdentityAuthenticationStateProvider(NavigationManager navigationManager, SiteState siteState, IServiceProvider serviceProvider)
|
||||
{
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = sitestate;
|
||||
_serviceProvider = provider;
|
||||
_navigationManager = navigationManager;
|
||||
_siteState = siteState;
|
||||
_serviceProvider = serviceProvider;
|
||||
}
|
||||
|
||||
public override async Task<AuthenticationState> GetAuthenticationStateAsync()
|
||||
|
@ -16,11 +16,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public AliasService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public AliasService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -17,11 +17,11 @@ namespace Oqtane.Services
|
||||
private readonly NavigationManager _navigationManager;
|
||||
private readonly IJSRuntime _jsRuntime;
|
||||
|
||||
public FileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager, IJSRuntime jsRuntime)
|
||||
public FileService(HttpClient http, SiteState siteState, NavigationManager navigationManager, IJSRuntime jsRuntime)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
_jsRuntime = jsRuntime;
|
||||
}
|
||||
|
||||
|
@ -15,11 +15,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public FolderService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public FolderService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public InstallationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public InstallationService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -10,15 +10,15 @@ namespace Oqtane.Services
|
||||
{
|
||||
public class JobLogService : ServiceBase, IJobLogService
|
||||
{
|
||||
private readonly HttpClient http;
|
||||
private readonly HttpClient _http;
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public JobLogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public JobLogService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_http = http;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
@ -28,27 +28,27 @@ namespace Oqtane.Services
|
||||
|
||||
public async Task<List<JobLog>> GetJobLogsAsync()
|
||||
{
|
||||
List<JobLog> Joblogs = await http.GetJsonAsync<List<JobLog>>(apiurl);
|
||||
List<JobLog> Joblogs = await _http.GetJsonAsync<List<JobLog>>(apiurl);
|
||||
return Joblogs.OrderBy(item => item.StartDate).ToList();
|
||||
}
|
||||
|
||||
public async Task<JobLog> GetJobLogAsync(int JobLogId)
|
||||
{
|
||||
return await http.GetJsonAsync<JobLog>(apiurl + "/" + JobLogId.ToString());
|
||||
return await _http.GetJsonAsync<JobLog>(apiurl + "/" + JobLogId.ToString());
|
||||
}
|
||||
|
||||
public async Task<JobLog> AddJobLogAsync(JobLog Joblog)
|
||||
{
|
||||
return await http.PostJsonAsync<JobLog>(apiurl, Joblog);
|
||||
return await _http.PostJsonAsync<JobLog>(apiurl, Joblog);
|
||||
}
|
||||
|
||||
public async Task<JobLog> UpdateJobLogAsync(JobLog Joblog)
|
||||
{
|
||||
return await http.PutJsonAsync<JobLog>(apiurl + "/" + Joblog.JobLogId.ToString(), Joblog);
|
||||
return await _http.PutJsonAsync<JobLog>(apiurl + "/" + Joblog.JobLogId.ToString(), Joblog);
|
||||
}
|
||||
public async Task DeleteJobLogAsync(int JobLogId)
|
||||
{
|
||||
await http.DeleteAsync(apiurl + "/" + JobLogId.ToString());
|
||||
await _http.DeleteAsync(apiurl + "/" + JobLogId.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public JobService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public JobService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -15,11 +15,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public LogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public LogService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -16,11 +16,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public ModuleDefinitionService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public ModuleDefinitionService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public ModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public ModuleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public NotificationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public NotificationService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public PackageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public PackageService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public PageModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public PageModuleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -15,11 +15,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public PageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public PageService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public ProfileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public ProfileService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public RoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public RoleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public SettingService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public SettingService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public SiteService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public SiteService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public TenantService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public TenantService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -16,11 +16,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public ThemeService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public ThemeService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -14,11 +14,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public UserRoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public UserRoleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -12,11 +12,11 @@ namespace Oqtane.Services
|
||||
private readonly SiteState _siteState;
|
||||
private readonly NavigationManager _navigationManager;
|
||||
|
||||
public UserService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager)
|
||||
public UserService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
|
||||
{
|
||||
_http = http;
|
||||
_siteState = sitestate;
|
||||
_navigationManager = NavigationManager;
|
||||
_siteState = siteState;
|
||||
_navigationManager = navigationManager;
|
||||
}
|
||||
|
||||
private string apiurl
|
||||
|
@ -17,9 +17,9 @@ namespace Oqtane.Controllers
|
||||
private readonly IAliasRepository _aliases;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public AliasController(IAliasRepository Aliases, ILogManager logger)
|
||||
public AliasController(IAliasRepository aliases, ILogManager logger)
|
||||
{
|
||||
_aliases = Aliases;
|
||||
_aliases = aliases;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -27,13 +27,13 @@ namespace Oqtane.Controllers
|
||||
private readonly ITenantResolver _tenants;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public FileController(IWebHostEnvironment environment, IFileRepository Files, IFolderRepository Folders, IUserPermissions UserPermissions, ITenantResolver Tenants, ILogManager logger)
|
||||
public FileController(IWebHostEnvironment environment, IFileRepository files, IFolderRepository folders, IUserPermissions userPermissions, ITenantResolver tenants, ILogManager logger)
|
||||
{
|
||||
_environment = environment;
|
||||
_files = Files;
|
||||
_folders = Folders;
|
||||
_userPermissions = UserPermissions;
|
||||
_tenants = Tenants;
|
||||
_files = files;
|
||||
_folders = folders;
|
||||
_userPermissions = userPermissions;
|
||||
_tenants = tenants;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -17,10 +17,10 @@ namespace Oqtane.Controllers
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public FolderController(IFolderRepository Folders, IUserPermissions UserPermissions, ILogManager logger)
|
||||
public FolderController(IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger)
|
||||
{
|
||||
_folders = Folders;
|
||||
_userPermissions = UserPermissions;
|
||||
_folders = folders;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -22,10 +22,10 @@ namespace Oqtane.Controllers
|
||||
private readonly IConfigurationRoot _config;
|
||||
private readonly IInstallationManager _installationManager;
|
||||
|
||||
public InstallationController(IConfigurationRoot Config, IInstallationManager InstallationManager)
|
||||
public InstallationController(IConfigurationRoot config, IInstallationManager installationManager)
|
||||
{
|
||||
_config = Config;
|
||||
_installationManager = InstallationManager;
|
||||
_config = config;
|
||||
_installationManager = installationManager;
|
||||
}
|
||||
|
||||
// POST api/<controller>
|
||||
|
@ -18,11 +18,11 @@ namespace Oqtane.Controllers
|
||||
private readonly ILogManager _logger;
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
|
||||
public JobController(IJobRepository Jobs, ILogManager logger, IServiceProvider ServiceProvider)
|
||||
public JobController(IJobRepository jobs, ILogManager logger, IServiceProvider serviceProvider)
|
||||
{
|
||||
_jobs = Jobs;
|
||||
_jobs = jobs;
|
||||
_logger = logger;
|
||||
_serviceProvider = ServiceProvider;
|
||||
_serviceProvider = serviceProvider;
|
||||
}
|
||||
|
||||
// GET: api/<controller>
|
||||
|
@ -14,9 +14,9 @@ namespace Oqtane.Controllers
|
||||
private readonly IJobLogRepository _jobLogs;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public JobLogController(IJobLogRepository JobLogs, ILogManager logger)
|
||||
public JobLogController(IJobLogRepository jobLogs, ILogManager logger)
|
||||
{
|
||||
_jobLogs = JobLogs;
|
||||
_jobLogs = jobLogs;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -12,13 +12,13 @@ namespace Oqtane.Controllers
|
||||
[Route("{site}/api/[controller]")]
|
||||
public class LogController : Controller
|
||||
{
|
||||
private readonly ILogManager _ogger;
|
||||
private readonly ILogManager _logger;
|
||||
private readonly ILogRepository _logs;
|
||||
|
||||
public LogController(ILogManager Logger, ILogRepository Logs)
|
||||
public LogController(ILogManager logger, ILogRepository logs)
|
||||
{
|
||||
_ogger = Logger;
|
||||
_logs = Logs;
|
||||
_logger = logger;
|
||||
_logs = logs;
|
||||
}
|
||||
|
||||
// GET: api/<controller>?siteid=x&level=y&function=z&rows=50
|
||||
@ -43,7 +43,7 @@ namespace Oqtane.Controllers
|
||||
{
|
||||
if (ModelState.IsValid)
|
||||
{
|
||||
_ogger.Log(Log);
|
||||
_logger.Log(Log);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -20,12 +20,12 @@ namespace Oqtane.Controllers
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public ModuleController(IModuleRepository Modules, IPageModuleRepository PageModules, IModuleDefinitionRepository ModuleDefinitions, IUserPermissions UserPermissions, ILogManager logger)
|
||||
public ModuleController(IModuleRepository modules, IPageModuleRepository pageModules, IModuleDefinitionRepository moduleDefinitions, IUserPermissions userPermissions, ILogManager logger)
|
||||
{
|
||||
_modules = Modules;
|
||||
_pageModules = PageModules;
|
||||
_moduleDefinitions = ModuleDefinitions;
|
||||
_userPermissions = UserPermissions;
|
||||
_modules = modules;
|
||||
_pageModules = pageModules;
|
||||
_moduleDefinitions = moduleDefinitions;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -22,11 +22,11 @@ namespace Oqtane.Controllers
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public ModuleDefinitionController(IModuleDefinitionRepository ModuleDefinitions, IUserPermissions UserPermissions, IInstallationManager InstallationManager, IWebHostEnvironment environment, ILogManager logger)
|
||||
public ModuleDefinitionController(IModuleDefinitionRepository moduleDefinitions, IUserPermissions userPermissions, IInstallationManager installationManager, IWebHostEnvironment environment, ILogManager logger)
|
||||
{
|
||||
_moduleDefinitions = ModuleDefinitions;
|
||||
_userPermissions = UserPermissions;
|
||||
_installationManager = InstallationManager;
|
||||
_moduleDefinitions = moduleDefinitions;
|
||||
_userPermissions = userPermissions;
|
||||
_installationManager = installationManager;
|
||||
_environment = environment;
|
||||
_logger = logger;
|
||||
}
|
||||
|
@ -17,10 +17,10 @@ namespace Oqtane.Controllers
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public NotificationController(INotificationRepository Notifications, IUserPermissions UserPermissions, ILogManager logger)
|
||||
public NotificationController(INotificationRepository notifications, IUserPermissions userPermissions, ILogManager logger)
|
||||
{
|
||||
_notifications = Notifications;
|
||||
_userPermissions = UserPermissions;
|
||||
_notifications = notifications;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -19,12 +19,12 @@ namespace Oqtane.Controllers
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public PageController(IPageRepository Pages, IModuleRepository Modules, IPageModuleRepository PageModules, IUserPermissions UserPermissions, ILogManager logger)
|
||||
public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, ILogManager logger)
|
||||
{
|
||||
_pages = Pages;
|
||||
_modules = Modules;
|
||||
_pageModules = PageModules;
|
||||
_userPermissions = UserPermissions;
|
||||
_pages = pages;
|
||||
_modules = modules;
|
||||
_pageModules = pageModules;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -18,11 +18,11 @@ namespace Oqtane.Controllers
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public PageModuleController(IPageModuleRepository PageModules, IModuleRepository Modules, IUserPermissions UserPermissions, ILogManager logger)
|
||||
public PageModuleController(IPageModuleRepository pageModules, IModuleRepository modules, IUserPermissions userPermissions, ILogManager logger)
|
||||
{
|
||||
_pageModules = PageModules;
|
||||
_modules = Modules;
|
||||
_userPermissions = UserPermissions;
|
||||
_pageModules = pageModules;
|
||||
_modules = modules;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -14,9 +14,9 @@ namespace Oqtane.Controllers
|
||||
private readonly IProfileRepository _profiles;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public ProfileController(IProfileRepository Profiles, ILogManager logger)
|
||||
public ProfileController(IProfileRepository profiles, ILogManager logger)
|
||||
{
|
||||
_profiles = Profiles;
|
||||
_profiles = profiles;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -14,9 +14,9 @@ namespace Oqtane.Controllers
|
||||
private readonly IRoleRepository _roles;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public RoleController(IRoleRepository Roles, ILogManager logger)
|
||||
public RoleController(IRoleRepository roles, ILogManager logger)
|
||||
{
|
||||
_roles = Roles;
|
||||
_roles = roles;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -18,11 +18,11 @@ namespace Oqtane.Controllers
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public SettingController(ISettingRepository Settings, IPageModuleRepository PageModules, IUserPermissions UserPermissions, ILogManager logger)
|
||||
public SettingController(ISettingRepository settings, IPageModuleRepository pageModules, IUserPermissions userPermissions, ILogManager logger)
|
||||
{
|
||||
_settings = Settings;
|
||||
_pageModules = PageModules;
|
||||
_userPermissions = UserPermissions;
|
||||
_settings = settings;
|
||||
_pageModules = pageModules;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -19,10 +19,10 @@ namespace Oqtane.Controllers
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public SiteController(ISiteRepository Sites, ITenantResolver Tenants, IWebHostEnvironment environment, ILogManager logger)
|
||||
public SiteController(ISiteRepository sites, ITenantResolver tenants, IWebHostEnvironment environment, ILogManager logger)
|
||||
{
|
||||
_sites = Sites;
|
||||
_tenants = Tenants;
|
||||
_sites = sites;
|
||||
_tenants = tenants;
|
||||
_environment = environment;
|
||||
_logger = logger;
|
||||
}
|
||||
|
@ -14,9 +14,9 @@ namespace Oqtane.Controllers
|
||||
private readonly ITenantRepository _tenants;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public TenantController(ITenantRepository Tenants, ILogManager logger)
|
||||
public TenantController(ITenantRepository tenants, ILogManager logger)
|
||||
{
|
||||
_tenants = Tenants;
|
||||
_tenants = tenants;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -20,10 +20,10 @@ namespace Oqtane.Controllers
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public ThemeController(IThemeRepository Themes, IInstallationManager InstallationManager, IWebHostEnvironment environment, ILogManager logger)
|
||||
public ThemeController(IThemeRepository themes, IInstallationManager installationManager, IWebHostEnvironment environment, ILogManager logger)
|
||||
{
|
||||
_themes = Themes;
|
||||
_installationManager = InstallationManager;
|
||||
_themes = themes;
|
||||
_installationManager = installationManager;
|
||||
_environment = environment;
|
||||
_logger = logger;
|
||||
}
|
||||
|
@ -29,16 +29,16 @@ namespace Oqtane.Controllers
|
||||
private readonly IFolderRepository _folders;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public UserController(IUserRepository Users, IRoleRepository Roles, IUserRoleRepository UserRoles, UserManager<IdentityUser> IdentityUserManager, SignInManager<IdentityUser> IdentitySignInManager, ITenantResolver Tenants, INotificationRepository Notifications, IFolderRepository Folders, ILogManager logger)
|
||||
public UserController(IUserRepository users, IRoleRepository roles, IUserRoleRepository userRoles, UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager, ITenantResolver tenants, INotificationRepository notifications, IFolderRepository folders, ILogManager logger)
|
||||
{
|
||||
_users = Users;
|
||||
_roles = Roles;
|
||||
_userRoles = UserRoles;
|
||||
_identityUserManager = IdentityUserManager;
|
||||
_identitySignInManager = IdentitySignInManager;
|
||||
_tenants = Tenants;
|
||||
_folders = Folders;
|
||||
_notifications = Notifications;
|
||||
_users = users;
|
||||
_roles = roles;
|
||||
_userRoles = userRoles;
|
||||
_identityUserManager = identityUserManager;
|
||||
_identitySignInManager = identitySignInManager;
|
||||
_tenants = tenants;
|
||||
_folders = folders;
|
||||
_notifications = notifications;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -14,9 +14,9 @@ namespace Oqtane.Controllers
|
||||
private readonly IUserRoleRepository _userRoles;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public UserRoleController(IUserRoleRepository UserRoles, ILogManager logger)
|
||||
public UserRoleController(IUserRoleRepository userRoles, ILogManager logger)
|
||||
{
|
||||
_userRoles = UserRoles;
|
||||
_userRoles = userRoles;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -15,9 +15,9 @@ namespace Oqtane.Infrastructure
|
||||
private readonly IHostApplicationLifetime _hostApplicationLifetime;
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
|
||||
public InstallationManager(IHostApplicationLifetime HostApplicationLifetime, IWebHostEnvironment environment)
|
||||
public InstallationManager(IHostApplicationLifetime hostApplicationLifetime, IWebHostEnvironment environment)
|
||||
{
|
||||
_hostApplicationLifetime = HostApplicationLifetime;
|
||||
_hostApplicationLifetime = hostApplicationLifetime;
|
||||
_environment = environment;
|
||||
}
|
||||
|
||||
|
@ -17,9 +17,9 @@ namespace Oqtane.Infrastructure
|
||||
private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
|
||||
private readonly IServiceScopeFactory _serviceScopeFactory;
|
||||
|
||||
public HostedServiceBase(IServiceScopeFactory ServiceScopeFactory)
|
||||
public HostedServiceBase(IServiceScopeFactory serviceScopeFactory)
|
||||
{
|
||||
_serviceScopeFactory = ServiceScopeFactory;
|
||||
_serviceScopeFactory = serviceScopeFactory;
|
||||
}
|
||||
|
||||
// abstract method must be overridden
|
||||
|
@ -18,13 +18,13 @@ namespace Oqtane.Infrastructure
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly IHttpContextAccessor _accessor;
|
||||
|
||||
public LogManager(ILogRepository Logs, ITenantResolver TenantResolver, IConfigurationRoot Config, IUserPermissions UserPermissions, IHttpContextAccessor Accessor)
|
||||
public LogManager(ILogRepository logs, ITenantResolver tenantResolver, IConfigurationRoot config, IUserPermissions userPermissions, IHttpContextAccessor accessor)
|
||||
{
|
||||
_logs = Logs;
|
||||
_tenantResolver = TenantResolver;
|
||||
_config = Config;
|
||||
_userPermissions = UserPermissions;
|
||||
_accessor = Accessor;
|
||||
_logs = logs;
|
||||
_tenantResolver = tenantResolver;
|
||||
_config = config;
|
||||
_userPermissions = userPermissions;
|
||||
_accessor = accessor;
|
||||
}
|
||||
|
||||
public void Log(LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args)
|
||||
|
@ -16,13 +16,13 @@ namespace Oqtane.Modules.HtmlText.Controllers
|
||||
private readonly ILogManager _logger;
|
||||
private int _entityId = -1; // passed as a querystring parameter for authorization and used for validation
|
||||
|
||||
public HtmlTextController(IHtmlTextRepository HtmlText, ILogManager logger, IHttpContextAccessor HttpContextAccessor)
|
||||
public HtmlTextController(IHtmlTextRepository htmlText, ILogManager logger, IHttpContextAccessor httpContextAccessor)
|
||||
{
|
||||
_htmlText = HtmlText;
|
||||
_htmlText = htmlText;
|
||||
_logger = logger;
|
||||
if (HttpContextAccessor.HttpContext.Request.Query.ContainsKey("entityid"))
|
||||
if (httpContextAccessor.HttpContext.Request.Query.ContainsKey("entityid"))
|
||||
{
|
||||
_entityId = int.Parse(HttpContextAccessor.HttpContext.Request.Query["entityid"]);
|
||||
_entityId = int.Parse(httpContextAccessor.HttpContext.Request.Query["entityid"]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -10,22 +10,22 @@ namespace Oqtane.Pages
|
||||
public class LoginModel : PageModel
|
||||
{
|
||||
|
||||
private readonly UserManager<IdentityUser> IdentityUserManager;
|
||||
private readonly SignInManager<IdentityUser> IdentitySignInManager;
|
||||
private readonly UserManager<IdentityUser> _identityUserManager;
|
||||
private readonly SignInManager<IdentityUser> _identitySignInManager;
|
||||
|
||||
public LoginModel(UserManager<IdentityUser> IdentityUserManager, SignInManager<IdentityUser> IdentitySignInManager)
|
||||
public LoginModel(UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager)
|
||||
{
|
||||
IdentityUserManager = IdentityUserManager;
|
||||
IdentitySignInManager = IdentitySignInManager;
|
||||
_identityUserManager = identityUserManager;
|
||||
_identitySignInManager = identitySignInManager;
|
||||
}
|
||||
|
||||
public async Task<IActionResult> OnPostAsync(string username, string password, bool remember, string returnurl)
|
||||
{
|
||||
bool validuser = false;
|
||||
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(username);
|
||||
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(username);
|
||||
if (identityuser != null)
|
||||
{
|
||||
var result = await IdentitySignInManager.CheckPasswordSignInAsync(identityuser, password, false);
|
||||
var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, password, false);
|
||||
if (result.Succeeded)
|
||||
{
|
||||
validuser = true;
|
||||
@ -34,7 +34,7 @@ namespace Oqtane.Pages
|
||||
|
||||
if (validuser)
|
||||
{
|
||||
await IdentitySignInManager.SignInAsync(identityuser, remember);
|
||||
await _identitySignInManager.SignInAsync(identityuser, remember);
|
||||
}
|
||||
|
||||
if (returnurl == null)
|
||||
|
@ -13,9 +13,9 @@ namespace Oqtane.Repository
|
||||
private Tenant _tenant;
|
||||
private IHttpContextAccessor _accessor;
|
||||
|
||||
public DBContextBase(ITenantResolver TenantResolver, IHttpContextAccessor accessor)
|
||||
public DBContextBase(ITenantResolver tenantResolver, IHttpContextAccessor accessor)
|
||||
{
|
||||
_tenant = TenantResolver.GetTenant();
|
||||
_tenant = tenantResolver.GetTenant();
|
||||
_accessor = accessor;
|
||||
}
|
||||
|
||||
|
@ -10,10 +10,10 @@ namespace Oqtane.Repository
|
||||
private TenantDBContext _db;
|
||||
private readonly IPermissionRepository _permissions;
|
||||
|
||||
public FileRepository(TenantDBContext context, IPermissionRepository Permissions)
|
||||
public FileRepository(TenantDBContext context, IPermissionRepository permissions)
|
||||
{
|
||||
_db = context;
|
||||
_permissions = Permissions;
|
||||
_permissions = permissions;
|
||||
}
|
||||
|
||||
public IEnumerable<File> GetFiles(int FolderId)
|
||||
|
@ -10,10 +10,10 @@ namespace Oqtane.Repository
|
||||
private TenantDBContext _db;
|
||||
private readonly IPermissionRepository _permissions;
|
||||
|
||||
public FolderRepository(TenantDBContext context, IPermissionRepository Permissions)
|
||||
public FolderRepository(TenantDBContext context, IPermissionRepository permissions)
|
||||
{
|
||||
_db = context;
|
||||
_permissions = Permissions;
|
||||
_permissions = permissions;
|
||||
}
|
||||
|
||||
public IEnumerable<Folder> GetFolders(int SiteId)
|
||||
|
@ -16,11 +16,11 @@ namespace Oqtane.Repository
|
||||
private readonly IMemoryCache _cache;
|
||||
private readonly IPermissionRepository _permissions;
|
||||
|
||||
public ModuleDefinitionRepository(MasterDBContext context, IMemoryCache cache, IPermissionRepository Permissions)
|
||||
public ModuleDefinitionRepository(MasterDBContext context, IMemoryCache cache, IPermissionRepository permissions)
|
||||
{
|
||||
_db = context;
|
||||
_cache = cache;
|
||||
_permissions = Permissions;
|
||||
_permissions = permissions;
|
||||
}
|
||||
|
||||
public IEnumerable<ModuleDefinition> GetModuleDefinitions(int SiteId)
|
||||
|
@ -17,12 +17,12 @@ namespace Oqtane.Repository
|
||||
private readonly IModuleDefinitionRepository _moduleDefinitions;
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
|
||||
public ModuleRepository(TenantDBContext context, IPermissionRepository Permissions, IModuleDefinitionRepository ModuleDefinitions, IServiceProvider ServiceProvider)
|
||||
public ModuleRepository(TenantDBContext context, IPermissionRepository permissions, IModuleDefinitionRepository moduleDefinitions, IServiceProvider serviceProvider)
|
||||
{
|
||||
_db = context;
|
||||
_permissions = Permissions;
|
||||
_moduleDefinitions = ModuleDefinitions;
|
||||
_serviceProvider = ServiceProvider;
|
||||
_permissions = permissions;
|
||||
_moduleDefinitions = moduleDefinitions;
|
||||
_serviceProvider = serviceProvider;
|
||||
}
|
||||
|
||||
public IEnumerable<Models.Module> GetModules(int SiteId)
|
||||
|
@ -10,10 +10,10 @@ namespace Oqtane.Repository
|
||||
private TenantDBContext _db;
|
||||
private readonly IPermissionRepository _permissions;
|
||||
|
||||
public PageModuleRepository(TenantDBContext context, IPermissionRepository Permissions)
|
||||
public PageModuleRepository(TenantDBContext context, IPermissionRepository permissions)
|
||||
{
|
||||
_db = context;
|
||||
_permissions = Permissions;
|
||||
_permissions = permissions;
|
||||
}
|
||||
|
||||
public IEnumerable<PageModule> GetPageModules(int SiteId)
|
||||
|
@ -11,11 +11,11 @@ namespace Oqtane.Repository
|
||||
private readonly IPermissionRepository _permissions;
|
||||
private readonly IPageModuleRepository _pageModules;
|
||||
|
||||
public PageRepository(TenantDBContext context, IPermissionRepository Permissions, IPageModuleRepository PageModules)
|
||||
public PageRepository(TenantDBContext context, IPermissionRepository permissions, IPageModuleRepository pageModules)
|
||||
{
|
||||
_db = context;
|
||||
_permissions = Permissions;
|
||||
_pageModules = PageModules;
|
||||
_permissions = permissions;
|
||||
_pageModules = pageModules;
|
||||
}
|
||||
|
||||
public IEnumerable<Page> GetPages(int SiteId)
|
||||
|
@ -14,10 +14,10 @@ namespace Oqtane.Repository
|
||||
private TenantDBContext _db;
|
||||
private readonly IRoleRepository _roles;
|
||||
|
||||
public PermissionRepository(TenantDBContext context, IRoleRepository Roles)
|
||||
public PermissionRepository(TenantDBContext context, IRoleRepository roles)
|
||||
{
|
||||
_db = context;
|
||||
_roles = Roles;
|
||||
_roles = roles;
|
||||
}
|
||||
|
||||
public IEnumerable<Permission> GetPermissions(int SiteId, string EntityName)
|
||||
|
@ -24,18 +24,18 @@ namespace Oqtane.Repository
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
private readonly List<PageTemplate> _siteTemplate;
|
||||
|
||||
public SiteRepository(TenantDBContext context, IRoleRepository RoleRepository, IProfileRepository ProfileRepository, IFolderRepository FolderRepository, IFileRepository FileRepository, IPageRepository PageRepository, IModuleRepository ModuleRepository, IPageModuleRepository PageModuleRepository, IModuleDefinitionRepository ModuleDefinitionRepository, IServiceProvider ServiceProvider)
|
||||
public SiteRepository(TenantDBContext context, IRoleRepository roleRepository, IProfileRepository profileRepository, IFolderRepository folderRepository, IFileRepository fileRepository, IPageRepository pageRepository, IModuleRepository moduleRepository, IPageModuleRepository pageModuleRepository, IModuleDefinitionRepository moduleDefinitionRepository, IServiceProvider serviceProvider)
|
||||
{
|
||||
_db = context;
|
||||
_roleRepository = RoleRepository;
|
||||
_profileRepository = ProfileRepository;
|
||||
_folderRepository = FolderRepository;
|
||||
_fileRepository = FileRepository;
|
||||
_pageRepository = PageRepository;
|
||||
_moduleRepository = ModuleRepository;
|
||||
_pageModuleRepository = PageModuleRepository;
|
||||
_moduleDefinitionRepository = ModuleDefinitionRepository;
|
||||
_serviceProvider = ServiceProvider;
|
||||
_roleRepository = roleRepository;
|
||||
_profileRepository = profileRepository;
|
||||
_folderRepository = folderRepository;
|
||||
_fileRepository = fileRepository;
|
||||
_pageRepository = pageRepository;
|
||||
_moduleRepository = moduleRepository;
|
||||
_pageModuleRepository = pageModuleRepository;
|
||||
_moduleDefinitionRepository = moduleDefinitionRepository;
|
||||
_serviceProvider = serviceProvider;
|
||||
|
||||
// define the default site template
|
||||
_siteTemplate = new List<PageTemplate>();
|
||||
|
@ -12,10 +12,10 @@ namespace Oqtane.Security
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public PermissionHandler(IHttpContextAccessor HttpContextAccessor, IUserPermissions UserPermissions, ILogManager logger)
|
||||
public PermissionHandler(IHttpContextAccessor httpContextAccessor, IUserPermissions userPermissions, ILogManager logger)
|
||||
{
|
||||
_httpContextAccessor = HttpContextAccessor;
|
||||
_userPermissions = UserPermissions;
|
||||
_httpContextAccessor = httpContextAccessor;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -8,10 +8,10 @@ namespace Oqtane.Security
|
||||
|
||||
public string PermissionName { get; }
|
||||
|
||||
public PermissionRequirement(string EntityName, string PermissionName)
|
||||
public PermissionRequirement(string entityName, string permissionName)
|
||||
{
|
||||
EntityName = EntityName;
|
||||
PermissionName = PermissionName;
|
||||
EntityName = entityName;
|
||||
PermissionName = permissionName;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -11,10 +11,10 @@ namespace Oqtane.Security
|
||||
private readonly IPermissionRepository _permissions;
|
||||
private readonly IHttpContextAccessor _accessor;
|
||||
|
||||
public UserPermissions(IPermissionRepository Permissions, IHttpContextAccessor Accessor)
|
||||
public UserPermissions(IPermissionRepository permissions, IHttpContextAccessor accessor)
|
||||
{
|
||||
_permissions = Permissions;
|
||||
_accessor = Accessor;
|
||||
_permissions = permissions;
|
||||
_accessor = accessor;
|
||||
}
|
||||
|
||||
public bool IsAuthorized(ClaimsPrincipal User, string EntityName, int EntityId, string PermissionName)
|
||||
|
Loading…
x
Reference in New Issue
Block a user