Fix authentication failure handlers auto-config

ch4mpy · Jun 7, 2024 · 217c6a2 · 217c6a2
1 parent 85e79cb
commit 217c6a2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/samples/pom.xml b/samples/pom.xml
@@ -34,8 +34,8 @@
 		<module>webmvc-jwt-default-jpa-authorities</module>
 		<module>webmvc-jwt-oauthentication</module>
 		<module>tutorials</module>
-		<module>springdoc-openapi-2494-reactive</module>
-		<module>springdoc-openapi-2494-servlet</module>
+		<!--module>springdoc-openapi-2494-reactive</module>
+		<module>springdoc-openapi-2494-servlet</module-->
 	</modules>
 
 	<dependencyManagement>

diff --git a/samples/springdoc-openapi-2494-reactive/pom.xml b/samples/springdoc-openapi-2494-reactive/pom.xml
@@ -22,7 +22,6 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webflux-api</artifactId>
-			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.c4-soft.springaddons</groupId>

diff --git a/samples/springdoc-openapi-2494-servlet/pom.xml b/samples/springdoc-openapi-2494-servlet/pom.xml
@@ -23,7 +23,6 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.c4-soft.springaddons</groupId>

diff --git a/.../oidc/starter/properties/condition/bean/DefaultAuthenticationSuccessHandlerCondition.java b/.../oidc/starter/properties/condition/bean/DefaultAuthenticationSuccessHandlerCondition.java
@@ -3,7 +3,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.NoneNestedConditions;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.security.web.server.authentication.ServerAuthenticationSuccessHandler;
 
 public class DefaultAuthenticationSuccessHandlerCondition extends NoneNestedConditions {
 
@@ -15,7 +14,7 @@ public DefaultAuthenticationSuccessHandlerCondition() {
 	static class AuthenticationSuccessHandlerProvidedCondition {
 	}
 
-	@ConditionalOnBean(ServerAuthenticationSuccessHandler.class)
+	@ConditionalOnBean(AuthenticationSuccessHandler.class)
 	static class ServerAuthenticationSuccessHandlerProvidedCondition {
 	}
 }
diff --git a/...s/security/oidc/starter/reactive/client/ReactiveSpringAddonsOidcClientWithLoginBeans.java b/...s/security/oidc/starter/reactive/client/ReactiveSpringAddonsOidcClientWithLoginBeans.java
@@ -37,6 +37,7 @@
 import com.c4_soft.springaddons.security.oidc.starter.SpringAddonsOAuth2LogoutRequestUriBuilder;
 import com.c4_soft.springaddons.security.oidc.starter.properties.SpringAddonsOidcProperties;
 import com.c4_soft.springaddons.security.oidc.starter.properties.condition.bean.CookieCsrfCondition;
+import com.c4_soft.springaddons.security.oidc.starter.properties.condition.bean.DefaultAuthenticationFailureHandlerCondition;
 import com.c4_soft.springaddons.security.oidc.starter.properties.condition.bean.DefaultAuthenticationSuccessHandlerCondition;
 import com.c4_soft.springaddons.security.oidc.starter.properties.condition.configuration.IsClientWithLoginCondition;
 import com.c4_soft.springaddons.security.oidc.starter.properties.condition.configuration.IsNotServlet;
@@ -264,7 +265,7 @@ ServerAuthenticationSuccessHandler authenticationSuccessHandler(SpringAddonsOidc
         return new SpringAddonsOauth2ServerAuthenticationSuccessHandler(addonsProperties);
     }
 
-    @Conditional(DefaultAuthenticationSuccessHandlerCondition.class)
+    @Conditional(DefaultAuthenticationFailureHandlerCondition.class)
     @Bean
     ServerAuthenticationFailureHandler authenticationFailureHandler(SpringAddonsOidcProperties addonsProperties) {
         return new SpringAddonsOauth2ServerAuthenticationFailureHandler(addonsProperties);