Refactor user services and separate authentication (issue-281)

James Moger

2013-11-24 04a98505a4ab8f48aee22800fcac193d9367d0ae

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

@@ -36,7 +36,7 @@
import com.gitblit.Keys;
import com.gitblit.Keys.web;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.ISessionManager;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.models.UserModel;

/**
@@ -54,16 +54,16 @@

   private final IStoredSettings settings;

   private final ISessionManager sessionManager;
   private final IAuthenticationManager authenticationManager;

   @Inject
   public EnforceAuthenticationFilter(
         IRuntimeManager runtimeManager,
         ISessionManager sessionManager) {
         IAuthenticationManager authenticationManager) {

      super();
      this.settings = runtimeManager.getSettings();
      this.sessionManager = sessionManager;
      this.authenticationManager = authenticationManager;
   }

   /*
@@ -86,7 +86,7 @@

      HttpServletRequest  httpRequest  = (HttpServletRequest) request;
      HttpServletResponse httpResponse = (HttpServletResponse) response;
      UserModel user = sessionManager.authenticate(httpRequest);
      UserModel user = authenticationManager.authenticate(httpRequest);

      if (mustForceAuth && (user == null)) {
         // not authenticated, enforce now: