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

pkg/user/user.go

@@ -419,7 +419,7 @@ func GetUserFromClaims(claims jwt.MapClaims) (user *User, err error) {
 }
 
 // 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
 	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
-	if user.Name == "" {
+	if user.Name == "" && !forceOverride {
 		user.Name = theUser.Name
 	}
 

pkg/user/user_test.go

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