Fixed LemonTokenAuthenticationFilter configuration

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.naturalprogrammer</groupId>
     <artifactId>spring-lemon</artifactId>
-    <version>0.13.0</version>
+    <version>1.0.0.M1</version>
     <packaging>jar</packaging>
 
     <name>spring-lemon</name>

src/main/java/com/naturalprogrammer/spring/lemon/LemonAutoConfiguration.java

@@ -57,6 +57,7 @@
 import com.naturalprogrammer.spring.lemon.security.LemonOidcUserService;
 import com.naturalprogrammer.spring.lemon.security.LemonPermissionEvaluator;
 import com.naturalprogrammer.spring.lemon.security.LemonSecurityConfig;
+import com.naturalprogrammer.spring.lemon.security.LemonTokenAuthenticationFilter;
 import com.naturalprogrammer.spring.lemon.security.LemonUserDetailsService;
 import com.naturalprogrammer.spring.lemon.security.OAuth2AuthenticationFailureHandler;
 import com.naturalprogrammer.spring.lemon.security.OAuth2AuthenticationSuccessHandler;
@@ -369,6 +370,18 @@ public LemonSecurityConfig lemonSecurityConfig() {
 		return new LemonSecurityConfig();
 	}
 
+
+    /**
+     * Configures our TokenAuthenticationFilter
+     */
+	@Bean
+	@ConditionalOnMissingBean(LemonTokenAuthenticationFilter.class)
+	public LemonTokenAuthenticationFilter lemonTokenAuthenticationFilter(
+			LemonSecurityConfig lemonSecurityConfig) throws Exception {
+
+		return new LemonTokenAuthenticationFilter(lemonSecurityConfig.getAuthenticationManager());
+	}
+
 	/**
 	 * Configures LemonUtils
 	 */

src/main/java/com/naturalprogrammer/spring/lemon/security/LemonSecurityConfig.java

@@ -3,8 +3,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
+import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -213,14 +212,12 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
         	.authenticationProvider(jwtAuthenticationProvider);
     }
 
-    
+
     /**
-     * Configures our TokenAuthenticationFilter
+     * Returns AuthenticationManager, to be used for configuring LemonTokenAuthenticationFilter
      */
-	@Bean
-	@ConditionalOnMissingBean(LemonTokenAuthenticationFilter.class)
-	public LemonTokenAuthenticationFilter lemonTokenAuthenticationFilter() throws Exception {
-
-		return new LemonTokenAuthenticationFilter(super.authenticationManager());
-	}
+    public AuthenticationManager getAuthenticationManager() throws Exception {
+
+    	return super.authenticationManager();
+    }
 }