aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/http/UserServlet.java
diff options
context:
space:
mode:
authorDemian <dalonso@ecotaxi.com>2015-06-16 18:25:28 -0300
committerDemian <dalonso@ecotaxi.com>2015-06-16 18:42:13 -0300
commit92ac9aaa10fcf65a005c4e06245ce4a9427d5148 (patch)
tree57a23077fc9af137baffbb51bcb4ba82cff2f94b /src/org/traccar/http/UserServlet.java
parent80f766554a3dd117b2958fd8c55b8fab2b73f9f9 (diff)
downloadtrackermap-server-92ac9aaa10fcf65a005c4e06245ce4a9427d5148.tar.gz
trackermap-server-92ac9aaa10fcf65a005c4e06245ce4a9427d5148.tar.bz2
trackermap-server-92ac9aaa10fcf65a005c4e06245ce4a9427d5148.zip
Separated the persisted password (hashedPassword) from the password sent from the web request. Improved JSON serialization so it doesnt send as a response the hashed password and salt.
Diffstat (limited to 'src/org/traccar/http/UserServlet.java')
-rw-r--r--src/org/traccar/http/UserServlet.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/http/UserServlet.java b/src/org/traccar/http/UserServlet.java
index 197ef0326..f388326b0 100644
--- a/src/org/traccar/http/UserServlet.java
+++ b/src/org/traccar/http/UserServlet.java
@@ -47,14 +47,14 @@ public class UserServlet extends BaseServlet {
private void add(HttpServletRequest req, HttpServletResponse resp) throws Exception {
User user = JsonConverter.objectFromJson(req.getReader(), new User());
Context.getPermissionsManager().checkUser(getUserId(req), user.getId());
- Context.getDataManager().addUser(user, user.getPassword());
+ Context.getDataManager().addUser(user);
sendResponse(resp.getWriter(), JsonConverter.objectToJson(user));
}
private void update(HttpServletRequest req, HttpServletResponse resp) throws Exception {
User user = JsonConverter.objectFromJson(req.getReader(), new User());
Context.getPermissionsManager().checkUser(getUserId(req), user.getId());
- Context.getDataManager().updateUser(user, user.getPassword());
+ Context.getDataManager().updateUser(user);
sendResponse(resp.getWriter(), true);
}