From c70aa8df95b7a276feda8de801aeaf62def34f8b Mon Sep 17 00:00:00 2001 From: shimingxy Date: Sun, 29 Mar 2020 19:41:55 +0800 Subject: [PATCH] RemeberMe fix --- .../org/maxkey/authn/AbstractAuthenticationProvider.java | 5 ----- .../java/org/maxkey/authn/RealmAuthenticationProvider.java | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java b/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java index c8d429f48..844df314d 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java @@ -1,7 +1,6 @@ package org.maxkey.authn; import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.support.jwt.JwtLoginService; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.config.ApplicationConfig; import org.maxkey.constants.LOGINTYPE; @@ -47,10 +46,6 @@ public abstract class AbstractAuthenticationProvider{ @Qualifier("remeberMeService") protected AbstractRemeberMeService remeberMeService; - /* @Autowired - @Qualifier("jwtLoginService") - JwtLoginService jwtLoginService; - */ protected abstract String getProviderName(); protected abstract Authentication doInternalAuthenticate(Authentication authentication); diff --git a/maxkey-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java b/maxkey-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java index eac545495..64d551390 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java @@ -60,7 +60,9 @@ public class RealmAuthenticationProvider extends AbstractAuthenticationProvider */ WebContext.setUserInfo(userInfo); - if(applicationConfig.getLoginConfig().isRemeberMe()){ + auth.setAuthenticated(true); + + if(auth.isAuthenticated()&&applicationConfig.getLoginConfig().isRemeberMe()){ if(auth.getJ_remeberme()!=null&&auth.getJ_remeberme().equals("remeberMe")){ WebContext.getSession().setAttribute(WebConstants.REMEBER_ME_SESSION,auth.getJ_username()); _logger.debug("do Remeber Me"); @@ -71,7 +73,6 @@ public class RealmAuthenticationProvider extends AbstractAuthenticationProvider } } - auth.setAuthenticated(true); UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken =new UsernamePasswordAuthenticationToken( auth, "PASSWORD",