Revert "fix: fix AuthenticationContext bean duplicated definition (#21845) (#21846) (#21847)" (#21849)

mcollovati · web-flow · commit 41a013f0732a · 2025-07-07T12:52:15.000+02:00
This reverts commit f771039.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringSecurityAutoConfiguration.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringSecurityAutoConfiguration.java
@@ -198,7 +198,7 @@ public VaadinRolePrefixHolder vaadinRolePrefixHolder(
                 .map(GrantedAuthorityDefaults::getRolePrefix).orElse(null));
     }
 
-    @Bean(name = "VaadinAuthenticationContext")
+    @Bean
     @ConditionalOnMissingBean
     AuthenticationContext authenticationContext() {
         return new AuthenticationContext();
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinWebSecurity.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinWebSecurity.java
@@ -16,7 +16,6 @@
 package com.vaadin.flow.spring.security;
 
 import javax.crypto.SecretKey;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -124,10 +123,6 @@ public abstract class VaadinWebSecurity {
     @Autowired
     private ObjectProvider<NavigationAccessControl> accessControlProvider;
 
-    // initialized only for tests, it gets overridden by the injected instance
-    @Autowired
-    private AuthenticationContext authenticationContext = new AuthenticationContext();
-
     private NavigationAccessControl accessControl;
 
     @PostConstruct
@@ -136,6 +131,8 @@ void afterPropertiesSet() {
         authenticationContext.setRolePrefixHolder(vaadinRolePrefixHolder);
     }
 
+    private final AuthenticationContext authenticationContext = new AuthenticationContext();
+
     /**
      * Registers default {@link SecurityFilterChain} bean.
      * <p>
@@ -168,6 +165,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
      *
      * @return the authentication-context bean
      */
+    @Bean(name = "VaadinAuthenticationContext")
     public AuthenticationContext getAuthenticationContext() {
         return authenticationContext;
     }

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public VaadinRolePrefixHolder vaadinRolePrefixHolder(`
`198`	`198`	`.map(GrantedAuthorityDefaults::getRolePrefix).orElse(null));`
`199`	`199`	`}`
`200`	`200`
`201`		`- @Bean(name = "VaadinAuthenticationContext")`
	`201`	`+ @Bean`
`202`	`202`	`@ConditionalOnMissingBean`
`203`	`203`	`AuthenticationContext authenticationContext() {`
`204`	`204`	`return new AuthenticationContext();`