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

Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk

This commit is contained in:
Sina Blattmann 2023-04-06 08:34:01 +02:00
parent d90547ecdb b6fbeb48b5
commit 68720b32ab
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,6 +157,7 @@ public static class SessionMethods
.Do(() => newUser.Password = newUser.SaltAndHashPassword(newUser.Password)) .Do(() => newUser.Password = newUser.SaltAndHashPassword(newUser.Password))
.Do(() => newUser.MustResetPassword = true) .Do(() => newUser.MustResetPassword = true)
.Apply(Db.Create); .Apply(Db.Create);
// && Mailer.Mailer.SendVerificationMessage(newUser); // && Mailer.Mailer.SendVerificationMessage(newUser);
//Send Email to new user to verify email and set password //Send Email to new user to verify email and set password
@ -172,7 +173,7 @@ public static class SessionMethods
&& sessionUser is not null && sessionUser is not null
&& originalUser is not null && originalUser is not null
&& sessionUser.HasWriteAccess && sessionUser.HasWriteAccess
&& sessionUser.HasAccessTo(editedUser) && sessionUser.HasAccessTo(originalUser)
&& editedUser && editedUser
.WithParentOf(originalUser) // prevent moving .WithParentOf(originalUser) // prevent moving
.WithNameOf(originalUser) .WithNameOf(originalUser)

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

@ -18,11 +18,13 @@ public static partial class Db
public static Boolean Update(User user) public static Boolean Update(User user)
{ {
var originalUser = GetUserById(user.Id); var originalUser = GetUserById(user.Id);
if (originalUser is null) return false;
return originalUser is not null
&& user.ParentId == originalUser.ParentId // these columns must not be modified! // these columns must not be modified!
&& user.Name == originalUser.Name user.ParentId = originalUser.ParentId;
&& Connection.Update(user) > 0; user.Name = originalUser.Name;
return Connection.Update(user) > 0;
} }