From 0639e2d172859b26a0827ca128d1a2e602e8e177 Mon Sep 17 00:00:00 2001
From: yyg-max <175597134+yyg-max@users.noreply.github.com>
Date: Thu, 25 Jun 2026 16:52:55 +0800
Subject: [PATCH] fix(oauth): release conflicted username without disabling
 account

---
 internal/apps/oauth/utils.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/apps/oauth/utils.go b/internal/apps/oauth/utils.go
index 91b0a33f..223aeef6 100644
--- a/internal/apps/oauth/utils.go
+++ b/internal/apps/oauth/utils.go
@@ -112,15 +112,15 @@ func doOAuth(ctx context.Context, code string) (*User, error) {
 	var user User
 	err = db.DB(ctx).Transaction(func(tx *gorm.DB) error {
 		var holder User
-		if conflictErr := tx.Where("username = ? AND id != ?", userInfo.Username, userInfo.Id).First(&holder).Error; conflictErr == nil {
-			// 存在冲突 -> 将占用者改名并注销
-			newParams := map[string]interface{}{
-				"username":  fmt.Sprintf("%s已注销: %s", holder.Username, uuid.NewString()),
-				"is_active": false,
-			}
-			if updateErr := tx.Model(&holder).Updates(newParams).Error; updateErr != nil {
+		conflictErr := tx.Where("username = ? AND id != ?", userInfo.Username, userInfo.Id).First(&holder).Error
+		if conflictErr == nil {
+			// 用户名来自 OAuth 且可能被改名复用；冲突时只释放旧用户名，不禁用原账号。
+			newUsername := fmt.Sprintf("__released_username__:%d:%s", holder.ID, uuid.NewString())
+			if updateErr := tx.Model(&holder).Update("username", newUsername).Error; updateErr != nil {
 				return updateErr
 			}
+		} else if !errors.Is(conflictErr, gorm.ErrRecordNotFound) {
+			return conflictErr
 		}
 
 		// 根据 ID 处理当前用户的 更新 或 创建