这是indexloc提供的服务，不要输入任何密码
Skip to content

oidc: distinguish between username and preferred_username claims #789

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
merged 2 commits into from
Jun 17, 2025
Merged

oidc: distinguish between username and preferred_username claims #789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52ce578
oidc: distinguish between username and preferred_username
dezeroku Jun 15, 2025
f368b95
Merge branch 'main' into oidc-username
gtsteffaniak Jun 17, 2025
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
8 changes: 8 additions & 0 deletions backend/http/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
type userInfo struct {
Name string `json:"name"`
PreferredUsername string `json:"preferred_username"`
Username string `json:"username"`
Email string `json:"email"`
Sub string `json:"sub"`
Phone string `json:"phone_number"`
Expand Down Expand Up @@ -143,6 +144,11 @@ func oidcCallbackHandler(w http.ResponseWriter, r *http.Request, d *requestConte
loginUsername = userdata.Email
}
case "username":
if userdata.Username != "" {
claimsFromIDToken = true
loginUsername = userdata.Username
}
case "preferred_username":
if userdata.PreferredUsername != "" {
claimsFromIDToken = true
loginUsername = userdata.PreferredUsername
Expand Down Expand Up @@ -181,6 +187,8 @@ func oidcCallbackHandler(w http.ResponseWriter, r *http.Request, d *requestConte
case "email":
loginUsername = userdata.Email
case "username":
loginUsername = userdata.Username
case "preferred_username":
loginUsername = userdata.PreferredUsername
case "phone":
loginUsername = userdata.Phone
Expand Down