From a46235ea1e3076817ddb6cf5c1c2d927896ccaa9 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Thu, 5 Mar 2020 01:46:53 +0300 Subject: [PATCH 1/3] Fix naming conventions for private fields --- .../IdentityAuthenticationStateProvider.cs | 16 +- Oqtane.Client/Services/AliasService.cs | 26 +-- Oqtane.Client/Services/FileService.cs | 34 ++-- Oqtane.Client/Services/FolderService.cs | 26 +-- Oqtane.Client/Services/InstallationService.cs | 20 +-- Oqtane.Client/Services/JobLogService.cs | 10 +- Oqtane.Client/Services/JobService.cs | 28 ++-- Oqtane.Client/Services/LogService.cs | 24 +-- .../Services/ModuleDefinitionService.cs | 28 ++-- Oqtane.Client/Services/ModuleService.cs | 28 ++-- Oqtane.Client/Services/NotificationService.cs | 24 +-- Oqtane.Client/Services/PackageService.cs | 18 +-- Oqtane.Client/Services/PageModuleService.cs | 26 +-- Oqtane.Client/Services/PageService.cs | 30 ++-- Oqtane.Client/Services/ProfileService.cs | 24 +-- Oqtane.Client/Services/RoleService.cs | 24 +-- Oqtane.Client/Services/SettingService.cs | 26 +-- Oqtane.Client/Services/SiteService.cs | 24 +-- Oqtane.Client/Services/TenantService.cs | 24 +-- Oqtane.Client/Services/ThemeService.cs | 24 +-- Oqtane.Client/Services/UserRoleService.cs | 24 +-- Oqtane.Client/Services/UserService.cs | 36 ++--- Oqtane.Client/Shared/Interop.cs | 18 +-- Oqtane.Server/Controllers/AliasController.cs | 26 +-- Oqtane.Server/Controllers/FileController.cs | 88 +++++----- Oqtane.Server/Controllers/FolderController.cs | 62 +++---- .../Controllers/InstallationController.cs | 16 +- Oqtane.Server/Controllers/JobController.cs | 36 ++--- Oqtane.Server/Controllers/JobLogController.cs | 24 +-- Oqtane.Server/Controllers/LogController.cs | 14 +- Oqtane.Server/Controllers/ModuleController.cs | 70 ++++---- .../Controllers/ModuleDefinitionController.cs | 48 +++--- .../Controllers/NotificationController.cs | 34 ++-- .../Controllers/PackageController.cs | 6 +- Oqtane.Server/Controllers/PageController.cs | 84 +++++----- .../Controllers/PageModuleController.cs | 64 ++++---- .../Controllers/ProfileController.cs | 24 +-- Oqtane.Server/Controllers/RoleController.cs | 24 +-- .../Controllers/SettingController.cs | 50 +++--- Oqtane.Server/Controllers/SiteController.cs | 36 ++--- Oqtane.Server/Controllers/TenantController.cs | 24 +-- Oqtane.Server/Controllers/ThemeController.cs | 30 ++-- Oqtane.Server/Controllers/UserController.cs | 142 ++++++++-------- .../Controllers/UserRoleController.cs | 24 +-- .../Infrastructure/InstallationManager.cs | 14 +- .../Infrastructure/Jobs/HostedServiceBase.cs | 16 +- Oqtane.Server/Infrastructure/LogManager.cs | 32 ++-- .../Controllers/HtmlTextController.cs | 42 ++--- .../HtmlText/Manager/HtmlTextManager.cs | 12 +- .../HtmlText/Repository/HtmlTextRepository.cs | 20 +-- Oqtane.Server/Repository/AliasRepository.cs | 22 +-- .../Repository/Context/DBContextBase.cs | 18 +-- .../Repository/Context/MasterDBContext.cs | 8 +- Oqtane.Server/Repository/FileRepository.cs | 34 ++-- Oqtane.Server/Repository/FolderRepository.cs | 46 +++--- Oqtane.Server/Repository/JobLogRepository.cs | 22 +-- Oqtane.Server/Repository/JobRepository.cs | 22 +-- Oqtane.Server/Repository/LogRepository.cs | 18 +-- .../Repository/ModuleDefinitionRepository.cs | 36 ++--- Oqtane.Server/Repository/ModuleRepository.cs | 52 +++--- .../Repository/NotificationRepository.cs | 24 +-- .../Repository/PageModuleRepository.cs | 46 +++--- Oqtane.Server/Repository/PageRepository.cs | 56 +++---- .../Repository/PermissionRepository.cs | 46 +++--- Oqtane.Server/Repository/ProfileRepository.cs | 22 +-- Oqtane.Server/Repository/RoleRepository.cs | 24 +-- Oqtane.Server/Repository/SettingRepository.cs | 22 +-- Oqtane.Server/Repository/SiteRepository.cs | 152 +++++++++--------- Oqtane.Server/Repository/TenantRepository.cs | 22 +-- Oqtane.Server/Repository/TenantResolver.cs | 16 +- Oqtane.Server/Repository/UserRepository.cs | 24 +-- .../Repository/UserRoleRepository.cs | 24 +-- .../Security/ClaimsPrincipalFactory.cs | 28 ++-- Oqtane.Server/Security/PermissionHandler.cs | 18 +-- Oqtane.Server/Security/UserPermissions.cs | 12 +- 75 files changed, 1219 insertions(+), 1219 deletions(-) diff --git a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs index 2aa9b618..2db32002 100644 --- a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs +++ b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs @@ -13,22 +13,22 @@ namespace Oqtane.Providers { public class IdentityAuthenticationStateProvider : AuthenticationStateProvider { - private readonly NavigationManager NavigationManager; - private readonly SiteState sitestate; - private readonly IServiceProvider provider; + private readonly NavigationManager _navigationManager; + private readonly SiteState _siteState; + private readonly IServiceProvider _serviceProvider; public IdentityAuthenticationStateProvider(NavigationManager NavigationManager, SiteState sitestate, IServiceProvider provider) { - this.NavigationManager = NavigationManager; - this.sitestate = sitestate; - this.provider = provider; + this._navigationManager = NavigationManager; + this._siteState = sitestate; + this._serviceProvider = provider; } public override async Task GetAuthenticationStateAsync() { // get HttpClient lazily from IServiceProvider as you cannot use standard dependency injection due to the AuthenticationStateProvider being initialized prior to NavigationManager ( https://github.com/aspnet/AspNetCore/issues/11867 ) - var http = provider.GetRequiredService(); - string apiurl = ServiceBase.CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "User") + "/authenticate"; + var http = _serviceProvider.GetRequiredService(); + string apiurl = ServiceBase.CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "User") + "/authenticate"; User user = await http.GetJsonAsync(apiurl); ClaimsIdentity identity = new ClaimsIdentity(); diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs index c60fed12..af150507 100644 --- a/Oqtane.Client/Services/AliasService.cs +++ b/Oqtane.Client/Services/AliasService.cs @@ -12,31 +12,31 @@ namespace Oqtane.Services { public class AliasService : ServiceBase, IAliasService { - 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 AliasService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Alias"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Alias"); } } public async Task> GetAliasesAsync() { - List aliases = await http.GetJsonAsync>(apiurl); + List aliases = await _http.GetJsonAsync>(apiurl); return aliases.OrderBy(item => item.Name).ToList(); } public async Task GetAliasAsync(int AliasId) { - return await http.GetJsonAsync(apiurl + "/" + AliasId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + AliasId.ToString()); } public async Task GetAliasAsync(string Url) @@ -51,21 +51,21 @@ namespace Oqtane.Services { name = name.Substring(0, name.Length - 1); } - return await http.GetJsonAsync(apiurl + "/name/" + WebUtility.UrlEncode(name)); + return await _http.GetJsonAsync(apiurl + "/name/" + WebUtility.UrlEncode(name)); } public async Task AddAliasAsync(Alias alias) { - return await http.PostJsonAsync(apiurl, alias); + return await _http.PostJsonAsync(apiurl, alias); } public async Task UpdateAliasAsync(Alias alias) { - return await http.PutJsonAsync(apiurl + "/" + alias.AliasId.ToString(), alias); + return await _http.PutJsonAsync(apiurl + "/" + alias.AliasId.ToString(), alias); } public async Task DeleteAliasAsync(int AliasId) { - await http.DeleteAsync(apiurl + "/" + AliasId.ToString()); + await _http.DeleteAsync(apiurl + "/" + AliasId.ToString()); } } } diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs index f706756f..553b9cca 100644 --- a/Oqtane.Client/Services/FileService.cs +++ b/Oqtane.Client/Services/FileService.cs @@ -12,22 +12,22 @@ namespace Oqtane.Services { public class FileService : ServiceBase, IFileService { - private readonly HttpClient http; - private readonly SiteState sitestate; - private readonly NavigationManager NavigationManager; - private readonly IJSRuntime jsRuntime; + private readonly HttpClient _http; + private readonly SiteState _siteState; + private readonly NavigationManager _navigationManager; + private readonly IJSRuntime _jsRuntime; public FileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager, IJSRuntime jsRuntime) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; - this.jsRuntime = jsRuntime; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; + this._jsRuntime = jsRuntime; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "File"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "File"); } } public async Task> GetFilesAsync(int FolderId) @@ -37,32 +37,32 @@ namespace Oqtane.Services public async Task> GetFilesAsync(string Folder) { - return await http.GetJsonAsync>(apiurl + "?folder=" + Folder); + return await _http.GetJsonAsync>(apiurl + "?folder=" + Folder); } public async Task GetFileAsync(int FileId) { - return await http.GetJsonAsync(apiurl + "/" + FileId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + FileId.ToString()); } public async Task AddFileAsync(File File) { - return await http.PostJsonAsync(apiurl, File); + return await _http.PostJsonAsync(apiurl, File); } public async Task UpdateFileAsync(File File) { - return await http.PutJsonAsync(apiurl + "/" + File.FileId.ToString(), File); + return await _http.PutJsonAsync(apiurl + "/" + File.FileId.ToString(), File); } public async Task DeleteFileAsync(int FileId) { - await http.DeleteAsync(apiurl + "/" + FileId.ToString()); + await _http.DeleteAsync(apiurl + "/" + FileId.ToString()); } public async Task UploadFileAsync(string Url, int FolderId) { - return await http.GetJsonAsync(apiurl + "/upload?url=" + WebUtility.UrlEncode(Url) + "&folderid=" + FolderId.ToString()); + return await _http.GetJsonAsync(apiurl + "/upload?url=" + WebUtility.UrlEncode(Url) + "&folderid=" + FolderId.ToString()); } public async Task UploadFilesAsync(int FolderId, string[] Files, string Id) @@ -74,7 +74,7 @@ namespace Oqtane.Services { string result = ""; - var interop = new Interop(jsRuntime); + var interop = new Interop(_jsRuntime); await interop.UploadFiles(apiurl + "/upload", Folder, Id); // uploading files is asynchronous so we need to wait for the upload to complete @@ -110,7 +110,7 @@ namespace Oqtane.Services public async Task DownloadFileAsync(int FileId) { - return await http.GetByteArrayAsync(apiurl + "/download/" + FileId.ToString()); + return await _http.GetByteArrayAsync(apiurl + "/download/" + FileId.ToString()); } } } diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs index 73ab4d74..17481aa6 100644 --- a/Oqtane.Client/Services/FolderService.cs +++ b/Oqtane.Client/Services/FolderService.cs @@ -11,52 +11,52 @@ namespace Oqtane.Services { public class FolderService : ServiceBase, IFolderService { - 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 FolderService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Folder"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Folder"); } } public async Task> GetFoldersAsync(int SiteId) { - List folders = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); + List folders = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); folders = GetFoldersHierarchy(folders); return folders; } public async Task GetFolderAsync(int FolderId) { - return await http.GetJsonAsync(apiurl + "/" + FolderId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + FolderId.ToString()); } public async Task AddFolderAsync(Folder Folder) { - return await http.PostJsonAsync(apiurl, Folder); + return await _http.PostJsonAsync(apiurl, Folder); } public async Task UpdateFolderAsync(Folder Folder) { - return await http.PutJsonAsync(apiurl + "/" + Folder.FolderId.ToString(), Folder); + return await _http.PutJsonAsync(apiurl + "/" + Folder.FolderId.ToString(), Folder); } public async Task UpdateFolderOrderAsync(int SiteId, int FolderId, int? ParentId) { - await http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&folderid=" + FolderId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null); + await _http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&folderid=" + FolderId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null); } public async Task DeleteFolderAsync(int FolderId) { - await http.DeleteAsync(apiurl + "/" + FolderId.ToString()); + await _http.DeleteAsync(apiurl + "/" + FolderId.ToString()); } private static List GetFoldersHierarchy(List Folders) diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs index 9a749c2b..ab37df1e 100644 --- a/Oqtane.Client/Services/InstallationService.cs +++ b/Oqtane.Client/Services/InstallationService.cs @@ -10,35 +10,35 @@ namespace Oqtane.Services { public class InstallationService : ServiceBase, IInstallationService { - 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 InstallationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Installation"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Installation"); } } public async Task IsInstalled() { - return await http.GetJsonAsync(apiurl + "/installed"); + return await _http.GetJsonAsync(apiurl + "/installed"); } public async Task Install(string connectionstring) { - return await http.PostJsonAsync(apiurl, connectionstring); + return await _http.PostJsonAsync(apiurl, connectionstring); } public async Task Upgrade() { - return await http.GetJsonAsync(apiurl + "/upgrade"); + return await _http.GetJsonAsync(apiurl + "/upgrade"); } } } diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs index bd1d0c44..55815fab 100644 --- a/Oqtane.Client/Services/JobLogService.cs +++ b/Oqtane.Client/Services/JobLogService.cs @@ -11,19 +11,19 @@ namespace Oqtane.Services public class JobLogService : ServiceBase, IJobLogService { private readonly HttpClient http; - private readonly SiteState sitestate; - private readonly NavigationManager NavigationManager; + private readonly SiteState _siteState; + private readonly NavigationManager _navigationManager; public JobLogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "JobLog"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "JobLog"); } } public async Task> GetJobLogsAsync() diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs index 8481b0b1..169c57db 100644 --- a/Oqtane.Client/Services/JobService.cs +++ b/Oqtane.Client/Services/JobService.cs @@ -10,55 +10,55 @@ namespace Oqtane.Services { public class JobService : ServiceBase, IJobService { - 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 JobService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Job"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Job"); } } public async Task> GetJobsAsync() { - List Jobs = await http.GetJsonAsync>(apiurl); + List Jobs = await _http.GetJsonAsync>(apiurl); return Jobs.OrderBy(item => item.Name).ToList(); } public async Task GetJobAsync(int JobId) { - return await http.GetJsonAsync(apiurl + "/" + JobId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + JobId.ToString()); } public async Task AddJobAsync(Job Job) { - return await http.PostJsonAsync(apiurl, Job); + return await _http.PostJsonAsync(apiurl, Job); } public async Task UpdateJobAsync(Job Job) { - return await http.PutJsonAsync(apiurl + "/" + Job.JobId.ToString(), Job); + return await _http.PutJsonAsync(apiurl + "/" + Job.JobId.ToString(), Job); } public async Task DeleteJobAsync(int JobId) { - await http.DeleteAsync(apiurl + "/" + JobId.ToString()); + await _http.DeleteAsync(apiurl + "/" + JobId.ToString()); } public async Task StartJobAsync(int JobId) { - await http.GetAsync(apiurl + "/start/" + JobId.ToString()); + await _http.GetAsync(apiurl + "/start/" + JobId.ToString()); } public async Task StopJobAsync(int JobId) { - await http.GetAsync(apiurl + "/stop/" + JobId.ToString()); + await _http.GetAsync(apiurl + "/stop/" + JobId.ToString()); } } } diff --git a/Oqtane.Client/Services/LogService.cs b/Oqtane.Client/Services/LogService.cs index 50cd6ebf..bd921230 100644 --- a/Oqtane.Client/Services/LogService.cs +++ b/Oqtane.Client/Services/LogService.cs @@ -11,30 +11,30 @@ namespace Oqtane.Services { public class LogService : ServiceBase, ILogService { - 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 LogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Log"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Log"); } } public async Task> GetLogsAsync(int SiteId, string Level, string Function, int Rows) { - return await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString() + "&level=" + Level + "&function=" + Function + "&rows=" + Rows.ToString()); + return await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString() + "&level=" + Level + "&function=" + Function + "&rows=" + Rows.ToString()); } public async Task GetLogAsync(int LogId) { - return await http.GetJsonAsync(apiurl + "/" + LogId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + LogId.ToString()); } public async Task Log(int? PageId, int? ModuleId, int? UserId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args) @@ -47,7 +47,7 @@ namespace Oqtane.Services Log log = new Log(); if (Alias == null) { - log.SiteId = sitestate.Alias.SiteId; + log.SiteId = _siteState.Alias.SiteId; } else { @@ -56,7 +56,7 @@ namespace Oqtane.Services log.PageId = PageId; log.ModuleId = ModuleId; log.UserId = UserId; - log.Url = NavigationManager.Uri; + log.Url = _navigationManager.Uri; log.Category = category; log.Feature = feature; log.Function = Enum.GetName(typeof(LogFunction), function); @@ -68,7 +68,7 @@ namespace Oqtane.Services log.Message = message; log.MessageTemplate = ""; log.Properties = JsonSerializer.Serialize(args); - await http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), log); + await _http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), log); } } } diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs index 70bf8ee1..8126f1be 100644 --- a/Oqtane.Client/Services/ModuleDefinitionService.cs +++ b/Oqtane.Client/Services/ModuleDefinitionService.cs @@ -12,46 +12,46 @@ namespace Oqtane.Services { public class ModuleDefinitionService : ServiceBase, IModuleDefinitionService { - 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 ModuleDefinitionService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "ModuleDefinition"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "ModuleDefinition"); } } public async Task> GetModuleDefinitionsAsync(int SiteId) { - List moduledefinitions = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); + List moduledefinitions = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); return moduledefinitions.OrderBy(item => item.Name).ToList(); } public async Task GetModuleDefinitionAsync(int ModuleDefinitionId, int SiteId) { - return await http.GetJsonAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString()); } public async Task UpdateModuleDefinitionAsync(ModuleDefinition ModuleDefinition) { - await http.PutJsonAsync(apiurl + "/" + ModuleDefinition.ModuleDefinitionId.ToString(), ModuleDefinition); + await _http.PutJsonAsync(apiurl + "/" + ModuleDefinition.ModuleDefinitionId.ToString(), ModuleDefinition); } public async Task InstallModuleDefinitionsAsync() { - await http.GetJsonAsync>(apiurl + "/install"); + await _http.GetJsonAsync>(apiurl + "/install"); } public async Task DeleteModuleDefinitionAsync(int ModuleDefinitionId, int SiteId) { - await http.DeleteAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString()); + await _http.DeleteAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString()); } public async Task LoadModuleDefinitionsAsync(int SiteId) @@ -73,7 +73,7 @@ namespace Oqtane.Services if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null) { // download assembly from server and load - var bytes = await http.GetByteArrayAsync(apiurl + "/load/" + assemblyname + ".dll"); + var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + assemblyname + ".dll"); Assembly.Load(bytes); } } @@ -82,7 +82,7 @@ namespace Oqtane.Services if (assemblies.Where(item => item.FullName.StartsWith(moduledefinition.AssemblyName + ",")).FirstOrDefault() == null) { // download assembly from server and load - var bytes = await http.GetByteArrayAsync(apiurl + "/load/" + moduledefinition.AssemblyName + ".dll"); + var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + moduledefinition.AssemblyName + ".dll"); Assembly.Load(bytes); } } diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs index 09c47de7..2207fc7a 100644 --- a/Oqtane.Client/Services/ModuleService.cs +++ b/Oqtane.Client/Services/ModuleService.cs @@ -10,25 +10,25 @@ namespace Oqtane.Services { public class ModuleService : ServiceBase, IModuleService { - 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 ModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Module"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Module"); } } public async Task> GetModulesAsync(int SiteId) { - List modules = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); + List modules = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); modules = modules .OrderBy(item => item.Order) .ToList(); @@ -37,32 +37,32 @@ namespace Oqtane.Services public async Task GetModuleAsync(int ModuleId) { - return await http.GetJsonAsync(apiurl + "/" + ModuleId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + ModuleId.ToString()); } public async Task AddModuleAsync(Module Module) { - return await http.PostJsonAsync(apiurl, Module); + return await _http.PostJsonAsync(apiurl, Module); } public async Task UpdateModuleAsync(Module Module) { - return await http.PutJsonAsync(apiurl + "/" + Module.ModuleId.ToString(), Module); + return await _http.PutJsonAsync(apiurl + "/" + Module.ModuleId.ToString(), Module); } public async Task DeleteModuleAsync(int ModuleId) { - await http.DeleteAsync(apiurl + "/" + ModuleId.ToString()); + await _http.DeleteAsync(apiurl + "/" + ModuleId.ToString()); } public async Task ImportModuleAsync(int ModuleId, string Content) { - return await http.PostJsonAsync(apiurl + "/import?moduleid=" + ModuleId, Content); + return await _http.PostJsonAsync(apiurl + "/import?moduleid=" + ModuleId, Content); } public async Task ExportModuleAsync(int ModuleId) { - return await http.GetStringAsync(apiurl + "/export?moduleid=" + ModuleId.ToString()); + return await _http.GetStringAsync(apiurl + "/export?moduleid=" + ModuleId.ToString()); } } } diff --git a/Oqtane.Client/Services/NotificationService.cs b/Oqtane.Client/Services/NotificationService.cs index c43f6f3e..c21d6ca4 100644 --- a/Oqtane.Client/Services/NotificationService.cs +++ b/Oqtane.Client/Services/NotificationService.cs @@ -10,46 +10,46 @@ namespace Oqtane.Services { public class NotificationService : ServiceBase, INotificationService { - 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 NotificationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Notification"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Notification"); } } public async Task> GetNotificationsAsync(int SiteId, string Direction, int UserId) { string querystring = "?siteid=" + SiteId.ToString() + "&direction=" + Direction.ToLower() + "&userid=" + UserId.ToString(); - List Notifications = await http.GetJsonAsync>(apiurl + querystring); + List Notifications = await _http.GetJsonAsync>(apiurl + querystring); return Notifications.OrderByDescending(item => item.CreatedOn).ToList(); } public async Task GetNotificationAsync(int NotificationId) { - return await http.GetJsonAsync(apiurl + "/" + NotificationId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + NotificationId.ToString()); } public async Task AddNotificationAsync(Notification Notification) { - return await http.PostJsonAsync(apiurl, Notification); + return await _http.PostJsonAsync(apiurl, Notification); } public async Task UpdateNotificationAsync(Notification Notification) { - return await http.PutJsonAsync(apiurl + "/" + Notification.NotificationId.ToString(), Notification); + return await _http.PutJsonAsync(apiurl + "/" + Notification.NotificationId.ToString(), Notification); } public async Task DeleteNotificationAsync(int NotificationId) { - await http.DeleteAsync(apiurl + "/" + NotificationId.ToString()); + await _http.DeleteAsync(apiurl + "/" + NotificationId.ToString()); } } } diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs index bd2c8b39..b3f42051 100644 --- a/Oqtane.Client/Services/PackageService.cs +++ b/Oqtane.Client/Services/PackageService.cs @@ -10,31 +10,31 @@ namespace Oqtane.Services { public class PackageService : ServiceBase, IPackageService { - 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 PackageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Package"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Package"); } } public async Task> GetPackagesAsync(string Tag) { - List packages = await http.GetJsonAsync>(apiurl + "?tag=" + Tag); + List packages = await _http.GetJsonAsync>(apiurl + "?tag=" + Tag); return packages.OrderByDescending(item => item.Downloads).ToList(); } public async Task DownloadPackageAsync(string PackageId, string Version, string Folder) { - await http.PostJsonAsync(apiurl + "?packageid=" + PackageId + "&version=" + Version + "&folder=" + Folder, null); + await _http.PostJsonAsync(apiurl + "?packageid=" + PackageId + "&version=" + Version + "&folder=" + Folder, null); } } } diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs index 5095b060..5d6bbbc8 100644 --- a/Oqtane.Client/Services/PageModuleService.cs +++ b/Oqtane.Client/Services/PageModuleService.cs @@ -10,50 +10,50 @@ namespace Oqtane.Services { public class PageModuleService : ServiceBase, IPageModuleService { - 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 PageModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "PageModule"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "PageModule"); } } public async Task GetPageModuleAsync(int PageModuleId) { - return await http.GetJsonAsync(apiurl + "/" + PageModuleId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + PageModuleId.ToString()); } public async Task GetPageModuleAsync(int PageId, int ModuleId) { - return await http.GetJsonAsync(apiurl + "/" + PageId.ToString() + "/" + ModuleId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + PageId.ToString() + "/" + ModuleId.ToString()); } public async Task AddPageModuleAsync(PageModule PageModule) { - return await http.PostJsonAsync(apiurl, PageModule); + return await _http.PostJsonAsync(apiurl, PageModule); } public async Task UpdatePageModuleAsync(PageModule PageModule) { - return await http.PutJsonAsync(apiurl + "/" + PageModule.PageModuleId.ToString(), PageModule); + return await _http.PutJsonAsync(apiurl + "/" + PageModule.PageModuleId.ToString(), PageModule); } public async Task UpdatePageModuleOrderAsync(int PageId, string Pane) { - await http.PutJsonAsync(apiurl + "/?pageid=" + PageId.ToString() + "&pane=" + Pane, null); + await _http.PutJsonAsync(apiurl + "/?pageid=" + PageId.ToString() + "&pane=" + Pane, null); } public async Task DeletePageModuleAsync(int PageModuleId) { - await http.DeleteAsync(apiurl + "/" + PageModuleId.ToString()); + await _http.DeleteAsync(apiurl + "/" + PageModuleId.ToString()); } } } diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs index 92607162..fe2b1486 100644 --- a/Oqtane.Client/Services/PageService.cs +++ b/Oqtane.Client/Services/PageService.cs @@ -11,62 +11,62 @@ namespace Oqtane.Services { public class PageService : ServiceBase, IPageService { - 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 PageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Page"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Page"); } } public async Task> GetPagesAsync(int SiteId) { - List pages = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); + List pages = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); pages = GetPagesHierarchy(pages); return pages; } public async Task GetPageAsync(int PageId) { - return await http.GetJsonAsync(apiurl + "/" + PageId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + PageId.ToString()); } public async Task GetPageAsync(int PageId, int UserId) { - return await http.GetJsonAsync(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString()); } public async Task AddPageAsync(Page Page) { - return await http.PostJsonAsync(apiurl, Page); + return await _http.PostJsonAsync(apiurl, Page); } public async Task AddPageAsync(int PageId, int UserId) { - return await http.PostJsonAsync(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString(), null); + return await _http.PostJsonAsync(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString(), null); } public async Task UpdatePageAsync(Page Page) { - return await http.PutJsonAsync(apiurl + "/" + Page.PageId.ToString(), Page); + return await _http.PutJsonAsync(apiurl + "/" + Page.PageId.ToString(), Page); } public async Task UpdatePageOrderAsync(int SiteId, int PageId, int? ParentId) { - await http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&pageid=" + PageId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null); + await _http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&pageid=" + PageId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null); } public async Task DeletePageAsync(int PageId) { - await http.DeleteAsync(apiurl + "/" + PageId.ToString()); + await _http.DeleteAsync(apiurl + "/" + PageId.ToString()); } private static List GetPagesHierarchy(List Pages) diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs index 7e187b03..67f07111 100644 --- a/Oqtane.Client/Services/ProfileService.cs +++ b/Oqtane.Client/Services/ProfileService.cs @@ -10,45 +10,45 @@ namespace Oqtane.Services { public class ProfileService : ServiceBase, IProfileService { - 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 ProfileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Profile"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Profile"); } } public async Task> GetProfilesAsync(int SiteId) { - List Profiles = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); + List Profiles = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); return Profiles.OrderBy(item => item.ViewOrder).ToList(); } public async Task GetProfileAsync(int ProfileId) { - return await http.GetJsonAsync(apiurl + "/" + ProfileId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + ProfileId.ToString()); } public async Task AddProfileAsync(Profile Profile) { - return await http.PostJsonAsync(apiurl, Profile); + return await _http.PostJsonAsync(apiurl, Profile); } public async Task UpdateProfileAsync(Profile Profile) { - return await http.PutJsonAsync(apiurl + "/" + Profile.SiteId.ToString(), Profile); + return await _http.PutJsonAsync(apiurl + "/" + Profile.SiteId.ToString(), Profile); } public async Task DeleteProfileAsync(int ProfileId) { - await http.DeleteAsync(apiurl + "/" + ProfileId.ToString()); + await _http.DeleteAsync(apiurl + "/" + ProfileId.ToString()); } } } diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs index b56f2e80..f25e68fa 100644 --- a/Oqtane.Client/Services/RoleService.cs +++ b/Oqtane.Client/Services/RoleService.cs @@ -10,45 +10,45 @@ namespace Oqtane.Services { public class RoleService : ServiceBase, IRoleService { - 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 RoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Role"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Role"); } } public async Task> GetRolesAsync(int SiteId) { - List Roles = await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); + List Roles = await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); return Roles.OrderBy(item => item.Name).ToList(); } public async Task GetRoleAsync(int RoleId) { - return await http.GetJsonAsync(apiurl + "/" + RoleId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + RoleId.ToString()); } public async Task AddRoleAsync(Role Role) { - return await http.PostJsonAsync(apiurl, Role); + return await _http.PostJsonAsync(apiurl, Role); } public async Task UpdateRoleAsync(Role Role) { - return await http.PutJsonAsync(apiurl + "/" + Role.RoleId.ToString(), Role); + return await _http.PutJsonAsync(apiurl + "/" + Role.RoleId.ToString(), Role); } public async Task DeleteRoleAsync(int RoleId) { - await http.DeleteAsync(apiurl + "/" + RoleId.ToString()); + await _http.DeleteAsync(apiurl + "/" + RoleId.ToString()); } } } diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs index e2b00c13..48026fce 100644 --- a/Oqtane.Client/Services/SettingService.cs +++ b/Oqtane.Client/Services/SettingService.cs @@ -10,20 +10,20 @@ namespace Oqtane.Services { public class SettingService : ServiceBase, ISettingService { - 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 SettingService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Setting"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Setting"); } } public async Task> GetHostSettingsAsync() @@ -99,7 +99,7 @@ namespace Oqtane.Services public async Task> GetSettingsAsync(string EntityName, int EntityId) { Dictionary dictionary = new Dictionary(); - List Settings = await http.GetJsonAsync>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString()); + List Settings = await _http.GetJsonAsync>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString()); foreach(Setting setting in Settings.OrderBy(item => item.SettingName).ToList()) { dictionary.Add(setting.SettingName, setting.SettingValue); @@ -109,7 +109,7 @@ namespace Oqtane.Services public async Task UpdateSettingsAsync(Dictionary Settings, string EntityName, int EntityId) { - List settings = await http.GetJsonAsync>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString()); + List settings = await _http.GetJsonAsync>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString()); foreach (KeyValuePair kvp in Settings) { Setting setting = settings.Where(item => item.SettingName == kvp.Key).FirstOrDefault(); @@ -136,22 +136,22 @@ namespace Oqtane.Services public async Task GetSettingAsync(int SettingId) { - return await http.GetJsonAsync(apiurl + "/" + SettingId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + SettingId.ToString()); } public async Task AddSettingAsync(Setting Setting) { - return await http.PostJsonAsync(apiurl, Setting); + return await _http.PostJsonAsync(apiurl, Setting); } public async Task UpdateSettingAsync(Setting Setting) { - return await http.PutJsonAsync(apiurl + "/" + Setting.SettingId.ToString(), Setting); + return await _http.PutJsonAsync(apiurl + "/" + Setting.SettingId.ToString(), Setting); } public async Task DeleteSettingAsync(int SettingId) { - await http.DeleteAsync(apiurl + "/" + SettingId.ToString()); + await _http.DeleteAsync(apiurl + "/" + SettingId.ToString()); } diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs index 48a5e5ba..9c95b358 100644 --- a/Oqtane.Client/Services/SiteService.cs +++ b/Oqtane.Client/Services/SiteService.cs @@ -10,46 +10,46 @@ namespace Oqtane.Services { public class SiteService : ServiceBase, ISiteService { - 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 SiteService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Site"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Site"); } } public async Task> GetSitesAsync(Alias Alias) { - List sites = await http.GetJsonAsync>(CreateCrossTenantUrl(apiurl, Alias)); + List sites = await _http.GetJsonAsync>(CreateCrossTenantUrl(apiurl, Alias)); return sites.OrderBy(item => item.Name).ToList(); } public async Task GetSiteAsync(int SiteId, Alias Alias) { - return await http.GetJsonAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias)); + return await _http.GetJsonAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias)); } public async Task AddSiteAsync(Site Site, Alias Alias) { - return await http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), Site); + return await _http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), Site); } public async Task UpdateSiteAsync(Site Site, Alias Alias) { - return await http.PutJsonAsync(CreateCrossTenantUrl(apiurl + "/" + Site.SiteId.ToString(), Alias), Site); + return await _http.PutJsonAsync(CreateCrossTenantUrl(apiurl + "/" + Site.SiteId.ToString(), Alias), Site); } public async Task DeleteSiteAsync(int SiteId, Alias Alias) { - await http.DeleteAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias)); + await _http.DeleteAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias)); } } } diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs index 9922ab41..bee9b1eb 100644 --- a/Oqtane.Client/Services/TenantService.cs +++ b/Oqtane.Client/Services/TenantService.cs @@ -10,46 +10,46 @@ namespace Oqtane.Services { public class TenantService : ServiceBase, ITenantService { - 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 TenantService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Tenant"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Tenant"); } } public async Task> GetTenantsAsync() { - List tenants = await http.GetJsonAsync>(apiurl); + List tenants = await _http.GetJsonAsync>(apiurl); return tenants.OrderBy(item => item.Name).ToList(); } public async Task GetTenantAsync(int TenantId) { - return await http.GetJsonAsync(apiurl + "/" + TenantId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + TenantId.ToString()); } public async Task AddTenantAsync(Tenant Tenant) { - return await http.PostJsonAsync(apiurl, Tenant); + return await _http.PostJsonAsync(apiurl, Tenant); } public async Task UpdateTenantAsync(Tenant Tenant) { - return await http.PutJsonAsync(apiurl + "/" + Tenant.TenantId.ToString(), Tenant); + return await _http.PutJsonAsync(apiurl + "/" + Tenant.TenantId.ToString(), Tenant); } public async Task DeleteTenantAsync(int TenantId) { - await http.DeleteAsync(apiurl + "/" + TenantId.ToString()); + await _http.DeleteAsync(apiurl + "/" + TenantId.ToString()); } } } diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs index ae90b47c..7594d28f 100644 --- a/Oqtane.Client/Services/ThemeService.cs +++ b/Oqtane.Client/Services/ThemeService.cs @@ -12,25 +12,25 @@ namespace Oqtane.Services { public class ThemeService : ServiceBase, IThemeService { - 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 ThemeService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Theme"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Theme"); } } public async Task> GetThemesAsync() { - List themes = await http.GetJsonAsync>(apiurl); + List themes = await _http.GetJsonAsync>(apiurl); // get list of loaded assemblies Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); @@ -45,7 +45,7 @@ namespace Oqtane.Services if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null) { // download assembly from server and load - var bytes = await http.GetByteArrayAsync(apiurl + "/load/" + assemblyname + ".dll"); + var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + assemblyname + ".dll"); Assembly.Load(bytes); } } @@ -53,7 +53,7 @@ namespace Oqtane.Services if (assemblies.Where(item => item.FullName.StartsWith(theme.AssemblyName + ",")).FirstOrDefault() == null) { // download assembly from server and load - var bytes = await http.GetByteArrayAsync(apiurl + "/load/" + theme.AssemblyName + ".dll"); + var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + theme.AssemblyName + ".dll"); Assembly.Load(bytes); } } @@ -105,12 +105,12 @@ namespace Oqtane.Services public async Task InstallThemesAsync() { - await http.GetJsonAsync>(apiurl + "/install"); + await _http.GetJsonAsync>(apiurl + "/install"); } public async Task DeleteThemeAsync(string ThemeName) { - await http.DeleteAsync(apiurl + "/" + ThemeName); + await _http.DeleteAsync(apiurl + "/" + ThemeName); } } } diff --git a/Oqtane.Client/Services/UserRoleService.cs b/Oqtane.Client/Services/UserRoleService.cs index 6553f232..fbe53cd8 100644 --- a/Oqtane.Client/Services/UserRoleService.cs +++ b/Oqtane.Client/Services/UserRoleService.cs @@ -10,45 +10,45 @@ namespace Oqtane.Services { public class UserRoleService : ServiceBase, IUserRoleService { - 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 UserRoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "UserRole"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "UserRole"); } } public async Task> GetUserRolesAsync(int SiteId) { - return await http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); + return await _http.GetJsonAsync>(apiurl + "?siteid=" + SiteId.ToString()); } public async Task GetUserRoleAsync(int UserRoleId) { - return await http.GetJsonAsync(apiurl + "/" + UserRoleId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + UserRoleId.ToString()); } public async Task AddUserRoleAsync(UserRole UserRole) { - return await http.PostJsonAsync(apiurl, UserRole); + return await _http.PostJsonAsync(apiurl, UserRole); } public async Task UpdateUserRoleAsync(UserRole UserRole) { - return await http.PutJsonAsync(apiurl + "/" + UserRole.UserRoleId.ToString(), UserRole); + return await _http.PutJsonAsync(apiurl + "/" + UserRole.UserRoleId.ToString(), UserRole); } public async Task DeleteUserRoleAsync(int UserRoleId) { - await http.DeleteAsync(apiurl + "/" + UserRoleId.ToString()); + await _http.DeleteAsync(apiurl + "/" + UserRoleId.ToString()); } } } diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs index f35e63fc..002e1536 100644 --- a/Oqtane.Client/Services/UserService.cs +++ b/Oqtane.Client/Services/UserService.cs @@ -8,37 +8,37 @@ namespace Oqtane.Services { public class UserService : ServiceBase, IUserService { - 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 UserService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + this._http = http; + this._siteState = sitestate; + this._navigationManager = NavigationManager; } private string apiurl { - get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "User"); } + get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "User"); } } public async Task GetUserAsync(int UserId, int SiteId) { - return await http.GetJsonAsync(apiurl + "/" + UserId.ToString() + "?siteid=" + SiteId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + UserId.ToString() + "?siteid=" + SiteId.ToString()); } public async Task GetUserAsync(string Username, int SiteId) { - return await http.GetJsonAsync(apiurl + "/name/" + Username + "?siteid=" + SiteId.ToString()); + return await _http.GetJsonAsync(apiurl + "/name/" + Username + "?siteid=" + SiteId.ToString()); } public async Task AddUserAsync(User User) { try { - return await http.PostJsonAsync(apiurl, User); + return await _http.PostJsonAsync(apiurl, User); } catch { @@ -50,7 +50,7 @@ namespace Oqtane.Services { try { - return await http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), User); + return await _http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), User); } catch { @@ -60,37 +60,37 @@ namespace Oqtane.Services public async Task UpdateUserAsync(User User) { - return await http.PutJsonAsync(apiurl + "/" + User.UserId.ToString(), User); + return await _http.PutJsonAsync(apiurl + "/" + User.UserId.ToString(), User); } public async Task DeleteUserAsync(int UserId) { - await http.DeleteAsync(apiurl + "/" + UserId.ToString()); + await _http.DeleteAsync(apiurl + "/" + UserId.ToString()); } public async Task LoginUserAsync(User User, bool SetCookie, bool IsPersistent) { - return await http.PostJsonAsync(apiurl + "/login?setcookie=" + SetCookie.ToString() + "&persistent=" + IsPersistent.ToString(), User); + return await _http.PostJsonAsync(apiurl + "/login?setcookie=" + SetCookie.ToString() + "&persistent=" + IsPersistent.ToString(), User); } public async Task LogoutUserAsync(User User) { // best practices recommend post is preferrable to get for logout - await http.PostJsonAsync(apiurl + "/logout", User); + await _http.PostJsonAsync(apiurl + "/logout", User); } public async Task VerifyEmailAsync(User User, string Token) { - return await http.PostJsonAsync(apiurl + "/verify?token=" + Token, User); + return await _http.PostJsonAsync(apiurl + "/verify?token=" + Token, User); } public async Task ForgotPasswordAsync(User User) { - await http.PostJsonAsync(apiurl + "/forgot", User); + await _http.PostJsonAsync(apiurl + "/forgot", User); } public async Task ResetPasswordAsync(User User, string Token) { - return await http.PostJsonAsync(apiurl + "/reset?token=" + Token, User); + return await _http.PostJsonAsync(apiurl + "/reset?token=" + Token, User); } } diff --git a/Oqtane.Client/Shared/Interop.cs b/Oqtane.Client/Shared/Interop.cs index 0a21512b..6f34d128 100644 --- a/Oqtane.Client/Shared/Interop.cs +++ b/Oqtane.Client/Shared/Interop.cs @@ -7,18 +7,18 @@ namespace Oqtane.Shared { public class Interop { - private readonly IJSRuntime jsRuntime; + private readonly IJSRuntime _jsRuntime; public Interop(IJSRuntime jsRuntime) { - this.jsRuntime = jsRuntime; + this._jsRuntime = jsRuntime; } public Task SetCookie(string name, string value, int days) { try { - jsRuntime.InvokeAsync( + _jsRuntime.InvokeAsync( "interop.setCookie", name, value, days); return Task.CompletedTask; @@ -33,7 +33,7 @@ namespace Oqtane.Shared { try { - return jsRuntime.InvokeAsync( + return _jsRuntime.InvokeAsync( "interop.getCookie", name); } @@ -47,7 +47,7 @@ namespace Oqtane.Shared { try { - jsRuntime.InvokeAsync( + _jsRuntime.InvokeAsync( "interop.includeCSS", id, url); return Task.CompletedTask; @@ -62,7 +62,7 @@ namespace Oqtane.Shared { try { - return jsRuntime.InvokeAsync( + return _jsRuntime.InvokeAsync( "interop.getElementByName", name); } @@ -76,7 +76,7 @@ namespace Oqtane.Shared { try { - jsRuntime.InvokeAsync( + _jsRuntime.InvokeAsync( "interop.submitForm", path, fields); return Task.CompletedTask; @@ -91,7 +91,7 @@ namespace Oqtane.Shared { try { - return jsRuntime.InvokeAsync( + return _jsRuntime.InvokeAsync( "interop.getFiles", id); } @@ -105,7 +105,7 @@ namespace Oqtane.Shared { try { - jsRuntime.InvokeAsync( + _jsRuntime.InvokeAsync( "interop.uploadFiles", posturl, folder, id); return Task.CompletedTask; diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs index 22fa40ec..1a969e65 100644 --- a/Oqtane.Server/Controllers/AliasController.cs +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -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/ @@ -28,7 +28,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.AdminRole)] public IEnumerable Get() { - return Aliases.GetAliases(); + return _aliases.GetAliases(); } // GET api//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//name/localhost:12345 @@ -44,7 +44,7 @@ namespace Oqtane.Controllers public Alias Get(string name) { name = WebUtility.UrlDecode(name); - List aliases = Aliases.GetAliases().ToList(); + List 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); } } } diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 514c699a..78529d00 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -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/?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) diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index 5f1da3ba..029a3984 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -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/?siteid=x @@ -29,9 +29,9 @@ namespace Oqtane.Controllers public IEnumerable Get(string siteid) { List folders = new List(); - 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 { 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 folders = Folders.GetFolders(siteid).ToList(); + List 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; } } diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs index 684f7173..dedb2044 100644 --- a/Oqtane.Server/Controllers/InstallationController.cs +++ b/Oqtane.Server/Controllers/InstallationController.cs @@ -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/ @@ -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; } } diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs index e5647351..29d18d12 100644 --- a/Oqtane.Server/Controllers/JobController.cs +++ b/Oqtane.Server/Controllers/JobController.cs @@ -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/ @@ -30,7 +30,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.HostRole)] public IEnumerable Get() { - return Jobs.GetJobs(); + return _jobs.GetJobs(); } // GET api//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/ @@ -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//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()); } } diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs index f514b519..330acfc8 100644 --- a/Oqtane.Server/Controllers/JobLogController.cs +++ b/Oqtane.Server/Controllers/JobLogController.cs @@ -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/ @@ -25,7 +25,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.HostRole)] public IEnumerable Get() { - return JobLogs.GetJobLogs(); + return _jobLogs.GetJobLogs(); } // GET api//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/ @@ -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); } } } diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs index a95a8d21..97280357 100644 --- a/Oqtane.Server/Controllers/LogController.cs +++ b/Oqtane.Server/Controllers/LogController.cs @@ -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/?siteid=x&level=y&function=z&rows=50 @@ -26,7 +26,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.AdminRole)] public IEnumerable 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//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/ @@ -43,7 +43,7 @@ namespace Oqtane.Controllers { if (ModelState.IsValid) { - Logger.Log(Log); + _ogger.Log(Log); } } } diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs index e61f1350..796211ac 100644 --- a/Oqtane.Server/Controllers/ModuleController.cs +++ b/Oqtane.Server/Controllers/ModuleController.cs @@ -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/?siteid=x [HttpGet] public IEnumerable Get(string siteid) { - List moduledefinitions = ModuleDefinitions.GetModuleDefinitions(int.Parse(siteid)).ToList(); + List moduledefinitions = _moduleDefinitions.GetModuleDefinitions(int.Parse(siteid)).ToList(); List modules = new List(); - 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 moduledefinitions = ModuleDefinitions.GetModuleDefinitions(module.SiteId).ToList(); + List 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; diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index c503bfc8..81e88b3c 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -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/?siteid=x @@ -36,9 +36,9 @@ namespace Oqtane.Controllers public IEnumerable Get(string siteid) { List moduledefinitions = new List(); - 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//5?siteid=x @@ -88,13 +88,13 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.HostRole)] public void Delete(int id, int siteid) { - List moduledefinitions = ModuleDefinitions.GetModuleDefinitions(siteid).ToList(); + List 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(); } } diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs index 2390297e..592de0e7 100644 --- a/Oqtane.Server/Controllers/NotificationController.cs +++ b/Oqtane.Server/Controllers/NotificationController.cs @@ -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/?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; } diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs index 3ee78da4..69f0b590 100644 --- a/Oqtane.Server/Controllers/PackageController.cs +++ b/Oqtane.Server/Controllers/PackageController.cs @@ -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/?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"; diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index c7bb7ded..5bdc2b50 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -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/?siteid=x @@ -33,9 +33,9 @@ namespace Oqtane.Controllers public IEnumerable Get(string siteid) { List pages = new List(); - 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 { 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 pagemodules = PageModules.GetPageModules(page.SiteId).ToList(); + List 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 pages = Pages.GetPages(siteid).ToList(); + List 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; } } diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs index db943e68..fb1d568b 100644 --- a/Oqtane.Server/Controllers/PageModuleController.cs +++ b/Oqtane.Server/Controllers/PageModuleController.cs @@ -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//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 pagemodules = PageModules.GetPageModules(pageid, pane).OrderBy(item => item.Order).ToList(); + List 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; } } diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs index 2e4e823c..4636cdb0 100644 --- a/Oqtane.Server/Controllers/ProfileController.cs +++ b/Oqtane.Server/Controllers/ProfileController.cs @@ -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/?siteid=x [HttpGet] public IEnumerable Get(string siteid) { - return Profiles.GetProfiles(int.Parse(siteid)); + return _profiles.GetProfiles(int.Parse(siteid)); } // GET api//5 [HttpGet("{id}")] public Profile Get(int id) { - return Profiles.GetProfile(id); + return _profiles.GetProfile(id); } // POST api/ @@ -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); } } } diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index a2b978ad..21d7be48 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -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/?siteid=x @@ -25,7 +25,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public IEnumerable Get(string siteid) { - return Roles.GetRoles(int.Parse(siteid)); + return _roles.GetRoles(int.Parse(siteid)); } // GET api//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/ @@ -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); } } } diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index fbc45cc4..7b3c16ee 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -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/ @@ -33,11 +33,11 @@ namespace Oqtane.Controllers List settings = new List(); 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; } diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index 46c61eff..4cbe52f0 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -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/ @@ -32,14 +32,14 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.HostRole)] public IEnumerable Get() { - return Sites.GetSites(); + return _sites.GetSites(); } // GET api//5 [HttpGet("{id}")] public Site Get(int id) { - return Sites.GetSite(id); + return _sites.GetSite(id); } // POST api/ @@ -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); } } } diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs index bf9303e9..c04af901 100644 --- a/Oqtane.Server/Controllers/TenantController.cs +++ b/Oqtane.Server/Controllers/TenantController.cs @@ -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/ @@ -25,7 +25,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.HostRole)] public IEnumerable Get() { - return Tenants.GetTenants(); + return _tenants.GetTenants(); } // GET api//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/ @@ -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); } } } diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index 4d8b26fe..e9908af8 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -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/ @@ -33,15 +33,15 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public IEnumerable 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//xxx @@ -49,13 +49,13 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.HostRole)] public void Delete(string themename) { - List themes = Themes.GetThemes().ToList(); + List 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(); } } diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index ab16c183..6569ebfd 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -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 IdentityUserManager; - private readonly SignInManager 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 _identityUserManager; + private readonly SignInManager _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 IdentityUserManager, SignInManager 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//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 roles = Roles.GetRoles(User.SiteId).Where(item => item.IsAutoAssigned == true).ToList(); + List 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//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 userroles = UserRoles.GetUserRoles(UserId, SiteId).ToList(); + List userroles = _userRoles.GetUserRoles(UserId, SiteId).ToList(); foreach (UserRole userrole in userroles) { roles += userrole.Role.Name + ";"; diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 136c019f..559d5419 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -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/?userid=x @@ -25,7 +25,7 @@ namespace Oqtane.Controllers [Authorize] public IEnumerable Get(string siteid) { - return UserRoles.GetUserRoles(int.Parse(siteid)); + return _userRoles.GetUserRoles(int.Parse(siteid)); } // GET api//5 @@ -33,7 +33,7 @@ namespace Oqtane.Controllers [Authorize] public UserRole Get(int id) { - return UserRoles.GetUserRole(id); + return _userRoles.GetUserRole(id); } // POST api/ @@ -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); } } } diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index eba54a2b..305ad72f 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -12,13 +12,13 @@ namespace Oqtane.Infrastructure { public class InstallationManager : IInstallationManager { - private readonly IHostApplicationLifetime HostApplicationLifetime; - private readonly IWebHostEnvironment environment; + private readonly IHostApplicationLifetime _hostApplicationLifetime; + private readonly IWebHostEnvironment _environment; public InstallationManager(IHostApplicationLifetime HostApplicationLifetime, IWebHostEnvironment environment) { - this.HostApplicationLifetime = HostApplicationLifetime; - this.environment = environment; + this._hostApplicationLifetime = HostApplicationLifetime; + this._environment = environment; } public void InstallPackages(string Folders, bool Restart) @@ -28,7 +28,7 @@ namespace Oqtane.Infrastructure foreach (string Folder in Folders.Split(',')) { - string folder = Path.Combine(environment.WebRootPath, Folder); + string folder = Path.Combine(_environment.WebRootPath, Folder); // create folder if it does not exist if (!Directory.Exists(folder)) @@ -113,7 +113,7 @@ namespace Oqtane.Infrastructure public void UpgradeFramework() { - string folder = Path.Combine(environment.WebRootPath, "Framework"); + string folder = Path.Combine(_environment.WebRootPath, "Framework"); if (Directory.Exists(folder)) { // get package with highest version and clean up any others @@ -189,7 +189,7 @@ namespace Oqtane.Infrastructure public void RestartApplication() { - HostApplicationLifetime.StopApplication(); + _hostApplicationLifetime.StopApplication(); } } } diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs index 7b81a102..670a2dbd 100644 --- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs +++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs @@ -14,12 +14,12 @@ namespace Oqtane.Infrastructure public abstract class HostedServiceBase : IHostedService, IDisposable { private Task ExecutingTask; - private readonly CancellationTokenSource CancellationTokenSource = new CancellationTokenSource(); - private readonly IServiceScopeFactory ServiceScopeFactory; + private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource(); + private readonly IServiceScopeFactory _serviceScopeFactory; public HostedServiceBase(IServiceScopeFactory ServiceScopeFactory) { - this.ServiceScopeFactory = ServiceScopeFactory; + this._serviceScopeFactory = ServiceScopeFactory; } // abstract method must be overridden @@ -31,7 +31,7 @@ namespace Oqtane.Infrastructure { while (!stoppingToken.IsCancellationRequested) { - using (var scope = ServiceScopeFactory.CreateScope()) + using (var scope = _serviceScopeFactory.CreateScope()) { // get name of job string JobType = Utilities.GetFullTypeName(this.GetType().AssemblyQualifiedName); @@ -144,7 +144,7 @@ namespace Oqtane.Infrastructure try { // set IsExecuting to false in case this job was forcefully terminated previously - using (var scope = ServiceScopeFactory.CreateScope()) + using (var scope = _serviceScopeFactory.CreateScope()) { string JobType = Utilities.GetFullTypeName(this.GetType().AssemblyQualifiedName); IJobRepository Jobs = scope.ServiceProvider.GetRequiredService(); @@ -162,7 +162,7 @@ namespace Oqtane.Infrastructure // can occur during the initial installation as there is no DBContext } - ExecutingTask = ExecuteAsync(CancellationTokenSource.Token); + ExecutingTask = ExecuteAsync(_cancellationTokenSource.Token); if (ExecutingTask.IsCompleted) { @@ -181,7 +181,7 @@ namespace Oqtane.Infrastructure try { - CancellationTokenSource.Cancel(); + _cancellationTokenSource.Cancel(); } finally { @@ -191,7 +191,7 @@ namespace Oqtane.Infrastructure public void Dispose() { - CancellationTokenSource.Cancel(); + _cancellationTokenSource.Cancel(); } } } diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 494ee7fb..8cfd8002 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -12,19 +12,19 @@ namespace Oqtane.Infrastructure { public class LogManager : ILogManager { - private readonly ILogRepository Logs; - private readonly ITenantResolver TenantResolver; - private readonly IConfigurationRoot Config; - private readonly IUserPermissions UserPermissions; - private readonly IHttpContextAccessor Accessor; + private readonly ILogRepository _logs; + private readonly ITenantResolver _tenantResolver; + private readonly IConfigurationRoot _config; + private readonly IUserPermissions _userPermissions; + private readonly IHttpContextAccessor _accessor; public LogManager(ILogRepository Logs, ITenantResolver TenantResolver, IConfigurationRoot Config, IUserPermissions UserPermissions, IHttpContextAccessor Accessor) { - this.Logs = Logs; - this.TenantResolver = TenantResolver; - this.Config = Config; - this.UserPermissions = UserPermissions; - this.Accessor = Accessor; + this._logs = Logs; + this._tenantResolver = TenantResolver; + this._config = Config; + this._userPermissions = UserPermissions; + this._accessor = Accessor; } public void Log(LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args) @@ -48,7 +48,7 @@ namespace Oqtane.Infrastructure if (SiteId == -1) { log.SiteId = null; - Alias alias = TenantResolver.GetAlias(); + Alias alias = _tenantResolver.GetAlias(); if (alias != null) { log.SiteId = alias.SiteId; @@ -61,12 +61,12 @@ namespace Oqtane.Infrastructure log.PageId = null; log.ModuleId = null; log.UserId = null; - User user = UserPermissions.GetUser(); + User user = _userPermissions.GetUser(); if (user != null) { log.UserId = user.UserId; } - HttpRequest request = Accessor.HttpContext.Request; + HttpRequest request = _accessor.HttpContext.Request; if (request != null) { log.Url = request.Scheme.ToString() + "://" + request.Host.ToString() + request.Path.ToString() + request.QueryString.ToString(); @@ -105,10 +105,10 @@ namespace Oqtane.Infrastructure public void Log(Log Log) { LogLevel minlevel = LogLevel.Information; - var section = Config.GetSection("Logging:LogLevel:Default"); + var section = _config.GetSection("Logging:LogLevel:Default"); if (section.Exists()) { - minlevel = Enum.Parse(Config.GetSection("Logging:LogLevel:Default").ToString()); + minlevel = Enum.Parse(_config.GetSection("Logging:LogLevel:Default").ToString()); } if (Enum.Parse(Log.Level) >= minlevel) @@ -119,7 +119,7 @@ namespace Oqtane.Infrastructure Log = ProcessStructuredLog(Log); try { - Logs.AddLog(Log); + _logs.AddLog(Log); } catch { diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs index 3318d278..9c5420c7 100644 --- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs +++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs @@ -12,17 +12,17 @@ namespace Oqtane.Modules.HtmlText.Controllers [Route("{site}/api/[controller]")] public class HtmlTextController : Controller { - private readonly IHtmlTextRepository htmltext; - private readonly ILogManager logger; - private int EntityId = -1; // passed as a querystring parameter for authorization and used for validation + private readonly IHtmlTextRepository _htmlText; + 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) { - htmltext = HtmlText; - this.logger = logger; + _htmlText = HtmlText; + this._logger = logger; if (HttpContextAccessor.HttpContext.Request.Query.ContainsKey("entityid")) { - EntityId = int.Parse(HttpContextAccessor.HttpContext.Request.Query["entityid"]); + _entityId = int.Parse(HttpContextAccessor.HttpContext.Request.Query["entityid"]); } } @@ -34,15 +34,15 @@ namespace Oqtane.Modules.HtmlText.Controllers try { HtmlTextInfo HtmlText = null; - if (EntityId == id) + if (_entityId == id) { - HtmlText = htmltext.GetHtmlText(id); + HtmlText = _htmlText.GetHtmlText(id); } return HtmlText; } catch (Exception ex) { - logger.Log(LogLevel.Error, this, LogFunction.Read, ex, "Get Error {Error}", ex.Message); + _logger.Log(LogLevel.Error, this, LogFunction.Read, ex, "Get Error {Error}", ex.Message); throw; } } @@ -54,16 +54,16 @@ namespace Oqtane.Modules.HtmlText.Controllers { try { - if (ModelState.IsValid && HtmlText.ModuleId == EntityId) + if (ModelState.IsValid && HtmlText.ModuleId == _entityId) { - HtmlText = htmltext.AddHtmlText(HtmlText); - logger.Log(LogLevel.Information, this, LogFunction.Create, "Html/Text Added {HtmlText}", HtmlText); + HtmlText = _htmlText.AddHtmlText(HtmlText); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "Html/Text Added {HtmlText}", HtmlText); } return HtmlText; } catch (Exception ex) { - logger.Log(LogLevel.Error, this, LogFunction.Create, ex, "Post Error {Error}", ex.Message); + _logger.Log(LogLevel.Error, this, LogFunction.Create, ex, "Post Error {Error}", ex.Message); throw; } } @@ -75,16 +75,16 @@ namespace Oqtane.Modules.HtmlText.Controllers { try { - if (ModelState.IsValid && HtmlText.ModuleId == EntityId) + if (ModelState.IsValid && HtmlText.ModuleId == _entityId) { - HtmlText = htmltext.UpdateHtmlText(HtmlText); - logger.Log(LogLevel.Information, this, LogFunction.Update, "Html/Text Updated {HtmlText}", HtmlText); + HtmlText = _htmlText.UpdateHtmlText(HtmlText); + _logger.Log(LogLevel.Information, this, LogFunction.Update, "Html/Text Updated {HtmlText}", HtmlText); } return HtmlText; } catch (Exception ex) { - logger.Log(LogLevel.Error, this, LogFunction.Update, ex, "Put Error {Error}", ex.Message); + _logger.Log(LogLevel.Error, this, LogFunction.Update, ex, "Put Error {Error}", ex.Message); throw; } } @@ -96,15 +96,15 @@ namespace Oqtane.Modules.HtmlText.Controllers { try { - if (id == EntityId) + if (id == _entityId) { - htmltext.DeleteHtmlText(id); - logger.Log(LogLevel.Information, this, LogFunction.Delete, "Html/Text Deleted {HtmlTextId}", id); + _htmlText.DeleteHtmlText(id); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Html/Text Deleted {HtmlTextId}", id); } } catch (Exception ex) { - logger.Log(LogLevel.Error, this, LogFunction.Delete, ex, "Delete Error {Error}", ex.Message); + _logger.Log(LogLevel.Error, this, LogFunction.Delete, ex, "Delete Error {Error}", ex.Message); throw; } } diff --git a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs index 71f37091..d1bdcd3f 100644 --- a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs +++ b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs @@ -7,17 +7,17 @@ namespace Oqtane.Modules.HtmlText.Manager { public class HtmlTextManager : IPortable { - private IHtmlTextRepository htmltexts; + private IHtmlTextRepository _htmlTexts; public HtmlTextManager(IHtmlTextRepository htmltexts) { - this.htmltexts = htmltexts; + this._htmlTexts = htmltexts; } public string ExportModule(Module Module) { string content = ""; - HtmlTextInfo htmltext = htmltexts.GetHtmlText(Module.ModuleId); + HtmlTextInfo htmltext = _htmlTexts.GetHtmlText(Module.ModuleId); if (htmltext != null) { content = WebUtility.HtmlEncode(htmltext.Content); @@ -28,18 +28,18 @@ namespace Oqtane.Modules.HtmlText.Manager public void ImportModule(Module Module, string Content, string Version) { Content = WebUtility.HtmlDecode(Content); - HtmlTextInfo htmltext = htmltexts.GetHtmlText(Module.ModuleId); + HtmlTextInfo htmltext = _htmlTexts.GetHtmlText(Module.ModuleId); if (htmltext != null) { htmltext.Content = Content; - htmltexts.UpdateHtmlText(htmltext); + _htmlTexts.UpdateHtmlText(htmltext); } else { htmltext = new HtmlTextInfo(); htmltext.ModuleId = Module.ModuleId; htmltext.Content = Content; - htmltexts.AddHtmlText(htmltext); + _htmlTexts.AddHtmlText(htmltext); } } } diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs index 79befc7b..144ea1e5 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs @@ -6,18 +6,18 @@ namespace Oqtane.Modules.HtmlText.Repository { public class HtmlTextRepository : IHtmlTextRepository, IService { - private readonly HtmlTextContext db; + private readonly HtmlTextContext _db; public HtmlTextRepository(HtmlTextContext context) { - db = context; + _db = context; } public HtmlTextInfo GetHtmlText(int ModuleId) { try { - return db.HtmlText.Where(item => item.ModuleId == ModuleId).FirstOrDefault(); + return _db.HtmlText.Where(item => item.ModuleId == ModuleId).FirstOrDefault(); } catch { @@ -30,8 +30,8 @@ namespace Oqtane.Modules.HtmlText.Repository { try { - db.HtmlText.Add(HtmlText); - db.SaveChanges(); + _db.HtmlText.Add(HtmlText); + _db.SaveChanges(); return HtmlText; } catch @@ -44,8 +44,8 @@ namespace Oqtane.Modules.HtmlText.Repository { try { - db.Entry(HtmlText).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(HtmlText).State = EntityState.Modified; + _db.SaveChanges(); return HtmlText; } catch @@ -58,9 +58,9 @@ namespace Oqtane.Modules.HtmlText.Repository { try { - HtmlTextInfo HtmlText = db.HtmlText.Where(item => item.ModuleId == ModuleId).FirstOrDefault(); - db.HtmlText.Remove(HtmlText); - db.SaveChanges(); + HtmlTextInfo HtmlText = _db.HtmlText.Where(item => item.ModuleId == ModuleId).FirstOrDefault(); + _db.HtmlText.Remove(HtmlText); + _db.SaveChanges(); } catch { diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs index 3df7eac5..fe16d4d9 100644 --- a/Oqtane.Server/Repository/AliasRepository.cs +++ b/Oqtane.Server/Repository/AliasRepository.cs @@ -9,12 +9,12 @@ namespace Oqtane.Repository { public class AliasRepository : IAliasRepository { - private MasterDBContext db; + private MasterDBContext _db; private readonly IMemoryCache _cache; public AliasRepository(MasterDBContext context, IMemoryCache cache) { - db = context; + _db = context; _cache = cache; } @@ -23,37 +23,37 @@ namespace Oqtane.Repository return _cache.GetOrCreate("aliases", entry => { entry.SlidingExpiration = TimeSpan.FromMinutes(30); - return db.Alias.ToList(); + return _db.Alias.ToList(); }); } public Alias AddAlias(Alias Alias) { - db.Alias.Add(Alias); - db.SaveChanges(); + _db.Alias.Add(Alias); + _db.SaveChanges(); _cache.Remove("aliases"); return Alias; } public Alias UpdateAlias(Alias Alias) { - db.Entry(Alias).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Alias).State = EntityState.Modified; + _db.SaveChanges(); _cache.Remove("aliases"); return Alias; } public Alias GetAlias(int AliasId) { - return db.Alias.Find(AliasId); + return _db.Alias.Find(AliasId); } public void DeleteAlias(int AliasId) { - Alias alias = db.Alias.Find(AliasId); - db.Alias.Remove(alias); + Alias alias = _db.Alias.Find(AliasId); + _db.Alias.Remove(alias); _cache.Remove("aliases"); - db.SaveChanges(); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs index bb1b2635..a5cf922a 100644 --- a/Oqtane.Server/Repository/Context/DBContextBase.cs +++ b/Oqtane.Server/Repository/Context/DBContextBase.cs @@ -10,18 +10,18 @@ namespace Oqtane.Repository { public class DBContextBase : IdentityUserContext { - private Tenant tenant; - private IHttpContextAccessor accessor; + private Tenant _tenant; + private IHttpContextAccessor _accessor; public DBContextBase(ITenantResolver TenantResolver, IHttpContextAccessor accessor) { - tenant = TenantResolver.GetTenant(); - this.accessor = accessor; + _tenant = TenantResolver.GetTenant(); + this._accessor = accessor; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseSqlServer(tenant.DBConnectionString + optionsBuilder.UseSqlServer(_tenant.DBConnectionString .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString()) ); base.OnConfiguring(optionsBuilder); @@ -31,9 +31,9 @@ namespace Oqtane.Repository { base.OnModelCreating(modelBuilder); - if (tenant.DBSchema != "") + if (_tenant.DBSchema != "") { - modelBuilder.HasDefaultSchema(tenant.DBSchema); + modelBuilder.HasDefaultSchema(_tenant.DBSchema); } } @@ -42,9 +42,9 @@ namespace Oqtane.Repository ChangeTracker.DetectChanges(); string username = ""; - if (accessor.HttpContext != null && accessor.HttpContext.User.Identity.Name != null) + if (_accessor.HttpContext != null && _accessor.HttpContext.User.Identity.Name != null) { - username = accessor.HttpContext.User.Identity.Name; + username = _accessor.HttpContext.User.Identity.Name; } DateTime date = DateTime.UtcNow; diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs index 88663bfa..669dd035 100644 --- a/Oqtane.Server/Repository/Context/MasterDBContext.cs +++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs @@ -8,11 +8,11 @@ namespace Oqtane.Repository { public class MasterDBContext : DbContext { - private IHttpContextAccessor accessor; + private IHttpContextAccessor _accessor; public MasterDBContext(DbContextOptions options, IHttpContextAccessor accessor) : base(options) { - this.accessor = accessor; + this._accessor = accessor; } public virtual DbSet Alias { get; set; } @@ -26,9 +26,9 @@ namespace Oqtane.Repository ChangeTracker.DetectChanges(); string username = ""; - if (accessor.HttpContext != null && accessor.HttpContext.User.Identity.Name != null) + if (_accessor.HttpContext != null && _accessor.HttpContext.User.Identity.Name != null) { - username = accessor.HttpContext.User.Identity.Name; + username = _accessor.HttpContext.User.Identity.Name; } DateTime date = DateTime.Now; diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs index 3d51b17d..67d2ffa3 100644 --- a/Oqtane.Server/Repository/FileRepository.cs +++ b/Oqtane.Server/Repository/FileRepository.cs @@ -7,56 +7,56 @@ namespace Oqtane.Repository { public class FileRepository : IFileRepository { - private TenantDBContext db; - private readonly IPermissionRepository Permissions; + private TenantDBContext _db; + private readonly IPermissionRepository _permissions; public FileRepository(TenantDBContext context, IPermissionRepository Permissions) { - db = context; - this.Permissions = Permissions; + _db = context; + this._permissions = Permissions; } public IEnumerable GetFiles(int FolderId) { - IEnumerable permissions = Permissions.GetPermissions("Folder", FolderId).ToList(); - IEnumerable files = db.File.Where(item => item.FolderId == FolderId).Include(item => item.Folder); + IEnumerable permissions = _permissions.GetPermissions("Folder", FolderId).ToList(); + IEnumerable files = _db.File.Where(item => item.FolderId == FolderId).Include(item => item.Folder); foreach (File file in files) { - file.Folder.Permissions = Permissions.EncodePermissions(FolderId, permissions); + file.Folder.Permissions = _permissions.EncodePermissions(FolderId, permissions); } return files; } public File AddFile(File File) { - db.File.Add(File); - db.SaveChanges(); + _db.File.Add(File); + _db.SaveChanges(); return File; } public File UpdateFile(File File) { - db.Entry(File).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(File).State = EntityState.Modified; + _db.SaveChanges(); return File; } public File GetFile(int FileId) { - File file = db.File.Where(item => item.FileId == FileId).Include(item => item.Folder).FirstOrDefault(); + File file = _db.File.Where(item => item.FileId == FileId).Include(item => item.Folder).FirstOrDefault(); if (file != null) { - IEnumerable permissions = Permissions.GetPermissions("Folder", file.FolderId).ToList(); - file.Folder.Permissions = Permissions.EncodePermissions(file.FolderId, permissions); + IEnumerable permissions = _permissions.GetPermissions("Folder", file.FolderId).ToList(); + file.Folder.Permissions = _permissions.EncodePermissions(file.FolderId, permissions); } return file; } public void DeleteFile(int FileId) { - File File = db.File.Find(FileId); - db.File.Remove(File); - db.SaveChanges(); + File File = _db.File.Find(FileId); + _db.File.Remove(File); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs index 75b44e29..60ba28f0 100644 --- a/Oqtane.Server/Repository/FolderRepository.cs +++ b/Oqtane.Server/Repository/FolderRepository.cs @@ -7,70 +7,70 @@ namespace Oqtane.Repository { public class FolderRepository : IFolderRepository { - private TenantDBContext db; - private readonly IPermissionRepository Permissions; + private TenantDBContext _db; + private readonly IPermissionRepository _permissions; public FolderRepository(TenantDBContext context, IPermissionRepository Permissions) { - db = context; - this.Permissions = Permissions; + _db = context; + this._permissions = Permissions; } public IEnumerable GetFolders(int SiteId) { - IEnumerable permissions = Permissions.GetPermissions(SiteId, "Folder").ToList(); - IEnumerable folders = db.Folder.Where(item => item.SiteId == SiteId); + IEnumerable permissions = _permissions.GetPermissions(SiteId, "Folder").ToList(); + IEnumerable folders = _db.Folder.Where(item => item.SiteId == SiteId); foreach(Folder folder in folders) { - folder.Permissions = Permissions.EncodePermissions(folder.FolderId, permissions); + folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions); } return folders; } public Folder AddFolder(Folder Folder) { - db.Folder.Add(Folder); - db.SaveChanges(); - Permissions.UpdatePermissions(Folder.SiteId, "Folder", Folder.FolderId, Folder.Permissions); + _db.Folder.Add(Folder); + _db.SaveChanges(); + _permissions.UpdatePermissions(Folder.SiteId, "Folder", Folder.FolderId, Folder.Permissions); return Folder; } public Folder UpdateFolder(Folder Folder) { - db.Entry(Folder).State = EntityState.Modified; - db.SaveChanges(); - Permissions.UpdatePermissions(Folder.SiteId, "Folder", Folder.FolderId, Folder.Permissions); + _db.Entry(Folder).State = EntityState.Modified; + _db.SaveChanges(); + _permissions.UpdatePermissions(Folder.SiteId, "Folder", Folder.FolderId, Folder.Permissions); return Folder; } public Folder GetFolder(int FolderId) { - Folder folder = db.Folder.Find(FolderId); + Folder folder = _db.Folder.Find(FolderId); if (folder != null) { - IEnumerable permissions = Permissions.GetPermissions("Folder", folder.FolderId).ToList(); - folder.Permissions = Permissions.EncodePermissions(folder.FolderId, permissions); + IEnumerable permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList(); + folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions); } return folder; } public Folder GetFolder(int SiteId, string Path) { - Folder folder = db.Folder.Where(item => item.SiteId == SiteId && item.Path == Path).FirstOrDefault(); + Folder folder = _db.Folder.Where(item => item.SiteId == SiteId && item.Path == Path).FirstOrDefault(); if (folder != null) { - IEnumerable permissions = Permissions.GetPermissions("Folder", folder.FolderId).ToList(); - folder.Permissions = Permissions.EncodePermissions(folder.FolderId, permissions); + IEnumerable permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList(); + folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions); } return folder; } public void DeleteFolder(int FolderId) { - Folder Folder = db.Folder.Find(FolderId); - Permissions.DeletePermissions(Folder.SiteId, "Folder", FolderId); - db.Folder.Remove(Folder); - db.SaveChanges(); + Folder Folder = _db.Folder.Find(FolderId); + _permissions.DeletePermissions(Folder.SiteId, "Folder", FolderId); + _db.Folder.Remove(Folder); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/JobLogRepository.cs b/Oqtane.Server/Repository/JobLogRepository.cs index 66ef6f2e..cdfca1c0 100644 --- a/Oqtane.Server/Repository/JobLogRepository.cs +++ b/Oqtane.Server/Repository/JobLogRepository.cs @@ -7,45 +7,45 @@ namespace Oqtane.Repository { public class JobLogRepository : IJobLogRepository { - private MasterDBContext db; + private MasterDBContext _db; public JobLogRepository(MasterDBContext context) { - db = context; + _db = context; } public IEnumerable GetJobLogs() { - return db.JobLog + return _db.JobLog .Include(item => item.Job) // eager load jobs .ToList(); } public JobLog AddJobLog(JobLog JobLog) { - db.JobLog.Add(JobLog); - db.SaveChanges(); + _db.JobLog.Add(JobLog); + _db.SaveChanges(); return JobLog; } public JobLog UpdateJobLog(JobLog JobLog) { - db.Entry(JobLog).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(JobLog).State = EntityState.Modified; + _db.SaveChanges(); return JobLog; } public JobLog GetJobLog(int JobLogId) { - return db.JobLog.Include(item => item.Job) // eager load job + return _db.JobLog.Include(item => item.Job) // eager load job .SingleOrDefault(item => item.JobLogId == JobLogId); } public void DeleteJobLog(int JobLogId) { - JobLog Joblog = db.JobLog.Find(JobLogId); - db.JobLog.Remove(Joblog); - db.SaveChanges(); + JobLog Joblog = _db.JobLog.Find(JobLogId); + _db.JobLog.Remove(Joblog); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/JobRepository.cs b/Oqtane.Server/Repository/JobRepository.cs index 6c390355..2d146142 100644 --- a/Oqtane.Server/Repository/JobRepository.cs +++ b/Oqtane.Server/Repository/JobRepository.cs @@ -9,12 +9,12 @@ namespace Oqtane.Repository { public class JobRepository : IJobRepository { - private MasterDBContext db; + private MasterDBContext _db; private readonly IMemoryCache _cache; public JobRepository(MasterDBContext context, IMemoryCache cache) { - db = context; + _db = context; _cache = cache; } @@ -23,34 +23,34 @@ namespace Oqtane.Repository return _cache.GetOrCreate("jobs", entry => { entry.SlidingExpiration = TimeSpan.FromMinutes(30); - return db.Job.ToList(); + return _db.Job.ToList(); }); } public Job AddJob(Job Job) { - db.Job.Add(Job); - db.SaveChanges(); + _db.Job.Add(Job); + _db.SaveChanges(); return Job; } public Job UpdateJob(Job Job) { - db.Entry(Job).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Job).State = EntityState.Modified; + _db.SaveChanges(); return Job; } public Job GetJob(int JobId) { - return db.Job.Find(JobId); + return _db.Job.Find(JobId); } public void DeleteJob(int JobId) { - Job Job = db.Job.Find(JobId); - db.Job.Remove(Job); - db.SaveChanges(); + Job Job = _db.Job.Find(JobId); + _db.Job.Remove(Job); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/LogRepository.cs b/Oqtane.Server/Repository/LogRepository.cs index 5115a35c..b01bc069 100644 --- a/Oqtane.Server/Repository/LogRepository.cs +++ b/Oqtane.Server/Repository/LogRepository.cs @@ -7,11 +7,11 @@ namespace Oqtane.Repository { public class LogRepository : ILogRepository { - private TenantDBContext db; + private TenantDBContext _db; public LogRepository(TenantDBContext context) { - db = context; + _db = context; } public IEnumerable GetLogs(int SiteId, string Level, string Function, int Rows) @@ -20,12 +20,12 @@ namespace Oqtane.Repository { if (Function == null) { - return db.Log.Where(item => item.SiteId == SiteId). + return _db.Log.Where(item => item.SiteId == SiteId). OrderByDescending(item => item.LogDate).Take(Rows); } else { - return db.Log.Where(item => item.SiteId == SiteId && item.Function == Function). + return _db.Log.Where(item => item.SiteId == SiteId && item.Function == Function). OrderByDescending(item => item.LogDate).Take(Rows); } } @@ -33,12 +33,12 @@ namespace Oqtane.Repository { if (Function == null) { - return db.Log.Where(item => item.SiteId == SiteId && item.Level == Level) + return _db.Log.Where(item => item.SiteId == SiteId && item.Level == Level) .OrderByDescending(item => item.LogDate).Take(Rows); } else { - return db.Log.Where(item => item.SiteId == SiteId && item.Level == Level && item.Function == Function) + return _db.Log.Where(item => item.SiteId == SiteId && item.Level == Level && item.Function == Function) .OrderByDescending(item => item.LogDate).Take(Rows); } } @@ -46,13 +46,13 @@ namespace Oqtane.Repository public Log GetLog(int LogId) { - return db.Log.Find(LogId); + return _db.Log.Find(LogId); } public void AddLog(Log Log) { - db.Log.Add(Log); - db.SaveChanges(); + _db.Log.Add(Log); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index c53c8396..f819e89c 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -12,15 +12,15 @@ namespace Oqtane.Repository { public class ModuleDefinitionRepository : IModuleDefinitionRepository { - private MasterDBContext db; + private MasterDBContext _db; private readonly IMemoryCache _cache; - private readonly IPermissionRepository Permissions; + private readonly IPermissionRepository _permissions; public ModuleDefinitionRepository(MasterDBContext context, IMemoryCache cache, IPermissionRepository Permissions) { - db = context; + _db = context; _cache = cache; - this.Permissions = Permissions; + this._permissions = Permissions; } public IEnumerable GetModuleDefinitions(int SiteId) @@ -36,16 +36,16 @@ namespace Oqtane.Repository public void UpdateModuleDefinition(ModuleDefinition ModuleDefinition) { - Permissions.UpdatePermissions(ModuleDefinition.SiteId, "ModuleDefinition", ModuleDefinition.ModuleDefinitionId, ModuleDefinition.Permissions); + _permissions.UpdatePermissions(ModuleDefinition.SiteId, "ModuleDefinition", ModuleDefinition.ModuleDefinitionId, ModuleDefinition.Permissions); _cache.Remove("moduledefinitions"); } public void DeleteModuleDefinition(int ModuleDefinitionId, int SiteId) { - ModuleDefinition ModuleDefinition = db.ModuleDefinition.Find(ModuleDefinitionId); - Permissions.DeletePermissions(SiteId, "ModuleDefinition", ModuleDefinitionId); - db.ModuleDefinition.Remove(ModuleDefinition); - db.SaveChanges(); + ModuleDefinition ModuleDefinition = _db.ModuleDefinition.Find(ModuleDefinitionId); + _permissions.DeletePermissions(SiteId, "ModuleDefinition", ModuleDefinitionId); + _db.ModuleDefinition.Remove(ModuleDefinition); + _db.SaveChanges(); _cache.Remove("moduledefinitions"); } @@ -60,20 +60,20 @@ namespace Oqtane.Repository }); // sync module definitions with database - List moduledefs = db.ModuleDefinition.ToList(); - List permissions = Permissions.GetPermissions(SiteId, "ModuleDefinition").ToList(); + List moduledefs = _db.ModuleDefinition.ToList(); + List permissions = _permissions.GetPermissions(SiteId, "ModuleDefinition").ToList(); foreach (ModuleDefinition moduledefinition in ModuleDefinitions) { ModuleDefinition moduledef = moduledefs.Where(item => item.ModuleDefinitionName == moduledefinition.ModuleDefinitionName).FirstOrDefault(); if (moduledef == null) { moduledef = new ModuleDefinition { ModuleDefinitionName = moduledefinition.ModuleDefinitionName }; - db.ModuleDefinition.Add(moduledef); - db.SaveChanges(); + _db.ModuleDefinition.Add(moduledef); + _db.SaveChanges(); if (moduledefinition.Permissions != "") { - Permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions); - foreach(Permission permission in Permissions.GetPermissions("ModuleDefinition", moduledef.ModuleDefinitionId)) + _permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions); + foreach(Permission permission in _permissions.GetPermissions("ModuleDefinition", moduledef.ModuleDefinitionId)) { permissions.Add(permission); } @@ -85,7 +85,7 @@ namespace Oqtane.Repository } moduledefinition.ModuleDefinitionId = moduledef.ModuleDefinitionId; moduledefinition.SiteId = SiteId; - moduledefinition.Permissions = Permissions.EncodePermissions(moduledefinition.ModuleDefinitionId, permissions); + moduledefinition.Permissions = _permissions.EncodePermissions(moduledefinition.ModuleDefinitionId, permissions); moduledefinition.CreatedBy = moduledef.CreatedBy; moduledefinition.CreatedOn = moduledef.CreatedOn; moduledefinition.ModifiedBy = moduledef.ModifiedBy; @@ -95,8 +95,8 @@ namespace Oqtane.Repository // any remaining module definitions are orphans foreach (ModuleDefinition moduledefinition in moduledefs) { - Permissions.DeletePermissions(SiteId, "ModuleDefinition", moduledefinition.ModuleDefinitionId); - db.ModuleDefinition.Remove(moduledefinition); // delete + _permissions.DeletePermissions(SiteId, "ModuleDefinition", moduledefinition.ModuleDefinitionId); + _db.ModuleDefinition.Remove(moduledefinition); // delete } return ModuleDefinitions; diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index f577e5f8..9a59e9fd 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -12,57 +12,57 @@ namespace Oqtane.Repository { public class ModuleRepository : IModuleRepository { - private TenantDBContext db; - private readonly IPermissionRepository Permissions; - private readonly IModuleDefinitionRepository ModuleDefinitions; - private readonly IServiceProvider ServiceProvider; + private TenantDBContext _db; + private readonly IPermissionRepository _permissions; + private readonly IModuleDefinitionRepository _moduleDefinitions; + private readonly IServiceProvider _serviceProvider; public ModuleRepository(TenantDBContext context, IPermissionRepository Permissions, IModuleDefinitionRepository ModuleDefinitions, IServiceProvider ServiceProvider) { - db = context; - this.Permissions = Permissions; - this.ModuleDefinitions = ModuleDefinitions; - this.ServiceProvider = ServiceProvider; + _db = context; + this._permissions = Permissions; + this._moduleDefinitions = ModuleDefinitions; + this._serviceProvider = ServiceProvider; } public IEnumerable GetModules(int SiteId) { - return db.Module.Where(item => item.SiteId == SiteId).ToList(); + return _db.Module.Where(item => item.SiteId == SiteId).ToList(); } public Models.Module AddModule(Models.Module Module) { - db.Module.Add(Module); - db.SaveChanges(); - Permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions); + _db.Module.Add(Module); + _db.SaveChanges(); + _permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions); return Module; } public Models.Module UpdateModule(Models.Module Module) { - db.Entry(Module).State = EntityState.Modified; - db.SaveChanges(); - Permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions); + _db.Entry(Module).State = EntityState.Modified; + _db.SaveChanges(); + _permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions); return Module; } public Models.Module GetModule(int ModuleId) { - Models.Module module = db.Module.Find(ModuleId); + Models.Module module = _db.Module.Find(ModuleId); if (module != null) { - List permissions = Permissions.GetPermissions("Module", module.ModuleId).ToList(); - module.Permissions = Permissions.EncodePermissions(module.ModuleId, permissions); + List permissions = _permissions.GetPermissions("Module", module.ModuleId).ToList(); + module.Permissions = _permissions.EncodePermissions(module.ModuleId, permissions); } return module; } public void DeleteModule(int ModuleId) { - Models.Module Module = db.Module.Find(ModuleId); - Permissions.DeletePermissions(Module.SiteId, "Module", ModuleId); - db.Module.Remove(Module); - db.SaveChanges(); + Models.Module Module = _db.Module.Find(ModuleId); + _permissions.DeletePermissions(Module.SiteId, "Module", ModuleId); + _db.Module.Remove(Module); + _db.SaveChanges(); } public string ExportModule(int ModuleId) @@ -73,7 +73,7 @@ namespace Oqtane.Repository Models.Module module = GetModule(ModuleId); if (module != null) { - List moduledefinitions = ModuleDefinitions.GetModuleDefinitions(module.SiteId).ToList(); + List moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList(); ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault(); if (moduledefinition != null) { @@ -94,7 +94,7 @@ namespace Oqtane.Repository .Where(item => item.GetInterfaces().Contains(typeof(IPortable))).FirstOrDefault(); if (moduletype != null) { - var moduleobject = ActivatorUtilities.CreateInstance(ServiceProvider, moduletype); + var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype); modulecontent.Content = ((IPortable)moduleobject).ExportModule(module); } } @@ -118,7 +118,7 @@ namespace Oqtane.Repository Models.Module module = GetModule(ModuleId); if (module != null) { - List moduledefinitions = ModuleDefinitions.GetModuleDefinitions(module.SiteId).ToList(); + List moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList(); ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault(); if (moduledefinition != null) { @@ -137,7 +137,7 @@ namespace Oqtane.Repository .Where(item => item.GetInterfaces().Contains(typeof(IPortable))).FirstOrDefault(); if (moduletype != null) { - var moduleobject = ActivatorUtilities.CreateInstance(ServiceProvider, moduletype); + var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype); ((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version); success = true; } diff --git a/Oqtane.Server/Repository/NotificationRepository.cs b/Oqtane.Server/Repository/NotificationRepository.cs index 3c2f9f98..dbc00564 100644 --- a/Oqtane.Server/Repository/NotificationRepository.cs +++ b/Oqtane.Server/Repository/NotificationRepository.cs @@ -7,18 +7,18 @@ namespace Oqtane.Repository { public class NotificationRepository : INotificationRepository { - private TenantDBContext db; + private TenantDBContext _db; public NotificationRepository(TenantDBContext context) { - db = context; + _db = context; } public IEnumerable GetNotifications(int SiteId, int FromUserId, int ToUserId) { if (ToUserId == -1 && FromUserId == -1) { - return db.Notification + return _db.Notification .Where(item => item.SiteId == SiteId) .Where(item => item.IsDelivered == false) .Include(item => item.FromUser) @@ -27,7 +27,7 @@ namespace Oqtane.Repository } else { - return db.Notification + return _db.Notification .Where(item => item.SiteId == SiteId) .Where(item => item.ToUserId == ToUserId || ToUserId == -1) .Where(item => item.FromUserId == FromUserId || FromUserId == -1) @@ -39,28 +39,28 @@ namespace Oqtane.Repository public Notification AddNotification(Notification Notification) { - db.Notification.Add(Notification); - db.SaveChanges(); + _db.Notification.Add(Notification); + _db.SaveChanges(); return Notification; } public Notification UpdateNotification(Notification Notification) { - db.Entry(Notification).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Notification).State = EntityState.Modified; + _db.SaveChanges(); return Notification; } public Notification GetNotification(int NotificationId) { - return db.Notification.Find(NotificationId); + return _db.Notification.Find(NotificationId); } public void DeleteNotification(int NotificationId) { - Notification Notification = db.Notification.Find(NotificationId); - db.Notification.Remove(Notification); - db.SaveChanges(); + Notification Notification = _db.Notification.Find(NotificationId); + _db.Notification.Remove(Notification); + _db.SaveChanges(); } } diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index eee61b7a..833a1923 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -7,26 +7,26 @@ namespace Oqtane.Repository { public class PageModuleRepository : IPageModuleRepository { - private TenantDBContext db; - private readonly IPermissionRepository Permissions; + private TenantDBContext _db; + private readonly IPermissionRepository _permissions; public PageModuleRepository(TenantDBContext context, IPermissionRepository Permissions) { - db = context; - this.Permissions = Permissions; + _db = context; + this._permissions = Permissions; } public IEnumerable GetPageModules(int SiteId) { - IEnumerable pagemodules = db.PageModule + IEnumerable pagemodules = _db.PageModule .Include(item => item.Module) // eager load modules .Where(item => item.Module.SiteId == SiteId); if (pagemodules != null && pagemodules.Any()) { - IEnumerable permissions = Permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); + IEnumerable permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); foreach (PageModule pagemodule in pagemodules) { - pagemodule.Module.Permissions = Permissions.EncodePermissions(pagemodule.ModuleId, permissions); + pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions); } } return pagemodules; @@ -34,7 +34,7 @@ namespace Oqtane.Repository public IEnumerable GetPageModules(int PageId, string Pane) { - IEnumerable pagemodules = db.PageModule + IEnumerable pagemodules = _db.PageModule .Include(item => item.Module) // eager load modules .Where(item => item.PageId == PageId); if (Pane != "" && pagemodules != null && pagemodules.Any()) @@ -43,10 +43,10 @@ namespace Oqtane.Repository } if (pagemodules != null && pagemodules.Any()) { - IEnumerable permissions = Permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); + IEnumerable permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); foreach (PageModule pagemodule in pagemodules) { - pagemodule.Module.Permissions = Permissions.EncodePermissions(pagemodule.ModuleId, permissions); + pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions); } } return pagemodules; @@ -54,47 +54,47 @@ namespace Oqtane.Repository public PageModule AddPageModule(PageModule PageModule) { - db.PageModule.Add(PageModule); - db.SaveChanges(); + _db.PageModule.Add(PageModule); + _db.SaveChanges(); return PageModule; } public PageModule UpdatePageModule(PageModule PageModule) { - db.Entry(PageModule).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(PageModule).State = EntityState.Modified; + _db.SaveChanges(); return PageModule; } public PageModule GetPageModule(int PageModuleId) { - PageModule pagemodule = db.PageModule.Include(item => item.Module) // eager load modules + PageModule pagemodule = _db.PageModule.Include(item => item.Module) // eager load modules .SingleOrDefault(item => item.PageModuleId == PageModuleId); if (pagemodule != null) { - IEnumerable permissions = Permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); - pagemodule.Module.Permissions = Permissions.EncodePermissions(pagemodule.ModuleId, permissions); + IEnumerable permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); + pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions); } return pagemodule; } public PageModule GetPageModule(int PageId, int ModuleId) { - PageModule pagemodule = db.PageModule.Include(item => item.Module) // eager load modules + PageModule pagemodule = _db.PageModule.Include(item => item.Module) // eager load modules .SingleOrDefault(item => item.PageId == PageId && item.ModuleId == ModuleId); if (pagemodule != null) { - IEnumerable permissions = Permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); - pagemodule.Module.Permissions = Permissions.EncodePermissions(pagemodule.ModuleId, permissions); + IEnumerable permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); + pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions); } return pagemodule; } public void DeletePageModule(int PageModuleId) { - PageModule PageModule = db.PageModule.Find(PageModuleId); - db.PageModule.Remove(PageModule); - db.SaveChanges(); + PageModule PageModule = _db.PageModule.Find(PageModuleId); + _db.PageModule.Remove(PageModule); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index 7e19c13d..03676f39 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -7,69 +7,69 @@ namespace Oqtane.Repository { public class PageRepository : IPageRepository { - private TenantDBContext db; - private readonly IPermissionRepository Permissions; - private readonly IPageModuleRepository PageModules; + private TenantDBContext _db; + private readonly IPermissionRepository _permissions; + private readonly IPageModuleRepository _pageModules; public PageRepository(TenantDBContext context, IPermissionRepository Permissions, IPageModuleRepository PageModules) { - db = context; - this.Permissions = Permissions; - this.PageModules = PageModules; + _db = context; + this._permissions = Permissions; + this._pageModules = PageModules; } public IEnumerable GetPages(int SiteId) { - IEnumerable permissions = Permissions.GetPermissions(SiteId, "Page").ToList(); - IEnumerable pages = db.Page.Where(item => item.SiteId == SiteId && item.UserId == null); + IEnumerable permissions = _permissions.GetPermissions(SiteId, "Page").ToList(); + IEnumerable pages = _db.Page.Where(item => item.SiteId == SiteId && item.UserId == null); foreach(Page page in pages) { - page.Permissions = Permissions.EncodePermissions(page.PageId, permissions); + page.Permissions = _permissions.EncodePermissions(page.PageId, permissions); } return pages; } public Page AddPage(Page Page) { - db.Page.Add(Page); - db.SaveChanges(); - Permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions); + _db.Page.Add(Page); + _db.SaveChanges(); + _permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions); return Page; } public Page UpdatePage(Page Page) { - db.Entry(Page).State = EntityState.Modified; - db.SaveChanges(); - Permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions); + _db.Entry(Page).State = EntityState.Modified; + _db.SaveChanges(); + _permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions); return Page; } public Page GetPage(int PageId) { - Page page = db.Page.Find(PageId); + Page page = _db.Page.Find(PageId); if (page != null) { - IEnumerable permissions = Permissions.GetPermissions("Page", page.PageId).ToList(); - page.Permissions = Permissions.EncodePermissions(page.PageId, permissions); + IEnumerable permissions = _permissions.GetPermissions("Page", page.PageId).ToList(); + page.Permissions = _permissions.EncodePermissions(page.PageId, permissions); } return page; } public Page GetPage(int PageId, int UserId) { - Page page = db.Page.Find(PageId); + Page page = _db.Page.Find(PageId); if (page != null) { - Page personalized = db.Page.Where(item => item.SiteId == page.SiteId && item.Path == page.Path && item.UserId == UserId).FirstOrDefault(); + Page personalized = _db.Page.Where(item => item.SiteId == page.SiteId && item.Path == page.Path && item.UserId == UserId).FirstOrDefault(); if (personalized != null) { page = personalized; } if (page != null) { - IEnumerable permissions = Permissions.GetPermissions("Page", page.PageId).ToList(); - page.Permissions = Permissions.EncodePermissions(page.PageId, permissions); + IEnumerable permissions = _permissions.GetPermissions("Page", page.PageId).ToList(); + page.Permissions = _permissions.EncodePermissions(page.PageId, permissions); } } return page; @@ -77,15 +77,15 @@ namespace Oqtane.Repository public void DeletePage(int PageId) { - Page Page = db.Page.Find(PageId); - Permissions.DeletePermissions(Page.SiteId, "Page", PageId); - IEnumerable pageModules = db.PageModule.Where(item => item.PageId == PageId).ToList(); + Page Page = _db.Page.Find(PageId); + _permissions.DeletePermissions(Page.SiteId, "Page", PageId); + IEnumerable pageModules = _db.PageModule.Where(item => item.PageId == PageId).ToList(); foreach (var pageModule in pageModules) { - PageModules.DeletePageModule(pageModule.PageModuleId); + _pageModules.DeletePageModule(pageModule.PageModuleId); } - db.Page.Remove(Page); - db.SaveChanges(); + _db.Page.Remove(Page); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index 9014362e..ad92f03a 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -11,32 +11,32 @@ namespace Oqtane.Repository { public class PermissionRepository : IPermissionRepository { - private TenantDBContext db; - private readonly IRoleRepository Roles; + private TenantDBContext _db; + private readonly IRoleRepository _roles; public PermissionRepository(TenantDBContext context, IRoleRepository Roles) { - db = context; - this.Roles = Roles; + _db = context; + this._roles = Roles; } public IEnumerable GetPermissions(int SiteId, string EntityName) { - return db.Permission.Where(item => item.SiteId == SiteId) + return _db.Permission.Where(item => item.SiteId == SiteId) .Where(item => item.EntityName == EntityName) .Include(item => item.Role); // eager load roles } public IEnumerable GetPermissions(string EntityName, int EntityId) { - return db.Permission.Where(item => item.EntityName == EntityName) + return _db.Permission.Where(item => item.EntityName == EntityName) .Where(item => item.EntityId == EntityId) .Include(item => item.Role); // eager load roles } public IEnumerable GetPermissions(string EntityName, int EntityId, string PermissionName) { - return db.Permission.Where(item => item.EntityName == EntityName) + return _db.Permission.Where(item => item.EntityName == EntityName) .Where(item => item.EntityId == EntityId) .Where(item => item.PermissionName == PermissionName) .Include(item => item.Role); // eager load roles @@ -44,61 +44,61 @@ namespace Oqtane.Repository public Permission AddPermission(Permission Permission) { - db.Permission.Add(Permission); - db.SaveChanges(); + _db.Permission.Add(Permission); + _db.SaveChanges(); return Permission; } public Permission UpdatePermission(Permission Permission) { - db.Entry(Permission).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Permission).State = EntityState.Modified; + _db.SaveChanges(); return Permission; } public void UpdatePermissions(int SiteId, string EntityName, int EntityId, string Permissions) { // get current permissions and delete - IEnumerable permissions = db.Permission + IEnumerable permissions = _db.Permission .Where(item => item.EntityName == EntityName) .Where(item => item.EntityId == EntityId) .Where(item => item.SiteId == SiteId); foreach (Permission permission in permissions) { - db.Permission.Remove(permission); + _db.Permission.Remove(permission); } // add permissions permissions = DecodePermissions(Permissions, SiteId, EntityName, EntityId); foreach (Permission permission in permissions) { - db.Permission.Add(permission); + _db.Permission.Add(permission); } - db.SaveChanges(); + _db.SaveChanges(); } public Permission GetPermission(int PermissionId) { - return db.Permission.Find(PermissionId); + return _db.Permission.Find(PermissionId); } public void DeletePermission(int PermissionId) { - Permission Permission = db.Permission.Find(PermissionId); - db.Permission.Remove(Permission); - db.SaveChanges(); + Permission Permission = _db.Permission.Find(PermissionId); + _db.Permission.Remove(Permission); + _db.SaveChanges(); } public void DeletePermissions(int SiteId, string EntityName, int EntityId) { - IEnumerable permissions = db.Permission + IEnumerable permissions = _db.Permission .Where(item => item.EntityName == EntityName) .Where(item => item.EntityId == EntityId) .Where(item => item.SiteId == SiteId); foreach (Permission permission in permissions) { - db.Permission.Remove(permission); + _db.Permission.Remove(permission); } - db.SaveChanges(); + _db.SaveChanges(); } // permissions are stored in the format "{permissionname:!rolename1;![userid1];rolename2;rolename3;[userid2];[userid3]}" where "!" designates Deny permissions @@ -158,7 +158,7 @@ namespace Oqtane.Repository public IEnumerable DecodePermissions(string PermissionStrings, int SiteId, string EntityName, int EntityId) { List permissions = new List(); - List roles = Roles.GetRoles(SiteId, true).ToList(); + List roles = _roles.GetRoles(SiteId, true).ToList(); string securityid = ""; foreach (PermissionString permissionstring in JsonSerializer.Deserialize>(PermissionStrings)) { diff --git a/Oqtane.Server/Repository/ProfileRepository.cs b/Oqtane.Server/Repository/ProfileRepository.cs index 448dc913..91062cf9 100644 --- a/Oqtane.Server/Repository/ProfileRepository.cs +++ b/Oqtane.Server/Repository/ProfileRepository.cs @@ -7,42 +7,42 @@ namespace Oqtane.Repository { public class ProfileRepository : IProfileRepository { - private TenantDBContext db; + private TenantDBContext _db; public ProfileRepository(TenantDBContext context) { - db = context; + _db = context; } public IEnumerable GetProfiles(int SiteId) { - return db.Profile.Where(item => item.SiteId == SiteId || item.SiteId == null); + return _db.Profile.Where(item => item.SiteId == SiteId || item.SiteId == null); } public Profile AddProfile(Profile Profile) { - db.Profile.Add(Profile); - db.SaveChanges(); + _db.Profile.Add(Profile); + _db.SaveChanges(); return Profile; } public Profile UpdateProfile(Profile Profile) { - db.Entry(Profile).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Profile).State = EntityState.Modified; + _db.SaveChanges(); return Profile; } public Profile GetProfile(int ProfileId) { - return db.Profile.Find(ProfileId); + return _db.Profile.Find(ProfileId); } public void DeleteProfile(int ProfileId) { - Profile Profile = db.Profile.Find(ProfileId); - db.Profile.Remove(Profile); - db.SaveChanges(); + Profile Profile = _db.Profile.Find(ProfileId); + _db.Profile.Remove(Profile); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs index adeb779f..35aa7fe3 100644 --- a/Oqtane.Server/Repository/RoleRepository.cs +++ b/Oqtane.Server/Repository/RoleRepository.cs @@ -7,48 +7,48 @@ namespace Oqtane.Repository { public class RoleRepository : IRoleRepository { - private TenantDBContext db; + private TenantDBContext _db; public RoleRepository(TenantDBContext context) { - db = context; + _db = context; } public IEnumerable GetRoles(int SiteId) { - return db.Role.Where(item => item.SiteId == SiteId); + return _db.Role.Where(item => item.SiteId == SiteId); } public IEnumerable GetRoles(int SiteId, bool IncludeGlobalRoles) { - return db.Role.Where(item => item.SiteId == SiteId || item.SiteId == null); + return _db.Role.Where(item => item.SiteId == SiteId || item.SiteId == null); } public Role AddRole(Role Role) { - db.Role.Add(Role); - db.SaveChanges(); + _db.Role.Add(Role); + _db.SaveChanges(); return Role; } public Role UpdateRole(Role Role) { - db.Entry(Role).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Role).State = EntityState.Modified; + _db.SaveChanges(); return Role; } public Role GetRole(int RoleId) { - return db.Role.Find(RoleId); + return _db.Role.Find(RoleId); } public void DeleteRole(int RoleId) { - Role Role = db.Role.Find(RoleId); - db.Role.Remove(Role); - db.SaveChanges(); + Role Role = _db.Role.Find(RoleId); + _db.Role.Remove(Role); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs index b191c9c5..3d670f55 100644 --- a/Oqtane.Server/Repository/SettingRepository.cs +++ b/Oqtane.Server/Repository/SettingRepository.cs @@ -7,43 +7,43 @@ namespace Oqtane.Repository { public class SettingRepository : ISettingRepository { - private TenantDBContext db; + private TenantDBContext _db; public SettingRepository(TenantDBContext context) { - db = context; + _db = context; } public IEnumerable GetSettings(string EntityName, int EntityId) { - return db.Setting.Where(item => item.EntityName == EntityName) + return _db.Setting.Where(item => item.EntityName == EntityName) .Where(item => item.EntityId == EntityId); } public Setting AddSetting(Setting Setting) { - db.Setting.Add(Setting); - db.SaveChanges(); + _db.Setting.Add(Setting); + _db.SaveChanges(); return Setting; } public Setting UpdateSetting(Setting Setting) { - db.Entry(Setting).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Setting).State = EntityState.Modified; + _db.SaveChanges(); return Setting; } public Setting GetSetting(int SettingId) { - return db.Setting.Find(SettingId); + return _db.Setting.Find(SettingId); } public void DeleteSetting(int SettingId) { - Setting Setting = db.Setting.Find(SettingId); - db.Setting.Remove(Setting); - db.SaveChanges(); + Setting Setting = _db.Setting.Find(SettingId); + _db.Setting.Remove(Setting); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index e7b5137f..3605cc7c 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -12,34 +12,34 @@ namespace Oqtane.Repository { public class SiteRepository : ISiteRepository { - private readonly TenantDBContext db; - private readonly IRoleRepository RoleRepository; - private readonly IProfileRepository ProfileRepository; - private readonly IFolderRepository FolderRepository; - private readonly IFileRepository FileRepository; - private readonly IPageRepository PageRepository; - private readonly IModuleRepository ModuleRepository; - private readonly IPageModuleRepository PageModuleRepository; - private readonly IModuleDefinitionRepository ModuleDefinitionRepository; - private readonly IServiceProvider ServiceProvider; - private readonly List SiteTemplate; + private readonly TenantDBContext _db; + private readonly IRoleRepository _roleRepository; + private readonly IProfileRepository _profileRepository; + private readonly IFolderRepository _folderRepository; + private readonly IFileRepository _fileRepository; + private readonly IPageRepository _pageRepository; + private readonly IModuleRepository _moduleRepository; + private readonly IPageModuleRepository _pageModuleRepository; + private readonly IModuleDefinitionRepository _moduleDefinitionRepository; + private readonly IServiceProvider _serviceProvider; + private readonly List _siteTemplate; public SiteRepository(TenantDBContext context, IRoleRepository RoleRepository, IProfileRepository ProfileRepository, IFolderRepository FolderRepository, IFileRepository FileRepository, IPageRepository PageRepository, IModuleRepository ModuleRepository, IPageModuleRepository PageModuleRepository, IModuleDefinitionRepository ModuleDefinitionRepository, IServiceProvider ServiceProvider) { - db = context; - this.RoleRepository = RoleRepository; - this.ProfileRepository = ProfileRepository; - this.FolderRepository = FolderRepository; - this.FileRepository = FileRepository; - this.PageRepository = PageRepository; - this.ModuleRepository = ModuleRepository; - this.PageModuleRepository = PageModuleRepository; - this.ModuleDefinitionRepository = ModuleDefinitionRepository; - this.ServiceProvider = ServiceProvider; + _db = context; + this._roleRepository = RoleRepository; + this._profileRepository = ProfileRepository; + this._folderRepository = FolderRepository; + this._fileRepository = FileRepository; + this._pageRepository = PageRepository; + this._moduleRepository = ModuleRepository; + this._pageModuleRepository = PageModuleRepository; + this._moduleDefinitionRepository = ModuleDefinitionRepository; + this._serviceProvider = ServiceProvider; // define the default site template - SiteTemplate = new List(); - SiteTemplate.Add(new PageTemplate { Name = "Home", Parent = "", Path = "", Icon = "home", IsNavigation = true, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate = new List(); + _siteTemplate.Add(new PageTemplate { Name = "Home", Parent = "", Path = "", Icon = "home", IsNavigation = true, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "

Oqtane is an open source modular application framework built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a fully dynamic web development experience which can be executed on a client or server. Whether you are looking for a platform to accelerate your web development efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.

" + "



Join Our Community  Clone Our Repo

" + @@ -54,149 +54,149 @@ namespace Oqtane.Repository } } }); - SiteTemplate.Add(new PageTemplate { Name = "Private", Parent = "", Path = "private", Icon = "lock-locked", IsNavigation = true, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Registered Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Private", Parent = "", Path = "private", Icon = "lock-locked", IsNavigation = true, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Registered Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Registered Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "

Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.

" } } }); - SiteTemplate.Add(new PageTemplate { Name = "My Page", Parent = "", Path = "mypage", Icon = "target", IsNavigation = true, IsPersonalizable = true, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "My Page", Parent = "", Path = "mypage", Icon = "target", IsNavigation = true, IsPersonalizable = true, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "

Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.

" } } }); - SiteTemplate.Add(new PageTemplate { Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Dashboard, Oqtane.Client", Title = "Admin Dashboard", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = "globe", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = "globe", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Sites, Oqtane.Client", Title = "Site Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Site Settings", Parent = "Admin", Path = "admin/site", Icon = "home", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Site Settings", Parent = "Admin", Path = "admin/site", Icon = "home", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Site, Oqtane.Client", Title = "Site Settings", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Page Management", Parent = "Admin", Path = "admin/pages", Icon = "layers", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Page Management", Parent = "Admin", Path = "admin/pages", Icon = "layers", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Pages, Oqtane.Client", Title = "Page Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Icon = "people", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Icon = "people", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Users, Oqtane.Client", Title = "User Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Profile Management", Parent = "Admin", Path = "admin/profiles", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Profile Management", Parent = "Admin", Path = "admin/profiles", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Profiles, Oqtane.Client", Title = "Profile Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Role Management", Parent = "Admin", Path = "admin/roles", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Role Management", Parent = "Admin", Path = "admin/roles", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Roles, Oqtane.Client", Title = "Role Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Event Log", Parent = "Admin", Path = "admin/log", Icon = "magnifying-glass", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Event Log", Parent = "Admin", Path = "admin/log", Icon = "magnifying-glass", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Logs, Oqtane.Client", Title = "Event Log", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Icon = "file", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Icon = "file", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Files, Oqtane.Client", Title = "File Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Recycle Bin", Parent = "Admin", Path = "admin/recyclebin", Icon = "trash", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Recycle Bin", Parent = "Admin", Path = "admin/recyclebin", Icon = "trash", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.RecycleBin, Oqtane.Client", Title = "Recycle Bin", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Tenant Management", Parent = "Admin", Path = "admin/tenants", Icon = "list", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Tenant Management", Parent = "Admin", Path = "admin/tenants", Icon = "list", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Tenants, Oqtane.Client", Title = "Tenant Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = "browser", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = "browser", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.ModuleDefinitions, Oqtane.Client", Title = "Module Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = "brush", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = "brush", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Themes, Oqtane.Client", Title = "Theme Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = "timer", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = "timer", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Jobs, Oqtane.Client", Title = "Scheduled Jobs", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Upgrade Service", Parent = "Admin", Path = "admin/upgrade", Icon = "aperture", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Upgrade Service", Parent = "Admin", Path = "admin/upgrade", Icon = "aperture", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Upgrade, Oqtane.Client", Title = "Upgrade Service", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Login", Parent = "", Path = "login", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Login", Parent = "", Path = "login", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Login, Oqtane.Client", Title = "User Login", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Register", Parent = "", Path = "register", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Register", Parent = "", Path = "register", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Register, Oqtane.Client", Title = "User Registration", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Reset", Parent = "", Path = "reset", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Reset", Parent = "", Path = "reset", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Reset, Oqtane.Client", Title = "Password Reset", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); - SiteTemplate.Add(new PageTemplate { Name = "Profile", Parent = "", Path = "profile", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { + _siteTemplate.Add(new PageTemplate { Name = "Profile", Parent = "", Path = "profile", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List { new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.UserProfile, Oqtane.Client", Title = "User Profile", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" } }}); } public IEnumerable GetSites() { - return db.Site; + return _db.Site; } public Site AddSite(Site Site) { - db.Site.Add(Site); - db.SaveChanges(); + _db.Site.Add(Site); + _db.SaveChanges(); CreateSite(Site); return Site; } public Site UpdateSite(Site Site) { - db.Entry(Site).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Site).State = EntityState.Modified; + _db.SaveChanges(); return Site; } public Site GetSite(int siteId) { - return db.Site.Find(siteId); + return _db.Site.Find(siteId); } public void DeleteSite(int siteId) { - var site = db.Site.Find(siteId); - db.Site.Remove(site); - db.SaveChanges(); + var site = _db.Site.Find(siteId); + _db.Site.Remove(site); + _db.SaveChanges(); } private void CreateSite(Site site) { - List roles = RoleRepository.GetRoles(site.SiteId, true).ToList(); + List roles = _roleRepository.GetRoles(site.SiteId, true).ToList(); if (!roles.Where(item => item.Name == Constants.AllUsersRole).Any()) { - RoleRepository.AddRole(new Role { SiteId = null, Name = Constants.AllUsersRole, Description = "All Users", IsAutoAssigned = false, IsSystem = true }); + _roleRepository.AddRole(new Role { SiteId = null, Name = Constants.AllUsersRole, Description = "All Users", IsAutoAssigned = false, IsSystem = true }); } if (!roles.Where(item => item.Name == Constants.HostRole).Any()) { - RoleRepository.AddRole(new Role { SiteId = null, Name = Constants.HostRole, Description = "Application Administrators", IsAutoAssigned = false, IsSystem = true }); + _roleRepository.AddRole(new Role { SiteId = null, Name = Constants.HostRole, Description = "Application Administrators", IsAutoAssigned = false, IsSystem = true }); } - RoleRepository.AddRole(new Role { SiteId = site.SiteId, Name = Constants.RegisteredRole, Description = "Registered Users", IsAutoAssigned = true, IsSystem = true }); - RoleRepository.AddRole(new Role { SiteId = site.SiteId, Name = Constants.AdminRole, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true }); + _roleRepository.AddRole(new Role { SiteId = site.SiteId, Name = Constants.RegisteredRole, Description = "Registered Users", IsAutoAssigned = true, IsSystem = true }); + _roleRepository.AddRole(new Role { SiteId = site.SiteId, Name = Constants.AdminRole, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true }); - ProfileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false }); - ProfileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder = 2, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false }); - ProfileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Street", Title = "Street", Description = "Street Or Building Address", Category = "Address", ViewOrder = 3, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); - ProfileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "City", Title = "City", Description = "City", Category = "Address", ViewOrder = 4, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); - ProfileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Region", Title = "Region", Description = "State Or Province", Category = "Address", ViewOrder = 5, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); - ProfileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Country", Title = "Country", Description = "Country", Category = "Address", ViewOrder = 6, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); - ProfileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "PostalCode", Title = "Postal Code", Description = "Postal Code Or Zip Code", Category = "Address", ViewOrder = 7, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); - ProfileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Phone", Title = "Phone Number", Description = "Phone Number", Category = "Contact", ViewOrder = 8, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); + _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false }); + _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder = 2, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false }); + _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Street", Title = "Street", Description = "Street Or Building Address", Category = "Address", ViewOrder = 3, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); + _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "City", Title = "City", Description = "City", Category = "Address", ViewOrder = 4, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); + _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Region", Title = "Region", Description = "State Or Province", Category = "Address", ViewOrder = 5, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); + _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Country", Title = "Country", Description = "Country", Category = "Address", ViewOrder = 6, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); + _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "PostalCode", Title = "Postal Code", Description = "Postal Code Or Zip Code", Category = "Address", ViewOrder = 7, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); + _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Phone", Title = "Phone Number", Description = "Phone Number", Category = "Contact", ViewOrder = 8, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); - Folder folder = FolderRepository.AddFolder(new Folder { SiteId = site.SiteId, ParentId = null, Name = "Root", Path = "", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" }); - FolderRepository.AddFolder(new Folder { SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = "Users\\", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" }); + Folder folder = _folderRepository.AddFolder(new Folder { SiteId = site.SiteId, ParentId = null, Name = "Root", Path = "", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" }); + _folderRepository.AddFolder(new Folder { SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = "Users\\", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" }); if (site.Name == "Default Site") { - File file = FileRepository.AddFile(new File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 }); + File file = _fileRepository.AddFile(new File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 }); site.LogoFileId = file.FileId; UpdateSite(site); } - List moduledefinitions = ModuleDefinitionRepository.GetModuleDefinitions(site.SiteId).ToList(); - foreach (PageTemplate pagetemplate in SiteTemplate) + List moduledefinitions = _moduleDefinitionRepository.GetModuleDefinitions(site.SiteId).ToList(); + foreach (PageTemplate pagetemplate in _siteTemplate) { int? parentid = null; if (pagetemplate.Parent != "") { - List pages = PageRepository.GetPages(site.SiteId).ToList(); + List pages = _pageRepository.GetPages(site.SiteId).ToList(); Page parent = pages.Where(item => item.Name == pagetemplate.Parent).FirstOrDefault(); parentid = parent.PageId; } @@ -217,7 +217,7 @@ namespace Oqtane.Repository IsPersonalizable = pagetemplate.IsPersonalizable, UserId = null }; - page = PageRepository.AddPage(page); + page = _pageRepository.AddPage(page); foreach(PageTemplateModule pagetemplatemodule in pagetemplate.PageTemplateModules) { @@ -232,7 +232,7 @@ namespace Oqtane.Repository ModuleDefinitionName = pagetemplatemodule.ModuleDefinitionName, Permissions = pagetemplatemodule.ModulePermissions, }; - module = ModuleRepository.AddModule(module); + module = _moduleRepository.AddModule(module); if (pagetemplatemodule.Content != "" && moduledefinition.ServerAssemblyName != "") { @@ -246,7 +246,7 @@ namespace Oqtane.Repository .Where(item => item.GetInterfaces().Contains(typeof(IPortable))).FirstOrDefault(); if (moduletype != null) { - var moduleobject = ActivatorUtilities.CreateInstance(ServiceProvider, moduletype); + var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype); ((IPortable)moduleobject).ImportModule(module, pagetemplatemodule.Content, moduledefinition.Version); } } @@ -261,7 +261,7 @@ namespace Oqtane.Repository Order = 1, ContainerType = "" }; - PageModuleRepository.AddPageModule(pagemodule); + _pageModuleRepository.AddPageModule(pagemodule); } } diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs index 150386d8..8d8c989e 100644 --- a/Oqtane.Server/Repository/TenantRepository.cs +++ b/Oqtane.Server/Repository/TenantRepository.cs @@ -10,12 +10,12 @@ namespace Oqtane.Repository { public class TenantRepository : ITenantRepository { - private MasterDBContext db; + private MasterDBContext _db; private readonly IMemoryCache _cache; public TenantRepository(MasterDBContext context, IMemoryCache cache) { - db = context; + _db = context; _cache = cache; } @@ -24,36 +24,36 @@ namespace Oqtane.Repository return _cache.GetOrCreate("tenants", entry => { entry.SlidingExpiration = TimeSpan.FromMinutes(30); - return db.Tenant.ToList(); + return _db.Tenant.ToList(); }); } public Tenant AddTenant(Tenant Tenant) { - db.Tenant.Add(Tenant); - db.SaveChanges(); + _db.Tenant.Add(Tenant); + _db.SaveChanges(); _cache.Remove("tenants"); return Tenant; } public Tenant UpdateTenant(Tenant Tenant) { - db.Entry(Tenant).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(Tenant).State = EntityState.Modified; + _db.SaveChanges(); _cache.Remove("tenants"); return Tenant; } public Tenant GetTenant(int TenantId) { - return db.Tenant.Find(TenantId); + return _db.Tenant.Find(TenantId); } public void DeleteTenant(int TenantId) { - Tenant tenant = db.Tenant.Find(TenantId); - db.Tenant.Remove(tenant); - db.SaveChanges(); + Tenant tenant = _db.Tenant.Find(TenantId); + _db.Tenant.Remove(tenant); + _db.SaveChanges(); _cache.Remove("tenants"); } } diff --git a/Oqtane.Server/Repository/TenantResolver.cs b/Oqtane.Server/Repository/TenantResolver.cs index 464d69a4..7cbfda35 100644 --- a/Oqtane.Server/Repository/TenantResolver.cs +++ b/Oqtane.Server/Repository/TenantResolver.cs @@ -9,8 +9,8 @@ namespace Oqtane.Repository { public class TenantResolver : ITenantResolver { - private readonly Alias alias = null; - private readonly Tenant tenant = null; + private readonly Alias _alias = null; + private readonly Tenant _tenant = null; public TenantResolver(IHttpContextAccessor Accessor, IAliasRepository Aliases, ITenantRepository Tenants, SiteState SiteState) { @@ -56,27 +56,27 @@ namespace Oqtane.Repository if (aliasid != -1) { - alias = aliases.Where(item => item.AliasId == aliasid).FirstOrDefault(); + _alias = aliases.Where(item => item.AliasId == aliasid).FirstOrDefault(); } else { - alias = aliases.Where(item => item.Name == aliasname).FirstOrDefault(); + _alias = aliases.Where(item => item.Name == aliasname).FirstOrDefault(); } - if (alias != null) + if (_alias != null) { - tenant = tenants.Where(item => item.TenantId == alias.TenantId).FirstOrDefault(); + _tenant = tenants.Where(item => item.TenantId == _alias.TenantId).FirstOrDefault(); } } } public Alias GetAlias() { - return alias; + return _alias; } public Tenant GetTenant() { - return tenant; + return _tenant; } } } \ No newline at end of file diff --git a/Oqtane.Server/Repository/UserRepository.cs b/Oqtane.Server/Repository/UserRepository.cs index e182dae4..16478504 100644 --- a/Oqtane.Server/Repository/UserRepository.cs +++ b/Oqtane.Server/Repository/UserRepository.cs @@ -7,47 +7,47 @@ namespace Oqtane.Repository { public class UserRepository : IUserRepository { - private TenantDBContext db; + private TenantDBContext _db; public UserRepository(TenantDBContext context) { - db = context; + _db = context; } public IEnumerable GetUsers() { - return db.User; + return _db.User; } public User AddUser(User user) { - db.User.Add(user); - db.SaveChanges(); + _db.User.Add(user); + _db.SaveChanges(); return user; } public User UpdateUser(User user) { - db.Entry(user).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(user).State = EntityState.Modified; + _db.SaveChanges(); return user; } public User GetUser(int userId) { - return db.User.Find(userId); + return _db.User.Find(userId); } public User GetUser(string Username) { - return db.User.Where(item => item.Username == Username).FirstOrDefault(); + return _db.User.Where(item => item.Username == Username).FirstOrDefault(); } public void DeleteUser(int userId) { - User user = db.User.Find(userId); - db.User.Remove(user); - db.SaveChanges(); + User user = _db.User.Find(userId); + _db.User.Remove(user); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs index 3789c05f..bf4c9676 100644 --- a/Oqtane.Server/Repository/UserRoleRepository.cs +++ b/Oqtane.Server/Repository/UserRoleRepository.cs @@ -7,16 +7,16 @@ namespace Oqtane.Repository { public class UserRoleRepository : IUserRoleRepository { - private TenantDBContext db; + private TenantDBContext _db; public UserRoleRepository(TenantDBContext context) { - db = context; + _db = context; } public IEnumerable GetUserRoles(int SiteId) { - return db.UserRole + return _db.UserRole .Include(item => item.Role) // eager load roles .Include(item => item.User) // eager load users .Where(item => item.Role.SiteId == SiteId || item.Role.SiteId == null); @@ -24,7 +24,7 @@ namespace Oqtane.Repository public IEnumerable GetUserRoles(int UserId, int SiteId) { - return db.UserRole.Where(item => item.UserId == UserId) + return _db.UserRole.Where(item => item.UserId == UserId) .Include(item => item.Role) // eager load roles .Include(item => item.User) // eager load users .Where(item => item.Role.SiteId == SiteId || item.Role.SiteId == null); @@ -32,21 +32,21 @@ namespace Oqtane.Repository public UserRole AddUserRole(UserRole UserRole) { - db.UserRole.Add(UserRole); - db.SaveChanges(); + _db.UserRole.Add(UserRole); + _db.SaveChanges(); return UserRole; } public UserRole UpdateUserRole(UserRole UserRole) { - db.Entry(UserRole).State = EntityState.Modified; - db.SaveChanges(); + _db.Entry(UserRole).State = EntityState.Modified; + _db.SaveChanges(); return UserRole; } public UserRole GetUserRole(int UserRoleId) { - return db.UserRole + return _db.UserRole .Include(item => item.Role) // eager load roles .Include(item => item.User) // eager load users .SingleOrDefault(item => item.UserRoleId == UserRoleId); @@ -54,9 +54,9 @@ namespace Oqtane.Repository public void DeleteUserRole(int UserRoleId) { - UserRole UserRole = db.UserRole.Find(UserRoleId); - db.UserRole.Remove(UserRole); - db.SaveChanges(); + UserRole UserRole = _db.UserRole.Find(UserRoleId); + _db.UserRole.Remove(UserRole); + _db.SaveChanges(); } } } diff --git a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs index 735201d4..eadf7c6f 100644 --- a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs +++ b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs @@ -12,42 +12,42 @@ namespace Oqtane.Security { public class ClaimsPrincipalFactory : UserClaimsPrincipalFactory where TUser : IdentityUser { - private readonly IdentityOptions options; - private readonly ITenantResolver Tenants; - private readonly IUserRepository Users; - private readonly IUserRoleRepository UserRoles; + private readonly IdentityOptions _options; + private readonly ITenantResolver _tenants; + private readonly IUserRepository _users; + private readonly IUserRoleRepository _userRoles; public ClaimsPrincipalFactory(UserManager userManager, IOptions optionsAccessor, ITenantResolver tenants, IUserRepository users, IUserRoleRepository userroles) : base(userManager, optionsAccessor) { - options = optionsAccessor.Value; - Tenants = tenants; - Users = users; - UserRoles = userroles; + _options = optionsAccessor.Value; + _tenants = tenants; + _users = users; + _userRoles = userroles; } protected override async Task GenerateClaimsAsync(TUser identityuser) { var id = await base.GenerateClaimsAsync(identityuser); - User user = Users.GetUser(identityuser.UserName); + User user = _users.GetUser(identityuser.UserName); if (user != null) { id.AddClaim(new Claim(ClaimTypes.PrimarySid, user.UserId.ToString())); - Alias alias = Tenants.GetAlias(); - List userroles = UserRoles.GetUserRoles(user.UserId, alias.SiteId).ToList(); + Alias alias = _tenants.GetAlias(); + List userroles = _userRoles.GetUserRoles(user.UserId, alias.SiteId).ToList(); foreach (UserRole userrole in userroles) { - id.AddClaim(new Claim(options.ClaimsIdentity.RoleClaimType, userrole.Role.Name)); + id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, userrole.Role.Name)); // host users are members of every site if (userrole.Role.Name == Constants.HostRole) { if (userroles.Where(item => item.Role.Name == Constants.RegisteredRole).FirstOrDefault() == null) { - id.AddClaim(new Claim(options.ClaimsIdentity.RoleClaimType, Constants.RegisteredRole)); + id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, Constants.RegisteredRole)); } if (userroles.Where(item => item.Role.Name == Constants.AdminRole).FirstOrDefault() == null) { - id.AddClaim(new Claim(options.ClaimsIdentity.RoleClaimType, Constants.AdminRole)); + id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, Constants.AdminRole)); } } } diff --git a/Oqtane.Server/Security/PermissionHandler.cs b/Oqtane.Server/Security/PermissionHandler.cs index 11762c21..bf08f7b1 100644 --- a/Oqtane.Server/Security/PermissionHandler.cs +++ b/Oqtane.Server/Security/PermissionHandler.cs @@ -8,31 +8,31 @@ namespace Oqtane.Security { public class PermissionHandler : AuthorizationHandler { - private readonly IHttpContextAccessor HttpContextAccessor; - private readonly IUserPermissions UserPermissions; - private readonly ILogManager logger; + private readonly IHttpContextAccessor _httpContextAccessor; + private readonly IUserPermissions _userPermissions; + private readonly ILogManager _logger; public PermissionHandler(IHttpContextAccessor HttpContextAccessor, IUserPermissions UserPermissions, ILogManager logger) { - this.HttpContextAccessor = HttpContextAccessor; - this.UserPermissions = UserPermissions; - this.logger = logger; + this._httpContextAccessor = HttpContextAccessor; + this._userPermissions = UserPermissions; + this._logger = logger; } protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement) { // permission is scoped based on EntityId which must be passed as a querystring parameter - var ctx = HttpContextAccessor.HttpContext; + var ctx = _httpContextAccessor.HttpContext; if (ctx != null && ctx.Request.Query.ContainsKey("entityid")) { int EntityId = int.Parse(ctx.Request.Query["entityid"]); - if (UserPermissions.IsAuthorized(context.User, requirement.EntityName, EntityId, requirement.PermissionName)) + if (_userPermissions.IsAuthorized(context.User, requirement.EntityName, EntityId, requirement.PermissionName)) { context.Succeed(requirement); } else { - logger.Log(LogLevel.Error, this, LogFunction.Security, "User {User} Does Not Have {PermissionName} Permission For {EntityName}:{EntityId}", context.User, requirement.PermissionName, requirement.EntityName, EntityId); + _logger.Log(LogLevel.Error, this, LogFunction.Security, "User {User} Does Not Have {PermissionName} Permission For {EntityName}:{EntityId}", context.User, requirement.PermissionName, requirement.EntityName, EntityId); } } return Task.CompletedTask; diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index 283d8738..b31a897d 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -8,18 +8,18 @@ namespace Oqtane.Security { public class UserPermissions : IUserPermissions { - private readonly IPermissionRepository Permissions; - private readonly IHttpContextAccessor Accessor; + private readonly IPermissionRepository _permissions; + private readonly IHttpContextAccessor _accessor; public UserPermissions(IPermissionRepository Permissions, IHttpContextAccessor Accessor) { - this.Permissions = Permissions; - this.Accessor = Accessor; + this._permissions = Permissions; + this._accessor = Accessor; } public bool IsAuthorized(ClaimsPrincipal User, string EntityName, int EntityId, string PermissionName) { - return IsAuthorized(User, PermissionName, Permissions.EncodePermissions(EntityId, Permissions.GetPermissions(EntityName, EntityId, PermissionName).ToList())); + return IsAuthorized(User, PermissionName, _permissions.EncodePermissions(EntityId, _permissions.GetPermissions(EntityName, EntityId, PermissionName).ToList())); } public bool IsAuthorized(ClaimsPrincipal User, string PermissionName, string Permissions) @@ -56,7 +56,7 @@ namespace Oqtane.Security public User GetUser() { - return GetUser(Accessor.HttpContext.User); + return GetUser(_accessor.HttpContext.User); } } } From 303bdf3be23cf40fb0f18f1706deda73ac988c6d Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Thu, 5 Mar 2020 19:22:13 +0300 Subject: [PATCH 2/3] Remove this keyword --- .../Modules/Controls/ModuleMessage.razor | 2 +- Oqtane.Client/Modules/HtmlText/Edit.razor | 2 +- .../HtmlText/Services/HtmlTextService.cs | 6 +++--- Oqtane.Client/Modules/ModuleBase.cs | 8 ++++---- .../IdentityAuthenticationStateProvider.cs | 6 +++--- Oqtane.Client/Services/AliasService.cs | 6 +++--- Oqtane.Client/Services/FileService.cs | 8 ++++---- Oqtane.Client/Services/FolderService.cs | 6 +++--- Oqtane.Client/Services/InstallationService.cs | 6 +++--- Oqtane.Client/Services/JobLogService.cs | 6 +++--- Oqtane.Client/Services/JobService.cs | 6 +++--- Oqtane.Client/Services/LogService.cs | 6 +++--- .../Services/ModuleDefinitionService.cs | 6 +++--- Oqtane.Client/Services/ModuleService.cs | 6 +++--- Oqtane.Client/Services/NotificationService.cs | 6 +++--- Oqtane.Client/Services/PackageService.cs | 6 +++--- Oqtane.Client/Services/PageModuleService.cs | 6 +++--- Oqtane.Client/Services/PageService.cs | 6 +++--- Oqtane.Client/Services/ProfileService.cs | 6 +++--- Oqtane.Client/Services/RoleService.cs | 6 +++--- Oqtane.Client/Services/SettingService.cs | 6 +++--- Oqtane.Client/Services/SiteService.cs | 6 +++--- Oqtane.Client/Services/TenantService.cs | 6 +++--- Oqtane.Client/Services/ThemeService.cs | 6 +++--- Oqtane.Client/Services/UserRoleService.cs | 6 +++--- Oqtane.Client/Services/UserService.cs | 6 +++--- Oqtane.Client/Shared/Interop.cs | 2 +- Oqtane.Client/Shared/SiteRouter.razor | 2 +- Oqtane.Client/Themes/ContainerBase.cs | 2 +- .../Themes/Controls/ControlPanel.razor | 6 +++--- Oqtane.Client/Themes/LayoutBase.cs | 2 +- Oqtane.Client/Themes/ThemeBase.cs | 2 +- Oqtane.Server/Controllers/AliasController.cs | 4 ++-- Oqtane.Server/Controllers/FileController.cs | 12 ++++++------ Oqtane.Server/Controllers/FolderController.cs | 6 +++--- .../Controllers/InstallationController.cs | 4 ++-- Oqtane.Server/Controllers/JobController.cs | 6 +++--- Oqtane.Server/Controllers/JobLogController.cs | 4 ++-- Oqtane.Server/Controllers/LogController.cs | 4 ++-- Oqtane.Server/Controllers/ModuleController.cs | 10 +++++----- .../Controllers/ModuleDefinitionController.cs | 10 +++++----- .../Controllers/NotificationController.cs | 6 +++--- Oqtane.Server/Controllers/PackageController.cs | 2 +- Oqtane.Server/Controllers/PageController.cs | 10 +++++----- .../Controllers/PageModuleController.cs | 8 ++++---- Oqtane.Server/Controllers/ProfileController.cs | 4 ++-- Oqtane.Server/Controllers/RoleController.cs | 4 ++-- Oqtane.Server/Controllers/SettingController.cs | 8 ++++---- Oqtane.Server/Controllers/SiteController.cs | 8 ++++---- Oqtane.Server/Controllers/TenantController.cs | 4 ++-- Oqtane.Server/Controllers/ThemeController.cs | 8 ++++---- Oqtane.Server/Controllers/UserController.cs | 18 +++++++++--------- .../Controllers/UserRoleController.cs | 4 ++-- .../Infrastructure/InstallationManager.cs | 4 ++-- .../Infrastructure/Jobs/HostedServiceBase.cs | 6 +++--- Oqtane.Server/Infrastructure/LogManager.cs | 10 +++++----- .../HtmlText/Controllers/HtmlTextController.cs | 2 +- .../HtmlText/Manager/HtmlTextManager.cs | 2 +- Oqtane.Server/Pages/Login.cshtml.cs | 4 ++-- .../Repository/Context/DBContextBase.cs | 2 +- .../Repository/Context/MasterDBContext.cs | 2 +- Oqtane.Server/Repository/FileRepository.cs | 2 +- Oqtane.Server/Repository/FolderRepository.cs | 2 +- .../Repository/ModuleDefinitionRepository.cs | 2 +- Oqtane.Server/Repository/ModuleRepository.cs | 6 +++--- .../Repository/PageModuleRepository.cs | 2 +- Oqtane.Server/Repository/PageRepository.cs | 4 ++-- .../Repository/PermissionRepository.cs | 2 +- Oqtane.Server/Repository/SiteRepository.cs | 18 +++++++++--------- Oqtane.Server/Security/PermissionHandler.cs | 6 +++--- .../Security/PermissionRequirement.cs | 4 ++-- Oqtane.Server/Security/UserPermissions.cs | 4 ++-- 72 files changed, 198 insertions(+), 198 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor index bdc96ba9..6c1a75f0 100644 --- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor +++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor @@ -28,7 +28,7 @@ public void SetModuleMessage(string message, MessageType type) { - this.message = message; + message = message; classname = GetMessageType(type); StateHasChanged(); } diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index d396da3c..48f6daf7 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -130,7 +130,7 @@ else { if (RichTextEditorMode) { - content = await this.RichTextEditorHtml.GetHTML(); + content = await RichTextEditorHtml.GetHTML(); } content = content.Replace(((PageState.Alias.Path == "") ? "/~" : PageState.Alias.Path) + Constants.ContentUrl, Constants.ContentUrl); diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs index b6336015..713d0f5b 100644 --- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs +++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Modules.HtmlText.Services public HtmlTextService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + http = http; + sitestate = sitestate; + NavigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs index 4e60257a..234026a5 100644 --- a/Oqtane.Client/Modules/ModuleBase.cs +++ b/Oqtane.Client/Modules/ModuleBase.cs @@ -14,7 +14,7 @@ namespace Oqtane.Modules public ModuleBase() { - this.logger = new Logger(this); + logger = new Logger(this); } [Inject] @@ -43,7 +43,7 @@ namespace Oqtane.Modules public string ModulePath() { - return "Modules/" + this.GetType().Namespace + "/"; + return "Modules/" + GetType().Namespace + "/"; } // url methods @@ -135,7 +135,7 @@ namespace Oqtane.Modules { UserId = PageState.User.UserId; } - string category = this.GetType().AssemblyQualifiedName; + string category = GetType().AssemblyQualifiedName; string feature = Utilities.GetTypeNameLastSegment(category, 1); LogFunction logfunction; if (string.IsNullOrEmpty(function)) @@ -170,7 +170,7 @@ namespace Oqtane.Modules public Logger(ModuleBase modulebase) { - this.modulebase = modulebase; + modulebase = modulebase; } public async Task LogTrace(string message, params object[] args) diff --git a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs index 2db32002..4f2c52d6 100644 --- a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs +++ b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs @@ -19,9 +19,9 @@ namespace Oqtane.Providers public IdentityAuthenticationStateProvider(NavigationManager NavigationManager, SiteState sitestate, IServiceProvider provider) { - this._navigationManager = NavigationManager; - this._siteState = sitestate; - this._serviceProvider = provider; + _navigationManager = NavigationManager; + _siteState = sitestate; + _serviceProvider = provider; } public override async Task GetAuthenticationStateAsync() diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs index af150507..c4c685e5 100644 --- a/Oqtane.Client/Services/AliasService.cs +++ b/Oqtane.Client/Services/AliasService.cs @@ -18,9 +18,9 @@ namespace Oqtane.Services public AliasService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs index 553b9cca..cc66d536 100644 --- a/Oqtane.Client/Services/FileService.cs +++ b/Oqtane.Client/Services/FileService.cs @@ -19,10 +19,10 @@ namespace Oqtane.Services public FileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager, IJSRuntime jsRuntime) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; - this._jsRuntime = jsRuntime; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; + _jsRuntime = jsRuntime; } private string apiurl diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs index 17481aa6..85bc7765 100644 --- a/Oqtane.Client/Services/FolderService.cs +++ b/Oqtane.Client/Services/FolderService.cs @@ -17,9 +17,9 @@ namespace Oqtane.Services public FolderService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs index ab37df1e..8e454ab1 100644 --- a/Oqtane.Client/Services/InstallationService.cs +++ b/Oqtane.Client/Services/InstallationService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public InstallationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs index 55815fab..e866e641 100644 --- a/Oqtane.Client/Services/JobLogService.cs +++ b/Oqtane.Client/Services/JobLogService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public JobLogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs index 169c57db..828203e1 100644 --- a/Oqtane.Client/Services/JobService.cs +++ b/Oqtane.Client/Services/JobService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public JobService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/LogService.cs b/Oqtane.Client/Services/LogService.cs index bd921230..b8f1b5b0 100644 --- a/Oqtane.Client/Services/LogService.cs +++ b/Oqtane.Client/Services/LogService.cs @@ -17,9 +17,9 @@ namespace Oqtane.Services public LogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs index 8126f1be..368b4cf5 100644 --- a/Oqtane.Client/Services/ModuleDefinitionService.cs +++ b/Oqtane.Client/Services/ModuleDefinitionService.cs @@ -18,9 +18,9 @@ namespace Oqtane.Services public ModuleDefinitionService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs index 2207fc7a..d6c4be40 100644 --- a/Oqtane.Client/Services/ModuleService.cs +++ b/Oqtane.Client/Services/ModuleService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public ModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/NotificationService.cs b/Oqtane.Client/Services/NotificationService.cs index c21d6ca4..c286a277 100644 --- a/Oqtane.Client/Services/NotificationService.cs +++ b/Oqtane.Client/Services/NotificationService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public NotificationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs index b3f42051..e0431556 100644 --- a/Oqtane.Client/Services/PackageService.cs +++ b/Oqtane.Client/Services/PackageService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public PackageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs index 5d6bbbc8..d3c813b0 100644 --- a/Oqtane.Client/Services/PageModuleService.cs +++ b/Oqtane.Client/Services/PageModuleService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public PageModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs index fe2b1486..07829178 100644 --- a/Oqtane.Client/Services/PageService.cs +++ b/Oqtane.Client/Services/PageService.cs @@ -17,9 +17,9 @@ namespace Oqtane.Services public PageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs index 67f07111..227b37c1 100644 --- a/Oqtane.Client/Services/ProfileService.cs +++ b/Oqtane.Client/Services/ProfileService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public ProfileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs index f25e68fa..da5b5642 100644 --- a/Oqtane.Client/Services/RoleService.cs +++ b/Oqtane.Client/Services/RoleService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public RoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs index 48026fce..a8ba70c2 100644 --- a/Oqtane.Client/Services/SettingService.cs +++ b/Oqtane.Client/Services/SettingService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public SettingService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs index 9c95b358..de62f802 100644 --- a/Oqtane.Client/Services/SiteService.cs +++ b/Oqtane.Client/Services/SiteService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public SiteService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs index bee9b1eb..3ef6761f 100644 --- a/Oqtane.Client/Services/TenantService.cs +++ b/Oqtane.Client/Services/TenantService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public TenantService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs index 7594d28f..270b880f 100644 --- a/Oqtane.Client/Services/ThemeService.cs +++ b/Oqtane.Client/Services/ThemeService.cs @@ -18,9 +18,9 @@ namespace Oqtane.Services public ThemeService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/UserRoleService.cs b/Oqtane.Client/Services/UserRoleService.cs index fbe53cd8..c6d95550 100644 --- a/Oqtane.Client/Services/UserRoleService.cs +++ b/Oqtane.Client/Services/UserRoleService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public UserRoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs index 002e1536..8636b90b 100644 --- a/Oqtane.Client/Services/UserService.cs +++ b/Oqtane.Client/Services/UserService.cs @@ -14,9 +14,9 @@ namespace Oqtane.Services public UserService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Shared/Interop.cs b/Oqtane.Client/Shared/Interop.cs index 6f34d128..82bf37a6 100644 --- a/Oqtane.Client/Shared/Interop.cs +++ b/Oqtane.Client/Shared/Interop.cs @@ -11,7 +11,7 @@ namespace Oqtane.Shared public Interop(IJSRuntime jsRuntime) { - this._jsRuntime = jsRuntime; + _jsRuntime = jsRuntime; } public Task SetCookie(string name, string value, int days) diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor index f6f84616..d6b99d02 100644 --- a/Oqtane.Client/Shared/SiteRouter.razor +++ b/Oqtane.Client/Shared/SiteRouter.razor @@ -59,7 +59,7 @@ } else { - System.Diagnostics.Debug.WriteLine(this.GetType().FullName + ": Error: API call to " + _absoluteUri + " is not mapped to a Controller"); + System.Diagnostics.Debug.WriteLine(GetType().FullName + ": Error: API call to " + _absoluteUri + " is not mapped to a Controller"); } } } diff --git a/Oqtane.Client/Themes/ContainerBase.cs b/Oqtane.Client/Themes/ContainerBase.cs index 867722f7..2e55f969 100644 --- a/Oqtane.Client/Themes/ContainerBase.cs +++ b/Oqtane.Client/Themes/ContainerBase.cs @@ -22,7 +22,7 @@ namespace Oqtane.Themes public string ThemePath() { - return "Themes/" + this.GetType().Namespace + "/"; + return "Themes/" + GetType().Namespace + "/"; } public string NavigateUrl() diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor index ef7f1a60..2680fa3b 100644 --- a/Oqtane.Client/Themes/Controls/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor @@ -459,19 +459,19 @@ { page.IsDeleted = true; await PageService.UpdatePageAsync(page); - await logger.Log(page.PageId, null, PageState.User.UserId, this.GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page); + await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page); NavigationManager.NavigateTo(NavigateUrl("", Reload.Site)); } else // personalized page { await PageService.DeletePageAsync(page.PageId); - await logger.Log(page.PageId, null, PageState.User.UserId, this.GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page); + await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page); NavigationManager.NavigateTo(NavigateUrl(Reload.Page)); } } catch (Exception ex) { - await logger.Log(page.PageId, null, PageState.User.UserId, this.GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, ex, "Page Deleted {Page} {Error}", page, ex.Message); + await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, ex, "Page Deleted {Page} {Error}", page, ex.Message); } } } diff --git a/Oqtane.Client/Themes/LayoutBase.cs b/Oqtane.Client/Themes/LayoutBase.cs index 546937ab..27bac9a6 100644 --- a/Oqtane.Client/Themes/LayoutBase.cs +++ b/Oqtane.Client/Themes/LayoutBase.cs @@ -11,7 +11,7 @@ namespace Oqtane.Themes public string LayoutPath() { - return "Themes/" + this.GetType().Namespace + "/"; + return "Themes/" + GetType().Namespace + "/"; } } diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs index 631ef9ea..f0d05016 100644 --- a/Oqtane.Client/Themes/ThemeBase.cs +++ b/Oqtane.Client/Themes/ThemeBase.cs @@ -16,7 +16,7 @@ namespace Oqtane.Themes public string ThemePath() { - return "Themes/" + this.GetType().Namespace + "/"; + return "Themes/" + GetType().Namespace + "/"; } public async Task IncludeCSS(string Url) diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs index 1a969e65..1727b15f 100644 --- a/Oqtane.Server/Controllers/AliasController.cs +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -19,8 +19,8 @@ namespace Oqtane.Controllers public AliasController(IAliasRepository Aliases, ILogManager logger) { - this._aliases = Aliases; - this._logger = logger; + _aliases = Aliases; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 78529d00..cd6408fe 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -29,12 +29,12 @@ namespace Oqtane.Controllers 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; + _environment = environment; + _files = Files; + _folders = Folders; + _userPermissions = UserPermissions; + _tenants = Tenants; + _logger = logger; } // GET: api/?folder=x diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index 029a3984..a99b0fcd 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -19,9 +19,9 @@ namespace Oqtane.Controllers public FolderController(IFolderRepository Folders, IUserPermissions UserPermissions, ILogManager logger) { - this._folders = Folders; - this._userPermissions = UserPermissions; - this._logger = logger; + _folders = Folders; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs index dedb2044..05e66775 100644 --- a/Oqtane.Server/Controllers/InstallationController.cs +++ b/Oqtane.Server/Controllers/InstallationController.cs @@ -24,8 +24,8 @@ namespace Oqtane.Controllers public InstallationController(IConfigurationRoot Config, IInstallationManager InstallationManager) { - this._config = Config; - this._installationManager = InstallationManager; + _config = Config; + _installationManager = InstallationManager; } // POST api/ diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs index 29d18d12..1d3088d6 100644 --- a/Oqtane.Server/Controllers/JobController.cs +++ b/Oqtane.Server/Controllers/JobController.cs @@ -20,9 +20,9 @@ namespace Oqtane.Controllers public JobController(IJobRepository Jobs, ILogManager logger, IServiceProvider ServiceProvider) { - this._jobs = Jobs; - this._logger = logger; - this._serviceProvider = ServiceProvider; + _jobs = Jobs; + _logger = logger; + _serviceProvider = ServiceProvider; } // GET: api/ diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs index 330acfc8..03c8db95 100644 --- a/Oqtane.Server/Controllers/JobLogController.cs +++ b/Oqtane.Server/Controllers/JobLogController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public JobLogController(IJobLogRepository JobLogs, ILogManager logger) { - this._jobLogs = JobLogs; - this._logger = logger; + _jobLogs = JobLogs; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs index 97280357..ca98b0ad 100644 --- a/Oqtane.Server/Controllers/LogController.cs +++ b/Oqtane.Server/Controllers/LogController.cs @@ -17,8 +17,8 @@ namespace Oqtane.Controllers public LogController(ILogManager Logger, ILogRepository Logs) { - this._ogger = Logger; - this._logs = Logs; + _ogger = Logger; + _logs = Logs; } // GET: api/?siteid=x&level=y&function=z&rows=50 diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs index 796211ac..9679f835 100644 --- a/Oqtane.Server/Controllers/ModuleController.cs +++ b/Oqtane.Server/Controllers/ModuleController.cs @@ -22,11 +22,11 @@ namespace Oqtane.Controllers 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; + _modules = Modules; + _pageModules = PageModules; + _moduleDefinitions = ModuleDefinitions; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 81e88b3c..212a2773 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -24,11 +24,11 @@ namespace Oqtane.Controllers 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; + _moduleDefinitions = ModuleDefinitions; + _userPermissions = UserPermissions; + _installationManager = InstallationManager; + _environment = environment; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs index 592de0e7..78879821 100644 --- a/Oqtane.Server/Controllers/NotificationController.cs +++ b/Oqtane.Server/Controllers/NotificationController.cs @@ -19,9 +19,9 @@ namespace Oqtane.Controllers public NotificationController(INotificationRepository Notifications, IUserPermissions UserPermissions, ILogManager logger) { - this._notifications = Notifications; - this._userPermissions = UserPermissions; - this._logger = logger; + _notifications = Notifications; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/?siteid=x&type=y&userid=z diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs index 69f0b590..5b69d426 100644 --- a/Oqtane.Server/Controllers/PackageController.cs +++ b/Oqtane.Server/Controllers/PackageController.cs @@ -21,7 +21,7 @@ namespace Oqtane.Controllers public PackageController(IWebHostEnvironment environment) { - this._environment = environment; + _environment = environment; } // GET: api/?tag=x diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 5bdc2b50..249b309b 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -21,11 +21,11 @@ namespace Oqtane.Controllers 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; + _pages = Pages; + _modules = Modules; + _pageModules = PageModules; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs index fb1d568b..5b6f9e7d 100644 --- a/Oqtane.Server/Controllers/PageModuleController.cs +++ b/Oqtane.Server/Controllers/PageModuleController.cs @@ -20,10 +20,10 @@ namespace Oqtane.Controllers public PageModuleController(IPageModuleRepository PageModules, IModuleRepository Modules, IUserPermissions UserPermissions, ILogManager logger) { - this._pageModules = PageModules; - this._modules = Modules; - this._userPermissions = UserPermissions; - this._logger = logger; + _pageModules = PageModules; + _modules = Modules; + _userPermissions = UserPermissions; + _logger = logger; } // GET api//5 diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs index 4636cdb0..6fda81cc 100644 --- a/Oqtane.Server/Controllers/ProfileController.cs +++ b/Oqtane.Server/Controllers/ProfileController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public ProfileController(IProfileRepository Profiles, ILogManager logger) { - this._profiles = Profiles; - this._logger = logger; + _profiles = Profiles; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index 21d7be48..74c7f87e 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public RoleController(IRoleRepository Roles, ILogManager logger) { - this._roles = Roles; - this._logger = logger; + _roles = Roles; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index 7b3c16ee..69996b05 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -20,10 +20,10 @@ namespace Oqtane.Controllers public SettingController(ISettingRepository Settings, IPageModuleRepository PageModules, IUserPermissions UserPermissions, ILogManager logger) { - this._settings = Settings; - this._pageModules = PageModules; - this._userPermissions = UserPermissions; - this._logger = logger; + _settings = Settings; + _pageModules = PageModules; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index 4cbe52f0..1642e1e1 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -21,10 +21,10 @@ namespace Oqtane.Controllers public SiteController(ISiteRepository Sites, ITenantResolver Tenants, IWebHostEnvironment environment, ILogManager logger) { - this._sites = Sites; - this._tenants = Tenants; - this._environment = environment; - this._logger = logger; + _sites = Sites; + _tenants = Tenants; + _environment = environment; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs index c04af901..437260cb 100644 --- a/Oqtane.Server/Controllers/TenantController.cs +++ b/Oqtane.Server/Controllers/TenantController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public TenantController(ITenantRepository Tenants, ILogManager logger) { - this._tenants = Tenants; - this._logger = logger; + _tenants = Tenants; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index e9908af8..4ced2132 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -22,10 +22,10 @@ namespace Oqtane.Controllers public ThemeController(IThemeRepository Themes, IInstallationManager InstallationManager, IWebHostEnvironment environment, ILogManager logger) { - this._themes = Themes; - this._installationManager = InstallationManager; - this._environment = environment; - this._logger = logger; + _themes = Themes; + _installationManager = InstallationManager; + _environment = environment; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index 6569ebfd..a3becc52 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -31,15 +31,15 @@ namespace Oqtane.Controllers public UserController(IUserRepository Users, IRoleRepository Roles, IUserRoleRepository UserRoles, UserManager IdentityUserManager, SignInManager 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; + _users = Users; + _roles = Roles; + _userRoles = UserRoles; + _identityUserManager = IdentityUserManager; + _identitySignInManager = IdentitySignInManager; + _tenants = Tenants; + _folders = Folders; + _notifications = Notifications; + _logger = logger; } // GET api//5?siteid=x diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 559d5419..216cb93e 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public UserRoleController(IUserRoleRepository UserRoles, ILogManager logger) { - this._userRoles = UserRoles; - this._logger = logger; + _userRoles = UserRoles; + _logger = logger; } // GET: api/?userid=x diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index 305ad72f..a7d34f16 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -17,8 +17,8 @@ namespace Oqtane.Infrastructure public InstallationManager(IHostApplicationLifetime HostApplicationLifetime, IWebHostEnvironment environment) { - this._hostApplicationLifetime = HostApplicationLifetime; - this._environment = environment; + _hostApplicationLifetime = HostApplicationLifetime; + _environment = environment; } public void InstallPackages(string Folders, bool Restart) diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs index 670a2dbd..40853084 100644 --- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs +++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs @@ -19,7 +19,7 @@ namespace Oqtane.Infrastructure public HostedServiceBase(IServiceScopeFactory ServiceScopeFactory) { - this._serviceScopeFactory = ServiceScopeFactory; + _serviceScopeFactory = ServiceScopeFactory; } // abstract method must be overridden @@ -34,7 +34,7 @@ namespace Oqtane.Infrastructure using (var scope = _serviceScopeFactory.CreateScope()) { // get name of job - string JobType = Utilities.GetFullTypeName(this.GetType().AssemblyQualifiedName); + string JobType = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName); // load jobs and find current job IJobRepository Jobs = scope.ServiceProvider.GetRequiredService(); @@ -146,7 +146,7 @@ namespace Oqtane.Infrastructure // set IsExecuting to false in case this job was forcefully terminated previously using (var scope = _serviceScopeFactory.CreateScope()) { - string JobType = Utilities.GetFullTypeName(this.GetType().AssemblyQualifiedName); + string JobType = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName); IJobRepository Jobs = scope.ServiceProvider.GetRequiredService(); Job Job = Jobs.GetJobs().Where(item => item.JobType == JobType).FirstOrDefault(); if (Job != null) diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 8cfd8002..67eb28eb 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -20,11 +20,11 @@ namespace Oqtane.Infrastructure public LogManager(ILogRepository Logs, ITenantResolver TenantResolver, IConfigurationRoot Config, IUserPermissions UserPermissions, IHttpContextAccessor Accessor) { - this._logs = Logs; - this._tenantResolver = TenantResolver; - this._config = Config; - this._userPermissions = UserPermissions; - this._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) diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs index 9c5420c7..ac0ab3af 100644 --- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs +++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs @@ -19,7 +19,7 @@ namespace Oqtane.Modules.HtmlText.Controllers public HtmlTextController(IHtmlTextRepository HtmlText, ILogManager logger, IHttpContextAccessor HttpContextAccessor) { _htmlText = HtmlText; - this._logger = logger; + _logger = logger; if (HttpContextAccessor.HttpContext.Request.Query.ContainsKey("entityid")) { _entityId = int.Parse(HttpContextAccessor.HttpContext.Request.Query["entityid"]); diff --git a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs index d1bdcd3f..0d87934d 100644 --- a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs +++ b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs @@ -11,7 +11,7 @@ namespace Oqtane.Modules.HtmlText.Manager public HtmlTextManager(IHtmlTextRepository htmltexts) { - this._htmlTexts = htmltexts; + _htmlTexts = htmltexts; } public string ExportModule(Module Module) diff --git a/Oqtane.Server/Pages/Login.cshtml.cs b/Oqtane.Server/Pages/Login.cshtml.cs index adf86ee4..179cbe09 100644 --- a/Oqtane.Server/Pages/Login.cshtml.cs +++ b/Oqtane.Server/Pages/Login.cshtml.cs @@ -15,8 +15,8 @@ namespace Oqtane.Pages public LoginModel(UserManager IdentityUserManager, SignInManager IdentitySignInManager) { - this.IdentityUserManager = IdentityUserManager; - this.IdentitySignInManager = IdentitySignInManager; + IdentityUserManager = IdentityUserManager; + IdentitySignInManager = IdentitySignInManager; } public async Task OnPostAsync(string username, string password, bool remember, string returnurl) diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs index a5cf922a..9395a75d 100644 --- a/Oqtane.Server/Repository/Context/DBContextBase.cs +++ b/Oqtane.Server/Repository/Context/DBContextBase.cs @@ -16,7 +16,7 @@ namespace Oqtane.Repository public DBContextBase(ITenantResolver TenantResolver, IHttpContextAccessor accessor) { _tenant = TenantResolver.GetTenant(); - this._accessor = accessor; + _accessor = accessor; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs index 669dd035..9ba8939f 100644 --- a/Oqtane.Server/Repository/Context/MasterDBContext.cs +++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs @@ -12,7 +12,7 @@ namespace Oqtane.Repository public MasterDBContext(DbContextOptions options, IHttpContextAccessor accessor) : base(options) { - this._accessor = accessor; + _accessor = accessor; } public virtual DbSet Alias { get; set; } diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs index 67d2ffa3..673aa110 100644 --- a/Oqtane.Server/Repository/FileRepository.cs +++ b/Oqtane.Server/Repository/FileRepository.cs @@ -13,7 +13,7 @@ namespace Oqtane.Repository public FileRepository(TenantDBContext context, IPermissionRepository Permissions) { _db = context; - this._permissions = Permissions; + _permissions = Permissions; } public IEnumerable GetFiles(int FolderId) diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs index 60ba28f0..900f044b 100644 --- a/Oqtane.Server/Repository/FolderRepository.cs +++ b/Oqtane.Server/Repository/FolderRepository.cs @@ -13,7 +13,7 @@ namespace Oqtane.Repository public FolderRepository(TenantDBContext context, IPermissionRepository Permissions) { _db = context; - this._permissions = Permissions; + _permissions = Permissions; } public IEnumerable GetFolders(int SiteId) diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index f819e89c..ed7c5ebe 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -20,7 +20,7 @@ namespace Oqtane.Repository { _db = context; _cache = cache; - this._permissions = Permissions; + _permissions = Permissions; } public IEnumerable GetModuleDefinitions(int SiteId) diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index 9a59e9fd..31f51f9f 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -20,9 +20,9 @@ namespace Oqtane.Repository public ModuleRepository(TenantDBContext context, IPermissionRepository Permissions, IModuleDefinitionRepository ModuleDefinitions, IServiceProvider ServiceProvider) { _db = context; - this._permissions = Permissions; - this._moduleDefinitions = ModuleDefinitions; - this._serviceProvider = ServiceProvider; + _permissions = Permissions; + _moduleDefinitions = ModuleDefinitions; + _serviceProvider = ServiceProvider; } public IEnumerable GetModules(int SiteId) diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index 833a1923..0696dfcc 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -13,7 +13,7 @@ namespace Oqtane.Repository public PageModuleRepository(TenantDBContext context, IPermissionRepository Permissions) { _db = context; - this._permissions = Permissions; + _permissions = Permissions; } public IEnumerable GetPageModules(int SiteId) diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index 03676f39..29161d8f 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -14,8 +14,8 @@ namespace Oqtane.Repository public PageRepository(TenantDBContext context, IPermissionRepository Permissions, IPageModuleRepository PageModules) { _db = context; - this._permissions = Permissions; - this._pageModules = PageModules; + _permissions = Permissions; + _pageModules = PageModules; } public IEnumerable GetPages(int SiteId) diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index ad92f03a..161703a0 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -17,7 +17,7 @@ namespace Oqtane.Repository public PermissionRepository(TenantDBContext context, IRoleRepository Roles) { _db = context; - this._roles = Roles; + _roles = Roles; } public IEnumerable GetPermissions(int SiteId, string EntityName) diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 3605cc7c..69f26491 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -27,15 +27,15 @@ namespace Oqtane.Repository public SiteRepository(TenantDBContext context, IRoleRepository RoleRepository, IProfileRepository ProfileRepository, IFolderRepository FolderRepository, IFileRepository FileRepository, IPageRepository PageRepository, IModuleRepository ModuleRepository, IPageModuleRepository PageModuleRepository, IModuleDefinitionRepository ModuleDefinitionRepository, IServiceProvider ServiceProvider) { _db = context; - this._roleRepository = RoleRepository; - this._profileRepository = ProfileRepository; - this._folderRepository = FolderRepository; - this._fileRepository = FileRepository; - this._pageRepository = PageRepository; - this._moduleRepository = ModuleRepository; - this._pageModuleRepository = PageModuleRepository; - this._moduleDefinitionRepository = ModuleDefinitionRepository; - this._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(); diff --git a/Oqtane.Server/Security/PermissionHandler.cs b/Oqtane.Server/Security/PermissionHandler.cs index bf08f7b1..6a3249ef 100644 --- a/Oqtane.Server/Security/PermissionHandler.cs +++ b/Oqtane.Server/Security/PermissionHandler.cs @@ -14,9 +14,9 @@ namespace Oqtane.Security public PermissionHandler(IHttpContextAccessor HttpContextAccessor, IUserPermissions UserPermissions, ILogManager logger) { - this._httpContextAccessor = HttpContextAccessor; - this._userPermissions = UserPermissions; - this._logger = logger; + _httpContextAccessor = HttpContextAccessor; + _userPermissions = UserPermissions; + _logger = logger; } protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement) diff --git a/Oqtane.Server/Security/PermissionRequirement.cs b/Oqtane.Server/Security/PermissionRequirement.cs index 7404d5bd..a8b23280 100644 --- a/Oqtane.Server/Security/PermissionRequirement.cs +++ b/Oqtane.Server/Security/PermissionRequirement.cs @@ -10,8 +10,8 @@ namespace Oqtane.Security public PermissionRequirement(string EntityName, string PermissionName) { - this.EntityName = EntityName; - this.PermissionName = PermissionName; + EntityName = EntityName; + PermissionName = PermissionName; } } } diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index b31a897d..b1bca9a6 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -13,8 +13,8 @@ namespace Oqtane.Security public UserPermissions(IPermissionRepository Permissions, IHttpContextAccessor Accessor) { - this._permissions = Permissions; - this._accessor = Accessor; + _permissions = Permissions; + _accessor = Accessor; } public bool IsAuthorized(ClaimsPrincipal User, string EntityName, int EntityId, string PermissionName) From 425b4e1c6704ef1ec486b143deac512b24ffdf23 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Thu, 5 Mar 2020 20:03:54 +0300 Subject: [PATCH 3/3] Fix casing for constructor params --- .../HtmlText/Services/HtmlTextService.cs | 24 +++++++++---------- .../IdentityAuthenticationStateProvider.cs | 8 +++---- Oqtane.Client/Services/AliasService.cs | 6 ++--- Oqtane.Client/Services/FileService.cs | 6 ++--- Oqtane.Client/Services/FolderService.cs | 6 ++--- Oqtane.Client/Services/InstallationService.cs | 6 ++--- Oqtane.Client/Services/JobLogService.cs | 20 ++++++++-------- Oqtane.Client/Services/JobService.cs | 6 ++--- Oqtane.Client/Services/LogService.cs | 6 ++--- .../Services/ModuleDefinitionService.cs | 6 ++--- Oqtane.Client/Services/ModuleService.cs | 6 ++--- Oqtane.Client/Services/NotificationService.cs | 6 ++--- Oqtane.Client/Services/PackageService.cs | 6 ++--- Oqtane.Client/Services/PageModuleService.cs | 6 ++--- Oqtane.Client/Services/PageService.cs | 6 ++--- Oqtane.Client/Services/ProfileService.cs | 6 ++--- Oqtane.Client/Services/RoleService.cs | 6 ++--- Oqtane.Client/Services/SettingService.cs | 6 ++--- Oqtane.Client/Services/SiteService.cs | 6 ++--- Oqtane.Client/Services/TenantService.cs | 6 ++--- Oqtane.Client/Services/ThemeService.cs | 6 ++--- Oqtane.Client/Services/UserRoleService.cs | 6 ++--- Oqtane.Client/Services/UserService.cs | 6 ++--- Oqtane.Server/Controllers/AliasController.cs | 4 ++-- Oqtane.Server/Controllers/FileController.cs | 10 ++++---- Oqtane.Server/Controllers/FolderController.cs | 6 ++--- .../Controllers/InstallationController.cs | 6 ++--- Oqtane.Server/Controllers/JobController.cs | 6 ++--- Oqtane.Server/Controllers/JobLogController.cs | 4 ++-- Oqtane.Server/Controllers/LogController.cs | 10 ++++---- Oqtane.Server/Controllers/ModuleController.cs | 10 ++++---- .../Controllers/ModuleDefinitionController.cs | 8 +++---- .../Controllers/NotificationController.cs | 6 ++--- Oqtane.Server/Controllers/PageController.cs | 10 ++++---- .../Controllers/PageModuleController.cs | 8 +++---- .../Controllers/ProfileController.cs | 4 ++-- Oqtane.Server/Controllers/RoleController.cs | 4 ++-- .../Controllers/SettingController.cs | 8 +++---- Oqtane.Server/Controllers/SiteController.cs | 6 ++--- Oqtane.Server/Controllers/TenantController.cs | 4 ++-- Oqtane.Server/Controllers/ThemeController.cs | 6 ++--- Oqtane.Server/Controllers/UserController.cs | 18 +++++++------- .../Controllers/UserRoleController.cs | 4 ++-- .../Infrastructure/InstallationManager.cs | 4 ++-- .../Infrastructure/Jobs/HostedServiceBase.cs | 4 ++-- Oqtane.Server/Infrastructure/LogManager.cs | 12 +++++----- .../Controllers/HtmlTextController.cs | 8 +++---- Oqtane.Server/Pages/Login.cshtml.cs | 16 ++++++------- .../Repository/Context/DBContextBase.cs | 4 ++-- Oqtane.Server/Repository/FileRepository.cs | 4 ++-- Oqtane.Server/Repository/FolderRepository.cs | 4 ++-- .../Repository/ModuleDefinitionRepository.cs | 4 ++-- Oqtane.Server/Repository/ModuleRepository.cs | 8 +++---- .../Repository/PageModuleRepository.cs | 4 ++-- Oqtane.Server/Repository/PageRepository.cs | 6 ++--- .../Repository/PermissionRepository.cs | 4 ++-- Oqtane.Server/Repository/SiteRepository.cs | 20 ++++++++-------- Oqtane.Server/Security/PermissionHandler.cs | 6 ++--- .../Security/PermissionRequirement.cs | 6 ++--- Oqtane.Server/Security/UserPermissions.cs | 6 ++--- 60 files changed, 217 insertions(+), 217 deletions(-) diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs index 713d0f5b..6027e62c 100644 --- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs +++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs @@ -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 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(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString()); + htmltext = await _http.GetJsonAsync(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()); } } diff --git a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs index 4f2c52d6..40904341 100644 --- a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs +++ b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs @@ -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 GetAuthenticationStateAsync() diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs index c4c685e5..03c0b845 100644 --- a/Oqtane.Client/Services/AliasService.cs +++ b/Oqtane.Client/Services/AliasService.cs @@ -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 diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs index cc66d536..3a3bc8a8 100644 --- a/Oqtane.Client/Services/FileService.cs +++ b/Oqtane.Client/Services/FileService.cs @@ -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; } diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs index 85bc7765..762ff7d8 100644 --- a/Oqtane.Client/Services/FolderService.cs +++ b/Oqtane.Client/Services/FolderService.cs @@ -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 diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs index 8e454ab1..e8b66cc4 100644 --- a/Oqtane.Client/Services/InstallationService.cs +++ b/Oqtane.Client/Services/InstallationService.cs @@ -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 diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs index e866e641..fde2c158 100644 --- a/Oqtane.Client/Services/JobLogService.cs +++ b/Oqtane.Client/Services/JobLogService.cs @@ -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> GetJobLogsAsync() { - List Joblogs = await http.GetJsonAsync>(apiurl); + List Joblogs = await _http.GetJsonAsync>(apiurl); return Joblogs.OrderBy(item => item.StartDate).ToList(); } public async Task GetJobLogAsync(int JobLogId) { - return await http.GetJsonAsync(apiurl + "/" + JobLogId.ToString()); + return await _http.GetJsonAsync(apiurl + "/" + JobLogId.ToString()); } public async Task AddJobLogAsync(JobLog Joblog) { - return await http.PostJsonAsync(apiurl, Joblog); + return await _http.PostJsonAsync(apiurl, Joblog); } public async Task UpdateJobLogAsync(JobLog Joblog) { - return await http.PutJsonAsync(apiurl + "/" + Joblog.JobLogId.ToString(), Joblog); + return await _http.PutJsonAsync(apiurl + "/" + Joblog.JobLogId.ToString(), Joblog); } public async Task DeleteJobLogAsync(int JobLogId) { - await http.DeleteAsync(apiurl + "/" + JobLogId.ToString()); + await _http.DeleteAsync(apiurl + "/" + JobLogId.ToString()); } } } diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs index 828203e1..b6b6a003 100644 --- a/Oqtane.Client/Services/JobService.cs +++ b/Oqtane.Client/Services/JobService.cs @@ -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 diff --git a/Oqtane.Client/Services/LogService.cs b/Oqtane.Client/Services/LogService.cs index b8f1b5b0..127effb4 100644 --- a/Oqtane.Client/Services/LogService.cs +++ b/Oqtane.Client/Services/LogService.cs @@ -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 diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs index 368b4cf5..9be0c222 100644 --- a/Oqtane.Client/Services/ModuleDefinitionService.cs +++ b/Oqtane.Client/Services/ModuleDefinitionService.cs @@ -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 diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs index d6c4be40..ee49abc5 100644 --- a/Oqtane.Client/Services/ModuleService.cs +++ b/Oqtane.Client/Services/ModuleService.cs @@ -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 diff --git a/Oqtane.Client/Services/NotificationService.cs b/Oqtane.Client/Services/NotificationService.cs index c286a277..22e4f7d3 100644 --- a/Oqtane.Client/Services/NotificationService.cs +++ b/Oqtane.Client/Services/NotificationService.cs @@ -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 diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs index e0431556..018b5f50 100644 --- a/Oqtane.Client/Services/PackageService.cs +++ b/Oqtane.Client/Services/PackageService.cs @@ -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 diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs index d3c813b0..28924e85 100644 --- a/Oqtane.Client/Services/PageModuleService.cs +++ b/Oqtane.Client/Services/PageModuleService.cs @@ -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 diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs index 07829178..9ad8cbbc 100644 --- a/Oqtane.Client/Services/PageService.cs +++ b/Oqtane.Client/Services/PageService.cs @@ -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 diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs index 227b37c1..c456423b 100644 --- a/Oqtane.Client/Services/ProfileService.cs +++ b/Oqtane.Client/Services/ProfileService.cs @@ -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 diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs index da5b5642..302d3271 100644 --- a/Oqtane.Client/Services/RoleService.cs +++ b/Oqtane.Client/Services/RoleService.cs @@ -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 diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs index a8ba70c2..cc308f5d 100644 --- a/Oqtane.Client/Services/SettingService.cs +++ b/Oqtane.Client/Services/SettingService.cs @@ -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 diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs index de62f802..6a5daff8 100644 --- a/Oqtane.Client/Services/SiteService.cs +++ b/Oqtane.Client/Services/SiteService.cs @@ -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 diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs index 3ef6761f..e1778bc4 100644 --- a/Oqtane.Client/Services/TenantService.cs +++ b/Oqtane.Client/Services/TenantService.cs @@ -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 diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs index 270b880f..a32dc5a8 100644 --- a/Oqtane.Client/Services/ThemeService.cs +++ b/Oqtane.Client/Services/ThemeService.cs @@ -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 diff --git a/Oqtane.Client/Services/UserRoleService.cs b/Oqtane.Client/Services/UserRoleService.cs index c6d95550..1927de33 100644 --- a/Oqtane.Client/Services/UserRoleService.cs +++ b/Oqtane.Client/Services/UserRoleService.cs @@ -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 diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs index 8636b90b..4e38b488 100644 --- a/Oqtane.Client/Services/UserService.cs +++ b/Oqtane.Client/Services/UserService.cs @@ -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 diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs index 1727b15f..332a8e3e 100644 --- a/Oqtane.Server/Controllers/AliasController.cs +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index cd6408fe..418c0829 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index a99b0fcd..cbb48fb8 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs index 05e66775..55ddceee 100644 --- a/Oqtane.Server/Controllers/InstallationController.cs +++ b/Oqtane.Server/Controllers/InstallationController.cs @@ -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/ diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs index 1d3088d6..0f5bdea3 100644 --- a/Oqtane.Server/Controllers/JobController.cs +++ b/Oqtane.Server/Controllers/JobController.cs @@ -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/ diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs index 03c8db95..2d9d4b7e 100644 --- a/Oqtane.Server/Controllers/JobLogController.cs +++ b/Oqtane.Server/Controllers/JobLogController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs index ca98b0ad..9942cf8b 100644 --- a/Oqtane.Server/Controllers/LogController.cs +++ b/Oqtane.Server/Controllers/LogController.cs @@ -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/?siteid=x&level=y&function=z&rows=50 @@ -43,7 +43,7 @@ namespace Oqtane.Controllers { if (ModelState.IsValid) { - _ogger.Log(Log); + _logger.Log(Log); } } } diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs index 9679f835..d2697ce1 100644 --- a/Oqtane.Server/Controllers/ModuleController.cs +++ b/Oqtane.Server/Controllers/ModuleController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 212a2773..51832744 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs index 78879821..cecc9216 100644 --- a/Oqtane.Server/Controllers/NotificationController.cs +++ b/Oqtane.Server/Controllers/NotificationController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 249b309b..ad404f8f 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs index 5b6f9e7d..c8e54a5d 100644 --- a/Oqtane.Server/Controllers/PageModuleController.cs +++ b/Oqtane.Server/Controllers/PageModuleController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs index 6fda81cc..b325fccf 100644 --- a/Oqtane.Server/Controllers/ProfileController.cs +++ b/Oqtane.Server/Controllers/ProfileController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index 74c7f87e..7de3ae22 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index 69996b05..5fcd65c4 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index 1642e1e1..ca4992c2 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs index 437260cb..61ecae8e 100644 --- a/Oqtane.Server/Controllers/TenantController.cs +++ b/Oqtane.Server/Controllers/TenantController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index 4ced2132..6ae226a7 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -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; } diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index a3becc52..e157062e 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -29,16 +29,16 @@ namespace Oqtane.Controllers private readonly IFolderRepository _folders; private readonly ILogManager _logger; - public UserController(IUserRepository Users, IRoleRepository Roles, IUserRoleRepository UserRoles, UserManager IdentityUserManager, SignInManager IdentitySignInManager, ITenantResolver Tenants, INotificationRepository Notifications, IFolderRepository Folders, ILogManager logger) + public UserController(IUserRepository users, IRoleRepository roles, IUserRoleRepository userRoles, UserManager identityUserManager, SignInManager 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; } diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 216cb93e..4817bcb5 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -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; } diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index a7d34f16..b375d21d 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -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; } diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs index 40853084..2130a5cd 100644 --- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs +++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs @@ -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 diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 67eb28eb..195e9c5b 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -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) diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs index ac0ab3af..30349611 100644 --- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs +++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs @@ -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"]); } } diff --git a/Oqtane.Server/Pages/Login.cshtml.cs b/Oqtane.Server/Pages/Login.cshtml.cs index 179cbe09..54958a67 100644 --- a/Oqtane.Server/Pages/Login.cshtml.cs +++ b/Oqtane.Server/Pages/Login.cshtml.cs @@ -10,22 +10,22 @@ namespace Oqtane.Pages public class LoginModel : PageModel { - private readonly UserManager IdentityUserManager; - private readonly SignInManager IdentitySignInManager; + private readonly UserManager _identityUserManager; + private readonly SignInManager _identitySignInManager; - public LoginModel(UserManager IdentityUserManager, SignInManager IdentitySignInManager) + public LoginModel(UserManager identityUserManager, SignInManager identitySignInManager) { - IdentityUserManager = IdentityUserManager; - IdentitySignInManager = IdentitySignInManager; + _identityUserManager = identityUserManager; + _identitySignInManager = identitySignInManager; } public async Task 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) diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs index 9395a75d..405d43ed 100644 --- a/Oqtane.Server/Repository/Context/DBContextBase.cs +++ b/Oqtane.Server/Repository/Context/DBContextBase.cs @@ -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; } diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs index 673aa110..5b67bb4a 100644 --- a/Oqtane.Server/Repository/FileRepository.cs +++ b/Oqtane.Server/Repository/FileRepository.cs @@ -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 GetFiles(int FolderId) diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs index 900f044b..f4a67d5a 100644 --- a/Oqtane.Server/Repository/FolderRepository.cs +++ b/Oqtane.Server/Repository/FolderRepository.cs @@ -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 GetFolders(int SiteId) diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index ed7c5ebe..0c4071a2 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -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 GetModuleDefinitions(int SiteId) diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index 31f51f9f..7abd0c34 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -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 GetModules(int SiteId) diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index 0696dfcc..8493c7f1 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -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 GetPageModules(int SiteId) diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index 29161d8f..4ef0ec09 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -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 GetPages(int SiteId) diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index 161703a0..f9edc3b6 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -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 GetPermissions(int SiteId, string EntityName) diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 69f26491..6b6db2c1 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -24,18 +24,18 @@ namespace Oqtane.Repository private readonly IServiceProvider _serviceProvider; private readonly List _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(); diff --git a/Oqtane.Server/Security/PermissionHandler.cs b/Oqtane.Server/Security/PermissionHandler.cs index 6a3249ef..1f47122b 100644 --- a/Oqtane.Server/Security/PermissionHandler.cs +++ b/Oqtane.Server/Security/PermissionHandler.cs @@ -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; } diff --git a/Oqtane.Server/Security/PermissionRequirement.cs b/Oqtane.Server/Security/PermissionRequirement.cs index a8b23280..7d5477ee 100644 --- a/Oqtane.Server/Security/PermissionRequirement.cs +++ b/Oqtane.Server/Security/PermissionRequirement.cs @@ -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; } } } diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index b1bca9a6..3ec92160 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -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)