Skip to content

Fix GDM name display for google/generic oidc brokers #1369

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

Open
nooreldeenmansour wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix GDM name display for google/generic oidc brokers #1369

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
2 changes: 1 addition & 1 deletion ...den/TestConcurrentIsAuthenticated/First_auth_starts_and_finishes_before_second/first_auth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"user1@example.com","uuid":"user1","dir":"/home/user1@example.com","shell":"/usr/bin/bash","gecos":"user1@example.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"user1@example.com","uuid":"user1","dir":"/home/user1@example.com","shell":"/usr/bin/bash","gecos":"user1","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...en/TestConcurrentIsAuthenticated/First_auth_starts_and_finishes_before_second/second_auth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"user2@example.com","uuid":"user2","dir":"/home/user2@example.com","shell":"/usr/bin/bash","gecos":"user2@example.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"user2@example.com","uuid":"user2","dir":"/home/user2@example.com","shell":"/usr/bin/bash","gecos":"user2","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...estConcurrentIsAuthenticated/First_auth_starts_first_but_second_finishes_first/first_auth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"user1@example.com","uuid":"user1","dir":"/home/user1@example.com","shell":"/usr/bin/bash","gecos":"user1@example.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"user1@example.com","uuid":"user1","dir":"/home/user1@example.com","shell":"/usr/bin/bash","gecos":"user1","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...stConcurrentIsAuthenticated/First_auth_starts_first_but_second_finishes_first/second_auth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"user2@example.com","uuid":"user2","dir":"/home/user2@example.com","shell":"/usr/bin/bash","gecos":"user2@example.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"user2@example.com","uuid":"user2","dir":"/home/user2@example.com","shell":"/usr/bin/bash","gecos":"user2","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...st_auth_starts_first_but_second_finishes_first_and_is_registered_as_the_owner/second_auth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"user2@example.com","uuid":"user2","dir":"/home/user2@example.com","shell":"/usr/bin/bash","gecos":"user2@example.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"user2@example.com","uuid":"user2","dir":"/home/user2@example.com","shell":"/usr/bin/bash","gecos":"user2","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...tIsAuthenticated/First_auth_starts_first_then_second_starts_and_first_finishes/first_auth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"user1@example.com","uuid":"user1","dir":"/home/user1@example.com","shell":"/usr/bin/bash","gecos":"user1@example.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"user1@example.com","uuid":"user1","dir":"/home/user1@example.com","shell":"/usr/bin/bash","gecos":"user1","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...IsAuthenticated/First_auth_starts_first_then_second_starts_and_first_finishes/second_auth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"user2@example.com","uuid":"user2","dir":"/home/user2@example.com","shell":"/usr/bin/bash","gecos":"user2@example.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"user2@example.com","uuid":"user2","dir":"/home/user2@example.com","shell":"/usr/bin/bash","gecos":"user2","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...n/TestIsAuthenticated/Authenticating_still_allowed_if_token_is_missing_scopes/second_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...Authenticated/Authenticating_when_the_auth_data_secret_field_uses_the_old_name/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...ed/Authenticating_with_device_auth_when_provider_supports_device_registration/second_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...ticated/Authenticating_with_password_keeps_old_groups_if_fetching_groups_fails/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"old-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"old-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...olden/TestIsAuthenticated/Authenticating_with_password_refreshes_expired_token/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...tdata/golden/TestIsAuthenticated/Authenticating_with_password_refreshes_groups/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"refreshed-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"refreshed-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...henticated/Authenticating_with_password_when_provider_authentication_is_forced/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...icated/Authenticating_with_password_when_provider_supports_device_registration/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...stdata/golden/TestIsAuthenticated/Authenticating_with_qrcode_reacquires_token/second_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...rs/internal/broker/testdata/golden/TestIsAuthenticated/Extra_groups_configured/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-group","ugid":""},{"name":"extra-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-group","ugid":""},{"name":"extra-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...ernal/broker/testdata/golden/TestIsAuthenticated/Owner_extra_groups_configured/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-group","ugid":""},{"name":"owner-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-group","ugid":""},{"name":"owner-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...stIsAuthenticated/Owner_extra_groups_configured_but_user_does_not_become_owner/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...Authenticated/Successfully_authenticate_user_with_device_auth_and_newpassword/second_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion ...stdata/golden/TestIsAuthenticated/Successfully_authenticate_user_with_password/first_call
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
access: granted
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user@email.com","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
data: '{"userinfo":{"name":"test-user@email.com","uuid":"test-user-id","dir":"/home/test-user@email.com","shell":"/usr/bin/bash","gecos":"test-user","groups":[{"name":"remote-test-group","ugid":"12345"},{"name":"local-test-group","ugid":""}]}}'
err: <nil>
2 changes: 1 addition & 1 deletion authd-oidc-brokers/internal/providers/genericprovider/genericprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ type claims struct {
Sub string `json:"sub"`
Home string `json:"home"`
Shell string `json:"shell"`
Gecos string `json:"gecos"`
Gecos string `json:"name"`
EmailVerified bool `json:"email_verified"`
}

Expand Down
2 changes: 1 addition & 1 deletion authd-oidc-brokers/internal/providers/genericprovider/genericprovider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestGetUserInfo(t *testing.T) {
"email_verified": true,
"home": "/home/user",
"shell": "/bin/bash",
"gecos": "Test User",
"name": "Test User",
},
wantUser: info.NewUser("user@example.com", "/home/user", "sub123", "/bin/bash", "Test User", nil),
},
Expand Down
2 changes: 1 addition & 1 deletion authd-oidc-brokers/internal/testutils/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ type claims struct {
Sub string `json:"sub"`
Home string `json:"home"`
Shell string `json:"shell"`
Gecos string `json:"gecos"`
Gecos string `json:"name"`
}

// userClaims returns the user claims parsed from the ID token.
Expand Down
Loading