Merge pull request #1194 from MegaAlex/MIFOSX-1747

MIFOSX-1747 Don't register the basic auth filter before Spring's filter ...

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/boot/WebXmlConfiguration.java

@@ -9,6 +9,9 @@ import javax.servlet.Filter;
 import javax.servlet.Servlet;
 
 import org.mifosplatform.infrastructure.core.filters.ResponseCorsFilter;
+import org.mifosplatform.infrastructure.security.filter.TenantAwareBasicAuthenticationFilter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.embedded.FilterRegistrationBean;
 import org.springframework.boot.context.embedded.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -25,6 +28,9 @@ import com.sun.jersey.spi.spring.container.servlet.SpringServlet;
 @Configuration
 public class WebXmlConfiguration {
 
+    @Autowired
+    private TenantAwareBasicAuthenticationFilter basicAuthenticationProcessingFilter;
+
     @Bean
     public Filter springSecurityFilterChain() {
         return new DelegatingFilterProxy();
@@ -48,4 +54,12 @@ public class WebXmlConfiguration {
         return jerseyServletRegistration;
     }
 
+    @Bean
+    public FilterRegistrationBean filterRegistrationBean() {
+        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+        filterRegistrationBean.setFilter(basicAuthenticationProcessingFilter);
+        filterRegistrationBean.setEnabled(false);
+        return filterRegistrationBean;
+    }
+
 }