Use UserInfo's ID in OAuth login

2025-05-22 18:25:47 +08:00 · 2023-09-23 00:13:13 +08:00 · 2023-09-23 00:13:13 +08:00 · 111d1a5786
commit 111d1a5786
parent 775dd9eb57
1 changed files with 6 additions and 1 deletions
--- a/controllers/auth.go
+++ b/controllers/auth.go
@ -615,11 +615,16 @@ func (c *ApiController) Login() {
 						return
 					}

+					userId := userInfo.Id
+					if userId == "" {
+						userId = util.GenerateId()
+					}
+
 					user = &object.User{
 						Owner:             application.Organization,
 						Name:              userInfo.Username,
 						CreatedTime:       util.GetCurrentTime(),
-						Id:                util.GenerateId(),
+						Id:                userId,
 						Type:              "normal-user",
 						DisplayName:       userInfo.DisplayName,
 						Avatar:            userInfo.AvatarUrl,