From 1293c279d1ab41ba7f4721009f87e89d4d48bf3d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Dec 2013 08:08:37 -0500
Subject: [PATCH] Fix external authentication failure
---
src/main/java/com/gitblit/servlet/RpcServlet.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java
index 481a8ba..a5d892f 100644
--- a/src/main/java/com/gitblit/servlet/RpcServlet.java
+++ b/src/main/java/com/gitblit/servlet/RpcServlet.java
@@ -23,8 +23,6 @@
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Singleton;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -55,7 +53,6 @@
* @author James Moger
*
*/
-@Singleton
public class RpcServlet extends JsonServlet {
private static final long serialVersionUID = 1L;
@@ -66,7 +63,6 @@
private final IGitblit gitblit;
- @Inject
public RpcServlet(IGitblit gitblit) {
super();
@@ -218,7 +214,7 @@
// create user
UserModel model = deserialize(request, response, UserModel.class);
try {
- gitblit.updateUserModel(model.username, model, true);
+ gitblit.addUser(model);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
@@ -231,7 +227,7 @@
username = model.username;
}
try {
- gitblit.updateUserModel(username, model, false);
+ gitblit.reviseUser(username, model);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
@@ -245,7 +241,7 @@
// create team
TeamModel model = deserialize(request, response, TeamModel.class);
try {
- gitblit.updateTeamModel(model.name, model, true);
+ gitblit.addTeam(model);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
@@ -258,7 +254,7 @@
teamname = model.name;
}
try {
- gitblit.updateTeamModel(teamname, model, false);
+ gitblit.reviseTeam(teamname, model);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
--
Gitblit v1.9.1