From 529c828b817752c2f0897214c8cf237ec72a233b Mon Sep 17 00:00:00 2001
From: Chatura Dilan <dilan@dilan.me>
Date: Tue, 21 Jun 2016 11:32:01 +0530
Subject: [PATCH] Fixed paths in Android related permissions.xml

---
 .../src/main/webapp/META-INF/permissions.xml  | 79 ++++++++++---------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml
index 3251719277..2839966fbf 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml
@@ -34,7 +34,7 @@
 
     <Permission>
         <name>Lock</name>
-        <path>/device-mgt/android/operations/lock</path>
+        <path>/device-mgt/emm-admin/operations/android/lock</path>
         <url>/admin/devices/lock-devices</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -42,7 +42,7 @@
 
     <Permission>
         <name>Unlock</name>
-        <path>/device-mgt/android/operations/unlock</path>
+        <path>/device-mgt/emm-admin/operations/android/unlock</path>
         <url>/admin/devices/unlock-devices</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -50,7 +50,7 @@
 
     <Permission>
         <name>Mute</name>
-        <path>/device-mgt/android/operations/mute</path>
+        <path>/device-mgt/emm-admin/operations/android/mute</path>
         <url>/admin/devices/mute</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -58,7 +58,7 @@
 
     <Permission>
         <name>Location</name>
-        <path>/device-mgt/android/operations/location</path>
+        <path>/device-mgt/emm-admin/operations/android/location</path>
         <url>/admin/devices/location</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -66,6 +66,7 @@
 
     <Permission>
         <name>Clear Passcode</name>
+        <path>/device-mgt/emm-admin/operations/android/clear-password</path>
         <url>/admin/devices/clear-password</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -73,7 +74,7 @@
 
     <Permission>
         <name>Camera</name>
-        <path>/device-mgt/android/operations/camera</path>
+        <path>/device-mgt/emm-admin/operations/android/camera</path>
         <url>/admin/devices/control-camera</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -81,7 +82,7 @@
 
     <Permission>
         <name>Device Info</name>
-        <path>/device-mgt/android/operations/device-info</path>
+        <path>/device-mgt/emm-admin/operations/android/device-info</path>
         <url>/admin/devices/info</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -89,7 +90,7 @@
 
     <Permission>
         <name>Enterprise Wipe</name>
-        <path>/device-mgt/android/operations/enterprise-wipe</path>
+        <path>/device-mgt/emm-admin/operations/android/enterprise-wipe</path>
         <url>/admin/devices/enterprise-wipe</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -97,7 +98,7 @@
 
     <Permission>
         <name>Wipe Data</name>
-        <path>/device-mgt/android/operations/wipe-data</path>
+        <path>/device-mgt/emm-admin/operations/android/wipe-data</path>
         <url>/admin/devices/wipe</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -105,7 +106,7 @@
 
     <Permission>
         <name>Application List</name>
-        <path>/device-mgt/android/operations/application-list</path>
+        <path>/device-mgt/emm-admin/operations/android/application-list</path>
         <url>/admin/devices/applications</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -113,7 +114,7 @@
 
     <Permission>
         <name>Ring</name>
-        <path>/device-mgt/android/operations/ring-device</path>
+        <path>/device-mgt/emm-admin/operations/android/ring-device</path>
         <url>/admin/devices/ring</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -121,7 +122,7 @@
 
     <Permission>
         <name>Reboot</name>
-        <path>/device-mgt/android/operations/reboot-device</path>
+        <path>/device-mgt/emm-admin/operations/android/reboot-device</path>
         <url>/admin/devices/reboot</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -129,7 +130,7 @@
 
     <Permission>
         <name>Upgrade Firmware</name>
-        <path>/device-mgt/android/operations/upgrade-firmware</path>
+        <path>/device-mgt/emm-admin/operations/android/upgrade-firmware</path>
         <url>/admin/devices/upgrade-firmware</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -137,7 +138,7 @@
 
     <Permission>
         <name>Configure VPN</name>
-        <path>/device-mgt/android/operations/vpn</path>
+        <path>/device-mgt/emm-admin/operations/android/vpn</path>
         <url>/admin/devices/configure-vpn</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -153,7 +154,7 @@
 
     <Permission>
         <name>Update Application</name>
-        <path>/device-mgt/android/operations/update-application</path>
+        <path>/device-mgt/emm-admin/operations/android/install-application</path>
         <url>/admin/devices/update-application</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -161,7 +162,7 @@
 
     <Permission>
         <name>Uninstall Application</name>
-        <path>/device-mgt/android/operations/uninstall-application</path>
+        <path>/device-mgt/emm-admin/operations/android/uninstall-application</path>
         <url>/admin/devices/uninstall-application</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -169,7 +170,7 @@
 
     <Permission>
         <name>Blacklist Applications</name>
-        <path>/device-mgt/android/operations/blacklist-applications</path>
+        <path>/device-mgt/emm-admin/operations/android/blacklist-applications</path>
         <url>/admin/devices/blacklist-applications</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -177,7 +178,7 @@
 
     <Permission>
         <name>Notification</name>
-        <path>/device-mgt/android/operations/notification</path>
+        <path>/device-mgt/emm-admin/operations/android/notification</path>
         <url>/admin/devices/send-notification</url>
         <method>POST</method>
         <scope>emm_admin,emm_user</scope>
@@ -185,7 +186,7 @@
 
     <Permission>
         <name>Wifi</name>
-        <path>/device-mgt/android/operations/wifi</path>
+        <path>/device-mgt/emm-admin/operations/android/wifi</path>
         <url>/admin/devices/configure-wifi</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -193,7 +194,7 @@
 
     <Permission>
         <name>Encryption</name>
-        <path>/device-mgt/android/operations/encrypt</path>
+        <path>/device-mgt/emm-admin/operations/android/encrypt</path>
         <url>/admin/devices/encrypt-storage</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -201,7 +202,7 @@
 
     <Permission>
         <name>Change lock code</name>
-        <path>/device-mgt/android/operations/change-lock-code</path>
+        <path>/device-mgt/emm-admin/operations/android/change-lock-code</path>
         <url>/admin/devices/change-lock-code</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -209,7 +210,7 @@
 
     <Permission>
         <name>Password Policy</name>
-        <path>/device-mgt/android/operations/password-policy</path>
+        <path>/device-mgt/emm-admin/operations/android/password-policy</path>
         <url>/admin/devices/set-password-policy</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -217,7 +218,7 @@
 
     <Permission>
         <name>Webclip</name>
-        <path>/device-mgt/android/operations/webclip</path>
+        <path>/device-mgt/emm-admin/operations/android/webclip</path>
         <url>/admin/devices/set-webclip</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -225,7 +226,7 @@
 
     <Permission>
         <name>Disenroll</name>
-        <path>/device-mgt/android/operations/disenroll</path>
+        <path>/device-mgt/emm-admin/operations/android/disenroll</path>
         <url>/operation/disenroll</url>
         <method>POST</method>
         <scope>emm_android_agent</scope>
@@ -234,7 +235,7 @@
     <!-- Device management related permissions -->
     <Permission>
         <name>View devices</name>
-        <path>/device-mgt/android/devices/list</path>
+        <path>/device-mgt/emm-admin/devices/view</path>
         <url>/device</url>
         <method>GET</method>
         <scope>emm_admin</scope>
@@ -242,7 +243,7 @@
 
     <Permission>
         <name>View device</name>
-        <path>/device-mgt/android/devices/view</path>
+        <path>/device-mgt/emm-admin/devices/view</path>
         <url>/device/*</url>
         <method>GET</method>
         <scope>emm_admin,emm_user</scope>
@@ -250,7 +251,7 @@
 
     <Permission>
         <name>Update device</name>
-        <path>/device-mgt/android/devices/update</path>
+        <path>/device-mgt/emm-admin/devices/update</path>
         <url>/device/*</url>
         <method>PUT</method>
         <scope>emm_admin,emm_user</scope>
@@ -258,7 +259,7 @@
 
     <Permission>
         <name>Update application list</name>
-        <path>/device-mgt/android/devices/update-app</path>
+        <path>/device-mgt/emm-admin/operations/android/update-applist</path>
         <url>/device/appList/*</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -266,7 +267,7 @@
 
     <Permission>
         <name>View license</name>
-        <path>/device-mgt/android/license/view</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/configuration/license</url>
         <method>GET</method>
         <scope>emm_android_agent</scope>
@@ -275,7 +276,7 @@
     <!-- Enrollment related permissions -->
     <Permission>
         <name>Enroll device</name>
-        <path>/device-mgt/android/devices/enroll</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/devices</url>
         <method>POST</method>
         <scope>emm_android_agent</scope>
@@ -283,7 +284,7 @@
 
     <Permission>
         <name>Devices related Operations</name>
-        <path>/device-mgt/android/devices</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/devices/*</url>
         <method>GET</method>
         <scope>emm_android_agent</scope>
@@ -291,7 +292,7 @@
 
     <Permission>
         <name>Device is enrolled</name>
-        <path>/device-mgt/android/devices</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/devices/*/status</url>
         <method>GET</method>
         <scope>emm_android_agent</scope>
@@ -299,7 +300,7 @@
 
     <Permission>
         <name>Devices related Operations</name>
-        <path>/device-mgt/android/devices/operations</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/devices/*/pending-operations</url>
         <method>PUT</method>
         <scope>emm_android_agent</scope>
@@ -307,7 +308,7 @@
 
     <Permission>
         <name>Modify devices</name>
-        <path>/device-mgt/android/devices/operations</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/devices/*</url>
         <method>PUT</method>
         <scope>emm_android_agent</scope>
@@ -315,7 +316,7 @@
 
     <Permission>
         <name>Delete devices</name>
-        <path>/device-mgt/android/devices/operations</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/devices/*</url>
         <method>DELETE</method>
         <scope>emm_android_agent</scope>
@@ -340,7 +341,7 @@
     <!-- Policy related permissions -->
     <Permission>
         <name>View Policies</name>
-        <path>/device-mgt/android/policies/view</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/policy/*</url>
         <method>GET</method>
         <scope>emm_admin</scope>
@@ -348,7 +349,7 @@
 
     <Permission>
         <name>View Policy Features</name>
-        <path>/device-mgt/android/policies/view</path>
+        <path>/device-mgt/user/enroll/android</path>
         <url>/policy/features/*</url>
         <method>GET</method>
         <scope>emm_admin</scope>
@@ -357,7 +358,7 @@
     <!-- Configuration related permissions -->
     <Permission>
         <name>View Tenant configuration</name>
-        <path>/device-mgt/android/tenant/configuration</path>
+        <path>/device-mgt/emm-admin/platform-configs/view</path>
         <url>/configuration</url>
         <method>GET</method>
         <scope>emm_admin</scope>
@@ -365,7 +366,7 @@
 
     <Permission>
         <name>Add Tenant configuration</name>
-        <path>/device-mgt/android/tenant/configuration</path>
+        <path>/device-mgt/emm-admin/platform-configs/add</path>
         <url>/configuration</url>
         <method>POST</method>
         <scope>emm_admin</scope>
@@ -373,7 +374,7 @@
 
     <Permission>
         <name>Update Tenant configuration</name>
-        <path>/device-mgt/android/tenant/configuration</path>
+        <path>/device-mgt/emm-admin/platform-configs/modify</path>
         <url>/configuration</url>
         <method>PUT</method>
         <scope>emm_admin</scope>