sathira
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements

Browse Source
revert-70aa11f8
prabathabey 9 years ago
parent 61beca5048 8d0e01a0ac
commit 3cb9b5bae2
3 changed files with 46 additions and 282 deletions
Show Stats Download Patch File Download Diff File

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java
Unescape View File

@ -336,7 +336,7 @@ public interface UserManagementService {
@QueryParam("limit") int limit); @QueryParam("limit") int limit);
@GET @GET
@Path("/usernames") @Path("/search/usernames")
@ApiOperation( @ApiOperation(
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
httpMethod = "GET", httpMethod = "GET",

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
Unescape View File

@ -381,7 +381,7 @@ public class UserManagementServiceImpl implements UserManagementService {
} }
@GET @GET
@Path("/usernames") @Path("/search/usernames")
@Override @Override
public Response getUserNames(@QueryParam("filter") String filter, @HeaderParam("If-Modified-Since") String timestamp, public Response getUserNames(@QueryParam("filter") String filter, @HeaderParam("If-Modified-Since") String timestamp,
@QueryParam("offset") int offset, @QueryParam("limit") int limit) { @QueryParam("offset") int offset, @QueryParam("limit") int limit) {

324
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
Unescape View File

@ -37,6 +37,12 @@
<url>/activities/*</url> <url>/activities/*</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission>
<name>Fetch Activity related details</name>
<path>/device-mgt/admin/activities/view</path>
<url>/activities</url>
<method>GET</method>
</Permission>
<!-- Activity related APIs --> <!-- Activity related APIs -->
<!-- Device related APIs --> <!-- Device related APIs -->
<Permission> <Permission>
@ -529,334 +535,100 @@
<url>/users</url> <url>/users</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission>
<name>Add user</name>
<path>/device-mgt/admin/users/add</path>
<url>/users</url>
<method>POST</method>
</Permission>
<Permission> <Permission>
<name>View user</name> <name>List users</name>
<path>/device-mgt/admin/users/view</path> <path>/device-mgt/admin/users/list</path>
<url>/users/view</url> <url>/users/search/usernames</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Update user</name> <name>Add user</name>
<path>/device-mgt/admin/users/update</path> <path>/device-mgt/admin/users/add</path>
<url>/users</url> <url>/users</url>
<method>PUT</method>
</Permission>
<Permission>
<name>Change user password</name>
<path>/login</path>
<url>/users/change-password</url>
<method>POST</method>
</Permission>
<Permission>
<name>Reset password</name>
<path>/device-mgt/admin/users/password-reset</path>
<url>/users/reset-password</url>
<method>POST</method> <method>POST</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Remove user</name> <name>Remove user</name>
<path>/device-mgt/admin/users/remove</path> <path>/device-mgt/admin/users/remove</path>
<url>/users</url> <url>/users/*</url>
<method>DELETE</method> <method>DELETE</method>
</Permission> </Permission>
<Permission> <Permission>
<name>View user</name> <name>View user</name>
<path>/device-mgt/admin/users/view</path> <path>/device-mgt/admin/users/view</path>
<url>/users/roles</url> <url>/users/*</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<!--<Permission>-->
<!--<name>Get user roles by name</name>-->
<!--<path>/device-mgt/admin/users/view</path>-->
<!--<url>/roles</url>-->
<!--<method>GET</method>-->
<!--</Permission>-->
<Permission>
<name>Add user</name>
<path>/device-mgt/admin/users/add</path>
<url>/roles</url>
<method>POST</method>
</Permission>
<Permission> <Permission>
<name>List user devices</name> <name>Update user</name>
<path>/device-mgt/user/devices/list</path> <path>/device-mgt/admin/users/update</path>
<url>/users/devices</url> <url>/users/*</url>
<method>GET</method> <method>PUT</method>
</Permission>
<Permission>
<name>View user</name>
<path>/device-mgt/admin/users/view</path>
<url>/users/*/*</url>
<method>GET</method>
</Permission>
<Permission>
<name>List users</name>
<path>/device-mgt/admin/users/list</path>
<url>/users/count</url>
<method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>List users</name> <name>Update user credential</name>
<path>/device-mgt/admin/users/list</path> <path>/device-mgt/admin/users/update</path>
<url>/users/view-users</url> <url>/users/*/credentials</url>
<method>GET</method> <method>PUT</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Add role</name> <name>Get role</name>
<path>/device-mgt/admin/roles/add</path> <path>/device-mgt/admin/roles/add</path>
<url>/users/view-users</url> <url>/users/*/roles</url>
<method>GET</method>
</Permission>
<Permission>
<name>Update role</name>
<path>/device-mgt/admin/roles/update</path>
<url>/users/view-users</url>
<method>GET</method>
</Permission>
<Permission>
<name>Add policy</name>
<path>/device-mgt/admin/policies/add</path>
<url>/users/view-users</url>
<method>GET</method>
</Permission>
<Permission>
<name>Update policy</name>
<path>/device-mgt/admin/policies/update</path>
<url>/users/view-users</url>
<method>GET</method>
</Permission>
<Permission>
<name>List users</name>
<path>/device-mgt/admin/users/list</path>
<url>/users/users-by-username</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission>
<name>List users</name>
<path>/device-mgt/admin/users/list</path>
<url>/users/users-by-username/*</url>
<method>GET</method>
</Permission>
<Permission> <Permission>
<name>Invite user</name> <name>Update user credential</name>
<path>/device-mgt/admin/users/invite</path> <path>/device-mgt/admin/users/update</path>
<url>/users/email-invitation</url> <url>/admin/users/*/credentials</url>
<method>POST</method> <method>POST</method>
</Permission> </Permission>
<Permission>
<name>Authorize user</name>
<path>/login</path>
<url>/users/authorize</url>
<method>POST</method>
</Permission>
<!-- End of User related APIs --> <!-- End of User related APIs -->
<!-- Policy related APIs --> <!-- Policy related APIs -->
<Permission>
<name>Add Policy</name>
<path>/device-mgt/admin/policies/add</path>
<url>/policies/inactive-policy</url>
<method>POST</method>
</Permission>
<Permission>
<name>Add Policy</name>
<path>/device-mgt/user/policies/add</path>
<url>/policies/inactive-policy</url>
<method>POST</method>
</Permission>
<Permission> <Permission>
<name>List policies</name> <name>List policies</name>
<path>/device-mgt/admin/policies/list</path> <path>/device-mgt/admin/policies/list</path>
<url>/policies/*/*</url> <url>/policies</url>
<method>POST</method>
</Permission>
<Permission>
<name>List policies</name>
<path>/device-mgt/admin/policies/list</path>
<url>/policies/*/*/*</url>
<method>GET</method>
</Permission>
<Permission>
<name>View device</name>
<path>/device-mgt/admin/devices/view</path>
<url>/policies/*/*/*</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>View device</name> <name>Add Policy</name>
<path>/device-mgt/user/devices/view</path> <path>/device-mgt/admin/policies/add</path>
<url>/policies/*/*/*</url> <url>/policies</url>
<method>GET</method> <method>POST</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Add policy</name> <name>Activate policy</name>
<path>/device-mgt/admin/policies/add</path> <path>/device-mgt/admin/policies/add</path>
<url>/policies/active-policy</url> <url>/policies/activate-policy</url>
<method>POST</method> <method>PUT</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Add Policy</name> <name>Deactivate Policy</name>
<path>/device-mgt/user/policies/add</path> <path>/device-mgt/user/policies/add</path>
<url>/policies/inactive-policy</url> <url>/policies/deactivate-policy</url>
<method>POST</method> <method>PUT</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Remove policy</name> <name>Remove Policy</name>
<path>/device-mgt/admin/policies/remove</path> <path>/device-mgt/user/policies/remove</path>
<url>/policies/remove-policy</url> <url>/policies/remove-policy</url>
<method>POST</method> <method>POST</method>
</Permission> </Permission>
<Permission>
<name>List policies</name>
<path>/device-mgt/admin/policies/list</path>
<url>/policies</url>
<method>GET</method>
</Permission>
<Permission> <Permission>
<name>List policies</name> <name>View Policy</name>
<path>/device-mgt/admin/policies/list</path> <path>/device-mgt/admin/policies/view</path>
<url>/policies/*</url>
<method>GET</method>
</Permission>
<Permission>
<name>List user policies</name>
<path>/device-mgt/user/policies/list</path>
<url>/policies</url>
<method>GET</method>
</Permission>
<Permission>
<name>List user policies</name>
<path>/device-mgt/user/policies/list</path>
<url>/policies/*</url> <url>/policies/*</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Update policy</name> <name>Update Policy</name>
<path>/device-mgt/admin/policies/update</path> <path>/device-mgt/admin/policies/update</path>
<url>/policies/*</url> <url>/policies/*</url>
<method>PUT</method> <method>Put</method>
</Permission>
<Permission>
<name>Remove policy</name>
<path>/device-mgt/admin/policies/remove</path>
<url>/policies</url>
<method>DELETE</method>
</Permission>
<Permission>
<name>List policies</name>
<path>/device-mgt/admin/policies/list</path>
<url>/policies/count</url>
<method>GET</method>
</Permission>
<Permission>
<name>Edit policy</name>
<path>/device-mgt/admin/policies/update</path>
<url>/policies/priorities</url>
<method>PUT</method>
</Permission>
<Permission>
<name>Edit policy</name>
<path>/device-mgt/admin/policies/update</path>
<url>/policies/activate</url>
<method>PUT</method>
</Permission>
<Permission>
<name>Add policy</name>
<path>/device-mgt/admin/policies/add</path>
<url>/policies/activate</url>
<method>PUT</method>
</Permission>
<Permission>
<name>Edit policy</name>
<path>/device-mgt/admin/policies/update</path>
<url>/policies/inactivate</url>
<method>PUT</method>
</Permission>
<Permission>
<name>Add policy</name>
<path>/device-mgt/admin/policies/add</path>
<url>/policies/inactivate</url>
<method>PUT</method>
</Permission>
<Permission>
<name>Edit policy</name>
<path>/device-mgt/admin/policies/update</path>
<url>/policies/apply-changes</url>
<method>PUT</method>
</Permission>
<Permission>
<name>Add policy</name>
<path>/device-mgt/admin/policies/add</path>
<url>/policies/start-task/*</url>
<method>GET</method>
</Permission>
<Permission>
<name>Add policy</name>
<path>/device-mgt/admin/policies/add</path>
<url>/policies/update-task/*</url>
<method>GET</method>
</Permission>
<Permission>
<name>Add policy</name>
<path>/device-mgt/admin/policies/add</path>
<url>/policies/stop-task</url>
<method>GET</method>
</Permission>
<Permission>
<name>List policies</name>
<path>/device-mgt/admin/policies/list</path>
<url>/policies/*/*</url>
<method>GET</method>
</Permission> </Permission>
<!-- End of Policy related APIs --> <!-- End of Policy related APIs -->
@ -939,14 +711,6 @@
<url>/configuration</url> <url>/configuration</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission>
<name>Add configuration</name>
<path>/device-mgt/admin/platform-configs/add</path>
<url>/configuration</url>
<method>POST</method>
</Permission>
<Permission> <Permission>
<name>Update configuration</name> <name>Update configuration</name>
<path>/device-mgt/admin/platform-configs/modify</path> <path>/device-mgt/admin/platform-configs/modify</path>

Write Preview
Loading…
Cancel
Save