Fix deprecations in OAuth

Author: rwinch

samples/oauth2-login-custom-config/src/test/java/testjars/authorizationserver/SecurityConfig.java

@@ -53,6 +53,8 @@
 import java.security.interfaces.RSAPublicKey;
 import java.util.UUID;
 
+import static org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer.authorizationServer;
+
 @Configuration
 @EnableWebSecurity
 public class SecurityConfig {
@@ -61,21 +63,23 @@ public class SecurityConfig {
 	@Order(1)
 	public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http)
 			throws Exception {
-		OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http);
-		http.getConfigurer(OAuth2AuthorizationServerConfigurer.class)
-				.oidc(Customizer.withDefaults());	// Enable OpenID Connect 1.0
+		OAuth2AuthorizationServerConfigurer authzServer = authorizationServer();
 		http
-				// Redirect to the login page when not authenticated from the
-				// authorization endpoint
-				.exceptionHandling((exceptions) -> exceptions
-						.defaultAuthenticationEntryPointFor(
-								new LoginUrlAuthenticationEntryPoint("/login"),
-								new MediaTypeRequestMatcher(MediaType.TEXT_HTML)
-						)
-				)
-				// Accept access tokens for User Info and/or Client Registration
-				.oauth2ResourceServer((resourceServer) -> resourceServer
-						.jwt(Customizer.withDefaults()));
+			.securityMatcher(authzServer.getEndpointsMatcher())
+			.with(authzServer, (authz) -> authz
+				.oidc(Customizer.withDefaults())
+			)
+			// Redirect to the login page when not authenticated from the
+			// authorization endpoint
+			.exceptionHandling((exceptions) -> exceptions
+					.defaultAuthenticationEntryPointFor(
+							new LoginUrlAuthenticationEntryPoint("/login"),
+							new MediaTypeRequestMatcher(MediaType.TEXT_HTML)
+					)
+			)
+			// Accept access tokens for User Info and/or Client Registration
+			.oauth2ResourceServer((resourceServer) -> resourceServer
+					.jwt(Customizer.withDefaults()));
 
 		return http.build();
 	}