Skip to content

Modern Docker Management, Designed for Everyone

fix: use prefered username in oidc cliams

Kyle Mendellee46e9aabe84
diff --git a/backend/internal/dto/oidc.go b/backend/internal/dto/oidc.go
index f89b19861..2b9c78b4c 100644
--- a/backend/internal/dto/oidc.go
+++ b/backend/internal/dto/oidc.go
@@ -1,14 +1,15 @@
package dto
type OidcUserInfo struct {
- Subject string `json:"sub"`
- Name string `json:"name,omitempty"`
- Email string `json:"email,omitempty"`
- GivenName string `json:"given_name,omitempty"`
- FamilyName string `json:"family_name,omitempty"`
- Admin bool `json:"admin,omitempty"`
- Roles []string `json:"roles,omitempty"`
- Groups []string `json:"groups,omitempty"`
+ Subject string `json:"sub"`
+ Name string `json:"name,omitempty"`
+ Email string `json:"email,omitempty"`
+ PreferredUsername string `json:"preferred_username,omitempty"`
+ GivenName string `json:"given_name,omitempty"`
+ FamilyName string `json:"family_name,omitempty"`
+ Admin bool `json:"admin,omitempty"`
+ Roles []string `json:"roles,omitempty"`
+ Groups []string `json:"groups,omitempty"`
// Raw extra claims from userinfo (not serialized back out)
Extra map[string]any `json:"-"`
diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.go
index 87d7a59e5..50fac80d3 100644
--- a/backend/internal/services/auth_service.go
+++ b/backend/internal/services/auth_service.go
@@ -301,7 +301,13 @@ func (s *AuthService) findOrCreateOidcUser(ctx context.Context, userInfo dto.Oid
func (s *AuthService) createOidcUser(ctx context.Context, userInfo dto.OidcUserInfo, tokenResp *dto.OidcTokenResponse) (*models.User, error) {
now := time.Now()
- username := generateUsernameFromEmail(userInfo.Email, userInfo.Subject)
+
+ var username string
+ if userInfo.PreferredUsername == "" {
+ username = generateUsernameFromEmail(userInfo.Email, userInfo.Subject)
+ } else {
+ username = userInfo.PreferredUsername
+ }
var displayName string
switch {