Refactor user services and separate authentication (issue-281)

James Moger

2013-11-24 04a98505a4ab8f48aee22800fcac193d9367d0ae

 src/main/java/com/gitblit/servlet/AuthenticationFilter.java

@@ -36,7 +36,7 @@
import org.slf4j.LoggerFactory;



import com.gitblit.Constants;

import com.gitblit.manager.ISessionManager;

import com.gitblit.manager.IAuthenticationManager;

import com.gitblit.models.UserModel;

import com.gitblit.utils.DeepCopier;

import com.gitblit.utils.StringUtils;

@@ -58,10 +58,10 @@


   protected transient Logger logger = LoggerFactory.getLogger(getClass());



   protected final ISessionManager sessionManager;

   protected final IAuthenticationManager authenticationManager;



   protected AuthenticationFilter(ISessionManager sessionManager) {

      this.sessionManager = sessionManager;

   protected AuthenticationFilter(IAuthenticationManager authenticationManager) {

      this.authenticationManager = authenticationManager;

   }



   /**

@@ -108,7 +108,7 @@
    * @return user

    */

   protected UserModel getUser(HttpServletRequest httpRequest) {

      UserModel user = sessionManager.authenticate(httpRequest, requiresClientCertificate());

      UserModel user = authenticationManager.authenticate(httpRequest, requiresClientCertificate());

      return user;

   }