diff --git a/samples/demo-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java b/samples/demo-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java index 37295a86..4c010a8d 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java +++ b/samples/demo-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java @@ -23,8 +23,8 @@ import com.nimbusds.jose.jwk.source.JWKSource; import com.nimbusds.jose.proc.SecurityContext; import sample.authentication.DeviceClientAuthenticationProvider; import sample.jose.Jwks; -import sample.security.FederatedIdentityConfigurer; -import sample.security.FederatedIdentityIdTokenCustomizer; +import sample.federation.FederatedIdentityConfigurer; +import sample.federation.FederatedIdentityIdTokenCustomizer; import sample.web.authentication.DeviceClientAuthenticationConverter; import org.springframework.context.annotation.Bean; diff --git a/samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java b/samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java index 541dbaaa..7b591efb 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java +++ b/samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java @@ -15,8 +15,8 @@ */ package sample.config; -import sample.security.FederatedIdentityConfigurer; -import sample.security.UserRepositoryOAuth2UserHandler; +import sample.federation.FederatedIdentityConfigurer; +import sample.federation.UserRepositoryOAuth2UserHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityAuthenticationEntryPoint.java b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationEntryPoint.java similarity index 99% rename from samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityAuthenticationEntryPoint.java rename to samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationEntryPoint.java index 17e7bb5d..bbf2c40f 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityAuthenticationEntryPoint.java +++ b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationEntryPoint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.security; +package sample.federation; import java.io.IOException; diff --git a/samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityAuthenticationSuccessHandler.java b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java similarity index 99% rename from samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityAuthenticationSuccessHandler.java rename to samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java index 7eaa4917..496c6000 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityAuthenticationSuccessHandler.java +++ b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.security; +package sample.federation; import java.io.IOException; import java.util.function.Consumer; diff --git a/samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityConfigurer.java b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityConfigurer.java similarity index 99% rename from samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityConfigurer.java rename to samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityConfigurer.java index d6487755..fea57679 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityConfigurer.java +++ b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityConfigurer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.security; +package sample.federation; import java.util.function.Consumer; diff --git a/samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityIdTokenCustomizer.java b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java similarity index 99% rename from samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityIdTokenCustomizer.java rename to samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java index 4442e085..61ae5fea 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/security/FederatedIdentityIdTokenCustomizer.java +++ b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.security; +package sample.federation; import java.util.Arrays; import java.util.Collections; diff --git a/samples/demo-authorizationserver/src/main/java/sample/security/UserRepositoryOAuth2UserHandler.java b/samples/demo-authorizationserver/src/main/java/sample/federation/UserRepositoryOAuth2UserHandler.java similarity index 98% rename from samples/demo-authorizationserver/src/main/java/sample/security/UserRepositoryOAuth2UserHandler.java rename to samples/demo-authorizationserver/src/main/java/sample/federation/UserRepositoryOAuth2UserHandler.java index 4857c81f..dd022289 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/security/UserRepositoryOAuth2UserHandler.java +++ b/samples/demo-authorizationserver/src/main/java/sample/federation/UserRepositoryOAuth2UserHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.security; +package sample.federation; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/samples/demo-client/src/main/java/sample/web/authentication/DeviceCodeOAuth2AuthorizedClientProvider.java b/samples/demo-client/src/main/java/sample/authorization/DeviceCodeOAuth2AuthorizedClientProvider.java similarity index 99% rename from samples/demo-client/src/main/java/sample/web/authentication/DeviceCodeOAuth2AuthorizedClientProvider.java rename to samples/demo-client/src/main/java/sample/authorization/DeviceCodeOAuth2AuthorizedClientProvider.java index 23fc41cc..ce0fe95c 100644 --- a/samples/demo-client/src/main/java/sample/web/authentication/DeviceCodeOAuth2AuthorizedClientProvider.java +++ b/samples/demo-client/src/main/java/sample/authorization/DeviceCodeOAuth2AuthorizedClientProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.web.authentication; +package sample.authorization; import java.time.Clock; import java.time.Duration; diff --git a/samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceAccessTokenResponseClient.java b/samples/demo-client/src/main/java/sample/authorization/OAuth2DeviceAccessTokenResponseClient.java similarity index 99% rename from samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceAccessTokenResponseClient.java rename to samples/demo-client/src/main/java/sample/authorization/OAuth2DeviceAccessTokenResponseClient.java index 1b69a3c8..2c3486ff 100644 --- a/samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceAccessTokenResponseClient.java +++ b/samples/demo-client/src/main/java/sample/authorization/OAuth2DeviceAccessTokenResponseClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.web.authentication; +package sample.authorization; import java.util.Arrays; diff --git a/samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceGrantRequest.java b/samples/demo-client/src/main/java/sample/authorization/OAuth2DeviceGrantRequest.java similarity index 97% rename from samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceGrantRequest.java rename to samples/demo-client/src/main/java/sample/authorization/OAuth2DeviceGrantRequest.java index 4ec72a1f..5687e269 100644 --- a/samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceGrantRequest.java +++ b/samples/demo-client/src/main/java/sample/authorization/OAuth2DeviceGrantRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.web.authentication; +package sample.authorization; import org.springframework.security.oauth2.client.endpoint.AbstractOAuth2AuthorizationGrantRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; diff --git a/samples/demo-client/src/main/java/sample/config/WebClientConfig.java b/samples/demo-client/src/main/java/sample/config/WebClientConfig.java index 65f82444..274ddccf 100644 --- a/samples/demo-client/src/main/java/sample/config/WebClientConfig.java +++ b/samples/demo-client/src/main/java/sample/config/WebClientConfig.java @@ -15,7 +15,7 @@ */ package sample.config; -import sample.web.authentication.DeviceCodeOAuth2AuthorizedClientProvider; +import sample.authorization.DeviceCodeOAuth2AuthorizedClientProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;