aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-12-07 10:44:16 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-12-07 10:44:16 +1300
commit8ce214876cb4c55c242e46fb004adeca16d3b23b (patch)
treead3ad3a51ca476da3517fb62cfbc8f7d4ca8b7f1
parente5b44532710862eb404563c4e83d104be4b2680b (diff)
downloadtrackermap-server-8ce214876cb4c55c242e46fb004adeca16d3b23b.tar.gz
trackermap-server-8ce214876cb4c55c242e46fb004adeca16d3b23b.tar.bz2
trackermap-server-8ce214876cb4c55c242e46fb004adeca16d3b23b.zip
Implement device permissions REST API
-rw-r--r--src/org/traccar/api/resource/PermissionResource.java62
-rw-r--r--src/org/traccar/web/WebServer.java3
-rw-r--r--web/app/view/UserDevicesController.js19
3 files changed, 78 insertions, 6 deletions
diff --git a/src/org/traccar/api/resource/PermissionResource.java b/src/org/traccar/api/resource/PermissionResource.java
new file mode 100644
index 000000000..c80d69e8c
--- /dev/null
+++ b/src/org/traccar/api/resource/PermissionResource.java
@@ -0,0 +1,62 @@
+/*
+ * 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.api.resource;
+
+import org.traccar.Context;
+import org.traccar.api.BaseResource;
+import org.traccar.model.Device;
+import org.traccar.model.Permission;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.sql.SQLException;
+import java.util.Collection;
+
+@Path("permissions")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class PermissionResource extends BaseResource {
+
+ @POST
+ public Response add(Permission entity) {
+ try {
+ Context.getDataManager().linkDevice(entity.getUserId(), entity.getDeviceId());
+ return Response.ok(entity).build();
+ } catch (SQLException e) {
+ throw new WebApplicationException(e);
+ }
+ }
+
+ @DELETE
+ public Response remove(Permission entity) {
+ try {
+ Context.getDataManager().unlinkDevice(entity.getUserId(), entity.getDeviceId());
+ return Response.noContent().build();
+ } catch (SQLException e) {
+ throw new WebApplicationException(e);
+ }
+ }
+
+}
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index c9bee7479..e7c0057e4 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -38,6 +38,7 @@ import org.traccar.api.ResourceErrorHandler;
import org.traccar.api.SecurityRequestFilter;
import org.traccar.api.resource.CommandResource;
import org.traccar.api.resource.DeviceResource;
+import org.traccar.api.resource.PermissionResource;
import org.traccar.api.resource.PositionResource;
import org.traccar.api.resource.ServerResource;
import org.traccar.api.resource.SessionResource;
@@ -129,7 +130,7 @@ public class WebServer {
resourceConfig.register(SecurityRequestFilter.class);
resourceConfig.register(CorsResponseFilter.class);
resourceConfig.registerClasses(ServerResource.class, SessionResource.class, CommandResource.class,
- DeviceResource.class, UserResource.class, PositionResource.class);
+ PermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class);
servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/rest/*");
}
servletHandler.addServlet(new ServletHolder(new AsyncServlet()), "/async/*");
diff --git a/web/app/view/UserDevicesController.js b/web/app/view/UserDevicesController.js
index aeb99c21c..4cbc6889a 100644
--- a/web/app/view/UserDevicesController.js
+++ b/web/app/view/UserDevicesController.js
@@ -47,24 +47,33 @@ Ext.define('Traccar.view.UserDevicesController', {
onBeforeSelect: function (object, record, index) {
Ext.Ajax.request({
scope: this,
- url: '/api/device/link',
- params: {
+ url: '/api/rest/permissions',
+ jsonData: {
userId: this.userId,
deviceId: record.getData().id
},
- callback: Traccar.app.getErrorHandler()
+ callback: function (options, success, response) {
+ if (!success) {
+ Traccar.app.showError(response);
+ }
+ }
});
},
onBeforeDeselect: function (object, record, index) {
Ext.Ajax.request({
scope: this,
+ method: 'DELETE',
url: '/api/device/unlink',
- params: {
+ jsonData: {
userId: this.userId,
deviceId: record.getData().id
},
- callback: Traccar.app.getErrorHandler()
+ callback: function (options, success, response) {
+ if (!success) {
+ Traccar.app.showError(response);
+ }
+ }
});
}
});