Fixed UserService dependency

rest-api/src/main/java/lcsb/mapviewer/api/SpringRestApiConfig.java

 package lcsb.mapviewer.api;
 
+import lcsb.mapviewer.api.users.CustomAuthenticationProvider;
+import lcsb.mapviewer.services.SpringServiceConfig;
+import lcsb.mapviewer.services.interfaces.IUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @Configuration
 @EnableWebMvc
+@Import({SpringServiceConfig.class})
 @ComponentScan(basePackages = {"lcsb.mapviewer.api"})
 public class SpringRestApiConfig {
+
+  private IUserService userService;
+
+  @Autowired
+  public SpringRestApiConfig(IUserService userService) {
+    this.userService = userService;
+  }
+
+  @Bean
+  public AuthenticationProvider authenticationProvider() {
+    CustomAuthenticationProvider provider = new CustomAuthenticationProvider();
+    provider.setUserService(userService);
+    return provider;
+  }
+
 }
 

web/src/main/java/lcsb/mapviewer/web/config/SpringSecurityConfig.java

 package lcsb.mapviewer.web.config;
 
-import lcsb.mapviewer.api.users.CustomAuthenticationProvider;
-import lcsb.mapviewer.services.interfaces.IUserService;
+import lcsb.mapviewer.api.SpringRestApiConfig;
 import lcsb.mapviewer.web.security.MvAuthenticationFailureHandler;
 import lcsb.mapviewer.web.security.MvAuthenticationSuccessHandler;
 import lcsb.mapviewer.web.security.MvUsernamePasswordAuthenticationFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.config.BeanIds;
@@ -26,17 +26,19 @@ import org.springframework.security.web.session.SessionManagementFilter;
 import java.util.Arrays;
 
 @Configuration
+@Import({SpringRestApiConfig.class})
 @EnableWebSecurity
 public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
 
   private SessionRegistry sessionRegistry;
 
-  private IUserService userService;
+  private AuthenticationProvider authenticationProvider;
 
   @Autowired
-  public SpringSecurityConfig(SessionRegistry sessionRegistry, IUserService userService) {
+  public SpringSecurityConfig(SessionRegistry sessionRegistry,
+                              AuthenticationProvider authenticationProvider) {
     this.sessionRegistry = sessionRegistry;
-    this.userService = userService;
+    this.authenticationProvider = authenticationProvider;
   }
 
   @Bean
@@ -73,13 +75,6 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
     return new HttpSessionSecurityContextRepository();
   }
 
-  @Bean
-  public AuthenticationProvider authenticationProvider() {
-    CustomAuthenticationProvider provider = new CustomAuthenticationProvider();
-    provider.setUserService(userService);
-    return provider;
-  }
-
   @Bean
   public MvAuthenticationSuccessHandler authenticationSuccessHandler() {
     MvAuthenticationSuccessHandler handler = new MvAuthenticationSuccessHandler();
@@ -133,7 +128,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
         .authenticationEntryPoint(loginUrlAuthenticationEntryPoint())
 
         .and()
-        .authenticationProvider(authenticationProvider())
+        .authenticationProvider(authenticationProvider)
 
         .addFilterBefore(sessionManagementFilter(), SessionManagementFilter.class)
         .addFilterAt(concurrentSessionFilter(), ConcurrentSessionFilter.class)