From 7feee22b32aefaa55d2e7338212d7ff488f2c795 Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Sat, 14 Mar 2020 18:16:04 +0100 Subject: [PATCH] EntityNames replacements --- Oqtane.Client/Modules/Admin/Files/Edit.razor | 4 ++-- .../Modules/Admin/ModuleDefinitions/Edit.razor | 2 +- Oqtane.Server/Controllers/FileController.cs | 4 ++-- Oqtane.Server/Controllers/FolderController.cs | 6 +++--- Oqtane.Server/Controllers/ModuleController.cs | 10 +++++----- Oqtane.Server/Controllers/PageController.cs | 16 ++++++++-------- .../Controllers/PageModuleController.cs | 16 ++++++++-------- Oqtane.Server/Controllers/SettingController.cs | 16 ++++++++-------- Oqtane.Server/Controllers/SiteController.cs | 2 +- Oqtane.Server/Controllers/UserController.cs | 2 +- Oqtane.Server/Controllers/UserRoleController.cs | 6 +++--- Oqtane.Shared/Shared/EntityNames.cs | 13 +++++++++++++ 12 files changed, 55 insertions(+), 42 deletions(-) create mode 100644 Oqtane.Shared/Shared/EntityNames.cs diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index d6c642ad..bbe37f9b 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -100,12 +100,12 @@ } else { - parentid = folders[0].FolderId; + _parentId = _folders[0].FolderId; List permissionstrings = new List(); permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.Browse, Permissions = Constants.AdminRole }); permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = Constants.AdminRole }); permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole }); - permissions = UserSecurity.SetPermissionStrings(permissionstrings); + _permissions = UserSecurity.SetPermissionStrings(permissionstrings); } } catch (Exception ex) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index 61a61b7b..3b4ad4df 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -17,7 +17,7 @@ - + diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index aed3deb6..ea02c5ba 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -120,7 +120,7 @@ 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, PermissionNames.Edit)) + if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, File.Folder.FolderId, PermissionNames.Edit)) { File = _files.UpdateFile(File); _logger.Log(LogLevel.Information, this, LogFunction.Update, "File Updated {File}", File); @@ -140,7 +140,7 @@ namespace Oqtane.Controllers public void Delete(int id) { Models.File file = _files.GetFile(id); - if (_userPermissions.IsAuthorized(User, "Folder", file.Folder.FolderId, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Folder, file.Folder.FolderId, PermissionNames.Edit)) { _files.DeleteFile(id); diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index 54c5eba9..24da6e17 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -124,7 +124,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public Folder Put(int id, [FromBody] Folder Folder) { - if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Folder", Folder.FolderId, PermissionNames.Edit)) + if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, Folder.FolderId, PermissionNames.Edit)) { if (string.IsNullOrEmpty(Folder.Path) && Folder.ParentId != null) { @@ -148,7 +148,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public void Put(int siteid, int folderid, int? parentid) { - if (_userPermissions.IsAuthorized(User, "Folder", folderid, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Folder, folderid, PermissionNames.Edit)) { int order = 1; List folders = _folders.GetFolders(siteid).ToList(); @@ -175,7 +175,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public void Delete(int id) { - if (_userPermissions.IsAuthorized(User, "Folder", id, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Folder, id, PermissionNames.Edit)) { _folders.DeleteFolder(id); _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Folder Deleted {FolderId}", id); diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs index 431167d3..40df2585 100644 --- a/Oqtane.Server/Controllers/ModuleController.cs +++ b/Oqtane.Server/Controllers/ModuleController.cs @@ -89,7 +89,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public Models.Module Post([FromBody] Models.Module Module) { - if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Page", Module.PageId, PermissionNames.Edit)) + if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, Module.PageId, PermissionNames.Edit)) { Module = _modules.AddModule(Module); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Added {Module}", Module); @@ -108,7 +108,7 @@ 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, PermissionNames.Edit)) + if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, Module.ModuleId, PermissionNames.Edit)) { Module = _modules.UpdateModule(Module); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", Module); @@ -127,7 +127,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public void Delete(int id) { - if (_userPermissions.IsAuthorized(User, "Module", id, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Module, id, PermissionNames.Edit)) { _modules.DeleteModule(id); _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleId}", id); @@ -145,7 +145,7 @@ namespace Oqtane.Controllers public string Export(int moduleid) { string content = ""; - if (_userPermissions.IsAuthorized(User, "Module", moduleid, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Module, moduleid, PermissionNames.Edit)) { content = _modules.ExportModule(moduleid); } @@ -163,7 +163,7 @@ namespace Oqtane.Controllers public bool Import(int moduleid, [FromBody] string Content) { bool success = false; - if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Module", moduleid, PermissionNames.Edit)) + if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, moduleid, PermissionNames.Edit)) { success = _modules.ImportModule(moduleid, Content); } diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 371c15d6..f7167a38 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -116,7 +116,7 @@ namespace Oqtane.Controllers if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions)) { Page = _pages.AddPage(Page); - _syncManager.AddSyncEvent("Site", Page.SiteId); + _syncManager.AddSyncEvent(EntityNames.Site, Page.SiteId); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Added {Page}", Page); } else @@ -156,7 +156,7 @@ namespace Oqtane.Controllers page.IsPersonalizable = false; page.UserId = int.Parse(userid); page = _pages.AddPage(page); - _syncManager.AddSyncEvent("Site", page.SiteId); + _syncManager.AddSyncEvent(EntityNames.Site, page.SiteId); // copy modules List pagemodules = _pageModules.GetPageModules(page.SiteId).ToList(); @@ -197,10 +197,10 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public Page Put(int id, [FromBody] Page Page) { - if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Page", Page.PageId, PermissionNames.Edit)) + if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, Page.PageId, PermissionNames.Edit)) { Page = _pages.UpdatePage(Page); - _syncManager.AddSyncEvent("Site", Page.SiteId); + _syncManager.AddSyncEvent(EntityNames.Site, Page.SiteId); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", Page); } else @@ -217,7 +217,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public void Put(int siteid, int pageid, int? parentid) { - if (_userPermissions.IsAuthorized(User, "Page", pageid, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit)) { int order = 1; List pages = _pages.GetPages(siteid).ToList(); @@ -230,7 +230,7 @@ namespace Oqtane.Controllers } order += 2; } - _syncManager.AddSyncEvent("Site", siteid); + _syncManager.AddSyncEvent(EntityNames.Site, siteid); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Order Updated {SiteId} {PageId} {ParentId}", siteid, pageid, parentid); } else @@ -246,10 +246,10 @@ namespace Oqtane.Controllers public void Delete(int id) { Page page = _pages.GetPage(id); - if (_userPermissions.IsAuthorized(User, "Page", page.PageId, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit)) { _pages.DeletePage(page.PageId); - _syncManager.AddSyncEvent("Site", page.SiteId); + _syncManager.AddSyncEvent(EntityNames.Site, page.SiteId); _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Deleted {PageId}", page.PageId); } else diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs index 71fdaeaf..265a3f00 100644 --- a/Oqtane.Server/Controllers/PageModuleController.cs +++ b/Oqtane.Server/Controllers/PageModuleController.cs @@ -67,10 +67,10 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public PageModule Post([FromBody] PageModule PageModule) { - if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Page", PageModule.PageId, PermissionNames.Edit)) + if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, PageModule.PageId, PermissionNames.Edit)) { PageModule = _pageModules.AddPageModule(PageModule); - _syncManager.AddSyncEvent("Page", PageModule.PageId); + _syncManager.AddSyncEvent(EntityNames.Page, PageModule.PageId); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Module Added {PageModule}", PageModule); } else @@ -87,10 +87,10 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public PageModule Put(int id, [FromBody] PageModule PageModule) { - if (ModelState.IsValid && _userPermissions.IsAuthorized(User, "Module", PageModule.ModuleId, PermissionNames.Edit)) + if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, PageModule.ModuleId, PermissionNames.Edit)) { PageModule = _pageModules.UpdatePageModule(PageModule); - _syncManager.AddSyncEvent("Page", PageModule.PageId); + _syncManager.AddSyncEvent(EntityNames.Page, PageModule.PageId); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Updated {PageModule}", PageModule); } else @@ -107,7 +107,7 @@ namespace Oqtane.Controllers [Authorize(Roles = Constants.RegisteredRole)] public void Put(int pageid, string pane) { - if (_userPermissions.IsAuthorized(User, "Page", pageid, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit)) { int order = 1; List pagemodules = _pageModules.GetPageModules(pageid, pane).OrderBy(item => item.Order).ToList(); @@ -120,7 +120,7 @@ namespace Oqtane.Controllers } order += 2; } - _syncManager.AddSyncEvent("Page", pageid); + _syncManager.AddSyncEvent(EntityNames.Page, pageid); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Order Updated {PageId} {Pane}", pageid, pane); } else @@ -136,10 +136,10 @@ namespace Oqtane.Controllers public void Delete(int id) { PageModule pagemodule = _pageModules.GetPageModule(id); - if (_userPermissions.IsAuthorized(User, "Page", pagemodule.PageId, PermissionNames.Edit)) + if (_userPermissions.IsAuthorized(User, EntityNames.Page, pagemodule.PageId, PermissionNames.Edit)) { _pageModules.DeletePageModule(id); - _syncManager.AddSyncEvent("Page", pagemodule.PageId); + _syncManager.AddSyncEvent(EntityNames.Page, pagemodule.PageId); _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Module Deleted {PageModuleId}", id); } else diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index e0a95d4e..c0a8571d 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -116,25 +116,25 @@ namespace Oqtane.Controllers private bool IsAuthorized(string EntityName, int EntityId, string PermissionName) { bool authorized = false; - if (EntityName == "PageModule") + if (EntityName == EntityNames.PageModule) { - EntityName = "Module"; + EntityName = EntityNames.Module; EntityId = _pageModules.GetPageModule(EntityId).ModuleId; } switch (EntityName) { - case "Host": + case EntityNames.Host: authorized = User.IsInRole(Constants.HostRole); break; - case "Site": + case EntityNames.Site: authorized = User.IsInRole(Constants.AdminRole); break; - case "Page": - case "Module": - case "Folder": + case EntityNames.Page: + case EntityNames.Module: + case EntityNames.Folder: authorized = _userPermissions.IsAuthorized(User, EntityName, EntityId, PermissionName); break; - case "User": + case EntityNames.User: authorized = true; if (PermissionName == PermissionNames.Edit) { diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index 361da726..47939bf4 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -79,7 +79,7 @@ namespace Oqtane.Controllers if (ModelState.IsValid) { Site = _sites.UpdateSite(Site); - _syncManager.AddSyncEvent("Site", Site.SiteId); + _syncManager.AddSyncEvent(EntityNames.Site, Site.SiteId); _logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", Site); } return Site; diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index 5c24186e..c338a0cc 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -187,7 +187,7 @@ namespace Oqtane.Controllers } } User = _users.UpdateUser(User); - _syncManager.AddSyncEvent("User", User.UserId); + _syncManager.AddSyncEvent(EntityNames.User, User.UserId); User.Password = ""; // remove sensitive information _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Updated {User}", User); } diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 28e3e7fa..7345beb9 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -46,7 +46,7 @@ namespace Oqtane.Controllers if (ModelState.IsValid) { UserRole = _userRoles.AddUserRole(UserRole); - _syncManager.AddSyncEvent("User", UserRole.UserId); + _syncManager.AddSyncEvent(EntityNames.User, UserRole.UserId); _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", UserRole); } return UserRole; @@ -60,7 +60,7 @@ namespace Oqtane.Controllers if (ModelState.IsValid) { UserRole = _userRoles.UpdateUserRole(UserRole); - _syncManager.AddSyncEvent("User", UserRole.UserId); + _syncManager.AddSyncEvent(EntityNames.User, UserRole.UserId); _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", UserRole); } return UserRole; @@ -73,7 +73,7 @@ namespace Oqtane.Controllers { UserRole userRole = _userRoles.GetUserRole(id); _userRoles.DeleteUserRole(id); - _syncManager.AddSyncEvent("User", userRole.UserId); + _syncManager.AddSyncEvent(EntityNames.User, userRole.UserId); _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); } } diff --git a/Oqtane.Shared/Shared/EntityNames.cs b/Oqtane.Shared/Shared/EntityNames.cs new file mode 100644 index 00000000..ffff34f0 --- /dev/null +++ b/Oqtane.Shared/Shared/EntityNames.cs @@ -0,0 +1,13 @@ +namespace Oqtane.Shared +{ + public class EntityNames + { + public const string Module = "Module"; + public const string PageModule = "PageModule"; + public const string Host = "Host"; + public const string Site = "Site"; + public const string Page = "Page"; + public const string Folder = "Folder"; + public const string User = "User"; + } +}