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

revert-70aa11f8
dilanua 9 years ago
commit dada719486

@ -33,7 +33,7 @@
<Permission> <Permission>
<name>get certificate in the database</name> <name>get certificate in the database</name>
<path>/device-mgt/emm-admin/certificate/GetSignCSR</path> <path>/device-mgt/emm-admin/certificate/GetSignCSR</path>
<url>/certificates/signcsr</url> <url>/certificates/scep/signcsr</url>
<method>POST</method> <method>POST</method>
<scope>emm_admin</scope> <scope>emm_admin</scope>
</Permission> </Permission>

@ -29,38 +29,30 @@
--> -->
<PermissionConfiguration> <PermissionConfiguration>
<APIVersion></APIVersion> <APIVersion></APIVersion>
<!-- Device related APIs -->
<Permission>
<name>get certificate in the database</name>
<path>/device-mgt/emm-admin/certificate/GetSignCSR</path>
<url>/certificates/sign-csr</url>
<method>POST</method>
<scope>emm_admin</scope>
</Permission>
<!-- CertificateManagementAdminService related APIs --> <!-- CertificateManagementAdminService related APIs -->
<Permission> <Permission>
<name>Save certificate</name> <name>Save certificate</name>
<path>/device-mgt/admin/certificate/Save</path> <path>/device-mgt/admin/certificate/Save</path>
<url>/certificates</url> <url>/admin/certificates</url>
<method>POST</method> <method>POST</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Get certificate</name> <name>Get certificate</name>
<path>/device-mgt/admin/certificate/Get</path> <path>/device-mgt/admin/certificate/Get</path>
<url>/certificates/*</url> <url>/admin/certificates/*</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Get all certificates</name> <name>Get all certificates</name>
<path>/device-mgt/admin/certificate/GetAll</path> <path>/device-mgt/admin/certificate/GetAll</path>
<url>/certificates</url> <url>/admin/certificates</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Remove certificate</name> <name>Remove certificate</name>
<path>/device-mgt/admin/certificate/Remove</path> <path>/device-mgt/admin/certificate/Remove</path>
<url>/certificates/*</url> <url>/admin/certificates/*</url>
<method>DELETE</method> <method>DELETE</method>
</Permission> </Permission>
<!-- End of CertificateManagementAdminService related APIs --> <!-- End of CertificateManagementAdminService related APIs -->

@ -30,104 +30,7 @@
<PermissionConfiguration> <PermissionConfiguration>
<APIVersion></APIVersion> <APIVersion></APIVersion>
<!-- Activity related APIs --> <!--Permission Tree Name-->
<Permission>
<name>Fetch Activity related details</name>
<path>/device-mgt/admin/activities/view</path>
<url>/activities/*</url>
<method>GET</method>
</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 -->
<!-- Device related APIs -->
<Permission>
<name>List devices</name>
<path>/device-mgt/admin/devices/list</path>
<url>/devices</url>
<method>GET</method>
</Permission>
<Permission>
<name>List device types</name>
<path>/device-mgt/admin/devices/list</path>
<url>/devices/types</url>
<method>GET</method>
</Permission>
<Permission>
<name>List device types</name>
<path>/device-mgt/user/devices/list</path>
<url>/devices/types</url>
<method>GET</method>
</Permission>
<Permission>
<name>Add policy</name>
<path>/device-mgt/admin/policies/add</path>
<url>/devices/types</url>
<method>GET</method>
</Permission>
<Permission>
<name>Add User policy</name>
<path>/device-mgt/user/policies/add</path>
<url>/devices/types</url>
<method>GET</method>
</Permission>
<Permission>
<name>Edit policy</name>
<path>/device-mgt/admin/policies/update</path>
<url>/devices/types</url>
<method>GET</method>
</Permission>
<Permission>
<name>Edit User policy</name>
<path>/device-mgt/user/policies/update</path>
<url>/devices/types</url>
<method>GET</method>
</Permission>
<Permission>
<name>View device</name>
<path>/device-mgt/admin/devices/view</path>
<url>/devices/view</url>
<method>GET</method>
</Permission>
<Permission>
<name>View user device</name>
<path>/device-mgt/user/devices/view</path>
<url>/devices/view</url>
<method>GET</method>
</Permission>
<Permission>
<name>Modify user device</name>
<path>/device-mgt/user/devices/update</path>
<url>/devices/type/*/id/*</url>
<method>PUT</method>
</Permission>
<Permission>
<name>Remove user device</name>
<path>/device-mgt/user/devices/remove</path>
<url>/devices/type/*/id/*</url>
<method>DELETE</method>
</Permission>
<Permission> <Permission>
<name>Device Management</name> <name>Device Management</name>
<path>/device-mgt</path> <path>/device-mgt</path>
@ -239,51 +142,90 @@
<url>/</url> <url>/</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<!--End of Permission Tree-->
<!-- Activity related APIs -->
<!--<Permission>-->
<!--<name>Get device</name>-->
<!--<path>/device-mgt/devices/view</path>-->
<!--<url>/devices/*/*</url>-->
<!--<method>GET</method>-->
<!--<scope>emm_admin,emm_user</scope>-->
<!--</Permission>-->
<Permission> <Permission>
<name>View device</name> <name>Fetch Activity related details</name>
<path>/device-mgt/admin/devices/view</path> <path>/device-mgt/admin/activities/view</path>
<url>/devices/user/*/*</url> <url>/activities/*</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Devices Count All</name> <name>Fetch Activity related details</name>
<path>/device-mgt/admin/activities/view</path>
<url>/activities</url>
<method>GET</method>
</Permission>
<!-- Activity related APIs -->
<!-- Device related APIs -->
<Permission>
<name>List devices</name>
<path>/device-mgt/admin/devices/list</path> <path>/device-mgt/admin/devices/list</path>
<url>/devices/count</url> <url>/devices</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>Device Count</name> <name>Retrieve device information</name>
<path>/device-mgt/user/devices/list</path> <path>/device-mgt/admin/devices/list</path>
<url>/devices/user/*/count</url> <url>/devices/*/*/info</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>List devices</name> <name>Get device</name>
<path>/device-mgt/admin/devices/list</path> <path>/device-mgt/admin/devices/list</path>
<url>/devices/name/*/*</url> <url>/devices/*/*</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission> <Permission>
<name>List All Own Devices</name> <name>Get device location</name>
<path>/device-mgt/user/devices/list</path> <path>/device-mgt/admin/devices/list</path>
<url>/devices/user/*</url> <url>/devices/*/*/location</url>
<method>GET</method>
</Permission>
<Permission>
<name>devices location</name>
<path>/device-mgt/admin/devices/list</path>
<url>/devices/locations</url>
<method>POST</method>
</Permission>
<Permission>
<name>Get devices feature</name>
<path>/device-mgt/admin/devices/list</path>
<url>/devices/*/*/features</url>
<method>GET</method>
</Permission>
<Permission>
<name>Search devices</name>
<path>/device-mgt/admin/devices/list</path>
<url>/devices/search-devices</url>
<method>POST</method>
</Permission>
<Permission>
<name>list device application</name>
<path>/device-mgt/admin/devices/list</path>
<url>/devices/*/*/applications</url>
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<Permission>
<name>list device operation</name>
<path>/device-mgt/admin/devices/list</path>
<url>/devices/*/*/operations</url>
<method>GET</method>
</Permission>
<Permission>
<name>list device effective-policy</name>
<path>/device-mgt/admin/devices/list</path>
<url>/devices/*/*/effective-policy</url>
<method>GET</method>
</Permission>
<Permission>
<name>list devices</name>
<path>/device-mgt/admin/devices/list</path>
<url>/admin/devices</url>
<method>GET</method>
</Permission>
<!-- End of Device related APIs --> <!-- End of Device related APIs -->
<!-- Notification related APIs --> <!-- Notification related APIs -->
@ -1033,5 +975,4 @@
<method>GET</method> <method>GET</method>
</Permission> </Permission>
<!-- End of Dashboard related APIs --> <!-- End of Dashboard related APIs -->
</PermissionConfiguration> </PermissionConfiguration>

Loading…
Cancel
Save