Fix user primary email changed (#17840)

This commit is contained in:
Lunny Xiao 2021-11-28 19:04:44 +08:00 committed by GitHub
parent 04517e17d6
commit d29a0fc3be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 58 additions and 14 deletions

View file

@ -1072,18 +1072,46 @@ func validateUser(u *User) error {
return ValidateEmail(u.Email)
}
func updateUser(e Engine, u *User) error {
func updateUser(e Engine, u *User, changePrimaryEmail bool) error {
if err := validateUser(u); err != nil {
return err
}
if changePrimaryEmail {
var emailAddress EmailAddress
has, err := e.Where("lower_email=?", strings.ToLower(u.Email)).Get(&emailAddress)
if err != nil {
return err
}
if !has {
// 1. Update old primary email
if _, err = e.Where("uid=? AND is_primary=?", u.ID, true).Cols("is_primary").Update(&EmailAddress{
IsPrimary: false,
}); err != nil {
return err
}
emailAddress.Email = u.Email
emailAddress.UID = u.ID
emailAddress.IsActivated = true
emailAddress.IsPrimary = true
if _, err := e.Insert(&emailAddress); err != nil {
return err
}
} else if _, err := e.ID(emailAddress).Cols("is_primary").Update(&EmailAddress{
IsPrimary: true,
}); err != nil {
return err
}
}
_, err := e.ID(u.ID).AllCols().Update(u)
return err
}
// UpdateUser updates user's information.
func UpdateUser(u *User) error {
return updateUser(x, u)
func UpdateUser(u *User, changePrimaryEmail bool) error {
return updateUser(x, u, changePrimaryEmail)
}
// UpdateUserCols update user according special columns
@ -1112,7 +1140,7 @@ func UpdateUserSetting(u *User) (err error) {
return err
}
}
if err = updateUser(sess, u); err != nil {
if err = updateUser(sess, u, false); err != nil {
return err
}
return sess.Commit()