Skip to content

fix(oauth): release conflicted username without disabling account #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenyme merged 1 commit into from
Jun 25, 2026
Merged

fix(oauth): release conflicted username without disabling account #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions internal/apps/oauth/logics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,13 @@ func doOAuth(ctx context.Context, code string, nonce string) (*model.User, error
err = db.DB(ctx).Transaction(func(tx *gorm.DB) error {
var holder model.User
if conflictErr := tx.Where("username = ? AND id != ?", userInfo.Username, userInfo.GetID()).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 {
// 用户名来自 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 处理当前用户的 更新 或 创建
Expand Down
2 changes: 1 addition & 1 deletion internal/model/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ type LeaderboardUser struct {

type User struct {
ID uint64 `json:"id" gorm:"primaryKey;index:idx_users_active_bal_id,priority:3"`
Username string `json:"username" gorm:"size:64;uniqueIndex"`
Username string `json:"username" gorm:"size:255;uniqueIndex"`
Nickname string `json:"nickname" gorm:"size:255"`
AvatarUrl string `json:"avatar_url" gorm:"size:255"`
TrustLevel TrustLevel `json:"trust_level" gorm:"index"`
Expand Down
Loading