[roller] branch master updated: Simplification of recent remember-me fix.

[snoopdave]

This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/master by this push:
     new 18b5371  Simplification of recent remember-me fix.
18b5371 is described below

commit 18b5371df3c65313d36247d689f40b090104131a
Author: snoopd...@gmail.com <snoopd...@gmail.com>
AuthorDate: Sun May 19 10:06:18 2019 -0400

    Simplification of recent remember-me fix.
---
 .../ui/core/security/RollerRememberMeAuthenticationProvider.java  | 2 +-
 .../weblogger/ui/core/security/RollerRememberMeServices.java      | 8 +-------
 app/src/main/webapp/WEB-INF/security.xml                          | 1 -
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeAuthenticationProvider.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeAuthenticationProvider.java
index d805c58..82e4322 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeAuthenticationProvider.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeAuthenticationProvider.java
@@ -28,7 +28,7 @@ public class RollerRememberMeAuthenticationProvider extends 
RememberMeAuthentica
     private static final Log log = 
LogFactory.getLog(RollerRememberMeServices.class);
 
 
-    public RollerRememberMeAuthenticationProvider(String ignored) {
+    public RollerRememberMeAuthenticationProvider() {
 
         String key = WebloggerConfig.getProperty("rememberme.key", 
"springRocks");
 
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
index 72cfee4..fdb920e 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
@@ -22,7 +22,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.config.AuthMethod;
 import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.codec.Hex;
 import 
org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices;
 
@@ -34,12 +33,7 @@ public class RollerRememberMeServices extends 
TokenBasedRememberMeServices {
     private static final Log log = 
LogFactory.getLog(RollerRememberMeServices.class);
 
 
-    public RollerRememberMeServices() {
-    }
-
-    public RollerRememberMeServices(String key, UserDetailsService 
userDetailsService) {
-        super(key, userDetailsService);
-    }
+    public RollerRememberMeServices() {}
 
     /**
      * Calculates the digital signature to be put in the cookie. Default value 
is
diff --git a/app/src/main/webapp/WEB-INF/security.xml 
b/app/src/main/webapp/WEB-INF/security.xml
index 9e4ba88..993073a 100644
--- a/app/src/main/webapp/WEB-INF/security.xml
+++ b/app/src/main/webapp/WEB-INF/security.xml
@@ -84,7 +84,6 @@
 
     <beans:bean id="rememberMeAuthenticationProvider"
                 
class="org.apache.roller.weblogger.ui.core.security.RollerRememberMeAuthenticationProvider">
-        <beans:property name="key" value="springRocks"/>
     </beans:bean>
 
     <beans:bean id = "openIDAuthProvider" 
class="org.springframework.security.openid.OpenIDAuthenticationProvider">