From 70543dcb3020f74b2ec13a64dd5e0a65996cbb18 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Thu, 26 Oct 2017 20:32:45 -0400 Subject: [PATCH] Move oidc package in oauth2-core and oauth2-client Fixes gh-4710 --- .../oauth2/client/OAuth2LoginConfigurer.java | 4 ++-- .../oauth2/client/CommonOAuth2Provider.java | 2 +- .../client/CommonOAuth2ProviderTests.java | 2 +- .../oidc}/OidcAuthorizedClient.java | 4 ++-- ...uthorizationCodeAuthenticationProvider.java | 18 +++++++++--------- .../oidc}/userinfo/OidcUserService.java | 14 +++++++------- .../registration/ClientRegistration.java | 2 +- .../{oidc/core => core/oidc}/Address.java | 2 +- .../core => core/oidc}/DefaultAddress.java | 2 +- .../{oidc/core => core/oidc}/IdToken.java | 2 +- .../{oidc/core => core/oidc}/IdTokenClaim.java | 2 +- .../oidc}/IdTokenClaimAccessor.java | 2 +- .../{oidc/core => core/oidc}/OidcScope.java | 2 +- .../core => core/oidc}/StandardClaim.java | 2 +- .../oidc}/StandardClaimAccessor.java | 2 +- .../{oidc/core => core/oidc}/UserInfo.java | 2 +- .../oidc}/endpoint/OidcParameter.java | 2 +- .../{oidc/core => core/oidc}/package-info.java | 2 +- .../oidc}/user/DefaultOidcUser.java | 9 +++++---- .../core => core/oidc}/user/OidcUser.java | 10 +++++----- .../oidc}/user/OidcUserAuthority.java | 7 ++++--- .../core => core/oidc}/user/package-info.java | 2 +- .../oidc}/user/DefaultOidcUserTests.java | 10 +++++----- 23 files changed, 54 insertions(+), 52 deletions(-) rename oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/{oidc/client => client/oidc}/OidcAuthorizedClient.java (94%) rename oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/{oidc/client => client/oidc}/authentication/OidcAuthorizationCodeAuthenticationProvider.java (96%) rename oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/{oidc/client => client/oidc}/userinfo/OidcUserService.java (93%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/Address.java (96%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/DefaultAddress.java (98%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/IdToken.java (97%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/IdTokenClaim.java (95%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/IdTokenClaimAccessor.java (97%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/OidcScope.java (96%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/StandardClaim.java (97%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/StandardClaimAccessor.java (98%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/UserInfo.java (97%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/endpoint/OidcParameter.java (94%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/package-info.java (92%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/user/DefaultOidcUser.java (87%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/user/OidcUser.java (88%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/user/OidcUserAuthority.java (89%) rename oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/user/package-info.java (92%) rename oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/{oidc/core => core/oidc}/user/DefaultOidcUserTests.java (93%) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java index 8ca24070bd..dfa8d4427a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java @@ -40,8 +40,8 @@ import org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationF import org.springframework.security.oauth2.core.AccessToken; import org.springframework.security.oauth2.core.endpoint.AuthorizationRequestUriBuilder; import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.security.oauth2.oidc.client.authentication.OidcAuthorizationCodeAuthenticationProvider; -import org.springframework.security.oauth2.oidc.client.userinfo.OidcUserService; +import org.springframework.security.oauth2.client.oidc.authentication.OidcAuthorizationCodeAuthenticationProvider; +import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService; import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; 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 56605c5c19..30d773aebd 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 @@ -19,7 +19,7 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio import org.springframework.security.oauth2.client.registration.ClientRegistration.Builder; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; -import org.springframework.security.oauth2.oidc.core.IdTokenClaim; +import org.springframework.security.oauth2.core.oidc.IdTokenClaim; /** * Common OAuth2 Providers that can be used to create 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 5c665f359b..041450c150 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 @@ -20,7 +20,7 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio import org.springframework.security.oauth2.client.registration.ClientRegistration.ProviderDetails; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; -import org.springframework.security.oauth2.oidc.core.IdTokenClaim; +import org.springframework.security.oauth2.core.oidc.IdTokenClaim; import static org.assertj.core.api.Assertions.assertThat; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/OidcAuthorizedClient.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/OidcAuthorizedClient.java similarity index 94% rename from oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/OidcAuthorizedClient.java rename to oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/OidcAuthorizedClient.java index e1699fb216..02bf4cb0c4 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/OidcAuthorizedClient.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/OidcAuthorizedClient.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.client; +package org.springframework.security.oauth2.client.oidc; import org.springframework.security.oauth2.client.AuthorizedClient; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AccessToken; -import org.springframework.security.oauth2.oidc.core.IdToken; +import org.springframework.security.oauth2.core.oidc.IdToken; import org.springframework.util.Assert; /** diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/authentication/OidcAuthorizationCodeAuthenticationProvider.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java similarity index 96% rename from oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/authentication/OidcAuthorizationCodeAuthenticationProvider.java rename to oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java index 5c934207ea..787169a255 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/authentication/OidcAuthorizationCodeAuthenticationProvider.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.client.authentication; +package org.springframework.security.oauth2.client.oidc.authentication; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.core.Authentication; @@ -22,25 +22,25 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper; import org.springframework.security.oauth2.client.authentication.AuthorizationCodeAuthenticationToken; import org.springframework.security.oauth2.client.authentication.AuthorizationGrantTokenExchanger; -import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken; import org.springframework.security.oauth2.client.authentication.jwt.JwtDecoderRegistry; -import org.springframework.security.oauth2.client.userinfo.OAuth2UserService; +import org.springframework.security.oauth2.client.oidc.OidcAuthorizedClient; +import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService; import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.security.oauth2.client.userinfo.OAuth2UserService; import org.springframework.security.oauth2.core.AccessToken; +import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.OAuth2Error; import org.springframework.security.oauth2.core.endpoint.AuthorizationRequest; import org.springframework.security.oauth2.core.endpoint.AuthorizationResponse; import org.springframework.security.oauth2.core.endpoint.TokenResponse; +import org.springframework.security.oauth2.core.oidc.IdToken; +import org.springframework.security.oauth2.core.oidc.OidcScope; +import org.springframework.security.oauth2.core.oidc.endpoint.OidcParameter; +import org.springframework.security.oauth2.core.oidc.user.OidcUser; import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.security.oauth2.jwt.Jwt; import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.security.oauth2.oidc.client.OidcAuthorizedClient; -import org.springframework.security.oauth2.oidc.client.userinfo.OidcUserService; -import org.springframework.security.oauth2.oidc.core.IdToken; -import org.springframework.security.oauth2.oidc.core.OidcScope; -import org.springframework.security.oauth2.oidc.core.endpoint.OidcParameter; -import org.springframework.security.oauth2.oidc.core.user.OidcUser; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/userinfo/OidcUserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java similarity index 93% rename from oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/userinfo/OidcUserService.java rename to oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java index 469a429565..663c01f01e 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/oidc/client/userinfo/OidcUserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.client.userinfo; +package org.springframework.security.oauth2.client.oidc.userinfo; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.oauth2.client.AuthorizedClient; -import org.springframework.security.oauth2.core.OAuth2AuthenticationException; +import org.springframework.security.oauth2.client.oidc.OidcAuthorizedClient; import org.springframework.security.oauth2.client.userinfo.NimbusUserInfoRetriever; import org.springframework.security.oauth2.client.userinfo.OAuth2UserService; import org.springframework.security.oauth2.client.userinfo.UserInfoRetriever; import org.springframework.security.oauth2.core.AuthorizationGrantType; +import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.OAuth2Error; +import org.springframework.security.oauth2.core.oidc.OidcScope; +import org.springframework.security.oauth2.core.oidc.UserInfo; +import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser; +import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority; import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.security.oauth2.oidc.client.OidcAuthorizedClient; -import org.springframework.security.oauth2.oidc.core.OidcScope; -import org.springframework.security.oauth2.oidc.core.UserInfo; -import org.springframework.security.oauth2.oidc.core.user.DefaultOidcUser; -import org.springframework.security.oauth2.oidc.core.user.OidcUserAuthority; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java index 1f03281723..3dbcc77d3d 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java @@ -17,7 +17,7 @@ package org.springframework.security.oauth2.client.registration; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; -import org.springframework.security.oauth2.oidc.core.OidcScope; +import org.springframework.security.oauth2.core.oidc.OidcScope; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/Address.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/Address.java similarity index 96% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/Address.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/Address.java index 0470fc5ad7..c11df3b1d3 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/Address.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/Address.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; /** * The Address Claim represents a physical mailing address defined by the OpenID Connect Core 1.0 specification diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/DefaultAddress.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddress.java similarity index 98% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/DefaultAddress.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddress.java index 3e0ade316a..19336165d4 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/DefaultAddress.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddress.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; import java.util.Map; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdToken.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdToken.java similarity index 97% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdToken.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdToken.java index d3e3f1cecb..a45d8735a1 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdToken.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; import org.springframework.security.oauth2.core.AbstractOAuth2Token; import org.springframework.util.Assert; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdTokenClaim.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdTokenClaim.java similarity index 95% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdTokenClaim.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdTokenClaim.java index 82f7c4ca1f..3b56465eca 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdTokenClaim.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdTokenClaim.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; /** * The "Claims" defined by the OpenID Connect Core 1.0 specification diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdTokenClaimAccessor.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdTokenClaimAccessor.java similarity index 97% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdTokenClaimAccessor.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdTokenClaimAccessor.java index c58b1584cc..ddd343c117 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdTokenClaimAccessor.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdTokenClaimAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; import org.springframework.security.oauth2.core.ClaimAccessor; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/OidcScope.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcScope.java similarity index 96% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/OidcScope.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcScope.java index c4f15f4193..347e719a58 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/OidcScope.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; import org.springframework.security.oauth2.core.AccessToken; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/StandardClaim.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/StandardClaim.java similarity index 97% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/StandardClaim.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/StandardClaim.java index 02f5ec871d..2219b120d4 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/StandardClaim.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/StandardClaim.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; /** * The "Standard Claims" defined by the OpenID Connect Core 1.0 specification diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/StandardClaimAccessor.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/StandardClaimAccessor.java similarity index 98% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/StandardClaimAccessor.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/StandardClaimAccessor.java index a8d162fc06..d04344d523 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/StandardClaimAccessor.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/StandardClaimAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; import org.springframework.security.oauth2.core.ClaimAccessor; import org.springframework.util.CollectionUtils; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/UserInfo.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/UserInfo.java similarity index 97% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/UserInfo.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/UserInfo.java index d47c6c9fb0..c55753d634 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/UserInfo.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/UserInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; import org.springframework.util.Assert; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/endpoint/OidcParameter.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/endpoint/OidcParameter.java similarity index 94% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/endpoint/OidcParameter.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/endpoint/OidcParameter.java index ff4aaa88a8..03fbdb3951 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/endpoint/OidcParameter.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/endpoint/OidcParameter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core.endpoint; +package org.springframework.security.oauth2.core.oidc.endpoint; /** * Standard parameters defined in the OAuth Parameters Registry diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/package-info.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/package-info.java similarity index 92% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/package-info.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/package-info.java index 7cb31d5bcd..3ef3fc9658 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/package-info.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/package-info.java @@ -16,4 +16,4 @@ /** * Core classes and interfaces providing support for OpenID Connect Core 1.0. */ -package org.springframework.security.oauth2.oidc.core; +package org.springframework.security.oauth2.core.oidc; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/DefaultOidcUser.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUser.java similarity index 87% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/DefaultOidcUser.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUser.java index 33dbe781ec..a1ac23a8b5 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/DefaultOidcUser.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUser.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core.user; +package org.springframework.security.oauth2.core.oidc.user; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.oauth2.core.oidc.user.OidcUser; import org.springframework.security.oauth2.core.user.DefaultOAuth2User; -import org.springframework.security.oauth2.oidc.core.IdToken; -import org.springframework.security.oauth2.oidc.core.IdTokenClaim; -import org.springframework.security.oauth2.oidc.core.UserInfo; +import org.springframework.security.oauth2.core.oidc.IdToken; +import org.springframework.security.oauth2.core.oidc.IdTokenClaim; +import org.springframework.security.oauth2.core.oidc.UserInfo; import java.util.Map; import java.util.Set; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/OidcUser.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUser.java similarity index 88% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/OidcUser.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUser.java index 204123ebd9..ccdd7825f9 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/OidcUser.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUser.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core.user; +package org.springframework.security.oauth2.core.oidc.user; import org.springframework.security.core.AuthenticatedPrincipal; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.security.oauth2.oidc.core.IdToken; -import org.springframework.security.oauth2.oidc.core.IdTokenClaimAccessor; -import org.springframework.security.oauth2.oidc.core.StandardClaimAccessor; -import org.springframework.security.oauth2.oidc.core.UserInfo; +import org.springframework.security.oauth2.core.oidc.IdToken; +import org.springframework.security.oauth2.core.oidc.IdTokenClaimAccessor; +import org.springframework.security.oauth2.core.oidc.StandardClaimAccessor; +import org.springframework.security.oauth2.core.oidc.UserInfo; import org.springframework.util.Assert; import java.util.HashMap; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/OidcUserAuthority.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUserAuthority.java similarity index 89% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/OidcUserAuthority.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUserAuthority.java index 5d6e669622..43ed050ffa 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/OidcUserAuthority.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUserAuthority.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core.user; +package org.springframework.security.oauth2.core.oidc.user; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.oauth2.core.oidc.user.OidcUser; import org.springframework.security.oauth2.core.user.OAuth2UserAuthority; -import org.springframework.security.oauth2.oidc.core.IdToken; -import org.springframework.security.oauth2.oidc.core.UserInfo; +import org.springframework.security.oauth2.core.oidc.IdToken; +import org.springframework.security.oauth2.core.oidc.UserInfo; /** * A {@link GrantedAuthority} that is associated with an {@link OidcUser}. diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/package-info.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/package-info.java similarity index 92% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/package-info.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/package-info.java index e2ed1f7358..a59bfd363b 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/user/package-info.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/package-info.java @@ -16,4 +16,4 @@ /** * Provides a model for an OpenID Connect Core 1.0 representation of a user Principal. */ -package org.springframework.security.oauth2.oidc.core.user; +package org.springframework.security.oauth2.core.oidc.user; diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/oidc/core/user/DefaultOidcUserTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUserTests.java similarity index 93% rename from oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/oidc/core/user/DefaultOidcUserTests.java rename to oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUserTests.java index b5ac3561a2..63eefe20fb 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/oidc/core/user/DefaultOidcUserTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUserTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.oauth2.oidc.core.user; +package org.springframework.security.oauth2.core.oidc.user; import java.time.Instant; import java.util.Collections; @@ -27,10 +27,10 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.oauth2.oidc.core.IdToken; -import org.springframework.security.oauth2.oidc.core.IdTokenClaim; -import org.springframework.security.oauth2.oidc.core.StandardClaim; -import org.springframework.security.oauth2.oidc.core.UserInfo; +import org.springframework.security.oauth2.core.oidc.IdToken; +import org.springframework.security.oauth2.core.oidc.IdTokenClaim; +import org.springframework.security.oauth2.core.oidc.StandardClaim; +import org.springframework.security.oauth2.core.oidc.UserInfo; import static org.assertj.core.api.Assertions.assertThat;