Refactor user services and separate authentication (issue-281)

James Moger

2013-11-24 04a98505a4ab8f48aee22800fcac193d9367d0ae

 src/main/java/com/gitblit/git/GitblitReceivePack.java

@@ -48,8 +48,6 @@
import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.client.Translation;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ArrayUtils;

@@ -91,17 +89,25 @@


   protected GroovyScriptEngine gse;



   public GitblitReceivePack(Repository db, RepositoryModel repository, UserModel user) {

   private final IStoredSettings settings;



   private final GitBlit gitblit;



   public GitblitReceivePack(

         GitBlit gitblit,

         Repository db,

         RepositoryModel repository,

         UserModel user) {



      super(db);



      IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);



      this.settings = gitblit.getSettings();

      this.gitblit = gitblit;

      this.repository = repository;

      this.user = user == null ? UserModel.ANONYMOUS : user;

      this.groovyDir = repositoryManager.getHooksFolder();

      this.user = user;

      this.groovyDir = gitblit.getHooksFolder();

      try {

         // set Grape root

         File grapeRoot = repositoryManager.getGrapesFolder();

         File grapeRoot = gitblit.getGrapesFolder();

         grapeRoot.mkdirs();

         System.setProperty("grape.root", grapeRoot.getAbsolutePath());

         this.gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());

@@ -239,9 +245,8 @@
         }

      }



      IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

      Set<String> scripts = new LinkedHashSet<String>();

      scripts.addAll(repositoryManager.getPreReceiveScriptsInherited(repository));

      scripts.addAll(gitblit.getPreReceiveScriptsInherited(repository));

      if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {

         scripts.addAll(repository.preReceiveScripts);

      }

@@ -265,8 +270,6 @@
         LOGGER.debug("skipping post-receive hooks, no refs created, updated, or removed");

         return;

      }



      IStoredSettings settings = GitBlit.getManager(IRuntimeManager.class).getSettings();



      // log ref changes

      for (ReceiveCommand cmd : commands) {

@@ -336,11 +339,9 @@
         LOGGER.error(MessageFormat.format("Failed to update {0} pushlog", repository.name), e);

      }



      IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);



      // run Groovy hook scripts

      Set<String> scripts = new LinkedHashSet<String>();

      scripts.addAll(repositoryManager.getPostReceiveScriptsInherited(repository));

      scripts.addAll(gitblit.getPostReceiveScriptsInherited(repository));

      if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {

         scripts.addAll(repository.postReceiveScripts);

      }

@@ -455,7 +456,7 @@
      }



      Binding binding = new Binding();

      binding.setVariable("gitblit", GitBlit.self());

      binding.setVariable("gitblit", gitblit);

      binding.setVariable("repository", repository);

      binding.setVariable("receivePack", this);

      binding.setVariable("user", user);