diff --git a/Moonlight.ApiServer/Http/Controllers/Admin/Users/UsersController.cs b/Moonlight.ApiServer/Http/Controllers/Admin/Users/UsersController.cs index 9d02396d..d583a5f0 100644 --- a/Moonlight.ApiServer/Http/Controllers/Admin/Users/UsersController.cs +++ b/Moonlight.ApiServer/Http/Controllers/Admin/Users/UsersController.cs @@ -44,7 +44,8 @@ public class UsersController : Controller { Id = x.Id, Email = x.Email, - Username = x.Username + Username = x.Username, + PermissionsJson = x.PermissionsJson }) .ToArray(); @@ -73,7 +74,8 @@ public class UsersController : Controller { Id = user.Id, Email = user.Email, - Username = user.Username + Username = user.Username, + PermissionsJson = user.PermissionsJson }; } @@ -108,7 +110,8 @@ public class UsersController : Controller { Id = finalUser.Id, Email = finalUser.Email, - Username = finalUser.Username + Username = finalUser.Username, + PermissionsJson = finalUser.PermissionsJson }; } @@ -138,12 +141,17 @@ public class UsersController : Controller if (!string.IsNullOrEmpty(request.Password)) { user.Password = HashHelper.Hash(request.Password); - user.TokenValidTimestamp = DateTime.UtcNow; // This change will get applied by the crud helper + user.TokenValidTimestamp = DateTime.UtcNow; // Log out user after password change + } + + if (user.PermissionsJson != request.PermissionsJson) + { + user.PermissionsJson = request.PermissionsJson; + user.TokenValidTimestamp = DateTime.UtcNow; // Log out user after permission change } user.Email = request.Email; user.Username = request.Username; - // TODO: Add permissions update here await UserRepository.Update(user); @@ -151,7 +159,8 @@ public class UsersController : Controller { Id = user.Id, Email = user.Email, - Username = user.Username + Username = user.Username, + PermissionsJson = user.PermissionsJson }; } diff --git a/Moonlight.Client/UI/Views/Admin/Users/Update.razor b/Moonlight.Client/UI/Views/Admin/Users/Update.razor index bd4ef88a..eed54284 100644 --- a/Moonlight.Client/UI/Views/Admin/Users/Update.razor +++ b/Moonlight.Client/UI/Views/Admin/Users/Update.razor @@ -35,6 +35,12 @@ +