From 6e5496e9699ee74d7657aa79ec74287e6eb31fb2 Mon Sep 17 00:00:00 2001 From: hishamco Date: Wed, 21 Apr 2021 16:41:24 +0300 Subject: [PATCH 1/6] Exclude English from the languages list --- Oqtane.Client/Modules/Admin/Languages/Add.razor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor index 7efbcf85..59115679 100644 --- a/Oqtane.Client/Modules/Admin/Languages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor @@ -61,6 +61,10 @@ else { AddModuleMessage(Localizer["The Only Supported Culture That Has Been Defined Is English"], MessageType.Warning); } + else + { + _supportedCultures = _supportedCultures.Where(c => !c.Name.Equals(Constants.DefaultCulture)); + } } private async Task SaveLanguage() From c52f6c92f1e10275d32bcb761a087d7e5ce4cb11 Mon Sep 17 00:00:00 2001 From: hishamco Date: Wed, 21 Apr 2021 17:47:50 +0300 Subject: [PATCH 2/6] Add English to the language switcher --- Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor index bd4ac6fc..64b1d196 100644 --- a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor +++ b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor @@ -27,6 +27,10 @@ protected override async Task OnParametersSetAsync() { var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId); + var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture); + + languages.Add(new Language { Code = defaultCulture.Name, Name = defaultCulture.DisplayName }); + _supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name }); } From 2780e4d02936826ad2a07b19d8d0bf56cbc33847 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Wed, 21 Apr 2021 19:31:02 -0400 Subject: [PATCH 3/6] modify nuget package installer to support satellite assemblies in subfolders --- .../Themes/OqtaneTheme/Themes/Default.razor | 6 +- .../OqtaneTheme/Themes/ThemeSettings.razor | 4 +- .../Infrastructure/InstallationManager.cs | 59 ++++++++++--------- .../Oqtane.Themes.OqtaneTheme/Theme.css | 1 + 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor index e2ff2270..3de4b465 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor @@ -93,10 +93,14 @@ @if (_footer) { -
+
} + else + { + + }
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor index baaa940f..05d0351b 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor @@ -7,10 +7,10 @@ @@ -140,9 +140,10 @@ else await UserRoleService.AddUserRoleAsync(userrole); } - await GetUserRoles(); await logger.LogInformation("User Assigned To Role {UserRole}", userrole); AddModuleMessage(Localizer["User Assigned To Role"], MessageType.Success); + await GetUserRoles(); + StateHasChanged(); } else { @@ -161,9 +162,10 @@ else try { await UserRoleService.DeleteUserRoleAsync(UserRoleId); - await GetUserRoles(); await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); AddModuleMessage(Localizer["User Removed From Role"], MessageType.Success); + await GetUserRoles(); + StateHasChanged(); } catch (Exception ex) { diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index 89b1e775..176050d3 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -131,26 +131,34 @@ { if (password == confirm) { - var user = new User(); - user.SiteId = PageState.Site.SiteId; - user.Username = username; - user.Password = password; - user.Email = email; - user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname; - user.PhotoFileId = null; - - user = await UserService.AddUserAsync(user); - - if (user != null) + var user = await UserService.GetUserAsync(username, PageState.Site.SiteId); + if (user == null) { - await SettingService.UpdateUserSettingsAsync(settings, user.UserId); - await logger.LogInformation("User Created {User}", user); - NavigationManager.NavigateTo(NavigateUrl()); + user = new User(); + user.SiteId = PageState.Site.SiteId; + user.Username = username; + user.Password = password; + user.Email = email; + user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname; + user.PhotoFileId = null; + + user = await UserService.AddUserAsync(user); + + if (user != null) + { + await SettingService.UpdateUserSettingsAsync(settings, user.UserId); + await logger.LogInformation("User Created {User}", user); + NavigationManager.NavigateTo(NavigateUrl()); + } + else + { + await logger.LogError("Error Adding User {Username} {Email}", username, email); + AddModuleMessage(Localizer["Error Adding User. Please Ensure Password Meets Complexity Requirements And Username And Email Are Not Already In Use."], MessageType.Error); + } } else { - await logger.LogError("Error Adding User {Username} {Email}", username, email); - AddModuleMessage(Localizer["Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use."], MessageType.Error); + AddModuleMessage(Localizer["Username Already Exists"], MessageType.Warning); } } else diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index e648083f..6b74a277 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -13,10 +13,15 @@ } else { - - -
- +
+
+ +
+
+
+   +
+
@@ -31,7 +36,10 @@ else
@@ -92,7 +92,14 @@ else userid = Int32.Parse(PageState.QueryString["id"]); User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId); name = user.DisplayName; - roles = await RoleService.GetRolesAsync(PageState.Site.SiteId); + if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) + { + roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true); + } + else + { + roles = await RoleService.GetRolesAsync(PageState.Site.SiteId); + } await GetUserRoles(); } catch (Exception ex) @@ -171,9 +178,10 @@ else await UserRoleService.AddUserRoleAsync(userrole); } - await GetUserRoles(); await logger.LogInformation("User Assigned To Role {UserRole}", userrole); AddModuleMessage(Localizer["User Assigned To Role"], MessageType.Success); + await GetUserRoles(); + StateHasChanged(); } else { @@ -192,9 +200,10 @@ else try { await UserRoleService.DeleteUserRoleAsync(UserRoleId); - await GetUserRoles(); await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); AddModuleMessage(Localizer["User Removed From Role"], MessageType.Success); + await GetUserRoles(); + StateHasChanged(); } catch (Exception ex) { diff --git a/Oqtane.Client/Services/Interfaces/IRoleService.cs b/Oqtane.Client/Services/Interfaces/IRoleService.cs index 23ae0d05..66edc8de 100644 --- a/Oqtane.Client/Services/Interfaces/IRoleService.cs +++ b/Oqtane.Client/Services/Interfaces/IRoleService.cs @@ -1,4 +1,4 @@ -using Oqtane.Models; +using Oqtane.Models; using System.Collections.Generic; using System.Threading.Tasks; @@ -8,6 +8,8 @@ namespace Oqtane.Services { Task> GetRolesAsync(int siteId); + Task> GetRolesAsync(int siteId, bool includeGlobalRoles); + Task GetRoleAsync(int roleId); Task AddRoleAsync(Role role); diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs index d304edf3..5d29dcd3 100644 --- a/Oqtane.Client/Services/RoleService.cs +++ b/Oqtane.Client/Services/RoleService.cs @@ -1,4 +1,4 @@ -using Oqtane.Models; +using Oqtane.Models; using System.Threading.Tasks; using System.Net.Http; using System.Linq; @@ -22,7 +22,12 @@ namespace Oqtane.Services public async Task> GetRolesAsync(int siteId) { - List roles = await GetJsonAsync>($"{Apiurl}?siteid={siteId}"); + return await GetRolesAsync(siteId, false); + } + + public async Task> GetRolesAsync(int siteId, bool includeGlobalRoles) + { + List roles = await GetJsonAsync>($"{Apiurl}?siteid={siteId}&global={includeGlobalRoles}"); return roles.OrderBy(item => item.Name).ToList(); } diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index 708e20c3..d04a59cb 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; using Oqtane.Enums; @@ -21,12 +21,16 @@ namespace Oqtane.Controllers _logger = logger; } - // GET: api/?siteid=x + // GET: api/?siteid=x&global=true/false [HttpGet] [Authorize(Roles = RoleNames.Registered)] - public IEnumerable Get(string siteid) + public IEnumerable Get(string siteid, string global) { - return _roles.GetRoles(int.Parse(siteid)); + if (string.IsNullOrEmpty(global)) + { + global = "false"; + } + return _roles.GetRoles(int.Parse(siteid), bool.Parse(global)); } // GET api//5 diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 11c875de..437c1e9e 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; using Oqtane.Enums; @@ -6,6 +6,7 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure; using Oqtane.Repository; +using System.Linq; namespace Oqtane.Controllers { @@ -13,13 +14,15 @@ namespace Oqtane.Controllers public class UserRoleController : Controller { private readonly IUserRoleRepository _userRoles; + private readonly IRoleRepository _roles; private readonly ITenantResolver _tenants; private readonly ISyncManager _syncManager; private readonly ILogManager _logger; - public UserRoleController(IUserRoleRepository userRoles, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger) + public UserRoleController(IUserRoleRepository userRoles, IRoleRepository roles, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger) { _userRoles = userRoles; + _roles = roles; _syncManager = syncManager; _tenants = tenants; _logger = logger; @@ -46,8 +49,13 @@ namespace Oqtane.Controllers [Authorize(Roles = RoleNames.Admin)] public UserRole Post([FromBody] UserRole userRole) { - if (ModelState.IsValid) + var role = _roles.GetRole(userRole.RoleId); + if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host)) { + if (role.Name == RoleNames.Host) + { + _userRoles.DeleteUserRoles(userRole.UserId); + } userRole = _userRoles.AddUserRole(userRole); _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); @@ -60,7 +68,8 @@ namespace Oqtane.Controllers [Authorize(Roles = RoleNames.Admin)] public UserRole Put(int id, [FromBody] UserRole userRole) { - if (ModelState.IsValid) + var role = _roles.GetRole(userRole.RoleId); + if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host)) { userRole = _userRoles.UpdateUserRole(userRole); _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); @@ -75,9 +84,17 @@ namespace Oqtane.Controllers public void Delete(int id) { UserRole userRole = _userRoles.GetUserRole(id); - _userRoles.DeleteUserRole(id); - _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); + if (User.IsInRole(RoleNames.Host) || userRole.Role.Name != RoleNames.Host) + { + _userRoles.DeleteUserRole(id); + if (userRole.Role.Name == RoleNames.Host) + { + var role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Registered); + _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); + } + _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); + } } } } diff --git a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs index c46a0e50..b26eb5dc 100644 --- a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Oqtane.Models; namespace Oqtane.Repository @@ -11,5 +11,6 @@ namespace Oqtane.Repository UserRole UpdateUserRole(UserRole userRole); UserRole GetUserRole(int userRoleId); void DeleteUserRole(int userRoleId); + void DeleteUserRoles(int userId); } } diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index b376b470..f3974ba8 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -649,9 +649,9 @@ namespace Oqtane.Repository _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Admin, 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}); + {SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = false, 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}); + {SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder = 2, MaxLength = 50, DefaultValue = "", IsRequired = false, 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( diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs index b47bd6f7..d62156f5 100644 --- a/Oqtane.Server/Repository/UserRoleRepository.cs +++ b/Oqtane.Server/Repository/UserRoleRepository.cs @@ -58,5 +58,14 @@ namespace Oqtane.Repository _db.UserRole.Remove(userRole); _db.SaveChanges(); } + + public void DeleteUserRoles(int userId) + { + foreach (UserRole userRole in _db.UserRole.Where(item => item.Role.SiteId != null)) + { + _db.UserRole.Remove(userRole); + } + _db.SaveChanges(); + } } } From 5a519510a90018e021ee24f3b40ff93a1bad830a Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Fri, 23 Apr 2021 16:29:18 -0400 Subject: [PATCH 5/6] improve comments and logging --- .../Controllers/UserRoleController.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 437c1e9e..d8fa360b 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -52,13 +52,17 @@ namespace Oqtane.Controllers var role = _roles.GetRole(userRole.RoleId); if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host)) { + userRole = _userRoles.AddUserRole(userRole); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); + if (role.Name == RoleNames.Host) { + // host roles can only exist at global level - remove all site specific user roles _userRoles.DeleteUserRoles(userRole.UserId); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Roles Deleted For UserId {UserId}", userRole.UserId); } - userRole = _userRoles.AddUserRole(userRole); + _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); } return userRole; } @@ -87,13 +91,20 @@ namespace Oqtane.Controllers if (User.IsInRole(RoleNames.Host) || userRole.Role.Name != RoleNames.Host) { _userRoles.DeleteUserRole(id); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); + if (userRole.Role.Name == RoleNames.Host) { + // add site specific user roles to preserve user access var role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Registered); - _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); + userRole = _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Added {UserRole}", userRole); + role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Admin); + userRole = _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Added {UserRole}", userRole); } + _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); } } } From d42c7a5ea5f7c7251c50d018177ed6c6763fd1ca Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Sat, 24 Apr 2021 13:47:20 -0400 Subject: [PATCH 6/6] user and role management improvements --- Oqtane.Client/Modules/Admin/Roles/Users.razor | 6 +++++- Oqtane.Client/Modules/Admin/Users/Index.razor | 5 +---- Oqtane.Client/Modules/Admin/Users/Roles.razor | 10 ++++++---- Oqtane.Server/Controllers/RoleController.cs | 10 +++++++--- Oqtane.Server/Controllers/UserRoleController.cs | 12 ++++++------ Oqtane.Server/Repository/RoleRepository.cs | 13 ++++++++++--- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index 16ab3a5e..c8049b18 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -58,12 +58,16 @@ else
+ + + + diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index 6b74a277..4245c649 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -36,10 +36,7 @@ else + + + + @@ -95,6 +96,7 @@ else if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) { roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true); + roles = roles.Where(item => item.Name != RoleNames.Everyone).ToList(); } else { diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index d04a59cb..0e842509 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -28,7 +28,7 @@ namespace Oqtane.Controllers { if (string.IsNullOrEmpty(global)) { - global = "false"; + global = "False"; } return _roles.GetRoles(int.Parse(siteid), bool.Parse(global)); } @@ -72,8 +72,12 @@ namespace Oqtane.Controllers [Authorize(Roles = RoleNames.Admin)] public void Delete(int id) { - _roles.DeleteRole(id); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Role Deleted {RoleId}", id); + var role = _roles.GetRole(id); + if (!role.IsSystem) + { + _roles.DeleteRole(id); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Role Deleted {RoleId}", id); + } } } } diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index d8fa360b..f7d9059d 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -52,16 +52,16 @@ namespace Oqtane.Controllers var role = _roles.GetRole(userRole.RoleId); if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host)) { - userRole = _userRoles.AddUserRole(userRole); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); - if (role.Name == RoleNames.Host) { // host roles can only exist at global level - remove all site specific user roles _userRoles.DeleteUserRoles(userRole.UserId); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Roles Deleted For UserId {UserId}", userRole.UserId); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Roles Deleted For UserId {UserId}", userRole.UserId); } + userRole = _userRoles.AddUserRole(userRole); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); + _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); } return userRole; @@ -98,10 +98,10 @@ namespace Oqtane.Controllers // add site specific user roles to preserve user access var role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Registered); userRole = _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Added {UserRole}", userRole); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Admin); userRole = _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Added {UserRole}", userRole); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); } _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs index f41cc31f..b8afb4a4 100644 --- a/Oqtane.Server/Repository/RoleRepository.cs +++ b/Oqtane.Server/Repository/RoleRepository.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; @@ -16,12 +16,19 @@ namespace Oqtane.Repository public IEnumerable GetRoles(int siteId) { - return _db.Role.Where(item => item.SiteId == siteId); + return GetRoles(siteId, false); } public IEnumerable GetRoles(int siteId, bool includeGlobalRoles) { - return _db.Role.Where(item => item.SiteId == siteId || item.SiteId == null); + if (includeGlobalRoles) + { + return _db.Role.Where(item => item.SiteId == siteId || item.SiteId == null); + } + else + { + return _db.Role.Where(item => item.SiteId == siteId); + } } public Role AddRole(Role role)
- + - diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index 3962baf5..ef3b0b7e 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -38,7 +38,7 @@ namespace Oqtane.Infrastructure public static bool InstallPackages(string folders, string webRootPath, string contentRootPath) { bool install = false; - string binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); + string binPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); foreach (string folder in folders.Split(',')) { @@ -82,40 +82,37 @@ namespace Oqtane.Infrastructure List assets = new List(); bool manifest = false; - // module and theme packages must be in form of name.1.0.0.nupkg + // packages are in form of name.1.0.0.nupkg or name.culture.1.0.0.nupkg string name = Path.GetFileNameWithoutExtension(packagename); string[] segments = name?.Split('.'); - if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3); + if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3); // remove version information // deploy to appropriate locations foreach (ZipArchiveEntry entry in archive.Entries) { - string foldername = Path.GetDirectoryName(entry.FullName).Split(Path.DirectorySeparatorChar)[0]; - string filename = Path.GetFileName(entry.FullName); + string filename = ""; - if (!manifest && filename == "assets.json") + // evaluate entry root folder + switch (entry.FullName.Split('/')[0]) { - manifest = true; + case "lib": // lib/net5.0/... + filename = ExtractFile(entry, binPath, 2); + break; + case "wwwroot": // wwwroot/... + filename = ExtractFile(entry, webRootPath, 1); + break; + case "runtimes": // runtimes/name/... + filename = ExtractFile(entry, binPath, 0); + break; } - switch (foldername) + if (filename != "") { - case "lib": - filename = Path.Combine(binFolder, filename); - ExtractFile(entry, filename); - assets.Add(filename.Replace(contentRootPath, "")); - break; - case "wwwroot": - filename = Path.Combine(webRootPath, Utilities.PathCombine(entry.FullName.Replace("wwwroot/", "").Split('/'))); - ExtractFile(entry, filename); - assets.Add(filename.Replace(contentRootPath, "")); - break; - case "runtimes": - var destSubFolder = Path.GetDirectoryName(entry.FullName); - filename = Path.Combine(binFolder, destSubFolder, filename); - ExtractFile(entry, filename); - assets.Add(filename.Replace(contentRootPath, "")); - break; + assets.Add(filename.Replace(contentRootPath, "")); + if (!manifest && Path.GetFileName(filename) == "assets.json") + { + manifest = true; + } } } @@ -145,21 +142,25 @@ namespace Oqtane.Infrastructure return install; } - private static void ExtractFile(ZipArchiveEntry entry, string filename) + private static string ExtractFile(ZipArchiveEntry entry, string folder, int ignoreLeadingSegments) { - if (!Directory.Exists(Path.GetDirectoryName(filename))) - { - Directory.CreateDirectory(Path.GetDirectoryName(filename)); - } + string[] segments = entry.FullName.Split('/'); // ZipArchiveEntries always use unix path separator + string filename = Path.Combine(folder, string.Join(Path.DirectorySeparatorChar, segments, ignoreLeadingSegments, segments.Length - ignoreLeadingSegments)); try { + if (!Directory.Exists(Path.GetDirectoryName(filename))) + { + Directory.CreateDirectory(Path.GetDirectoryName(filename)); + } entry.ExtractToFile(filename, true); } catch { // an error occurred extracting the file + filename = ""; } + return filename; } public void UpgradeFramework() diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css index a4c5f957..e95b6d11 100644 --- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css +++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css @@ -55,6 +55,7 @@ div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu min-height: 40px; text-align: center; color: #ffffff; + z-index: 1000; } @media (max-width: 767px) { From 9d083726be86e81b8f238fce987f14c5d10cdd09 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Fri, 23 Apr 2021 16:11:35 -0400 Subject: [PATCH 4/6] user and role management improvements --- Oqtane.Client/Modules/Admin/Roles/Users.razor | 8 ++-- Oqtane.Client/Modules/Admin/Users/Add.razor | 40 +++++++++++-------- Oqtane.Client/Modules/Admin/Users/Index.razor | 38 +++++++++++------- Oqtane.Client/Modules/Admin/Users/Roles.razor | 23 +++++++---- .../Services/Interfaces/IRoleService.cs | 4 +- Oqtane.Client/Services/RoleService.cs | 9 ++++- Oqtane.Server/Controllers/RoleController.cs | 12 ++++-- .../Controllers/UserRoleController.cs | 31 ++++++++++---- .../Interfaces/IUserRoleRepository.cs | 3 +- Oqtane.Server/Repository/SiteRepository.cs | 4 +- .../Repository/UserRoleRepository.cs | 9 +++++ 11 files changed, 123 insertions(+), 58 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index b9dcd431..16ab3a5e 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -63,7 +63,7 @@ else @context.User.DisplayName - + - + @if (context.Role.Name != RoleNames.Host) + { + + } @@ -57,19 +65,19 @@ else private List Search(string search) { + var results = allroles.Where(item => item.Role.Name == RoleNames.Registered || (item.Role.Name == RoleNames.Host && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))); + if (string.IsNullOrEmpty(_search)) { - return allroles.Where(item => item.Role.Name == RoleNames.Registered).ToList(); + results = results.Where(item => + ( + item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) || + item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) || + item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase) + ) + ); } - return allroles - .Where(item => item.Role.Name == RoleNames.Registered && - ( - item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) || - item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) || - item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase) - ) - ) - .ToList(); + return results.ToList(); } private async Task OnSearch() diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 037daabb..03d9e32e 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -64,10 +64,10 @@ else @context.Role.Name - @if (context.Role.Name != RoleNames.Registered) - { - - } + @if (context.Role.Name != RoleNames.Registered && (context.Role.Name != RoleNames.Host || userid != PageState.User.UserId)) + { + + } @Localizer["Users"]@Localizer["Effective"]@Localizer["Expiry"]   @context.User.DisplayName@context.EffectiveDate@context.ExpiryDate - + - @if (context.Role.Name != RoleNames.Host) - { - - } + diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 03d9e32e..13c4e780 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -59,15 +59,16 @@ else
@Localizer["Roles"]@Localizer["Effective"]@Localizer["Expiry"]   @context.Role.Name@context.EffectiveDate@context.ExpiryDate - @if (context.Role.Name != RoleNames.Registered && (context.Role.Name != RoleNames.Host || userid != PageState.User.UserId)) - { - - } +