diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml
index 83412d2252..296825f23d 100644
--- a/spring-security-modules/pom.xml
+++ b/spring-security-modules/pom.xml
@@ -47,6 +47,7 @@
spring-security-web-thymeleaf
spring-security-web-x509
spring-security-opa
+ spring-security-pkce
diff --git a/spring-security-modules/spring-security-pkce/pkce-auth-server/src/main/java/com/baeldung/security/pkce/authserver/conf/AuthServerConfiguration.java b/spring-security-modules/spring-security-pkce/pkce-auth-server/src/main/java/com/baeldung/security/pkce/authserver/conf/AuthServerConfiguration.java
index 1f6484478d..b599880f3c 100644
--- a/spring-security-modules/spring-security-pkce/pkce-auth-server/src/main/java/com/baeldung/security/pkce/authserver/conf/AuthServerConfiguration.java
+++ b/spring-security-modules/spring-security-pkce/pkce-auth-server/src/main/java/com/baeldung/security/pkce/authserver/conf/AuthServerConfiguration.java
@@ -31,12 +31,11 @@ public class AuthServerConfiguration {
@Order(1)
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
- var authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer();
- var endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
+ OAuth2AuthorizationServerConfigurer authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer<>();
// @formatter:off
http
- .requestMatcher(endpointsMatcher)
+ .requestMatcher(authorizationServerConfigurer.getEndpointsMatcher())
.authorizeRequests(authorize ->
authorize
.anyRequest()
@@ -46,7 +45,7 @@ public class AuthServerConfiguration {
exceptions.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login")))
.csrf( csrf ->
csrf
- .ignoringRequestMatchers(endpointsMatcher))
+ .ignoringRequestMatchers(authorizationServerConfigurer.getEndpointsMatcher()))
.apply(authorizationServerConfigurer);
// Required by /userinfo endpoint
@@ -68,7 +67,7 @@ public class AuthServerConfiguration {
@Bean
public RegisteredClientRepository registeredClientRepository() {
- var pkceClient = RegisteredClient
+ RegisteredClient pkceClient = RegisteredClient
.withId(UUID.randomUUID().toString())
.clientId("pkce-client")
.clientSecret("{noop}obscura")
diff --git a/spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/SpringSecurityPkceApplicationTests.java b/spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/SpringSecurityPkceApplicationLiveTest.java
similarity index 100%
rename from spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/SpringSecurityPkceApplicationTests.java
rename to spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/SpringSecurityPkceApplicationLiveTest.java
diff --git a/spring-security-modules/spring-security-pkce/pkce-client/src/main/java/com/baeldung/security/pkce/client/config/OAuth2ClientConfiguration.java b/spring-security-modules/spring-security-pkce/pkce-client/src/main/java/com/baeldung/security/pkce/client/config/OAuth2ClientConfiguration.java
index 6863c13fa7..8868bccdb2 100644
--- a/spring-security-modules/spring-security-pkce/pkce-client/src/main/java/com/baeldung/security/pkce/client/config/OAuth2ClientConfiguration.java
+++ b/spring-security-modules/spring-security-pkce/pkce-client/src/main/java/com/baeldung/security/pkce/client/config/OAuth2ClientConfiguration.java
@@ -21,7 +21,7 @@ public class OAuth2ClientConfiguration {
@Bean
public ServerOAuth2AuthorizationRequestResolver pkceResolver(ReactiveClientRegistrationRepository repo) {
- var resolver = new DefaultServerOAuth2AuthorizationRequestResolver(repo);
+ DefaultServerOAuth2AuthorizationRequestResolver resolver = new DefaultServerOAuth2AuthorizationRequestResolver(repo);
resolver.setAuthorizationRequestCustomizer(OAuth2AuthorizationRequestCustomizers.withPkce());
return resolver;
}
diff --git a/spring-security-modules/spring-security-pkce/pom.xml b/spring-security-modules/spring-security-pkce/pom.xml
index a90a0d5c1d..d835c8a9e5 100644
--- a/spring-security-modules/spring-security-pkce/pom.xml
+++ b/spring-security-modules/spring-security-pkce/pom.xml
@@ -17,7 +17,6 @@
2.7.2
- 11