Refactored scopes

components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java

@@ -19,17 +19,11 @@
 package org.wso2.carbon.device.mgt.iot.androidsense.service.impl;
 
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.DeviceType;
 import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature;
-import javax.ws.rs.Consumes;
+
-import javax.ws.rs.DELETE;
+import javax.ws.rs.*;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
 @DeviceType(value = "android_sense")
@@ -45,7 +39,7 @@ public interface AndroidSenseService {
     @Path("device/{deviceId}/words")
     @POST
     @Feature(code = "keywords", name = "Add Keywords", description = "Send keywords to the device")
-    @Permission(scope = "android_sense_user", roles = {"/permission/admin/device-mgt/user/operations"})
+    @Scope(key = "device:android-sense:enroll", name = "", description = "")
     Response sendKeyWords(@PathParam("deviceId") String deviceId, @QueryParam("keywords") String keywords);
 
     /**
@@ -57,13 +51,13 @@ public interface AndroidSenseService {
     @Path("device/{deviceId}/words/threshold")
     @POST
     @Feature(code = "threshold", name = "Add a Threshold", description = "Set a threshold for word in the device")
-    @Permission(scope = "android_sense_user", roles = {"emm-user"})
+    @Scope(key = "device:android-sense:enroll", name = "", description = "")
     Response sendThreshold(@PathParam("deviceId") String deviceId, @QueryParam("threshold") String threshold);
 
     @Path("device/{deviceId}/words")
     @DELETE
     @Feature(code = "remove", name = "Remove Keywords", description = "Remove the keywords")
-    @Permission(scope = "android_sense_user", roles = {"emm-user"})
+    @Scope(key = "device:android-sense:enroll", name = "", description = "")
     Response removeKeyWords(@PathParam("deviceId") String deviceId, @QueryParam("words") String words);
 
     /**
@@ -72,7 +66,7 @@ public interface AndroidSenseService {
     @Path("stats/{deviceId}/sensors/{sensorName}")
     @GET
     @Consumes("application/json")
-    @Permission(scope = "android_sense_user", roles = {"emm-user"})
+    @Scope(key = "device:android-sense:enroll", name = "", description = "")
     @Produces("application/json")
     Response getAndroidSenseDeviceStats(@PathParam("deviceId") String deviceId, @PathParam("sensorName") String sensor,
                                         @QueryParam("from") long from, @QueryParam("to") long to);
@@ -82,7 +76,7 @@ public interface AndroidSenseService {
      */
     @Path("device/{device_id}/register")
     @POST
-    @Permission(scope = "android_sense_user", roles = {"emm-user"})
+    @Scope(key = "device:android-sense:enroll", name = "", description = "")
     Response register(@PathParam("device_id") String deviceId, @QueryParam("deviceName") String deviceName);
 
 }

components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/ArduinoService.java

@@ -19,16 +19,11 @@
 package org.wso2.carbon.device.mgt.iot.arduino.service.impl;
 
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.DeviceType;
 import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature;
-import javax.ws.rs.Consumes;
+
-import javax.ws.rs.GET;
+import javax.ws.rs.*;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
 @API(name = "arduino", version = "1.0.0", context = "/arduino", tags = {"arduino"})
@@ -38,12 +33,12 @@ public interface ArduinoService {
     @Path("device/{deviceId}/bulb")
     @POST
     @Feature(code = "bulb", name = "Control Bulb", description = "Control Bulb on Arduino Uno")
-    @Permission(scope = "arduino_user", roles = {"emm-user"})
+    @Scope(key = "device:arduino:enroll", name = "", description = "")
     Response switchBulb(@PathParam("deviceId") String deviceId, @QueryParam("state") String state);
 
     @Path("device/{deviceId}/controls")
     @GET
-    @Permission(scope = "arduino_device", roles = {"emm-user"})
+    @Scope(key = "device:arduino:enroll", name = "", description = "")
     Response readControls(@PathParam("deviceId") String deviceId);
 
     /**
@@ -53,7 +48,7 @@ public interface ArduinoService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
-    @Permission(scope = "arduino_user", roles = {"emm-user"})
+    @Scope(key = "device:arduino:enroll", name = "", description = "")
     Response getArduinoTemperatureStats(@PathParam("deviceId") String deviceId, @QueryParam("from") long from,
                                                @QueryParam("to") long to);
 
@@ -63,7 +58,7 @@ public interface ArduinoService {
     @Path("device/download")
     @GET
     @Produces("application/octet-stream")
-    @Permission(scope = "arduino_user", roles = {"emm-user"})
+    @Scope(key = "device:arduino:enroll", name = "", description = "")
     Response downloadSketch(@QueryParam("deviceName") String customDeviceName);
 
 }

components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiService.java

@@ -19,16 +19,11 @@
 package org.wso2.carbon.device.mgt.iot.raspberrypi.service.impl;
 
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.DeviceType;
 import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature;
-import javax.ws.rs.Consumes;
+
-import javax.ws.rs.GET;
+import javax.ws.rs.*;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
@@ -39,7 +34,7 @@ public interface RaspberryPiService {
     @Path("device/{deviceId}/bulb")
     @POST
     @Feature(code = "bulb", name = "Bulb On / Off", description = "Switch on/off Raspberry Pi agent's bulb. (On / Off)")
-    @Permission(scope = "raspberrypi_user", roles = {"emm-user"})
+    @Scope(key = "device:raspberrypi:enroll", name = "", description = "")
     Response switchBulb(@PathParam("deviceId") String deviceId, @QueryParam("state") String state);
 
     /**
@@ -49,7 +44,7 @@ public interface RaspberryPiService {
     @GET
     @Consumes("application/json")
     @Produces("application/json")
-    @Permission(scope = "raspberrypi_user", roles = {"emm-user"})
+    @Scope(key = "device:raspberrypi:enroll", name = "", description = "")
     Response getRaspberryPiTemperatureStats(@PathParam("deviceId") String deviceId,
                                         @QueryParam("from") long from, @QueryParam("to") long to);
 
@@ -59,7 +54,7 @@ public interface RaspberryPiService {
     @Path("device/download")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    @Permission(scope = "raspberrypi_user", roles = {"emm-user"})
+    @Scope(key = "device:raspberrypi:enroll", name = "", description = "")
     Response downloadSketch(@QueryParam("deviceName") String deviceName, @QueryParam("sketch_type") String sketchType);
 
 }

components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java

@@ -19,7 +19,7 @@
 package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl;
 
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.DeviceType;
 import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature;
 
@@ -48,7 +48,7 @@ public interface VirtualFireAlarmService {
      */
     @POST
     @Path("device/{deviceId}/buzz")
-    @Permission(scope = "virtual_firealarm_user", roles = {"emm-user"})
+    @Scope(key = "device:firealarm:enroll", name = "", description = "")
     @Feature(code = "buzz", name = "Buzzer On / Off", description = "Switch on/off Virtual Fire Alarm Buzzer. (On / Off)")
     Response switchBuzzer(@PathParam("deviceId") String deviceId,
                              @FormParam("state") String state);
@@ -58,7 +58,7 @@ public interface VirtualFireAlarmService {
      */
     @Path("device/stats/{deviceId}")
     @GET
-    @Permission(scope = "virtual_firealarm_user", roles = {"emm-user"})
+    @Scope(key = "device:firealarm:enroll", name = "", description = "")
     @Consumes("application/json")
     @Produces("application/json")
     Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId, @QueryParam("from") long from,
@@ -67,7 +67,7 @@ public interface VirtualFireAlarmService {
     @Path("device/download")
     @GET
     @Produces("application/zip")
-    @Permission(scope = "virtual_firealarm_user", roles = {"emm-user"})
+    @Scope(key = "device:firealarm:enroll", name = "", description = "")
     Response downloadSketch(@QueryParam("deviceName") String deviceName, @QueryParam("sketchType") String sketchType);
 
 }

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java

@@ -20,7 +20,7 @@ package org.wso2.carbon.mdm.services.android.services;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.mdm.services.android.bean.wrapper.*;
 
@@ -91,7 +91,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new lock operation.")
     })
-    @Permission(scope = "device:android:lock", roles = {"admin"})
+    @Scope(key = "device:android:operation:lock", name = "Lock device", description = "")
     Response configureDeviceLock(
             @ApiParam(name = "deviceLockBeanWrapper",
                     value = "Device lock configurations with device IDs") DeviceLockBeanWrapper deviceLockBeanWrapper);
@@ -145,7 +145,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new un-lock operation.")
     })
-    @Permission(scope = "device:android:unlock", roles = {"admin"})
+    @Scope(key = "device:android:operation:unlock", name = "Unlock device", description = "")
     Response configureDeviceUnlock(
             @ApiParam(name = "deviceIDs", value = "DeviceIds to be enable device unlock operation")
             List<String> deviceIDs);
@@ -198,7 +198,7 @@ public interface DeviceManagementAdminService {
                     code = 500,
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new get-location operation.")})
-    @Permission(scope = "device:android:location", roles = {"admin"})
+    @Scope(key = "device:android:operation:location", name = "Get device location", description = "")
     Response getDeviceLocation(
             @ApiParam(name = "deviceIDs", value = "DeviceIDs to be requested to get device location")
             List<String> deviceIDs);
@@ -251,7 +251,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new clear password operation.")
     })
-    @Permission(scope = "device:android:clear-password", roles = {"admin"})
+    @Scope(key = "device:android:operation:clear-password", name = "Clear password of device", description = "")
     Response removePassword(
             @ApiParam(name = "deviceIDs",
                     value = "DeviceIds to be requested to remove password")  List<String> deviceIDs);
@@ -304,7 +304,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new control camera operation.")
     })
-    @Permission(scope = "device:android:camera", roles = {"admin"})
+    @Scope(key = "device:android:operation:camera", name = "Enable/Disable camera", description = "")
     Response configureCamera(
             @ApiParam(name = "cameraBeanWrapper", value = "Camera enable/disable configurations with device IDs")
             CameraBeanWrapper cameraBeanWrapper);
@@ -360,7 +360,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new device info operation.")
     })
-    @Permission(scope = "device:android:info", roles = {"admin"})
+    @Scope(key = "device:android:operation:info", name = "Get device information", description = "")
     Response getDeviceInformation(
             @ApiParam(name = "deviceIds", value = "Device IDs to be requested to get device information")
             List<String> deviceIDs);
@@ -469,7 +469,7 @@ public interface DeviceManagementAdminService {
                     code = 500,
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a enterprise wipe operation.")})
-    @Permission(scope = "device:android:enterprise-wipe", roles = {"admin"})
+    @Scope(key = "device:android:operation:enterprise-wipe", name = "Enterprise wipe", description = "")
     Response wipeDevice(@ApiParam(name = "deviceIDs", value = "Device IDs to be requested to do enterprise-wipe")
                         List<String> deviceIDs);
 
@@ -521,7 +521,7 @@ public interface DeviceManagementAdminService {
                     code = 500,
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a device wipe operation.")})
-    @Permission(scope = "device:android:wipe", roles = {"admin"})
+    @Scope(key = "device:android:operation:wipe", name = "Factory reset device", description = "")
     Response wipeData(
             @ApiParam(name = "wipeDataBeanWrapper", value = "Configurations and DeviceIds needed to do wipe-data")
             WipeDataBeanWrapper wipeDataBeanWrapper);
@@ -578,7 +578,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new get-applications operation.")
     })
-    @Permission(scope = "device:android:get-applications", roles = {"admin"})
+    @Scope(key = "device:android:operation:applications", name = "Get installed applications", description = "")
     Response getApplications(
             @ApiParam(name = "deviceIDs", value = "Device Ids needed to get applications that are already installed")
             List<String> deviceIDs);
@@ -631,7 +631,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new device ring operation.")
     })
-    @Permission(scope = "device:android:ring", roles = {"admin"})
+    @Scope(key = "device:android:operation:ring", name = "Ring device", description = "")
     Response ringDevice(
             @ApiParam(name = "deviceIDs", value = "Device Ids needed for ring")
             List<String> deviceIDs);
@@ -684,7 +684,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new device reboot operation.")
     })
-    @Permission(scope = "device:android:reboot", roles = {"admin"})
+    @Scope(key = "device:android:operation:reboot", name = "Reboot device", description = "")
     Response rebootDevice(
             @ApiParam(name = "deviceIDs", value = "Device Ids needed for reboot.")
             List<String> deviceIDs);
@@ -737,7 +737,7 @@ public interface DeviceManagementAdminService {
                             "Server error occurred while adding a new device mute operation.")
     })
     @Path("/mute")
-    @Permission(scope = "device:android:mute", roles = {"admin"})
+    @Scope(key = "device:android:operation:mute", name = "Mute device", description = "")
     Response muteDevice(
             @ApiParam(name = "deviceIDs", value = "DeviceIDs need to be muted")
             List<String> deviceIDs);
@@ -793,7 +793,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new install-application operation.")
     })
-    @Permission(scope = "device:android:install-application", roles = {"admin"})
+    @Scope(key = "device:android:operation:install-app", name = "Install applications", description = "")
     Response installApplication(
             @ApiParam(name = "applicationInstallationBeanWrapper", value = "Properties of installed apps and device IDs")
             ApplicationInstallationBeanWrapper applicationInstallationBeanWrapper);
@@ -849,7 +849,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new update-application operation.")
     })
-    @Permission(scope = "device:android:update-application", roles = {"admin"})
+    @Scope(key = "device:android:operation:update-app", name = "Update installed applications", description = "")
     Response updateApplication(
             @ApiParam(name = "applicationUpdateBeanWrapper", value = "Properties of updated apps and device IDs")
             ApplicationUpdateBeanWrapper applicationUpdateBeanWrapper);
@@ -902,7 +902,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new uninstall-application operation.")
     })
-    @Permission(scope = "device:android:uninstall-application", roles = {"admin"})
+    @Scope(key = "device:android:operation:uninstall-app", name = "Uninstall applications", description = "")
     Response uninstallApplication(
             @ApiParam(name = "applicationUninstallationBeanWrapper",
                     value = "applicationUninstallationConfigs and Device Ids")
@@ -957,7 +957,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new blacklist-applications operation.")
     })
-    @Permission(scope = "device:android:blacklist-applications", roles = {"admin"})
+    @Scope(key = "device:android:operation:blacklist-app", name = "Blacklist applications", description = "")
     Response blacklistApplications(
             @ApiParam(name = "blacklistApplicationsBeanWrapper", value = "BlacklistApplications " +
                     "Configuration and DeviceIds")
@@ -1012,7 +1012,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new upgrade firmware operation.")
     })
-    @Permission(scope = "device:android:upgrade-firmware", roles = {"admin"})
+    @Scope(key = "device:android:operation:upgrade", name = "Upgrade firmware", description = "")
     Response upgradeFirmware(
             @ApiParam(name = "upgradeFirmwareBeanWrapper",
                     value = "Firmware upgrade configuration and DeviceIds")
@@ -1067,7 +1067,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new configure VPN operation.")
     })
-    @Permission(scope = "device:android:vpn", roles = {"admin"})
+    @Scope(key = "device:android:operation:vpn", name = "Add VPN profiles", description = "")
     Response configureVPN(
             @ApiParam(name = "vpnBeanWrapper",
                     value = "VPN configuration and DeviceIds")
@@ -1121,7 +1121,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new send notification operation.")
     })
-    @Permission(scope = "device:android:send-notification", roles = {"admin"})
+    @Scope(key = "device:android:operation:notification", name = "Send notifications", description = "")
     Response sendNotification(
             @ApiParam(name = "notificationBeanWrapper",
                     value = "Notification Configurations and device Ids")
@@ -1175,7 +1175,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new configure wifi operation.")
     })
-    @Permission(scope = "device:android:wifi", roles = {"admin"})
+    @Scope(key = "device:android:operation:wifi", name = "Add WiFi configurations", description = "")
     Response configureWifi(
             @ApiParam(name = "wifiBeanWrapper",
                     value = "WifiConfigurations and Device Ids") WifiBeanWrapper wifiBeanWrapper);
@@ -1228,7 +1228,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new encrypt storage operation.")
     })
-    @Permission(scope = "device:android:encrypt", roles = {"admin"})
+    @Scope(key = "device:android:operation:encrypt", name = "Encrypt device", description = "")
     Response encryptStorage(
             @ApiParam(name = "encryptionBeanWrapper",
                     value = "Configurations and deviceIds need to be done data encryption")
@@ -1282,7 +1282,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new change lock code operation.")
     })
-    @Permission(scope = "device:android:change-lock-code", roles = {"admin"})
+    @Scope(key = "device:android:operation:change-lock", name = "Change password of device", description = "")
     Response changeLockCode(
             @ApiParam(name = "lockCodeBeanWrapper",
                     value = "Configurations and device Ids need to be done change lock code")
@@ -1336,7 +1336,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new set password policy operation.")
     })
-    @Permission(scope = "device:android:set-password-policy", roles = {"admin"})
+    @Scope(key = "device:android:operation:password-policy", name = "Set password policy", description = "")
     Response setPasswordPolicy(
             @ApiParam(name = "passwordPolicyBeanWrapper",
                     value = "Password Policy Configurations and Device Ids")
@@ -1390,7 +1390,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new set webclip operation.")
     })
-    @Permission(scope = "device:android:webclip", roles = {"admin"})
+    @Scope(key = "device:android:operation:webclip", name = "Add webclips", description = "")
     Response setWebClip(
             @ApiParam(name = "webClipBeanWrapper",
                     value = "Configurations to need set web clip on device and device Ids")

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementService.java

@@ -20,7 +20,7 @@ package org.wso2.carbon.mdm.services.android.services;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication;
 import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice;
@@ -87,7 +87,7 @@ public interface DeviceManagementService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while updating the application list.")
     })
-    @Permission(scope = "device:android:enroll", roles = {"admin"})
+    @Scope(key = "device:android:enroll", name = "Enroll Android device", description = "")
     Response updateApplicationList(
             @ApiParam(
                     name = "id",
@@ -141,7 +141,7 @@ public interface DeviceManagementService {
                     code = 500,
                     message = "Internal Server Error. \n Server error occurred while fetching policies.")
     })
-    @Permission(scope = "device:android:enroll", roles = {"admin"})
+    @Scope(key = "device:android:enroll", name = "Enroll Android device", description = "")
     Response getPendingOperations(
             @ApiParam(
                     name = "id",
@@ -245,7 +245,7 @@ public interface DeviceManagementService {
                     code = 500,
                     message = "Internal Server Error. \n Server error occurred while fetching the enrollment status of the Android device.")
     })
-    @Permission(scope = "device:android:enroll", roles = {"admin"})
+    @Scope(key = "device:android:enroll", name = "Enroll Android device", description = "")
     Response isEnrolled(
             @ApiParam(
                     name = "id",
@@ -299,7 +299,7 @@ public interface DeviceManagementService {
                             message = "Internal Server Error. \n " +
                                     "Server error occurred while updating the device enrollment.")
             })
-    @Permission(scope = "device:android:enroll", roles = {"admin"})
+    @Scope(key = "device:android:enroll", name = "Enroll Android device", description = "")
     Response modifyEnrollment(
             @ApiParam(
                     name = "id",
@@ -329,7 +329,7 @@ public interface DeviceManagementService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while dis-enrolling the device.")
     })
-    @Permission(scope = "device:android:enroll", roles = {"admin"})
+    @Scope(key = "device:android:enroll", name = "Enroll Android device", description = "")
     Response disEnrollDevice(
             @ApiParam(
                     name = "id",

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java

@@ -20,7 +20,7 @@ package org.wso2.carbon.mdm.services.android.services;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.mdm.services.android.bean.AndroidPlatformConfiguration;
 import org.wso2.carbon.mdm.services.android.exception.AndroidAgentException;
@@ -81,7 +81,7 @@ public interface DeviceTypeConfigurationService {
                     code = 500,
                     message = "Internal Server Error. \n Server error occurred while fetching Android platform configuration.")
     })
-    @Permission(scope = "configuration:view", roles = {"admin"})
+    @Scope(key = "configuration:read", name = "View configurations", description = "")
     Response getConfiguration(
             @ApiParam(
                     name = "If-Modified-Since",
@@ -131,7 +131,7 @@ public interface DeviceTypeConfigurationService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while modifying Android platform configuration.")
     })
-    @Permission(scope = "configuration:modify", roles = {"admin"})
+    @Scope(key = "configuration:write", name = "Add configurations", description = "")
     Response updateConfiguration(
             @ApiParam(name = "configuration",
                     value = "AndroidPlatformConfiguration")
@@ -179,7 +179,7 @@ public interface DeviceTypeConfigurationService {
                     code = 500,
                     message = "Internal Server Error. \n Server error occurred while fetching Android license configuration.")
     })
-    @Permission(scope = "device:android:enroll", roles = {"admin"})
+    @Scope(key = "device:android:enroll", name = "Enroll Android device", description = "")
     Response getLicense(
             @ApiParam(
                     name = "If-Modified-Since",

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/EventReceiverService.java

@@ -20,7 +20,7 @@ package org.wso2.carbon.mdm.services.android.services;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.mdm.services.android.bean.DeviceState;
 import org.wso2.carbon.mdm.services.android.bean.wrapper.EventBeanWrapper;
 
@@ -91,7 +91,7 @@ public interface EventReceiverService {
                             message = "Internal Server Error. \n " +
                                     "Server error occurred while publishing events.")
             })
-    @Permission(scope = "device:android:event:publish", roles = {"admin"})
+    @Scope(key = "device:android:event:write", name = "Publish events to DAS", description = "")
     Response publishEvents(
             @ApiParam(
                     name = "eventBeanWrapper",
@@ -141,7 +141,7 @@ public interface EventReceiverService {
                             code = 500,
                             message = "Error occurred while getting published events for specific device.")
             })
-    @Permission(scope = "device:android:event:view", roles = {"admin"})
+    @Scope(key = "device:android:event:read", name = "View events", description = "")
     Response retrieveAlerts(
             @ApiParam(
                     name = "id",