aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java7
-rw-r--r--juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java9
2 files changed, 13 insertions, 3 deletions
diff --git a/juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java b/juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
index 259e8c08..19485579 100644
--- a/juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
+++ b/juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
@@ -27,6 +27,11 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Bean("userDetailsService")
@Override
public UserDetailsService userDetailsServiceBean() throws Exception {
+ return super.userDetailsServiceBean();
+ }
+
+ @Override
+ public UserDetailsService userDetailsService() {
return new JuickUserDetailsService(userService);
}
@@ -57,7 +62,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.alwaysRemember(true)
//.useSecureCookie(true) // TODO Enable if https is supports
.rememberMeCookieDomain(env.getProperty("web_domain", "juick.com"))
- .userDetailsService(userDetailsServiceBean())
+ .userDetailsService(userDetailsService())
.key(env.getProperty("auth_remember_me_key"))
.and()
.csrf().disable();
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
index dde67aa1..c6357c90 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
+++ b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
@@ -34,6 +34,11 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Bean("userDetailsService")
@Override
public UserDetailsService userDetailsServiceBean() throws Exception {
+ return super.userDetailsServiceBean();
+ }
+
+ @Override
+ public UserDetailsService userDetailsService() {
return new JuickUserDetailsService(userService);
}
@@ -83,7 +88,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
public DaoAuthenticationProvider authenticationProvider() throws Exception {
DaoAuthenticationProvider authenticationProvider = new DaoAuthenticationProvider();
- authenticationProvider.setUserDetailsService(userDetailsServiceBean());
+ authenticationProvider.setUserDetailsService(userDetailsService());
return authenticationProvider;
}
@@ -96,7 +101,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Bean
public RememberMeServices rememberMeServices() throws Exception {
TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(
- rememberMeKey, userDetailsServiceBean());
+ rememberMeKey, userDetailsService());
services.setCookieName("juick-remember-me");
services.setCookieDomain(webDomain);