From 72647f314771c2cf7ef3b2ccd9e93d4d56bced06 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sat, 29 Nov 2025 15:01:49 -0800
Subject: [PATCH] Fix bug when updating user email

---
 routers/web/admin/users.go |  2 +-
 services/user/email.go     | 63 +++++++++++++++++++-------------------
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go
index a3389361513a5..ed0eecf90a6f2 100644
--- a/routers/web/admin/users.go
+++ b/routers/web/admin/users.go
@@ -409,7 +409,7 @@ func EditUserPost(ctx *context.Context) {
 	}
 
 	if form.Email != "" {
-		if err := user_service.AdminAddOrSetPrimaryEmailAddress(ctx, u, form.Email); err != nil {
+		if err := user_service.ReplacePrimaryEmailAddress(ctx, u, form.Email); err != nil {
 			switch {
 			case user_model.IsErrEmailCharIsNotSupported(err), user_model.IsErrEmailInvalid(err):
 				ctx.Data["Err_Email"] = true
diff --git a/services/user/email.go b/services/user/email.go
index 5c0de708e9a8e..de1e024bd156e 100644
--- a/services/user/email.go
+++ b/services/user/email.go
@@ -77,43 +77,44 @@ func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailSt
 		return err
 	}
 
-	if !u.IsOrganization() {
-		// Check if address exists already
-		email, err := user_model.GetEmailAddressByEmail(ctx, emailStr)
-		if err != nil && !errors.Is(err, util.ErrNotExist) {
-			return err
-		}
-		if email != nil {
-			if email.IsPrimary && email.UID == u.ID {
-				return nil
+	return db.WithTx(ctx, func(ctx context.Context) error {
+		if !u.IsOrganization() {
+			// Check if address exists already
+			email, err := user_model.GetEmailAddressByEmail(ctx, emailStr)
+			if err != nil && !errors.Is(err, util.ErrNotExist) {
+				return err
+			}
+			if email != nil {
+				if email.IsPrimary && email.UID == u.ID {
+					return nil
+				}
+				return user_model.ErrEmailAlreadyUsed{Email: emailStr}
 			}
-			return user_model.ErrEmailAlreadyUsed{Email: emailStr}
-		}
 
-		// Remove old primary address
-		primary, err := user_model.GetPrimaryEmailAddressOfUser(ctx, u.ID)
-		if err != nil {
-			return err
-		}
-		if _, err := db.DeleteByID[user_model.EmailAddress](ctx, primary.ID); err != nil {
-			return err
-		}
+			// Remove old primary address
+			primary, err := user_model.GetPrimaryEmailAddressOfUser(ctx, u.ID)
+			if err != nil {
+				return err
+			}
+			if _, err := db.DeleteByID[user_model.EmailAddress](ctx, primary.ID); err != nil {
+				return err
+			}
 
-		// Insert new primary address
-		email = &user_model.EmailAddress{
-			UID:         u.ID,
-			Email:       emailStr,
-			IsActivated: true,
-			IsPrimary:   true,
-		}
-		if _, err := user_model.InsertEmailAddress(ctx, email); err != nil {
-			return err
+			// Insert new primary address
+			if _, err := user_model.InsertEmailAddress(ctx, &user_model.EmailAddress{
+				UID:         u.ID,
+				Email:       emailStr,
+				IsActivated: true,
+				IsPrimary:   true,
+			}); err != nil {
+				return err
+			}
 		}
-	}
 
-	u.Email = emailStr
+		u.Email = emailStr
 
-	return user_model.UpdateUserCols(ctx, u, "email")
+		return user_model.UpdateUserCols(ctx, u, "email")
+	})
 }
 
 func AddEmailAddresses(ctx context.Context, u *user_model.User, emails []string) error {