Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix naming conventions for private fields

Browse Source
This commit is contained in:
Hisham Bin Ateya
2020-03-05 01:46:53 +03:00
parent e74f0d7644
commit a46235ea1e
75 changed files with 1219 additions and 1219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Oqtane.Server/Controllers/AliasController.cs
View File

@ -14,13 +14,13 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class AliasController : Controller
{
private readonly IAliasRepository Aliases;
private readonly ILogManager logger;
private readonly IAliasRepository _aliases;
private readonly ILogManager _logger;
public AliasController(IAliasRepository Aliases, ILogManager logger)
{
this.Aliases = Aliases;
this.logger = logger;
this._aliases = Aliases;
this._logger = logger;
}
// GET: api/<controller>
@ -28,7 +28,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public IEnumerable<Alias> Get()
{
return Aliases.GetAliases();
return _aliases.GetAliases();
}
// GET api/<controller>/5
@ -36,7 +36,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public Alias Get(int id)
{
return Aliases.GetAlias(id);
return _aliases.GetAlias(id);
}
// GET api/<controller>/name/localhost:12345
@ -44,7 +44,7 @@ namespace Oqtane.Controllers
public Alias Get(string name)
{
name = WebUtility.UrlDecode(name);
List<Alias> aliases = Aliases.GetAliases().ToList();
List<Alias> aliases = _aliases.GetAliases().ToList();
Alias alias = null;
alias = aliases.Where(item => item.Name == name).FirstOrDefault();
if (alias == null && name.Contains("/"))
@ -67,8 +67,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Alias = Aliases.AddAlias(Alias);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Alias Added {Alias}", Alias);
Alias = _aliases.AddAlias(Alias);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Alias Added {Alias}", Alias);
}
return Alias;
}
@ -80,8 +80,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Alias = Aliases.UpdateAlias(Alias);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Alias Updated {Alias}", Alias);
Alias = _aliases.UpdateAlias(Alias);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Alias Updated {Alias}", Alias);
}
return Alias;
}
@ -91,8 +91,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public void Delete(int id)
{
Aliases.DeleteAlias(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Alias Deleted {AliasId}", id);
_aliases.DeleteAlias(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Alias Deleted {AliasId}", id);
}
}
}

88
Oqtane.Server/Controllers/FileController.cs
View File

@ -20,21 +20,21 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class FileController : Controller
{
private readonly IWebHostEnvironment environment;
private readonly IFileRepository Files;
private readonly IFolderRepository Folders;
private readonly IUserPermissions UserPermissions;
private readonly ITenantResolver Tenants;
private readonly ILogManager logger;
private readonly IWebHostEnvironment _environment;
private readonly IFileRepository _files;
private readonly IFolderRepository _folders;
private readonly IUserPermissions _userPermissions;
private readonly ITenantResolver _tenants;
private readonly ILogManager _logger;
public FileController(IWebHostEnvironment environment, IFileRepository Files, IFolderRepository Folders, IUserPermissions UserPermissions, ITenantResolver Tenants, ILogManager logger)
{
this.environment = environment;
this.Files = Files;
this.Folders = Folders;
this.UserPermissions = UserPermissions;
this.Tenants = Tenants;
this.logger = logger;
this._environment = environment;
this._files = Files;
this._folders = Folders;
this._userPermissions = UserPermissions;
this._tenants = Tenants;
this._logger = logger;
}
// GET: api/<controller>?folder=x
@ -45,10 +45,10 @@ namespace Oqtane.Controllers
int folderid;
if (int.TryParse(folder, out folderid))
{
Folder Folder = Folders.GetFolder(folderid);
if (Folder != null && UserPermissions.IsAuthorized(User, "Browse", Folder.Permissions))
Folder Folder = _folders.GetFolder(folderid);
if (Folder != null && _userPermissions.IsAuthorized(User, "Browse", Folder.Permissions))
{
files = Files.GetFiles(folderid).ToList();
files = _files.GetFiles(folderid).ToList();
}
}
else
@ -72,14 +72,14 @@ namespace Oqtane.Controllers
[HttpGet("{id}")]
public Models.File Get(int id)
{
Models.File file = Files.GetFile(id);
if (UserPermissions.IsAuthorized(User, "View", file.Folder.Permissions))
Models.File file = _files.GetFile(id);
if (_userPermissions.IsAuthorized(User, "View", file.Folder.Permissions))
{
return file;
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {File}", file);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {File}", file);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -90,14 +90,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public Models.File Put(int id, [FromBody] Models.File File)
{
if (ModelState.IsValid && UserPermissions.IsAuthorized(User, "Folder", File.Folder.FolderId, "Edit"))
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Folder", File.Folder.FolderId, "Edit"))
{
File = Files.UpdateFile(File);
logger.Log(LogLevel.Information, this, LogFunction.Update, "File Updated {File}", File);
File = _files.UpdateFile(File);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "File Updated {File}", File);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update File {File}", File);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update File {File}", File);
HttpContext.Response.StatusCode = 401;
File = null;
}
@ -109,21 +109,21 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Delete(int id)
{
Models.File File = Files.GetFile(id);
if (UserPermissions.IsAuthorized(User, "Folder", File.Folder.FolderId, "Edit"))
Models.File File = _files.GetFile(id);
if (_userPermissions.IsAuthorized(User, "Folder", File.Folder.FolderId, "Edit"))
{
Files.DeleteFile(id);
_files.DeleteFile(id);
string filepath = Path.Combine(GetFolderPath(File.Folder) + File.Name);
if (System.IO.File.Exists(filepath))
{
System.IO.File.Delete(filepath);
}
logger.Log(LogLevel.Information, this, LogFunction.Delete, "File Deleted {File}", File);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "File Deleted {File}", File);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete File {FileId}", id);
_logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete File {FileId}", id);
HttpContext.Response.StatusCode = 401;
}
}
@ -133,8 +133,8 @@ namespace Oqtane.Controllers
public Models.File UploadFile(string url, string folderid)
{
Models.File file = null;
Folder folder = Folders.GetFolder(int.Parse(folderid));
if (folder != null && UserPermissions.IsAuthorized(User, "Edit", folder.Permissions))
Folder folder = _folders.GetFolder(int.Parse(folderid));
if (folder != null && _userPermissions.IsAuthorized(User, "Edit", folder.Permissions))
{
string folderpath = GetFolderPath(folder);
CreateDirectory(folderpath);
@ -151,21 +151,21 @@ namespace Oqtane.Controllers
System.IO.File.Delete(folderpath + filename);
}
client.DownloadFile(url, folderpath + filename);
Files.AddFile(CreateFile(filename, folder.FolderId, folderpath + filename));
_files.AddFile(CreateFile(filename, folder.FolderId, folderpath + filename));
}
catch
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "File Could Not Be Downloaded From Url {Url}", url);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "File Could Not Be Downloaded From Url {Url}", url);
}
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "File Could Not Be Downloaded From Url Due To Its File Extension {Url}", url);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "File Could Not Be Downloaded From Url Due To Its File Extension {Url}", url);
}
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Download File {Url} {FolderId}", url, folderid);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Download File {Url} {FolderId}", url, folderid);
HttpContext.Response.StatusCode = 401;
file = null;
}
@ -182,8 +182,8 @@ namespace Oqtane.Controllers
int folderid = -1;
if (int.TryParse(folder, out folderid))
{
Folder Folder = Folders.GetFolder(folderid);
if (Folder != null && UserPermissions.IsAuthorized(User, "Edit", Folder.Permissions))
Folder Folder = _folders.GetFolder(folderid);
if (Folder != null && _userPermissions.IsAuthorized(User, "Edit", Folder.Permissions))
{
folderpath = GetFolderPath(Folder);
}
@ -205,12 +205,12 @@ namespace Oqtane.Controllers
string upload = await MergeFile(folderpath, file.FileName);
if (upload != "" && folderid != -1)
{
Files.AddFile(CreateFile(upload, folderid, folderpath + upload));
_files.AddFile(CreateFile(upload, folderid, folderpath + upload));
}
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Upload File {Folder} {File}", folder, file);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Upload File {Folder} {File}", folder, file);
HttpContext.Response.StatusCode = 401;
}
}
@ -272,7 +272,7 @@ namespace Oqtane.Controllers
}
// rename file now that the entire process is completed
System.IO.File.Move(Path.Combine(folder, filename + ".tmp"), Path.Combine(folder, filename));
logger.Log(LogLevel.Information, this, LogFunction.Create, "File Uploaded {File}", Path.Combine(folder, filename));
_logger.Log(LogLevel.Information, this, LogFunction.Create, "File Uploaded {File}", Path.Combine(folder, filename));
}
merged = filename;
}
@ -333,8 +333,8 @@ namespace Oqtane.Controllers
[HttpGet("download/{id}")]
public IActionResult Download(int id)
{
Models.File file = Files.GetFile(id);
if (file != null && UserPermissions.IsAuthorized(User, "View", file.Folder.Permissions))
Models.File file = _files.GetFile(id);
if (file != null && _userPermissions.IsAuthorized(User, "View", file.Folder.Permissions))
{
string filepath = GetFolderPath(file.Folder) + file.Name;
if (System.IO.File.Exists(filepath))
@ -344,14 +344,14 @@ namespace Oqtane.Controllers
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {File}", file);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {File}", file);
HttpContext.Response.StatusCode = 404;
return null;
}
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {FileId}", id);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {FileId}", id);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -359,12 +359,12 @@ namespace Oqtane.Controllers
private string GetFolderPath(Folder folder)
{
return environment.ContentRootPath + "\\Content\\Tenants\\" + Tenants.GetTenant().TenantId.ToString() + "\\Sites\\" + folder.SiteId.ToString() + "\\" + folder.Path;
return _environment.ContentRootPath + "\\Content\\Tenants\\" + _tenants.GetTenant().TenantId.ToString() + "\\Sites\\" + folder.SiteId.ToString() + "\\" + folder.Path;
}
private string GetFolderPath(string folder)
{
return Path.Combine(environment.WebRootPath, folder);
return Path.Combine(_environment.WebRootPath, folder);
}
private void CreateDirectory(string folderpath)

62
Oqtane.Server/Controllers/FolderController.cs
View File

@ -13,15 +13,15 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class FolderController : Controller
{
private readonly IFolderRepository Folders;
private readonly IUserPermissions UserPermissions;
private readonly ILogManager logger;
private readonly IFolderRepository _folders;
private readonly IUserPermissions _userPermissions;
private readonly ILogManager _logger;
public FolderController(IFolderRepository Folders, IUserPermissions UserPermissions, ILogManager logger)
{
this.Folders = Folders;
this.UserPermissions = UserPermissions;
this.logger = logger;
this._folders = Folders;
this._userPermissions = UserPermissions;
this._logger = logger;
}
// GET: api/<controller>?siteid=x
@ -29,9 +29,9 @@ namespace Oqtane.Controllers
public IEnumerable<Folder> Get(string siteid)
{
List<Folder> folders = new List<Folder>();
foreach(Folder folder in Folders.GetFolders(int.Parse(siteid)))
foreach(Folder folder in _folders.GetFolders(int.Parse(siteid)))
{
if (UserPermissions.IsAuthorized(User, "Browse", folder.Permissions))
if (_userPermissions.IsAuthorized(User, "Browse", folder.Permissions))
{
folders.Add(folder);
}
@ -43,14 +43,14 @@ namespace Oqtane.Controllers
[HttpGet("{id}")]
public Folder Get(int id)
{
Folder folder = Folders.GetFolder(id);
if (UserPermissions.IsAuthorized(User, "Browse", folder.Permissions))
Folder folder = _folders.GetFolder(id);
if (_userPermissions.IsAuthorized(User, "Browse", folder.Permissions))
{
return folder;
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Folder {Folder}", folder);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Folder {Folder}", folder);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -66,25 +66,25 @@ namespace Oqtane.Controllers
string permissions;
if (Folder.ParentId != null)
{
permissions = Folders.GetFolder(Folder.ParentId.Value).Permissions;
permissions = _folders.GetFolder(Folder.ParentId.Value).Permissions;
}
else
{
permissions = UserSecurity.SetPermissionStrings(new List<PermissionString> { new PermissionString { PermissionName = "Edit", Permissions = Constants.AdminRole } });
}
if (UserPermissions.IsAuthorized(User, "Edit", permissions))
if (_userPermissions.IsAuthorized(User, "Edit", permissions))
{
if (string.IsNullOrEmpty(Folder.Path) && Folder.ParentId != null)
{
Folder parent = Folders.GetFolder(Folder.ParentId.Value);
Folder parent = _folders.GetFolder(Folder.ParentId.Value);
Folder.Path = parent.Path + Folder.Name + "\\";
}
Folder = Folders.AddFolder(Folder);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", Folder);
Folder = _folders.AddFolder(Folder);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", Folder);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Folder {Folder}", Folder);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Folder {Folder}", Folder);
HttpContext.Response.StatusCode = 401;
Folder = null;
}
@ -97,19 +97,19 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public Folder Put(int id, [FromBody] Folder Folder)
{
if (ModelState.IsValid && UserPermissions.IsAuthorized(User, "Folder", Folder.FolderId, "Edit"))
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Folder", Folder.FolderId, "Edit"))
{
if (string.IsNullOrEmpty(Folder.Path) && Folder.ParentId != null)
{
Folder parent = Folders.GetFolder(Folder.ParentId.Value);
Folder parent = _folders.GetFolder(Folder.ParentId.Value);
Folder.Path = parent.Path + Folder.Name + "\\";
}
Folder = Folders.UpdateFolder(Folder);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", Folder);
Folder = _folders.UpdateFolder(Folder);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", Folder);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Folder {Folder}", Folder);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Folder {Folder}", Folder);
HttpContext.Response.StatusCode = 401;
Folder = null;
}
@ -121,24 +121,24 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Put(int siteid, int folderid, int? parentid)
{
if (UserPermissions.IsAuthorized(User, "Folder", folderid, "Edit"))
if (_userPermissions.IsAuthorized(User, "Folder", folderid, "Edit"))
{
int order = 1;
List<Folder> folders = Folders.GetFolders(siteid).ToList();
List<Folder> folders = _folders.GetFolders(siteid).ToList();
foreach (Folder folder in folders.Where(item => item.ParentId == parentid).OrderBy(item => item.Order))
{
if (folder.Order != order)
{
folder.Order = order;
Folders.UpdateFolder(folder);
_folders.UpdateFolder(folder);
}
order += 2;
}
logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Order Updated {SiteId} {FolderId} {ParentId}", siteid, folderid, parentid);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Order Updated {SiteId} {FolderId} {ParentId}", siteid, folderid, parentid);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Folder Order {SiteId} {FolderId} {ParentId}", siteid, folderid, parentid);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Folder Order {SiteId} {FolderId} {ParentId}", siteid, folderid, parentid);
HttpContext.Response.StatusCode = 401;
}
}
@ -148,14 +148,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Delete(int id)
{
if (UserPermissions.IsAuthorized(User, "Folder", id, "Edit"))
if (_userPermissions.IsAuthorized(User, "Folder", id, "Edit"))
{
Folders.DeleteFolder(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Folder Deleted {FolderId}", id);
_folders.DeleteFolder(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Folder Deleted {FolderId}", id);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Folder {FolderId}", id);
_logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Folder {FolderId}", id);
HttpContext.Response.StatusCode = 401;
}
}

16
Oqtane.Server/Controllers/InstallationController.cs
View File

@ -19,13 +19,13 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class InstallationController : Controller
{
private readonly IConfigurationRoot Config;
private readonly IInstallationManager InstallationManager;
private readonly IConfigurationRoot _config;
private readonly IInstallationManager _installationManager;
public InstallationController(IConfigurationRoot Config, IInstallationManager InstallationManager)
{
this.Config = Config;
this.InstallationManager = InstallationManager;
this._config = Config;
this._installationManager = InstallationManager;
}
// POST api/<controller>
@ -37,7 +37,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid)
{
bool master = false;
string defaultconnectionstring = Config.GetConnectionString("DefaultConnection");
string defaultconnectionstring = _config.GetConnectionString("DefaultConnection");
if (string.IsNullOrEmpty(defaultconnectionstring) || connectionstring == defaultconnectionstring)
{
master = true;
@ -158,7 +158,7 @@ namespace Oqtane.Controllers
{
writer.WriteLine(config);
}
Config.Reload();
_config.Reload();
}
response.Success = true;
}
@ -180,7 +180,7 @@ namespace Oqtane.Controllers
var response = new GenericResponse { Success = false, Message = "" };
string datadirectory = AppDomain.CurrentDomain.GetData("DataDirectory").ToString();
string connectionString = Config.GetConnectionString("DefaultConnection");
string connectionString = _config.GetConnectionString("DefaultConnection");
connectionString = connectionString.Replace("|DataDirectory|", datadirectory);
if (!string.IsNullOrEmpty(connectionString))
@ -286,7 +286,7 @@ namespace Oqtane.Controllers
public GenericResponse Upgrade()
{
var response = new GenericResponse { Success = true, Message = "" };
InstallationManager.UpgradeFramework();
_installationManager.UpgradeFramework();
return response;
}
}

36
Oqtane.Server/Controllers/JobController.cs
View File

@ -14,15 +14,15 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class JobController : Controller
{
private readonly IJobRepository Jobs;
private readonly ILogManager logger;
private readonly IServiceProvider ServiceProvider;
private readonly IJobRepository _jobs;
private readonly ILogManager _logger;
private readonly IServiceProvider _serviceProvider;
public JobController(IJobRepository Jobs, ILogManager logger, IServiceProvider ServiceProvider)
{
this.Jobs = Jobs;
this.logger = logger;
this.ServiceProvider = ServiceProvider;
this._jobs = Jobs;
this._logger = logger;
this._serviceProvider = ServiceProvider;
}
// GET: api/<controller>
@ -30,7 +30,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public IEnumerable<Job> Get()
{
return Jobs.GetJobs();
return _jobs.GetJobs();
}
// GET api/<controller>/5
@ -38,7 +38,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public Job Get(int id)
{
return Jobs.GetJob(id);
return _jobs.GetJob(id);
}
// POST api/<controller>
@ -48,8 +48,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Job = Jobs.AddJob(Job);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Added {Job}", Job);
Job = _jobs.AddJob(Job);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Added {Job}", Job);
}
return Job;
}
@ -61,8 +61,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Job = Jobs.UpdateJob(Job);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Updated {Job}", Job);
Job = _jobs.UpdateJob(Job);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Updated {Job}", Job);
}
return Job;
}
@ -72,8 +72,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Delete(int id)
{
Jobs.DeleteJob(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Job Deleted {JobId}", id);
_jobs.DeleteJob(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Job Deleted {JobId}", id);
}
// GET api/<controller>/start
@ -81,11 +81,11 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Start(int id)
{
Job job = Jobs.GetJob(id);
Job job = _jobs.GetJob(id);
Type jobtype = Type.GetType(job.JobType);
if (jobtype != null)
{
var jobobject = ActivatorUtilities.CreateInstance(ServiceProvider, jobtype);
var jobobject = ActivatorUtilities.CreateInstance(_serviceProvider, jobtype);
((IHostedService)jobobject).StartAsync(new System.Threading.CancellationToken());
}
}
@ -95,11 +95,11 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Stop(int id)
{
Job job = Jobs.GetJob(id);
Job job = _jobs.GetJob(id);
Type jobtype = Type.GetType(job.JobType);
if (jobtype != null)
{
var jobobject = ActivatorUtilities.CreateInstance(ServiceProvider, jobtype);
var jobobject = ActivatorUtilities.CreateInstance(_serviceProvider, jobtype);
((IHostedService)jobobject).StopAsync(new System.Threading.CancellationToken());
}
}

24
Oqtane.Server/Controllers/JobLogController.cs
View File

@ -11,13 +11,13 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class JobLogController : Controller
{
private readonly IJobLogRepository JobLogs;
private readonly ILogManager logger;
private readonly IJobLogRepository _jobLogs;
private readonly ILogManager _logger;
public JobLogController(IJobLogRepository JobLogs, ILogManager logger)
{
this.JobLogs = JobLogs;
this.logger = logger;
this._jobLogs = JobLogs;
this._logger = logger;
}
// GET: api/<controller>
@ -25,7 +25,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public IEnumerable<JobLog> Get()
{
return JobLogs.GetJobLogs();
return _jobLogs.GetJobLogs();
}
// GET api/<controller>/5
@ -33,7 +33,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public JobLog Get(int id)
{
return JobLogs.GetJobLog(id);
return _jobLogs.GetJobLog(id);
}
// POST api/<controller>
@ -43,8 +43,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
JobLog = JobLogs.AddJobLog(JobLog);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Log Added {JobLog}", JobLog);
JobLog = _jobLogs.AddJobLog(JobLog);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Log Added {JobLog}", JobLog);
}
return JobLog;
}
@ -56,8 +56,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
JobLog = JobLogs.UpdateJobLog(JobLog);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Log Updated {JobLog}", JobLog);
JobLog = _jobLogs.UpdateJobLog(JobLog);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Log Updated {JobLog}", JobLog);
}
return JobLog;
}
@ -67,8 +67,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Delete(int id)
{
JobLogs.DeleteJobLog(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Job Log Deleted {JobLogId}", id);
_jobLogs.DeleteJobLog(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Job Log Deleted {JobLogId}", id);
}
}
}

14
Oqtane.Server/Controllers/LogController.cs
View File

@ -12,13 +12,13 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class LogController : Controller
{
private readonly ILogManager Logger;
private readonly ILogRepository Logs;
private readonly ILogManager _ogger;
private readonly ILogRepository _logs;
public LogController(ILogManager Logger, ILogRepository Logs)
{
this.Logger = Logger;
this.Logs = Logs;
this._ogger = Logger;
this._logs = Logs;
}
// GET: api/<controller>?siteid=x&level=y&function=z&rows=50
@ -26,7 +26,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public IEnumerable<Log> Get(string siteid, string level, string function, string rows)
{
return Logs.GetLogs(int.Parse(siteid), level, function, int.Parse(rows));
return _logs.GetLogs(int.Parse(siteid), level, function, int.Parse(rows));
}
// GET api/<controller>/5
@ -34,7 +34,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public Log Get(int id)
{
return Logs.GetLog(id);
return _logs.GetLog(id);
}
// POST api/<controller>
@ -43,7 +43,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Logger.Log(Log);
_ogger.Log(Log);
}
}
}

70
Oqtane.Server/Controllers/ModuleController.cs
View File

@ -14,30 +14,30 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class ModuleController : Controller
{
private readonly IModuleRepository Modules;
private readonly IPageModuleRepository PageModules;
private readonly IModuleDefinitionRepository ModuleDefinitions;
private readonly IUserPermissions UserPermissions;
private readonly ILogManager logger;
private readonly IModuleRepository _modules;
private readonly IPageModuleRepository _pageModules;
private readonly IModuleDefinitionRepository _moduleDefinitions;
private readonly IUserPermissions _userPermissions;
private readonly ILogManager _logger;
public ModuleController(IModuleRepository Modules, IPageModuleRepository PageModules, IModuleDefinitionRepository ModuleDefinitions, IUserPermissions UserPermissions, ILogManager logger)
{
this.Modules = Modules;
this.PageModules = PageModules;
this.ModuleDefinitions = ModuleDefinitions;
this.UserPermissions = UserPermissions;
this.logger = logger;
this._modules = Modules;
this._pageModules = PageModules;
this._moduleDefinitions = ModuleDefinitions;
this._userPermissions = UserPermissions;
this._logger = logger;
}
// GET: api/<controller>?siteid=x
[HttpGet]
public IEnumerable<Models.Module> Get(string siteid)
{
List<ModuleDefinition> moduledefinitions = ModuleDefinitions.GetModuleDefinitions(int.Parse(siteid)).ToList();
List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(int.Parse(siteid)).ToList();
List<Models.Module> modules = new List<Models.Module>();
foreach (PageModule pagemodule in PageModules.GetPageModules(int.Parse(siteid)))
foreach (PageModule pagemodule in _pageModules.GetPageModules(int.Parse(siteid)))
{
if (UserPermissions.IsAuthorized(User, "View", pagemodule.Module.Permissions))
if (_userPermissions.IsAuthorized(User, "View", pagemodule.Module.Permissions))
{
Models.Module module = new Models.Module();
module.SiteId = pagemodule.Module.SiteId;
@ -69,16 +69,16 @@ namespace Oqtane.Controllers
[HttpGet("{id}")]
public Models.Module Get(int id)
{
Models.Module module = Modules.GetModule(id);
if (UserPermissions.IsAuthorized(User, "View", module.Permissions))
Models.Module module = _modules.GetModule(id);
if (_userPermissions.IsAuthorized(User, "View", module.Permissions))
{
List<ModuleDefinition> moduledefinitions = ModuleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
return module;
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Module {Module}", module);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Module {Module}", module);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -89,14 +89,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public Models.Module Post([FromBody] Models.Module Module)
{
if (ModelState.IsValid && UserPermissions.IsAuthorized(User, "Page", Module.PageId, "Edit"))
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Page", Module.PageId, "Edit"))
{
Module = Modules.AddModule(Module);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Added {Module}", Module);
Module = _modules.AddModule(Module);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Added {Module}", Module);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Module {Module}", Module);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Module {Module}", Module);
HttpContext.Response.StatusCode = 401;
Module = null;
}
@ -108,14 +108,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public Models.Module Put(int id, [FromBody] Models.Module Module)
{
if (ModelState.IsValid && UserPermissions.IsAuthorized(User, "Module", Module.ModuleId, "Edit"))
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Module", Module.ModuleId, "Edit"))
{
Module = Modules.UpdateModule(Module);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", Module);
Module = _modules.UpdateModule(Module);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", Module);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Module {Module}", Module);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Module {Module}", Module);
HttpContext.Response.StatusCode = 401;
Module = null;
}
@ -127,14 +127,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Delete(int id)
{
if (UserPermissions.IsAuthorized(User, "Module", id, "Edit"))
if (_userPermissions.IsAuthorized(User, "Module", id, "Edit"))
{
Modules.DeleteModule(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleId}", id);
_modules.DeleteModule(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleId}", id);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Module {ModuleId}", id);
_logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Module {ModuleId}", id);
HttpContext.Response.StatusCode = 401;
}
}
@ -145,13 +145,13 @@ namespace Oqtane.Controllers
public string Export(int moduleid)
{
string content = "";
if (UserPermissions.IsAuthorized(User, "Module", moduleid, "Edit"))
if (_userPermissions.IsAuthorized(User, "Module", moduleid, "Edit"))
{
content = Modules.ExportModule(moduleid);
content = _modules.ExportModule(moduleid);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Other, "User Not Authorized To Export Module {ModuleId}", moduleid);
_logger.Log(LogLevel.Error, this, LogFunction.Other, "User Not Authorized To Export Module {ModuleId}", moduleid);
HttpContext.Response.StatusCode = 401;
}
return content;
@ -163,13 +163,13 @@ namespace Oqtane.Controllers
public bool Import(int moduleid, [FromBody] string Content)
{
bool success = false;
if (ModelState.IsValid && UserPermissions.IsAuthorized(User, "Module", moduleid, "Edit"))
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Module", moduleid, "Edit"))
{
success = Modules.ImportModule(moduleid, Content);
success = _modules.ImportModule(moduleid, Content);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Other, "User Not Authorized To Import Module {ModuleId}", moduleid);
_logger.Log(LogLevel.Error, this, LogFunction.Other, "User Not Authorized To Import Module {ModuleId}", moduleid);
HttpContext.Response.StatusCode = 401;
}
return success;

48
Oqtane.Server/Controllers/ModuleDefinitionController.cs
View File

@ -16,19 +16,19 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class ModuleDefinitionController : Controller
{
private readonly IModuleDefinitionRepository ModuleDefinitions;
private readonly IUserPermissions UserPermissions;
private readonly IInstallationManager InstallationManager;
private readonly IWebHostEnvironment environment;
private readonly ILogManager logger;
private readonly IModuleDefinitionRepository _moduleDefinitions;
private readonly IUserPermissions _userPermissions;
private readonly IInstallationManager _installationManager;
private readonly IWebHostEnvironment _environment;
private readonly ILogManager _logger;
public ModuleDefinitionController(IModuleDefinitionRepository ModuleDefinitions, IUserPermissions UserPermissions, IInstallationManager InstallationManager, IWebHostEnvironment environment, ILogManager logger)
{
this.ModuleDefinitions = ModuleDefinitions;
this.UserPermissions = UserPermissions;
this.InstallationManager = InstallationManager;
this.environment = environment;
this.logger = logger;
this._moduleDefinitions = ModuleDefinitions;
this._userPermissions = UserPermissions;
this._installationManager = InstallationManager;
this._environment = environment;
this._logger = logger;
}
// GET: api/<controller>?siteid=x
@ -36,9 +36,9 @@ namespace Oqtane.Controllers
public IEnumerable<ModuleDefinition> Get(string siteid)
{
List<ModuleDefinition> moduledefinitions = new List<ModuleDefinition>();
foreach(ModuleDefinition moduledefinition in ModuleDefinitions.GetModuleDefinitions(int.Parse(siteid)))
foreach(ModuleDefinition moduledefinition in _moduleDefinitions.GetModuleDefinitions(int.Parse(siteid)))
{
if (UserPermissions.IsAuthorized(User, "Utilize", moduledefinition.Permissions))
if (_userPermissions.IsAuthorized(User, "Utilize", moduledefinition.Permissions))
{
moduledefinitions.Add(moduledefinition);
}
@ -50,14 +50,14 @@ namespace Oqtane.Controllers
[HttpGet("{id}")]
public ModuleDefinition Get(int id, string siteid)
{
ModuleDefinition moduledefinition = ModuleDefinitions.GetModuleDefinition(id, int.Parse(siteid));
if (UserPermissions.IsAuthorized(User, "Utilize", moduledefinition.Permissions))
ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, int.Parse(siteid));
if (_userPermissions.IsAuthorized(User, "Utilize", moduledefinition.Permissions))
{
return moduledefinition;
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access ModuleDefinition {ModuleDefinition}", moduledefinition);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access ModuleDefinition {ModuleDefinition}", moduledefinition);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -70,8 +70,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
ModuleDefinitions.UpdateModuleDefinition(ModuleDefinition);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Definition Updated {ModuleDefinition}", ModuleDefinition);
_moduleDefinitions.UpdateModuleDefinition(ModuleDefinition);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Definition Updated {ModuleDefinition}", ModuleDefinition);
}
}
@ -79,8 +79,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void InstallModules()
{
InstallationManager.InstallPackages("Modules", true);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
_installationManager.InstallPackages("Modules", true);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
}
// DELETE api/<controller>/5?siteid=x
@ -88,13 +88,13 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Delete(int id, int siteid)
{
List<ModuleDefinition> moduledefinitions = ModuleDefinitions.GetModuleDefinitions(siteid).ToList();
List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(siteid).ToList();
ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionId == id).FirstOrDefault();
if (moduledefinition != null)
{
string moduledefinitionname = moduledefinition.ModuleDefinitionName.Substring(0, moduledefinition.ModuleDefinitionName.IndexOf(","));
string folder = Path.Combine(environment.WebRootPath, "Modules\\" + moduledefinitionname);
string folder = Path.Combine(_environment.WebRootPath, "Modules\\" + moduledefinitionname);
if (Directory.Exists(folder))
{
Directory.Delete(folder, true);
@ -106,10 +106,10 @@ namespace Oqtane.Controllers
System.IO.File.Delete(file);
}
ModuleDefinitions.DeleteModuleDefinition(id, siteid);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleDefinitionId}", id);
_moduleDefinitions.DeleteModuleDefinition(id, siteid);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleDefinitionId}", id);
InstallationManager.RestartApplication();
_installationManager.RestartApplication();
}
}

34
Oqtane.Server/Controllers/NotificationController.cs
View File

@ -13,15 +13,15 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class NotificationController : Controller
{
private readonly INotificationRepository Notifications;
private readonly IUserPermissions UserPermissions;
private readonly ILogManager logger;
private readonly INotificationRepository _notifications;
private readonly IUserPermissions _userPermissions;
private readonly ILogManager _logger;
public NotificationController(INotificationRepository Notifications, IUserPermissions UserPermissions, ILogManager logger)
{
this.Notifications = Notifications;
this.UserPermissions = UserPermissions;
this.logger = logger;
this._notifications = Notifications;
this._userPermissions = UserPermissions;
this._logger = logger;
}
// GET: api/<controller>?siteid=x&type=y&userid=z
@ -34,11 +34,11 @@ namespace Oqtane.Controllers
{
if (direction == "to")
{
notifications = Notifications.GetNotifications(int.Parse(siteid), -1, int.Parse(userid));
notifications = _notifications.GetNotifications(int.Parse(siteid), -1, int.Parse(userid));
}
else
{
notifications = Notifications.GetNotifications(int.Parse(siteid), int.Parse(userid), -1);
notifications = _notifications.GetNotifications(int.Parse(siteid), int.Parse(userid), -1);
}
}
return notifications;
@ -49,7 +49,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public Notification Get(int id)
{
Notification Notification = Notifications.GetNotification(id);
Notification Notification = _notifications.GetNotification(id);
if (!(IsAuthorized(Notification.FromUserId) || IsAuthorized(Notification.ToUserId)))
{
Notification = null;
@ -64,8 +64,8 @@ namespace Oqtane.Controllers
{
if (IsAuthorized(Notification.FromUserId))
{
Notification = Notifications.AddNotification(Notification);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Notification Added {Notification}", Notification);
Notification = _notifications.AddNotification(Notification);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Notification Added {Notification}", Notification);
}
return Notification;
}
@ -77,8 +77,8 @@ namespace Oqtane.Controllers
{
if (IsAuthorized(Notification.FromUserId))
{
Notification = Notifications.UpdateNotification(Notification);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Notification Updated {Folder}", Notification);
Notification = _notifications.UpdateNotification(Notification);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Notification Updated {Folder}", Notification);
}
return Notification;
}
@ -88,11 +88,11 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Delete(int id)
{
Notification Notification = Notifications.GetNotification(id);
Notification Notification = _notifications.GetNotification(id);
if (IsAuthorized(Notification.FromUserId) || IsAuthorized(Notification.ToUserId))
{
Notifications.DeleteNotification(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Notification Deleted {NotificationId}", id);
_notifications.DeleteNotification(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Notification Deleted {NotificationId}", id);
}
}
@ -101,7 +101,7 @@ namespace Oqtane.Controllers
bool authorized = true;
if (userid != null)
{
authorized = (UserPermissions.GetUser(User).UserId == userid);
authorized = (_userPermissions.GetUser(User).UserId == userid);
}
return authorized;
}

6
Oqtane.Server/Controllers/PackageController.cs
View File

@ -17,11 +17,11 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class PackageController : Controller
{
private readonly IWebHostEnvironment environment;
private readonly IWebHostEnvironment _environment;
public PackageController(IWebHostEnvironment environment)
{
this.environment = environment;
this._environment = environment;
}
// GET: api/<controller>?tag=x
@ -61,7 +61,7 @@ namespace Oqtane.Controllers
using (var httpClient = new HttpClient())
{
CancellationToken token;
folder = Path.Combine(environment.WebRootPath, folder);
folder = Path.Combine(_environment.WebRootPath, folder);
var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version, token).ConfigureAwait(false);
response.EnsureSuccessStatusCode();
string filename = packageid + "." + version + ".nupkg";

84
Oqtane.Server/Controllers/PageController.cs
View File

@ -13,19 +13,19 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class PageController : Controller
{
private readonly IPageRepository Pages;
private readonly IModuleRepository Modules;
private readonly IPageModuleRepository PageModules;
private readonly IUserPermissions UserPermissions;
private readonly ILogManager logger;
private readonly IPageRepository _pages;
private readonly IModuleRepository _modules;
private readonly IPageModuleRepository _pageModules;
private readonly IUserPermissions _userPermissions;
private readonly ILogManager _logger;
public PageController(IPageRepository Pages, IModuleRepository Modules, IPageModuleRepository PageModules, IUserPermissions UserPermissions, ILogManager logger)
{
this.Pages = Pages;
this.Modules = Modules;
this.PageModules = PageModules;
this.UserPermissions = UserPermissions;
this.logger = logger;
this._pages = Pages;
this._modules = Modules;
this._pageModules = PageModules;
this._userPermissions = UserPermissions;
this._logger = logger;
}
// GET: api/<controller>?siteid=x
@ -33,9 +33,9 @@ namespace Oqtane.Controllers
public IEnumerable<Page> Get(string siteid)
{
List<Page> pages = new List<Page>();
foreach (Page page in Pages.GetPages(int.Parse(siteid)))
foreach (Page page in _pages.GetPages(int.Parse(siteid)))
{
if (UserPermissions.IsAuthorized(User, "View", page.Permissions))
if (_userPermissions.IsAuthorized(User, "View", page.Permissions))
{
pages.Add(page);
}
@ -50,19 +50,19 @@ namespace Oqtane.Controllers
Page page;
if (string.IsNullOrEmpty(userid))
{
page = Pages.GetPage(id);
page = _pages.GetPage(id);
}
else
{
page = Pages.GetPage(id, int.Parse(userid));
page = _pages.GetPage(id, int.Parse(userid));
}
if (UserPermissions.IsAuthorized(User, "View", page.Permissions))
if (_userPermissions.IsAuthorized(User, "View", page.Permissions))
{
return page;
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Page {Page}", page);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Page {Page}", page);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -78,21 +78,21 @@ namespace Oqtane.Controllers
string permissions;
if (Page.ParentId != null)
{
permissions = Pages.GetPage(Page.ParentId.Value).Permissions;
permissions = _pages.GetPage(Page.ParentId.Value).Permissions;
}
else
{
permissions = UserSecurity.SetPermissionStrings(new List<PermissionString> { new PermissionString { PermissionName = "Edit", Permissions = Constants.AdminRole } });
}
if (UserPermissions.IsAuthorized(User, "Edit", permissions))
if (_userPermissions.IsAuthorized(User, "Edit", permissions))
{
Page = Pages.AddPage(Page);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Added {Page}", Page);
Page = _pages.AddPage(Page);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Added {Page}", Page);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Page {Page}", Page);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Page {Page}", Page);
HttpContext.Response.StatusCode = 401;
Page = null;
}
@ -106,8 +106,8 @@ namespace Oqtane.Controllers
public Page Post(int id, string userid)
{
Page page = null;
Page parent = Pages.GetPage(id);
if (parent != null && parent.IsPersonalizable && UserPermissions.GetUser(User).UserId == int.Parse(userid))
Page parent = _pages.GetPage(id);
if (parent != null && parent.IsPersonalizable && _userPermissions.GetUser(User).UserId == int.Parse(userid))
{
page = new Page();
page.SiteId = parent.SiteId;
@ -126,10 +126,10 @@ namespace Oqtane.Controllers
page.Permissions = UserSecurity.SetPermissionStrings(permissions);
page.IsPersonalizable = false;
page.UserId = int.Parse(userid);
page = Pages.AddPage(page);
page = _pages.AddPage(page);
// copy modules
List<PageModule> pagemodules = PageModules.GetPageModules(page.SiteId).ToList();
List<PageModule> pagemodules = _pageModules.GetPageModules(page.SiteId).ToList();
foreach (PageModule pm in pagemodules.Where(item => item.PageId == parent.PageId && !item.IsDeleted))
{
Module module = new Module();
@ -140,12 +140,12 @@ namespace Oqtane.Controllers
permissions.Add(new PermissionString { PermissionName = "View", Permissions = "[" + userid + "]" });
permissions.Add(new PermissionString { PermissionName = "Edit", Permissions = "[" + userid + "]" });
module.Permissions = UserSecurity.SetPermissionStrings(permissions);
module = Modules.AddModule(module);
module = _modules.AddModule(module);
string content = Modules.ExportModule(pm.ModuleId);
string content = _modules.ExportModule(pm.ModuleId);
if (content != "")
{
Modules.ImportModule(module.ModuleId, content);
_modules.ImportModule(module.ModuleId, content);
}
PageModule pagemodule = new PageModule();
@ -156,7 +156,7 @@ namespace Oqtane.Controllers
pagemodule.Order = pm.Order;
pagemodule.ContainerType = pm.ContainerType;
PageModules.AddPageModule(pagemodule);
_pageModules.AddPageModule(pagemodule);
}
}
return page;
@ -167,14 +167,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public Page Put(int id, [FromBody] Page Page)
{
if (ModelState.IsValid && UserPermissions.IsAuthorized(User, "Page", Page.PageId, "Edit"))
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Page", Page.PageId, "Edit"))
{
Page = Pages.UpdatePage(Page);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", Page);
Page = _pages.UpdatePage(Page);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", Page);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page {Page}", Page);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page {Page}", Page);
HttpContext.Response.StatusCode = 401;
Page = null;
}
@ -186,24 +186,24 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Put(int siteid, int pageid, int? parentid)
{
if (UserPermissions.IsAuthorized(User, "Page", pageid, "Edit"))
if (_userPermissions.IsAuthorized(User, "Page", pageid, "Edit"))
{
int order = 1;
List<Page> pages = Pages.GetPages(siteid).ToList();
List<Page> pages = _pages.GetPages(siteid).ToList();
foreach (Page page in pages.Where(item => item.ParentId == parentid).OrderBy(item => item.Order))
{
if (page.Order != order)
{
page.Order = order;
Pages.UpdatePage(page);
_pages.UpdatePage(page);
}
order += 2;
}
logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Order Updated {SiteId} {PageId} {ParentId}", siteid, pageid, parentid);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Order Updated {SiteId} {PageId} {ParentId}", siteid, pageid, parentid);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page Order {SiteId} {PageId} {ParentId}", siteid, pageid, parentid);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page Order {SiteId} {PageId} {ParentId}", siteid, pageid, parentid);
HttpContext.Response.StatusCode = 401;
}
}
@ -213,14 +213,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Delete(int id)
{
if (UserPermissions.IsAuthorized(User, "Page", id, "Edit"))
if (_userPermissions.IsAuthorized(User, "Page", id, "Edit"))
{
Pages.DeletePage(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Deleted {PageId}", id);
_pages.DeletePage(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Deleted {PageId}", id);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Page {PageId}", id);
_logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Page {PageId}", id);
HttpContext.Response.StatusCode = 401;
}
}

64
Oqtane.Server/Controllers/PageModuleController.cs
View File

@ -13,31 +13,31 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class PageModuleController : Controller
{
private readonly IPageModuleRepository PageModules;
private readonly IModuleRepository Modules;
private readonly IUserPermissions UserPermissions;
private readonly ILogManager logger;
private readonly IPageModuleRepository _pageModules;
private readonly IModuleRepository _modules;
private readonly IUserPermissions _userPermissions;
private readonly ILogManager _logger;
public PageModuleController(IPageModuleRepository PageModules, IModuleRepository Modules, IUserPermissions UserPermissions, ILogManager logger)
{
this.PageModules = PageModules;
this.Modules = Modules;
this.UserPermissions = UserPermissions;
this.logger = logger;
this._pageModules = PageModules;
this._modules = Modules;
this._userPermissions = UserPermissions;
this._logger = logger;
}
// GET api/<controller>/5
[HttpGet("{id}")]
public PageModule Get(int id)
{
PageModule pagemodule = PageModules.GetPageModule(id);
if (UserPermissions.IsAuthorized(User, "View", pagemodule.Module.Permissions))
PageModule pagemodule = _pageModules.GetPageModule(id);
if (_userPermissions.IsAuthorized(User, "View", pagemodule.Module.Permissions))
{
return pagemodule;
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access PageModule {PageModule}", pagemodule);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access PageModule {PageModule}", pagemodule);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -47,14 +47,14 @@ namespace Oqtane.Controllers
[HttpGet("{pageid}/{moduleid}")]
public PageModule Get(int pageid, int moduleid)
{
PageModule pagemodule = PageModules.GetPageModule(pageid, moduleid);
if (UserPermissions.IsAuthorized(User, "View", pagemodule.Module.Permissions))
PageModule pagemodule = _pageModules.GetPageModule(pageid, moduleid);
if (_userPermissions.IsAuthorized(User, "View", pagemodule.Module.Permissions))
{
return pagemodule;
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access PageModule {PageModule}", pagemodule);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access PageModule {PageModule}", pagemodule);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -65,14 +65,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public PageModule Post([FromBody] PageModule PageModule)
{
if (ModelState.IsValid && UserPermissions.IsAuthorized(User, "Page", PageModule.PageId, "Edit"))
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Page", PageModule.PageId, "Edit"))
{
PageModule = PageModules.AddPageModule(PageModule);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Module Added {PageModule}", PageModule);
PageModule = _pageModules.AddPageModule(PageModule);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Module Added {PageModule}", PageModule);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add PageModule {PageModule}", PageModule);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add PageModule {PageModule}", PageModule);
HttpContext.Response.StatusCode = 401;
PageModule = null;
}
@ -84,14 +84,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public PageModule Put(int id, [FromBody] PageModule PageModule)
{
if (ModelState.IsValid && UserPermissions.IsAuthorized(User, "Module", PageModule.ModuleId, "Edit"))
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Module", PageModule.ModuleId, "Edit"))
{
PageModule = PageModules.UpdatePageModule(PageModule);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Updated {PageModule}", PageModule);
PageModule = _pageModules.UpdatePageModule(PageModule);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Updated {PageModule}", PageModule);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update PageModule {PageModule}", PageModule);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update PageModule {PageModule}", PageModule);
HttpContext.Response.StatusCode = 401;
PageModule = null;
}
@ -103,24 +103,24 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Put(int pageid, string pane)
{
if (UserPermissions.IsAuthorized(User, "Page", pageid, "Edit"))
if (_userPermissions.IsAuthorized(User, "Page", pageid, "Edit"))
{
int order = 1;
List<PageModule> pagemodules = PageModules.GetPageModules(pageid, pane).OrderBy(item => item.Order).ToList();
List<PageModule> pagemodules = _pageModules.GetPageModules(pageid, pane).OrderBy(item => item.Order).ToList();
foreach (PageModule pagemodule in pagemodules)
{
if (pagemodule.Order != order)
{
pagemodule.Order = order;
PageModules.UpdatePageModule(pagemodule);
_pageModules.UpdatePageModule(pagemodule);
}
order += 2;
}
logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Order Updated {PageId} {Pane}", pageid, pane);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Order Updated {PageId} {Pane}", pageid, pane);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page Module Order {PageId} {Pane}", pageid, pane);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page Module Order {PageId} {Pane}", pageid, pane);
HttpContext.Response.StatusCode = 401;
}
}
@ -130,15 +130,15 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public void Delete(int id)
{
PageModule pagemodule = PageModules.GetPageModule(id);
if (UserPermissions.IsAuthorized(User, "Page", pagemodule.PageId, "Edit"))
PageModule pagemodule = _pageModules.GetPageModule(id);
if (_userPermissions.IsAuthorized(User, "Page", pagemodule.PageId, "Edit"))
{
PageModules.DeletePageModule(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Module Deleted {PageModuleId}", id);
_pageModules.DeletePageModule(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Module Deleted {PageModuleId}", id);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete PageModule {PageModuleId}", id);
_logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete PageModule {PageModuleId}", id);
HttpContext.Response.StatusCode = 401;
}
}

24
Oqtane.Server/Controllers/ProfileController.cs
View File

@ -11,27 +11,27 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class ProfileController : Controller
{
private readonly IProfileRepository Profiles;
private readonly ILogManager logger;
private readonly IProfileRepository _profiles;
private readonly ILogManager _logger;
public ProfileController(IProfileRepository Profiles, ILogManager logger)
{
this.Profiles = Profiles;
this.logger = logger;
this._profiles = Profiles;
this._logger = logger;
}
// GET: api/<controller>?siteid=x
[HttpGet]
public IEnumerable<Profile> Get(string siteid)
{
return Profiles.GetProfiles(int.Parse(siteid));
return _profiles.GetProfiles(int.Parse(siteid));
}
// GET api/<controller>/5
[HttpGet("{id}")]
public Profile Get(int id)
{
return Profiles.GetProfile(id);
return _profiles.GetProfile(id);
}
// POST api/<controller>
@ -41,8 +41,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Profile = Profiles.AddProfile(Profile);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Profile Added {Profile}", Profile);
Profile = _profiles.AddProfile(Profile);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Profile Added {Profile}", Profile);
}
return Profile;
}
@ -54,8 +54,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Profile = Profiles.UpdateProfile(Profile);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Profile Updated {Profile}", Profile);
Profile = _profiles.UpdateProfile(Profile);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Profile Updated {Profile}", Profile);
}
return Profile;
}
@ -65,8 +65,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public void Delete(int id)
{
Profiles.DeleteProfile(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Profile Deleted {ProfileId}", id);
_profiles.DeleteProfile(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Profile Deleted {ProfileId}", id);
}
}
}

24
Oqtane.Server/Controllers/RoleController.cs
View File

@ -11,13 +11,13 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class RoleController : Controller
{
private readonly IRoleRepository Roles;
private readonly ILogManager logger;
private readonly IRoleRepository _roles;
private readonly ILogManager _logger;
public RoleController(IRoleRepository Roles, ILogManager logger)
{
this.Roles = Roles;
this.logger = logger;
this._roles = Roles;
this._logger = logger;
}
// GET: api/<controller>?siteid=x
@ -25,7 +25,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public IEnumerable<Role> Get(string siteid)
{
return Roles.GetRoles(int.Parse(siteid));
return _roles.GetRoles(int.Parse(siteid));
}
// GET api/<controller>/5
@ -33,7 +33,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public Role Get(int id)
{
return Roles.GetRole(id);
return _roles.GetRole(id);
}
// POST api/<controller>
@ -43,8 +43,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Role = Roles.AddRole(Role);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Role Added {Role}", Role);
Role = _roles.AddRole(Role);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Role Added {Role}", Role);
}
return Role;
}
@ -56,8 +56,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Role = Roles.UpdateRole(Role);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Role Updated {Role}", Role);
Role = _roles.UpdateRole(Role);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Role Updated {Role}", Role);
}
return Role;
}
@ -67,8 +67,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public void Delete(int id)
{
Roles.DeleteRole(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Role Deleted {RoleId}", id);
_roles.DeleteRole(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Role Deleted {RoleId}", id);
}
}
}

50
Oqtane.Server/Controllers/SettingController.cs
View File

@ -13,17 +13,17 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class SettingController : Controller
{
private readonly ISettingRepository Settings;
private readonly IPageModuleRepository PageModules;
private readonly IUserPermissions UserPermissions;
private readonly ILogManager logger;
private readonly ISettingRepository _settings;
private readonly IPageModuleRepository _pageModules;
private readonly IUserPermissions _userPermissions;
private readonly ILogManager _logger;
public SettingController(ISettingRepository Settings, IPageModuleRepository PageModules, IUserPermissions UserPermissions, ILogManager logger)
{
this.Settings = Settings;
this.PageModules = PageModules;
this.UserPermissions = UserPermissions;
this.logger = logger;
this._settings = Settings;
this._pageModules = PageModules;
this._userPermissions = UserPermissions;
this._logger = logger;
}
// GET: api/<controller>
@ -33,11 +33,11 @@ namespace Oqtane.Controllers
List<Setting> settings = new List<Setting>();
if (IsAuthorized(entityname, entityid, "View"))
{
settings = Settings.GetSettings(entityname, entityid).ToList();
settings = _settings.GetSettings(entityname, entityid).ToList();
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityname, entityid);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityname, entityid);
HttpContext.Response.StatusCode = 401;
}
return settings;
@ -47,14 +47,14 @@ namespace Oqtane.Controllers
[HttpGet("{id}")]
public Setting Get(int id)
{
Setting setting = Settings.GetSetting(id);
Setting setting = _settings.GetSetting(id);
if (IsAuthorized(setting.EntityName, setting.EntityId, "View"))
{
return setting;
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {Setting}", setting);
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {Setting}", setting);
HttpContext.Response.StatusCode = 401;
return null;
}
@ -66,12 +66,12 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid && IsAuthorized(Setting.EntityName, Setting.EntityId, "Edit"))
{
Setting = Settings.AddSetting(Setting);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Setting Added {Setting}", Setting);
Setting = _settings.AddSetting(Setting);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Setting Added {Setting}", Setting);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Setting {Setting}", Setting);
_logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Setting {Setting}", Setting);
HttpContext.Response.StatusCode = 401;
Setting = null;
}
@ -84,12 +84,12 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid && IsAuthorized(Setting.EntityName, Setting.EntityId, "Edit"))
{
Setting = Settings.UpdateSetting(Setting);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Updated {Setting}", Setting);
Setting = _settings.UpdateSetting(Setting);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Updated {Setting}", Setting);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Setting {Setting}", Setting);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Setting {Setting}", Setting);
HttpContext.Response.StatusCode = 401;
Setting = null;
}
@ -100,15 +100,15 @@ namespace Oqtane.Controllers
[HttpDelete("{id}")]
public void Delete(int id)
{
Setting setting = Settings.GetSetting(id);
Setting setting = _settings.GetSetting(id);
if (IsAuthorized(setting.EntityName, setting.EntityId, "Edit"))
{
Settings.DeleteSetting(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Setting Deleted {Setting}", setting);
_settings.DeleteSetting(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Setting Deleted {Setting}", setting);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Setting {Setting}", setting);
_logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Setting {Setting}", setting);
HttpContext.Response.StatusCode = 401;
}
}
@ -119,7 +119,7 @@ namespace Oqtane.Controllers
if (EntityName == "PageModule")
{
EntityName = "Module";
EntityId = PageModules.GetPageModule(EntityId).ModuleId;
EntityId = _pageModules.GetPageModule(EntityId).ModuleId;
}
switch (EntityName)
{
@ -132,13 +132,13 @@ namespace Oqtane.Controllers
case "Page":
case "Module":
case "Folder":
authorized = UserPermissions.IsAuthorized(User, EntityName, EntityId, PermissionName);
authorized = _userPermissions.IsAuthorized(User, EntityName, EntityId, PermissionName);
break;
case "User":
authorized = true;
if (PermissionName == "Edit")
{
authorized = User.IsInRole(Constants.AdminRole) || (UserPermissions.GetUser(User).UserId == EntityId);
authorized = User.IsInRole(Constants.AdminRole) || (_userPermissions.GetUser(User).UserId == EntityId);
}
break;
}

36
Oqtane.Server/Controllers/SiteController.cs
View File

@ -14,17 +14,17 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class SiteController : Controller
{
private readonly ISiteRepository Sites;
private readonly ITenantResolver Tenants;
private readonly IWebHostEnvironment environment;
private readonly ILogManager logger;
private readonly ISiteRepository _sites;
private readonly ITenantResolver _tenants;
private readonly IWebHostEnvironment _environment;
private readonly ILogManager _logger;
public SiteController(ISiteRepository Sites, ITenantResolver Tenants, IWebHostEnvironment environment, ILogManager logger)
{
this.Sites = Sites;
this.Tenants = Tenants;
this.environment = environment;
this.logger = logger;
this._sites = Sites;
this._tenants = Tenants;
this._environment = environment;
this._logger = logger;
}
// GET: api/<controller>
@ -32,14 +32,14 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public IEnumerable<Site> Get()
{
return Sites.GetSites();
return _sites.GetSites();
}
// GET api/<controller>/5
[HttpGet("{id}")]
public Site Get(int id)
{
return Sites.GetSite(id);
return _sites.GetSite(id);
}
// POST api/<controller>
@ -49,11 +49,11 @@ namespace Oqtane.Controllers
if (ModelState.IsValid)
{
bool authorized;
if (!Sites.GetSites().Any())
if (!_sites.GetSites().Any())
{
// provision initial site during installation
authorized = true;
Tenant tenant = Tenants.GetTenant();
Tenant tenant = _tenants.GetTenant();
Site.TenantId = tenant.TenantId;
}
else
@ -62,8 +62,8 @@ namespace Oqtane.Controllers
}
if (authorized)
{
Site = Sites.AddSite(Site);
logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Create, "Site Added {Site}", Site);
Site = _sites.AddSite(Site);
_logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Create, "Site Added {Site}", Site);
}
}
return Site;
@ -76,8 +76,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Site = Sites.UpdateSite(Site);
logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", Site);
Site = _sites.UpdateSite(Site);
_logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", Site);
}
return Site;
}
@ -87,8 +87,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Delete(int id)
{
Sites.DeleteSite(id);
logger.Log(id, LogLevel.Information, this, LogFunction.Delete, "Site Deleted {SiteId}", id);
_sites.DeleteSite(id);
_logger.Log(id, LogLevel.Information, this, LogFunction.Delete, "Site Deleted {SiteId}", id);
}
}
}

24
Oqtane.Server/Controllers/TenantController.cs
View File

@ -11,13 +11,13 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class TenantController : Controller
{
private readonly ITenantRepository Tenants;
private readonly ILogManager logger;
private readonly ITenantRepository _tenants;
private readonly ILogManager _logger;
public TenantController(ITenantRepository Tenants, ILogManager logger)
{
this.Tenants = Tenants;
this.logger = logger;
this._tenants = Tenants;
this._logger = logger;
}
// GET: api/<controller>
@ -25,7 +25,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public IEnumerable<Tenant> Get()
{
return Tenants.GetTenants();
return _tenants.GetTenants();
}
// GET api/<controller>/5
@ -33,7 +33,7 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public Tenant Get(int id)
{
return Tenants.GetTenant(id);
return _tenants.GetTenant(id);
}
// POST api/<controller>
@ -43,8 +43,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Tenant = Tenants.AddTenant(Tenant);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Tenant Added {TenantId}", Tenant.TenantId);
Tenant = _tenants.AddTenant(Tenant);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Tenant Added {TenantId}", Tenant.TenantId);
}
return Tenant;
}
@ -56,8 +56,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Tenant = Tenants.UpdateTenant(Tenant);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Tenant Updated {TenantId}", Tenant.TenantId);
Tenant = _tenants.UpdateTenant(Tenant);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Tenant Updated {TenantId}", Tenant.TenantId);
}
return Tenant;
}
@ -67,8 +67,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Delete(int id)
{
Tenants.DeleteTenant(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Tenant Deleted {TenantId}", id);
_tenants.DeleteTenant(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Tenant Deleted {TenantId}", id);
}
}
}

30
Oqtane.Server/Controllers/ThemeController.cs
View File

@ -15,17 +15,17 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class ThemeController : Controller
{
private readonly IThemeRepository Themes;
private readonly IInstallationManager InstallationManager;
private readonly IWebHostEnvironment environment;
private readonly ILogManager logger;
private readonly IThemeRepository _themes;
private readonly IInstallationManager _installationManager;
private readonly IWebHostEnvironment _environment;
private readonly ILogManager _logger;
public ThemeController(IThemeRepository Themes, IInstallationManager InstallationManager, IWebHostEnvironment environment, ILogManager logger)
{
this.Themes = Themes;
this.InstallationManager = InstallationManager;
this.environment = environment;
this.logger = logger;
this._themes = Themes;
this._installationManager = InstallationManager;
this._environment = environment;
this._logger = logger;
}
// GET: api/<controller>
@ -33,15 +33,15 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.RegisteredRole)]
public IEnumerable<Theme> Get()
{
return Themes.GetThemes();
return _themes.GetThemes();
}
[HttpGet("install")]
[Authorize(Roles = Constants.HostRole)]
public void InstallThemes()
{
InstallationManager.InstallPackages("Themes", true);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Themes Installed");
_installationManager.InstallPackages("Themes", true);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Themes Installed");
}
// DELETE api/<controller>/xxx
@ -49,13 +49,13 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Delete(string themename)
{
List<Theme> themes = Themes.GetThemes().ToList();
List<Theme> themes = _themes.GetThemes().ToList();
Theme theme = themes.Where(item => item.ThemeName == themename).FirstOrDefault();
if (theme != null)
{
themename = theme.ThemeName.Substring(0, theme.ThemeName.IndexOf(","));
string folder = Path.Combine(environment.WebRootPath, "Themes\\" + themename);
string folder = Path.Combine(_environment.WebRootPath, "Themes\\" + themename);
if (Directory.Exists(folder))
{
Directory.Delete(folder, true);
@ -66,9 +66,9 @@ namespace Oqtane.Controllers
{
System.IO.File.Delete(file);
}
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Deleted {ThemeName}", themename);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Deleted {ThemeName}", themename);
InstallationManager.RestartApplication();
_installationManager.RestartApplication();
}
}

142
Oqtane.Server/Controllers/UserController.cs
View File

@ -19,27 +19,27 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class UserController : Controller
{
private readonly IUserRepository Users;
private readonly IRoleRepository Roles;
private readonly IUserRoleRepository UserRoles;
private readonly UserManager<IdentityUser> IdentityUserManager;
private readonly SignInManager<IdentityUser> IdentitySignInManager;
private readonly ITenantResolver Tenants;
private readonly INotificationRepository Notifications;
private readonly IFolderRepository Folders;
private readonly ILogManager logger;
private readonly IUserRepository _users;
private readonly IRoleRepository _roles;
private readonly IUserRoleRepository _userRoles;
private readonly UserManager<IdentityUser> _identityUserManager;
private readonly SignInManager<IdentityUser> _identitySignInManager;
private readonly ITenantResolver _tenants;
private readonly INotificationRepository _notifications;
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)
{
this.Users = Users;
this.Roles = Roles;
this.UserRoles = UserRoles;
this.IdentityUserManager = IdentityUserManager;
this.IdentitySignInManager = IdentitySignInManager;
this.Tenants = Tenants;
this.Folders = Folders;
this.Notifications = Notifications;
this.logger = logger;
this._users = Users;
this._roles = Roles;
this._userRoles = UserRoles;
this._identityUserManager = IdentityUserManager;
this._identitySignInManager = IdentitySignInManager;
this._tenants = Tenants;
this._folders = Folders;
this._notifications = Notifications;
this._logger = logger;
}
// GET api/<controller>/5?siteid=x
@ -47,7 +47,7 @@ namespace Oqtane.Controllers
[Authorize]
public User Get(int id, string siteid)
{
User user = Users.GetUser(id);
User user = _users.GetUser(id);
if (user != null)
{
user.SiteId = int.Parse(siteid);
@ -60,7 +60,7 @@ namespace Oqtane.Controllers
[HttpGet("name/{name}")]
public User Get(string name, string siteid)
{
User user = Users.GetUser(name);
User user = _users.GetUser(name);
if (user != null)
{
user.SiteId = int.Parse(siteid);
@ -84,19 +84,19 @@ namespace Oqtane.Controllers
verified = false;
}
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
if (identityuser == null)
{
identityuser = new IdentityUser();
identityuser.UserName = User.Username;
identityuser.Email = User.Email;
identityuser.EmailConfirmed = verified;
var result = await IdentityUserManager.CreateAsync(identityuser, User.Password);
var result = await _identityUserManager.CreateAsync(identityuser, User.Password);
if (result.Succeeded)
{
User.LastLoginOn = null;
User.LastIPAddress = "";
user = Users.AddUser(User);
user = _users.AddUser(User);
if (!verified)
{
Notification notification = new Notification();
@ -105,50 +105,50 @@ namespace Oqtane.Controllers
notification.ToUserId = user.UserId;
notification.ToEmail = "";
notification.Subject = "User Account Verification";
string token = await IdentityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
string url = HttpContext.Request.Scheme + "://" + Tenants.GetAlias().Name + "/login?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/login?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
notification.Body = "Dear " + User.DisplayName + ",\n\nIn Order To Complete The Registration Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
notification.ParentId = null;
notification.CreatedOn = DateTime.Now;
notification.IsDelivered = false;
notification.DeliveredOn = null;
Notifications.AddNotification(notification);
_notifications.AddNotification(notification);
}
// assign to host role if this is the host user ( initial installation )
if (User.Username == Constants.HostUser)
{
int hostroleid = Roles.GetRoles(User.SiteId, true).Where(item => item.Name == Constants.HostRole).FirstOrDefault().RoleId;
int hostroleid = _roles.GetRoles(User.SiteId, true).Where(item => item.Name == Constants.HostRole).FirstOrDefault().RoleId;
UserRole userrole = new UserRole();
userrole.UserId = user.UserId;
userrole.RoleId = hostroleid;
userrole.EffectiveDate = null;
userrole.ExpiryDate = null;
UserRoles.AddUserRole(userrole);
_userRoles.AddUserRole(userrole);
}
// add folder for user
Folder folder = Folders.GetFolder(User.SiteId, "Users\\");
Folder folder = _folders.GetFolder(User.SiteId, "Users\\");
if (folder != null)
{
Folders.AddFolder(new Folder { SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", Path = folder.Path + user.UserId.ToString() + "\\", Order = 1, IsSystem = true,
_folders.AddFolder(new Folder { SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", Path = folder.Path + user.UserId.ToString() + "\\", Order = 1, IsSystem = true,
Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + user.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" + user.UserId.ToString() + "]\"}]" });
}
}
}
else
{
var result = await IdentitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
if (result.Succeeded)
{
user = Users.GetUser(User.Username);
user = _users.GetUser(User.Username);
}
}
if (user != null && User.Username != Constants.HostUser)
{
// add auto assigned roles to user for site
List<Role> roles = Roles.GetRoles(User.SiteId).Where(item => item.IsAutoAssigned == true).ToList();
List<Role> roles = _roles.GetRoles(User.SiteId).Where(item => item.IsAutoAssigned == true).ToList();
foreach (Role role in roles)
{
UserRole userrole = new UserRole();
@ -156,11 +156,11 @@ namespace Oqtane.Controllers
userrole.RoleId = role.RoleId;
userrole.EffectiveDate = null;
userrole.ExpiryDate = null;
UserRoles.AddUserRole(userrole);
_userRoles.AddUserRole(userrole);
}
}
user.Password = ""; // remove sensitive information
logger.Log(User.SiteId, LogLevel.Information, this, LogFunction.Create, "User Added {User}", user);
_logger.Log(User.SiteId, LogLevel.Information, this, LogFunction.Create, "User Added {User}", user);
}
return user;
@ -177,20 +177,20 @@ namespace Oqtane.Controllers
{
if (User.Password != "")
{
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
if (identityuser != null)
{
identityuser.PasswordHash = IdentityUserManager.PasswordHasher.HashPassword(identityuser, User.Password);
await IdentityUserManager.UpdateAsync(identityuser);
identityuser.PasswordHash = _identityUserManager.PasswordHasher.HashPassword(identityuser, User.Password);
await _identityUserManager.UpdateAsync(identityuser);
}
}
User = Users.UpdateUser(User);
User = _users.UpdateUser(User);
User.Password = ""; // remove sensitive information
logger.Log(LogLevel.Information, this, LogFunction.Update, "User Updated {User}", User);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "User Updated {User}", User);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update User {User}", User);
_logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update User {User}", User);
HttpContext.Response.StatusCode = 401;
User = null;
}
@ -203,16 +203,16 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public async Task Delete(int id)
{
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(Users.GetUser(id).Username);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(_users.GetUser(id).Username);
if (identityuser != null)
{
var result = await IdentityUserManager.DeleteAsync(identityuser);
var result = await _identityUserManager.DeleteAsync(identityuser);
if (result != null)
{
Users.DeleteUser(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Deleted {UserId}", id);
_users.DeleteUser(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Deleted {UserId}", id);
}
}
}
@ -225,13 +225,13 @@ namespace Oqtane.Controllers
if (ModelState.IsValid)
{
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
if (identityuser != null)
{
var result = await IdentitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
if (result.Succeeded)
{
user = Users.GetUser(identityuser.UserName);
user = _users.GetUser(identityuser.UserName);
if (user != null)
{
if (identityuser.EmailConfirmed)
@ -239,22 +239,22 @@ namespace Oqtane.Controllers
user.IsAuthenticated = true;
user.LastLoginOn = DateTime.Now;
user.LastIPAddress = HttpContext.Connection.RemoteIpAddress.ToString();
Users.UpdateUser(user);
logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", User.Username);
_users.UpdateUser(user);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", User.Username);
if (SetCookie)
{
await IdentitySignInManager.SignInAsync(identityuser, IsPersistent);
await _identitySignInManager.SignInAsync(identityuser, IsPersistent);
}
}
else
{
logger.Log(LogLevel.Information, this, LogFunction.Security, "User Not Verified {Username}", User.Username);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "User Not Verified {Username}", User.Username);
}
}
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Security, "User Login Failed {Username}", User.Username);
_logger.Log(LogLevel.Error, this, LogFunction.Security, "User Login Failed {Username}", User.Username);
}
}
}
@ -268,7 +268,7 @@ namespace Oqtane.Controllers
public async Task Logout([FromBody] User User)
{
await HttpContext.SignOutAsync(IdentityConstants.ApplicationScheme);
logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", User.Username);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", User.Username);
}
// POST api/<controller>/verify
@ -277,23 +277,23 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
if (identityuser != null)
{
var result = await IdentityUserManager.ConfirmEmailAsync(identityuser, token);
var result = await _identityUserManager.ConfirmEmailAsync(identityuser, token);
if (result.Succeeded)
{
logger.Log(LogLevel.Information, this, LogFunction.Security, "Email Verified For {Username}", User.Username);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "Email Verified For {Username}", User.Username);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", User.Username);
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", User.Username);
User = null;
}
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", User.Username);
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", User.Username);
User = null;
}
}
@ -306,7 +306,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
if (identityuser != null)
{
Notification notification = new Notification();
@ -315,19 +315,19 @@ namespace Oqtane.Controllers
notification.ToUserId = User.UserId;
notification.ToEmail = "";
notification.Subject = "User Password Reset";
string token = await IdentityUserManager.GeneratePasswordResetTokenAsync(identityuser);
string url = HttpContext.Request.Scheme + "://" + Tenants.GetAlias().Name + "/reset?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/reset?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
notification.Body = "Dear " + User.DisplayName + ",\n\nPlease Click The Link Displayed Below To Reset Your Password:\n\n" + url + "\n\nThank You!";
notification.ParentId = null;
notification.CreatedOn = DateTime.Now;
notification.IsDelivered = false;
notification.DeliveredOn = null;
Notifications.AddNotification(notification);
logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", User.Username);
_notifications.AddNotification(notification);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", User.Username);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Notification Failed For {Username}", User.Username);
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Notification Failed For {Username}", User.Username);
}
}
}
@ -338,24 +338,24 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
if (identityuser != null && !string.IsNullOrEmpty(token))
{
var result = await IdentityUserManager.ResetPasswordAsync(identityuser, token, User.Password);
var result = await _identityUserManager.ResetPasswordAsync(identityuser, token, User.Password);
if (result.Succeeded)
{
logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset For {Username}", User.Username);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset For {Username}", User.Username);
User.Password = "";
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", User.Username);
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", User.Username);
User = null;
}
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", User.Username);
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", User.Username);
User = null;
}
}
@ -382,7 +382,7 @@ namespace Oqtane.Controllers
private string GetUserRoles(int UserId, int SiteId)
{
string roles = "";
List<UserRole> userroles = UserRoles.GetUserRoles(UserId, SiteId).ToList();
List<UserRole> userroles = _userRoles.GetUserRoles(UserId, SiteId).ToList();
foreach (UserRole userrole in userroles)
{
roles += userrole.Role.Name + ";";

24
Oqtane.Server/Controllers/UserRoleController.cs
View File

@ -11,13 +11,13 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class UserRoleController : Controller
{
private readonly IUserRoleRepository UserRoles;
private readonly ILogManager logger;
private readonly IUserRoleRepository _userRoles;
private readonly ILogManager _logger;
public UserRoleController(IUserRoleRepository UserRoles, ILogManager logger)
{
this.UserRoles = UserRoles;
this.logger = logger;
this._userRoles = UserRoles;
this._logger = logger;
}
// GET: api/<controller>?userid=x
@ -25,7 +25,7 @@ namespace Oqtane.Controllers
[Authorize]
public IEnumerable<UserRole> Get(string siteid)
{
return UserRoles.GetUserRoles(int.Parse(siteid));
return _userRoles.GetUserRoles(int.Parse(siteid));
}
// GET api/<controller>/5
@ -33,7 +33,7 @@ namespace Oqtane.Controllers
[Authorize]
public UserRole Get(int id)
{
return UserRoles.GetUserRole(id);
return _userRoles.GetUserRole(id);
}
// POST api/<controller>
@ -43,8 +43,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
UserRole = UserRoles.AddUserRole(UserRole);
logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", UserRole);
UserRole = _userRoles.AddUserRole(UserRole);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", UserRole);
}
return UserRole;
}
@ -56,8 +56,8 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
UserRole = UserRoles.UpdateUserRole(UserRole);
logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", UserRole);
UserRole = _userRoles.UpdateUserRole(UserRole);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", UserRole);
}
return UserRole;
}
@ -67,8 +67,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public void Delete(int id)
{
UserRoles.DeleteUserRole(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRoleId}", id);
_userRoles.DeleteUserRole(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRoleId}", id);
}
}
}