From 9f6af4f3b8e79a8a45369d99862cd3d96f4083ce Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 3 Dec 2017 13:28:01 +0900 Subject: [PATCH] Remove address and phone from default scope for Google Fixes gh-4895 --- .../security/config/oauth2/client/CommonOAuth2Provider.java | 2 +- .../config/oauth2/client/CommonOAuth2ProviderTests.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/oauth2/client/CommonOAuth2Provider.java b/config/src/main/java/org/springframework/security/config/oauth2/client/CommonOAuth2Provider.java index 81e2dd7603..ac33f1f636 100644 --- a/config/src/main/java/org/springframework/security/config/oauth2/client/CommonOAuth2Provider.java +++ b/config/src/main/java/org/springframework/security/config/oauth2/client/CommonOAuth2Provider.java @@ -37,7 +37,7 @@ public enum CommonOAuth2Provider { public Builder getBuilder(String registrationId) { ClientRegistration.Builder builder = getBuilder(registrationId, ClientAuthenticationMethod.BASIC, DEFAULT_LOGIN_REDIRECT_URL); - builder.scope("openid", "profile", "email", "address", "phone"); + builder.scope("openid", "profile", "email"); builder.authorizationUri("https://accounts.google.com/o/oauth2/v2/auth"); builder.tokenUri("https://www.googleapis.com/oauth2/v4/token"); builder.jwkSetUri("https://www.googleapis.com/oauth2/v3/certs"); diff --git a/config/src/test/java/org/springframework/security/config/oauth2/client/CommonOAuth2ProviderTests.java b/config/src/test/java/org/springframework/security/config/oauth2/client/CommonOAuth2ProviderTests.java index f01877c89b..148c5164ba 100644 --- a/config/src/test/java/org/springframework/security/config/oauth2/client/CommonOAuth2ProviderTests.java +++ b/config/src/test/java/org/springframework/security/config/oauth2/client/CommonOAuth2ProviderTests.java @@ -52,8 +52,7 @@ public class CommonOAuth2ProviderTests { assertThat(registration.getAuthorizationGrantType()) .isEqualTo(AuthorizationGrantType.AUTHORIZATION_CODE); assertThat(registration.getRedirectUriTemplate()).isEqualTo(DEFAULT_LOGIN_REDIRECT_URL); - assertThat(registration.getScopes()).containsOnly("openid", "profile", "email", - "address", "phone"); + assertThat(registration.getScopes()).containsOnly("openid", "profile", "email"); assertThat(registration.getClientName()).isEqualTo("Google"); assertThat(registration.getRegistrationId()).isEqualTo("123"); }