opendev/gerrit
Code Issues Proposed changes

Prevent injecting IdentifiedUser for project REST endpoints

Browse Source 
To support gathering of all UiActions (i. e. REST endpoints) defined for
project resource, we can not support injection of IdentifiedUser because the
actions gathering take also place when user is not authenticated.

Refactor the code to not need injection of IdentifiedUser.

Change-Id: I3bbfc4701685adfd0e04b12cedc6dff86c9c105b
This commit is contained in:
David Ostrovsky
2013-08-29 21:32:16 +02:00
parent 513659c490
commit fff6f19dbd
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java
View File

@@ -25,6 +25,7 @@ import com.google.gerrit.server.auth.AuthException;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.project.SetHead.Input;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Constants;
@@ -40,10 +41,10 @@ public class SetHead implements RestModifyView<ProjectResource, Input> {
}
private final GitRepositoryManager repoManager;
private final IdentifiedUser identifiedUser;
private final Provider<IdentifiedUser> identifiedUser;
@Inject
SetHead(GitRepositoryManager repoManager, IdentifiedUser identifiedUser) {
SetHead(GitRepositoryManager repoManager, Provider<IdentifiedUser> identifiedUser) {
this.repoManager = repoManager;
this.identifiedUser = identifiedUser;
}
@@ -73,7 +74,7 @@ public class SetHead implements RestModifyView<ProjectResource, Input> {
if (!repo.getRef(Constants.HEAD).getTarget().getName().equals(ref)) {
final RefUpdate u = repo.updateRef(Constants.HEAD, true);
u.setRefLogIdent(identifiedUser.newRefLogIdent());
u.setRefLogIdent(identifiedUser.get().newRefLogIdent());
RefUpdate.Result res = u.link(ref);
switch(res) {
case NO_CHANGE: