Innovenergy
/
Innovenergy_trunk
3
1
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fixed issue failed to change user name in frontend

This commit is contained in:
Yinyin Liu 2026-02-26 15:17:48 +01:00
parent 075624717d
commit e5b910238f
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
csharp/App/Backend/DataTypes/Methods/Session.cs
View File

@ -376,8 +376,7 @@ public static class SessionMethods
&& sessionUser.HasAccessTo(originalUser) && sessionUser.HasAccessTo(originalUser)
&& editedUser && editedUser
.WithParentOf(originalUser) // prevent moving .WithParentOf(originalUser) // prevent moving
.WithNameOf(originalUser) .WithPasswordOf(originalUser)
.WithPasswordOf(originalUser)
.Apply(Db.Update); .Apply(Db.Update);
} }
@ -473,24 +472,24 @@ public static class SessionMethods
public static Boolean RevokeUserAccessTo(this Session? session, User? user, Installation? installation) public static Boolean RevokeUserAccessTo(this Session? session, User? user, Installation? installation)
{ {
var sessionUser = session?.User; var sessionUser = session?.User;
return sessionUser is not null return sessionUser is not null
&& installation is not null && installation is not null
&& user is not null && user is not null
&& user.IsDescendantOf(sessionUser) && (user.IsDescendantOf(sessionUser) || sessionUser.UserType == 2)
&& sessionUser.HasAccessTo(installation) && sessionUser.HasAccessTo(installation)
&& user.HasAccessTo(installation) && user.HasAccessTo(installation)
&& Db.InstallationAccess.Delete(a => a.UserId == user.Id && a.InstallationId == installation.Id) > 0; && Db.InstallationAccess.Delete(a => a.UserId == user.Id && a.InstallationId == installation.Id) > 0;
} }
public static Boolean RevokeUserAccessTo(this Session? session, User? user, Folder? folder) public static Boolean RevokeUserAccessTo(this Session? session, User? user, Folder? folder)
{ {
var sessionUser = session?.User; var sessionUser = session?.User;
return sessionUser is not null return sessionUser is not null
&& folder is not null && folder is not null
&& user is not null && user is not null
&& user.IsDescendantOf(sessionUser) && (user.IsDescendantOf(sessionUser) || sessionUser.UserType == 2)
&& sessionUser.HasAccessTo(folder) && sessionUser.HasAccessTo(folder)
&& user.HasAccessTo(folder) && user.HasAccessTo(folder)
&& Db.FolderAccess.Delete(a => a.UserId == user.Id && a.FolderId == folder.Id) > 0; && Db.FolderAccess.Delete(a => a.UserId == user.Id && a.FolderId == folder.Id) > 0;

7
csharp/App/Backend/Database/Update.cs
View File

@ -40,10 +40,9 @@ public static partial class Db
var originalUser = GetUserById(user.Id); var originalUser = GetUserById(user.Id);
if (originalUser is null) return false; if (originalUser is null) return false;
// these columns must not be modified! // ParentId must not be modified via this method
user.ParentId = originalUser.ParentId; user.ParentId = originalUser.ParentId;
user.Name = originalUser.Name;
return Update(obj: user); return Update(obj: user);
} }