Refactor user services and separate authentication (issue-281)

James Moger

2013-11-24 04a98505a4ab8f48aee22800fcac193d9367d0ae

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

@@ -31,7 +31,7 @@
import com.gitblit.Keys.fanout;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.manager.ISessionManager;

import com.gitblit.manager.IAuthenticationManager;

import com.gitblit.manager.IUserManager;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

@@ -52,7 +52,7 @@


   private final IUserManager userManager;



   private final ISessionManager sessionManager;

   private final IAuthenticationManager authenticationManager;



   private final IRepositoryManager repositoryManager;



@@ -60,13 +60,13 @@
   public SparkleShareInviteServlet(

         IRuntimeManager runtimeManager,

         IUserManager userManager,

         ISessionManager sessionManager,

         IAuthenticationManager authenticationManager,

         IRepositoryManager repositoryManager) {



      super();

      this.settings = runtimeManager.getSettings();

      this.userManager = userManager;

      this.sessionManager = sessionManager;

      this.authenticationManager = authenticationManager;

      this.repositoryManager = repositoryManager;

   }



@@ -106,7 +106,7 @@
      }

      UserModel user;

      if (StringUtils.isEmpty(username)) {

         user = sessionManager.authenticate(request);

         user = authenticationManager.authenticate(request);

      } else {

         user = userManager.getUserModel(username);

      }