Circular reference when injecting SessionRegistry #1455

Author: Gavrilov-Ivan

jmix-security/security/src/main/java/io/jmix/security/SecurityConfiguration.java

@@ -64,12 +64,6 @@ public class SecurityConfiguration {
     @Autowired
     private RememberMeProperties rememberMeProperties;
 
-    @Autowired
-    private PersistentTokenRepository rememberMeTokenRepository;
-
-    @Autowired
-    private SessionRegistry sessionRegistry;
-
     @Autowired
     private UserRepository userRepository;
 
@@ -89,7 +83,7 @@ protected PersistentTokenRepository inMemoryRememberMeRepository() {
     }
 
     @Bean("sec_rememberMeServices")
-    public RememberMeServices rememberMeServices() {
+    public RememberMeServices rememberMeServices(PersistentTokenRepository rememberMeTokenRepository) {
         JmixRememberMeServices rememberMeServices =
                 new JmixRememberMeServices(rememberMeProperties.getKey(), userRepository, rememberMeTokenRepository);
         rememberMeServices.setTokenValiditySeconds(rememberMeProperties.getTokenValiditySeconds());
@@ -99,11 +93,11 @@ public RememberMeServices rememberMeServices() {
 
     @Primary
     @Bean
-    public SessionAuthenticationStrategy sessionControlAuthenticationStrategy() {
-        return new CompositeSessionAuthenticationStrategy(strategies());
+    public SessionAuthenticationStrategy sessionControlAuthenticationStrategy(SessionRegistry sessionRegistry) {
+        return new CompositeSessionAuthenticationStrategy(strategies(sessionRegistry));
     }
 
-    protected List<SessionAuthenticationStrategy> strategies() {
+    protected List<SessionAuthenticationStrategy> strategies(SessionRegistry sessionRegistry) {
         RegisterSessionAuthenticationStrategy registerSessionAuthenticationStrategy
                 = new RegisterSessionAuthenticationStrategy(sessionRegistry);
         ConcurrentSessionControlAuthenticationStrategy concurrentSessionControlStrategy