diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-01-18 00:33:59 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 00:33:59 +1300 |
| commit | 2cdc0c93b759dfbdaff0c5577862b151d9aadf7f (patch) | |
| tree | b397ec630e858c76d7ea3ca29305def271f08f62 /src/org/traccar/api/resource/DevicePermissionResource.java | |
| parent | 09a5ceb7b1681cb50338f37f775e13a5121e4385 (diff) | |
| parent | 68abcc05ddd3633167f4e1c45d0ae9cf05dbcc43 (diff) | |
| download | trackermap-server-2cdc0c93b759dfbdaff0c5577862b151d9aadf7f.tar.gz trackermap-server-2cdc0c93b759dfbdaff0c5577862b151d9aadf7f.tar.bz2 trackermap-server-2cdc0c93b759dfbdaff0c5577862b151d9aadf7f.zip | |
Merge pull request #2801 from Abyss777/manager
Implement user management
Diffstat (limited to 'src/org/traccar/api/resource/DevicePermissionResource.java')
| -rw-r--r-- | src/org/traccar/api/resource/DevicePermissionResource.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/org/traccar/api/resource/DevicePermissionResource.java b/src/org/traccar/api/resource/DevicePermissionResource.java index 3b89507fa..af38676b0 100644 --- a/src/org/traccar/api/resource/DevicePermissionResource.java +++ b/src/org/traccar/api/resource/DevicePermissionResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,12 @@ public class DevicePermissionResource extends BaseResource { @POST public Response add(DevicePermission entity) throws SQLException { - Context.getPermissionsManager().checkAdmin(getUserId()); + Context.getPermissionsManager().checkReadonly(getUserId()); + Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId()); + Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId()); + if (!Context.getPermissionsManager().isAdmin(getUserId())) { + Context.getPermissionsManager().checkDeviceLimit(entity.getUserId()); + } Context.getDataManager().linkDevice(entity.getUserId(), entity.getDeviceId()); Context.getPermissionsManager().refreshPermissions(); if (Context.getGeofenceManager() != null) { @@ -46,7 +51,9 @@ public class DevicePermissionResource extends BaseResource { @DELETE public Response remove(DevicePermission entity) throws SQLException { - Context.getPermissionsManager().checkAdmin(getUserId()); + Context.getPermissionsManager().checkReadonly(getUserId()); + Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId()); + Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId()); Context.getDataManager().unlinkDevice(entity.getUserId(), entity.getDeviceId()); Context.getPermissionsManager().refreshPermissions(); if (Context.getGeofenceManager() != null) { |