2 files changed, 4 insertions, 11 deletions
diff --git a/src/org/traccar/web/CommandServlet.java b/src/org/traccar/web/CommandServlet.java
index 7febb7f42..ff8c85542 100644
--- a/src/org/traccar/web/CommandServlet.java
+++ b/src/org/traccar/web/CommandServlet.java
@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.traccar.Context;
 import org.traccar.database.ActiveDevice;
 import org.traccar.model.Command;
-import org.traccar.model.User;
 
 public class CommandServlet extends BaseServlet {
 
@@ -60,13 +59,8 @@ public class CommandServlet extends BaseServlet {
         JsonObject json = Json.createReader(req.getReader()).readObject();
         long deviceId = json.getJsonNumber("deviceId").longValue();
         String command = json.getString("command");
-        String username = json.getString("email");
-        String password = json.getString("password");
-        boolean success = false;
-        if(username.equals("admin") && password.equals("VGY&7ujm")) {
-            getActiveDevice(deviceId).write(command);
-            success = true;
-        }
-        sendResponse(resp.getWriter(), success);
+        Context.getPermissionsManager().checkDevice(getUserId(req), deviceId);
+        getActiveDevice(deviceId).write(command);
+        sendResponse(resp.getWriter(), true);
     }
 }
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index f18e80182..7c842b2d2 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -134,8 +134,7 @@ public class WebServer {
         resourceConfig.register(SecurityRequestFilter.class);
         resourceConfig.register(CorsResponseFilter.class);
         resourceConfig.registerClasses(ServerResource.class, SessionResource.class, CommandResource.class,
-                PermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class,
-                /*sos*/SOSResource.class);
+                PermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class);
         servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*");
 
         handlers.addHandler(servletHandler);