From e5d47daf26c2472c123faf8549331ac1338d69f5 Mon Sep 17 00:00:00 2001
From: feitianbubu <feitianbubu@qq.com>
Date: Mon, 9 Feb 2026 15:03:41 +0800
Subject: [PATCH] feat: allow custom username for new users

---
 controller/oauth.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/controller/oauth.go b/controller/oauth.go
index 65e18f9d..faa22dd4 100644
--- a/controller/oauth.go
+++ b/controller/oauth.go
@@ -237,6 +237,13 @@ func findOrCreateOAuthUser(c *gin.Context, provider oauth.Provider, oauthUser *o
 
 	// Set up new user
 	user.Username = provider.GetProviderPrefix() + strconv.Itoa(model.GetMaxUserId()+1)
+
+	if oauthUser.Username != "" {
+		if exists, err := model.CheckUserExistOrDeleted(oauthUser.Username, ""); err == nil && !exists {
+			user.Username = oauthUser.Username
+		}
+	}
+
 	if oauthUser.DisplayName != "" {
 		user.DisplayName = oauthUser.DisplayName
 	} else if oauthUser.Username != "" {