aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/database/DataManager.java17
-rw-r--r--src/org/traccar/http/MainServlet.java8
-rw-r--r--src/org/traccar/http/UserServlet.java64
-rw-r--r--src/org/traccar/http/WebServer.java1
4 files changed, 80 insertions, 10 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 54f1cdc3a..db863e8f4 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -221,10 +221,16 @@ public class DataManager {
.executeQuerySingle(new User());
}
+ public Collection<User> getUsers() throws SQLException {
+ return QueryBuilder.create(dataSource,
+ "SELECT * FROM user;")
+ .executeQuery(new User());
+ }
+
public void addUser(User user) throws SQLException {
user.setId(QueryBuilder.create(dataSource,
- "INSERT INTO user (name, email, password, salt, admin) " +
- "VALUES (:name, :email, CAST(HASH('SHA256', STRINGTOUTF8(:password), 1000) AS VARCHAR), '', :admin);")
+ "INSERT INTO user (name, email, password, admin) " +
+ "VALUES (:name, :email, CAST(HASH('SHA256', STRINGTOUTF8(:password), 1000) AS VARCHAR), :admin);")
.setObject(user)
.executeUpdate());
}
@@ -236,6 +242,13 @@ public class DataManager {
.setObject(user)
.executeUpdate();
}
+
+ public void removeUser(User user) throws SQLException {
+ QueryBuilder.create(dataSource,
+ "DELETE FROM user WHERE id = :id;")
+ .setObject(user)
+ .executeUpdate();
+ }
public Collection<Permission> getPermissions() throws SQLException {
return QueryBuilder.create(dataSource,
diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/http/MainServlet.java
index 84ec25906..18430f0c3 100644
--- a/src/org/traccar/http/MainServlet.java
+++ b/src/org/traccar/http/MainServlet.java
@@ -34,8 +34,6 @@ public class MainServlet extends BaseServlet {
logout(req, resp);
} else if (command.equals("/register")) {
register(req, resp);
- } else if (command.equals("/user/update")) {
- update(req, resp);
} else {
return false;
}
@@ -72,11 +70,5 @@ public class MainServlet extends BaseServlet {
Context.getDataManager().addUser(user);
sendResponse(resp.getWriter(), true);
}
-
- private void update(HttpServletRequest req, HttpServletResponse resp) throws Exception {
- Context.getDataManager().updateUser(JsonConverter.objectFromJson(
- req.getReader(), new User()));
- sendResponse(resp.getWriter(), true);
- }
}
diff --git a/src/org/traccar/http/UserServlet.java b/src/org/traccar/http/UserServlet.java
new file mode 100644
index 000000000..597b54a5c
--- /dev/null
+++ b/src/org/traccar/http/UserServlet.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.http;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.traccar.Context;
+import org.traccar.model.User;
+
+public class UserServlet extends BaseServlet {
+
+ @Override
+ protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception {
+ if (command.equals("/get")) {
+ get(req, resp);
+ } else if (command.equals("/add")) {
+ add(req, resp);
+ } else if (command.equals("/update")) {
+ update(req, resp);
+ } else if (command.equals("/remove")) {
+ remove(req, resp);
+ } else {
+ return false;
+ }
+ return true;
+ }
+
+ private void get(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+ sendResponse(resp.getWriter(), JsonConverter.arrayToJson(
+ Context.getDataManager().getUsers()));
+ }
+
+ private void add(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+ User user = JsonConverter.objectFromJson(req.getReader(), new User());
+ Context.getDataManager().addUser(user);
+ sendResponse(resp.getWriter(), JsonConverter.objectToJson(user));
+ }
+
+ private void update(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+ Context.getDataManager().updateUser(JsonConverter.objectFromJson(
+ req.getReader(), new User()));
+ sendResponse(resp.getWriter(), true);
+ }
+
+ private void remove(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+ Context.getDataManager().removeUser(JsonConverter.objectFromJson(
+ req.getReader(), new User()));
+ sendResponse(resp.getWriter(), true);
+ }
+
+}
diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java
index b56d04e87..9315ad059 100644
--- a/src/org/traccar/http/WebServer.java
+++ b/src/org/traccar/http/WebServer.java
@@ -53,6 +53,7 @@ public class WebServer {
servletHandler.setContextPath("/api");
servletHandler.addServlet(new ServletHolder(new AsyncServlet()), "/async/*");
servletHandler.addServlet(new ServletHolder(new ServerServlet()), "/server/*");
+ servletHandler.addServlet(new ServletHolder(new UserServlet()), "/user/*");
servletHandler.addServlet(new ServletHolder(new DeviceServlet()), "/device/*");
servletHandler.addServlet(new ServletHolder(new PositionServlet()), "/position/*");
servletHandler.addServlet(new ServletHolder(new MainServlet()), "/*");