Skip to content

Commit 06c4bff

Browse files
habumajgrandja
authored andcommitted
Use id field instead of name field for GitHub and Facebook providers.
Fixes gh-4764
1 parent 881cd0b commit 06c4bff

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

config/src/main/java/org/springframework/security/config/oauth2/client/CommonOAuth2Provider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public Builder getBuilder(String registrationId) {
5858
builder.authorizationUri("https://github.com/login/oauth/authorize");
5959
builder.tokenUri("https://github.com/login/oauth/access_token");
6060
builder.userInfoUri("https://api.github.com/user");
61-
builder.userNameAttributeName("name");
61+
builder.userNameAttributeName("id");
6262
builder.clientName("GitHub");
6363
return builder;
6464
}
@@ -74,7 +74,7 @@ public Builder getBuilder(String registrationId) {
7474
builder.authorizationUri("https://www.facebook.com/v2.8/dialog/oauth");
7575
builder.tokenUri("https://graph.facebook.com/v2.8/oauth/access_token");
7676
builder.userInfoUri("https://graph.facebook.com/me");
77-
builder.userNameAttributeName("name");
77+
builder.userNameAttributeName("id");
7878
builder.clientName("Facebook");
7979
return builder;
8080
}

config/src/test/java/org/springframework/security/config/oauth2/client/CommonOAuth2ProviderTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void getBuilderWhenGitHubShouldHaveGitHubSettings() throws Exception {
6969
assertThat(providerDetails.getUserInfoEndpoint().getUri())
7070
.isEqualTo("https://api.github.com/user");
7171
assertThat(providerDetails.getUserInfoEndpoint().getUserNameAttributeName())
72-
.isEqualTo("name");
72+
.isEqualTo("id");
7373
assertThat(providerDetails.getJwkSetUri()).isNull();
7474
assertThat(registration.getClientAuthenticationMethod())
7575
.isEqualTo(ClientAuthenticationMethod.BASIC);
@@ -92,7 +92,7 @@ public void getBuilderWhenFacebookShouldHaveFacebookSettings() throws Exception
9292
assertThat(providerDetails.getUserInfoEndpoint().getUri())
9393
.isEqualTo("https://graph.facebook.com/me");
9494
assertThat(providerDetails.getUserInfoEndpoint().getUserNameAttributeName())
95-
.isEqualTo("name");
95+
.isEqualTo("id");
9696
assertThat(providerDetails.getJwkSetUri()).isNull();
9797
assertThat(registration.getClientAuthenticationMethod())
9898
.isEqualTo(ClientAuthenticationMethod.POST);

0 commit comments

Comments
 (0)