James Moger
2014-03-17 7f3682a7448c6c4f59d7b66b3eab81fcf2999d0d
src/main/java/com/gitblit/manager/GitblitManager.java
@@ -22,6 +22,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.security.PublicKey;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -68,7 +69,7 @@
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.tickets.ITicketService;
import com.gitblit.transport.ssh.SshSession;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.JsonUtils;
@@ -107,6 +108,8 @@
   protected final IAuthenticationManager authenticationManager;
   protected final IPublicKeyManager publicKeyManager;
   protected final IRepositoryManager repositoryManager;
   protected final IProjectManager projectManager;
@@ -118,6 +121,7 @@
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IPublicKeyManager publicKeyManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IFederationManager federationManager) {
@@ -127,6 +131,7 @@
      this.notificationManager = notificationManager;
      this.userManager = userManager;
      this.authenticationManager = authenticationManager;
      this.publicKeyManager = publicKeyManager;
      this.repositoryManager = repositoryManager;
      this.projectManager = projectManager;
      this.federationManager = federationManager;
@@ -524,6 +529,11 @@
      throw new RuntimeException("This class does not have a ticket service!");
   }
   @Override
   public IPublicKeyManager getPublicKeyManager() {
      return publicKeyManager;
   }
   /*
    * ISTOREDSETTINGS
    *
@@ -652,12 +662,12 @@
      }
      return user;
   }
   @Override
   public UserModel authenticate(SshSession sshSession) {
      return authenticationManager.authenticate(sshSession);
   public UserModel authenticate(String username, PublicKey key) {
      return authenticationManager.authenticate(username, key);
   }
   @Override
   public UserModel authenticate(HttpServletRequest httpRequest, boolean requiresCertificate) {
      UserModel user = authenticationManager.authenticate(httpRequest, requiresCertificate);