Refactor user services and separate authentication (issue-281)

Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
index 4b8b24f4..3bef51dd 100644
--- a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
+++ b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
@@ -31,7 +31,7 @@ import com.gitblit.Keys;
 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 @@ public class SparkleShareInviteServlet extends HttpServlet {
 

 	private final IUserManager userManager;

 

-	private final ISessionManager sessionManager;

+	private final IAuthenticationManager authenticationManager;

 

 	private final IRepositoryManager repositoryManager;

 

@@ -60,13 +60,13 @@ public class SparkleShareInviteServlet extends HttpServlet {
 	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 @@ public class SparkleShareInviteServlet extends HttpServlet {
 		}

 		UserModel user;

 		if (StringUtils.isEmpty(username)) {

-			user = sessionManager.authenticate(request);

+			user = authenticationManager.authenticate(request);

 		} else {

 			user = userManager.getUserModel(username);

 		}