From c70dc3181ec21b7ab7b9974a7f43095cce5bb248 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Fri, 7 Oct 2022 22:31:46 +0200 Subject: [PATCH] #63 fixed a circular spring dependency --- .../api/security/WebSecurityConfigJWT.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/WebSecurityConfigJWT.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/WebSecurityConfigJWT.java index 7fa81e7..dd6c53f 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/WebSecurityConfigJWT.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/WebSecurityConfigJWT.java @@ -63,9 +63,6 @@ public class WebSecurityConfigJWT extends WebSecurityConfigurerAdapter { @Autowired private ObjectMapper objectMapper; - @Autowired - private UserDetailsService userDetailsService; - @Autowired private InMemoryAccountProperties inMemoryAccountProps; @@ -85,10 +82,6 @@ public class WebSecurityConfigJWT extends WebSecurityConfigurerAdapter { QuartzManagerHttpSecurity.from(http).withLoginConfigurer(loginConfigurer(), logoutConfigurer()) // .login(QUARTZ_MANAGER_LOGIN_PATH, authenticationManager()).logout(QUARTZ_MANAGER_LOGOUT_PATH); - - // temporary disabled csfr - // http.csrf().ignoringAntMatchers("/api/login", "/api/signup") // - // .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()) // } @Override @@ -133,8 +126,8 @@ public class WebSecurityConfigJWT extends WebSecurityConfigurerAdapter { } // @Bean - public JwtTokenAuthenticationFilter jwtAuthenticationTokenFilter() { - return new JwtTokenAuthenticationFilter(jwtTokenHelper(), userDetailsService); + public JwtTokenAuthenticationFilter jwtAuthenticationTokenFilter() throws Exception { + return new JwtTokenAuthenticationFilter(jwtTokenHelper(), userDetailsServiceBean()); } @Bean