ami/tl-vikunja
1
0
Fork 0
Code

fix(user): make reset the user's name to empty actually work

Browse Source
This commit is contained in:
kolaente 2023-01-23 18:30:01 +01:00
parent 7bf7a13bb9
commit 530bb0a63c
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cmd/user.go
View File

@ -225,7 +225,7 @@ var userUpdateCmd = &cobra.Command{
u.AvatarProvider = userFlagAvatar u.AvatarProvider = userFlagAvatar
} }
_, err := user.UpdateUser(s, u) _, err := user.UpdateUser(s, u, false)
if err != nil { if err != nil {
_ = s.Rollback() _ = s.Rollback()
log.Fatalf("Error updating the user: %s", err) log.Fatalf("Error updating the user: %s", err)
@ -299,7 +299,7 @@ var userChangeEnabledCmd = &cobra.Command{
u.Status = user.StatusActive u.Status = user.StatusActive
} }
} }
_, err := user.UpdateUser(s, u) _, err := user.UpdateUser(s, u, false)
if err != nil { if err != nil {
_ = s.Rollback() _ = s.Rollback()
log.Fatalf("Could not enable the user") log.Fatalf("Could not enable the user")

2
pkg/modules/auth/openid/openid.go
View File

@ -267,7 +267,7 @@ func getOrCreateUser(s *xorm.Session, cl *claims, issuer, subject string) (u *us
Name: u.Name, Name: u.Name,
Issuer: issuer, Issuer: issuer,
Subject: subject, Subject: subject,
}) }, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
pkg/routes/api/v1/avatar.go
View File

@ -205,7 +205,7 @@ func UploadAvatar(c echo.Context) (err error) {
u.AvatarFileID = f.ID u.AvatarFileID = f.ID
u.AvatarProvider = "upload" u.AvatarProvider = "upload"
if _, err := user.UpdateUser(s, u); err != nil { if _, err := user.UpdateUser(s, u, false); err != nil {
_ = s.Rollback() _ = s.Rollback()
return handler.HandleHTTPError(err, c) return handler.HandleHTTPError(err, c)
} }

4
pkg/routes/api/v1/user_settings.go
View File

@ -133,7 +133,7 @@ func ChangeUserAvatarProvider(c echo.Context) error {
user.AvatarProvider = uap.AvatarProvider user.AvatarProvider = uap.AvatarProvider
_, err = user2.UpdateUser(s, user) _, err = user2.UpdateUser(s, user, false)
if err != nil { if err != nil {
_ = s.Rollback() _ = s.Rollback()
return handler.HandleHTTPError(err, c) return handler.HandleHTTPError(err, c)
@ -199,7 +199,7 @@ func UpdateGeneralUserSettings(c echo.Context) error {
user.Timezone = us.Timezone user.Timezone = us.Timezone
user.OverdueTasksRemindersTime = us.OverdueTasksRemindersTime user.OverdueTasksRemindersTime = us.OverdueTasksRemindersTime
_, err = user2.UpdateUser(s, user) _, err = user2.UpdateUser(s, user, true)
if err != nil { if err != nil {
_ = s.Rollback() _ = s.Rollback()
return handler.HandleHTTPError(err, c) return handler.HandleHTTPError(err, c)

4
pkg/user/user.go
View File

@ -419,7 +419,7 @@ func GetUserFromClaims(claims jwt.MapClaims) (user *User, err error) {
} }
// UpdateUser updates a user // UpdateUser updates a user
func UpdateUser(s *xorm.Session, user *User) (updatedUser *User, err error) { func UpdateUser(s *xorm.Session, user *User, forceOverride bool) (updatedUser *User, err error) {
// Check if it exists // Check if it exists
theUser, err := GetUserWithEmail(s, &User{ID: user.ID}) theUser, err := GetUserWithEmail(s, &User{ID: user.ID})
@ -442,7 +442,7 @@ func UpdateUser(s *xorm.Session, user *User) (updatedUser *User, err error) {
} }
// Check if we have a name // Check if we have a name
if user.Name == "" { if user.Name == "" && !forceOverride {
user.Name = theUser.Name user.Name = theUser.Name
} }

6
pkg/user/user_test.go
View File

@ -292,7 +292,7 @@ func TestUpdateUser(t *testing.T) {
ID: 1, ID: 1,
Password: "LoremIpsum", Password: "LoremIpsum",
Email: "testing@example.com", Email: "testing@example.com",
}) }, false)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", uuser.Password) // Password should not change assert.Equal(t, "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", uuser.Password) // Password should not change
assert.Equal(t, "user1", uuser.Username) // Username should not change either assert.Equal(t, "user1", uuser.Username) // Username should not change either
@ -305,7 +305,7 @@ func TestUpdateUser(t *testing.T) {
uuser, err := UpdateUser(s, &User{ uuser, err := UpdateUser(s, &User{
ID: 1, ID: 1,
Username: "changedname", Username: "changedname",
}) }, false)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", uuser.Password) // Password should not change assert.Equal(t, "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", uuser.Password) // Password should not change
assert.Equal(t, "changedname", uuser.Username) assert.Equal(t, "changedname", uuser.Username)
@ -317,7 +317,7 @@ func TestUpdateUser(t *testing.T) {
_, err := UpdateUser(s, &User{ _, err := UpdateUser(s, &User{
ID: 99999, ID: 99999,
}) }, false)
assert.Error(t, err) assert.Error(t, err)
assert.True(t, IsErrUserDoesNotExist(err)) assert.True(t, IsErrUserDoesNotExist(err))
}) })