From 1e0e6ca3e749c7408c610f54791f7ec68910e655 Mon Sep 17 00:00:00 2001
From: ibondarenko <ivan.bondarenko@zorallabs.com>
Date: Thu, 21 Nov 2019 17:36:43 +0200
Subject: [PATCH] FINERACT-724 fix oauth configuration

---
 .../infrastructure/core/boot/WebXmlOauthConfiguration.java  | 6 ------
 .../src/main/resources/META-INF/spring/securityContext.xml  | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebXmlOauthConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebXmlOauthConfiguration.java
index 28455146d..635e298e8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebXmlOauthConfiguration.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebXmlOauthConfiguration.java
@@ -40,12 +40,6 @@ import com.sun.jersey.spi.spring.container.servlet.SpringServlet;
 @Profile("oauth")
 public class WebXmlOauthConfiguration {
 
-
-    @Bean
-    public Filter springSecurityFilterChain() {
-        return new DelegatingFilterProxy();
-    }
-
     @Bean
     public ServletRegistrationBean jersey() {
         Servlet jerseyServlet = new SpringServlet();
diff --git a/fineract-provider/src/main/resources/META-INF/spring/securityContext.xml b/fineract-provider/src/main/resources/META-INF/spring/securityContext.xml
index 20c08160c..ff6b5b23b 100644
--- a/fineract-provider/src/main/resources/META-INF/spring/securityContext.xml
+++ b/fineract-provider/src/main/resources/META-INF/spring/securityContext.xml
@@ -131,6 +131,11 @@
 				before="BASIC_AUTH_FILTER" />
 			<access-denied-handler ref="oauthAccessDeniedHandler" />
 		</http>
+
+        <beans:bean id="passwordEncoder" class="org.apache.fineract.infrastructure.core.domain.DefaultPasswordEncoderFactories"
+                    factory-method="createDelegatingPasswordEncoder">
+        </beans:bean>
+
 		<beans:bean id="oauthAuthenticationEntryPoint"
 			class="org.springframework.security.oauth2.provider.error.OAuth2AuthenticationEntryPoint">
 			<beans:property name="realmName" value="Fineract Platform API" />