Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

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

@@ -90,7 +90,7 @@ public interface EventReceiverService {
                             message = "Internal Server Error. \n " +
                                     "Server error occurred while publishing events.")
             })
-    @Scope(key = "device:android:event:write", name = "Publish events to DAS", description = "")
+    @Scope(key = "device:android:event:manage", name = "Publish events to DAS", description = "")
     Response publishEvents(
             @ApiParam(
                     name = "eventBeanWrapper",

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

@@ -209,12 +209,18 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             PolicyManagerService policyManagerService = AndroidAPIUtils.getPolicyManagerService();
             policyManagerService.getEffectivePolicy(new DeviceIdentifier(androidDevice.getDeviceIdentifier(), device.getType()));
             if (status) {
-                return Response.status(Response.Status.OK).entity("Android device, which carries the id '" +
+                Message responseMessage = new Message();
-                        androidDevice.getDeviceIdentifier() + "' has successfully been enrolled").build();
+                responseMessage.setResponseCode(Response.Status.OK.toString());
+                responseMessage.setResponseMessage("Android device, which carries the id '" +
+                        androidDevice.getDeviceIdentifier() + "' has successfully been enrolled");
+                return Response.status(Response.Status.OK).entity(responseMessage).build();
             } else {
-                return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity("Failed to enroll '" +
+                Message responseMessage = new Message();
+                responseMessage.setResponseCode(Response.Status.INTERNAL_SERVER_ERROR.toString());
+                responseMessage.setResponseMessage("Failed to enroll '" +
                         device.getType() + "' device, which carries the id '" +
-                        androidDevice.getDeviceIdentifier() + "'").build();
+                        androidDevice.getDeviceIdentifier() + "'");
+                return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(responseMessage).build();
             }
         } catch (DeviceManagementException e) {
             String msg = "Error occurred while enrolling the android, which carries the id '" +
@@ -241,11 +247,16 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         try {
             result = AndroidAPIUtils.getDeviceManagementService().isEnrolled(deviceIdentifier);
             if (result) {
-                return Response.status(Response.Status.OK).entity("Android device that carries the id '" +
+                Message responseMessage = new Message();
-                        id + "' is enrolled").build();
+                responseMessage.setResponseCode(Response.Status.OK.toString());
+                responseMessage.setResponseMessage("Android device that carries the id '" +
+                        id + "' is enrolled");
+                return Response.status(Response.Status.OK).entity(responseMessage).build();
             } else {
-                return Response.status(Response.Status.NOT_FOUND).entity("No Android device is found upon the id '" +
+                Message responseMessage = new Message();
-                        id + "'").build();
+                responseMessage.setResponseCode(Response.Status.NOT_FOUND.toString());
+                responseMessage.setResponseMessage("No Android device is found upon the id '" + id + "'");
+                return Response.status(Response.Status.NOT_FOUND).entity(responseMessage).build();
             }
         } catch (DeviceManagementException e) {
             String msg = "Error occurred while checking enrollment status of the device.";
@@ -283,11 +294,17 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
             result = AndroidAPIUtils.getDeviceManagementService().modifyEnrollment(device);
             if (result) {
-                return Response.status(Response.Status.ACCEPTED).entity("Enrollment of Android device that " +
+                Message responseMessage = new Message();
-                        "carries the id '" + id + "' has successfully updated").build();
+                responseMessage.setResponseCode(Response.Status.ACCEPTED.toString());
+                responseMessage.setResponseMessage("Enrollment of Android device that " +
+                        "carries the id '" + id + "' has successfully updated");
+                return Response.status(Response.Status.ACCEPTED).entity(responseMessage).build();
             } else {
-                return Response.status(Response.Status.NOT_MODIFIED).entity("Enrollment of Android device that " +
+                Message responseMessage = new Message();
-                        "carries the id '" + id + "' has not been updated").build();
+                responseMessage.setResponseCode(Response.Status.NOT_MODIFIED.toString());
+                responseMessage.setResponseMessage("Enrollment of Android device that " +
+                        "carries the id '" + id + "' has not been updated");
+                return Response.status(Response.Status.NOT_MODIFIED).entity(responseMessage).build();
             }
         } catch (DeviceManagementException e) {
             msg = "Error occurred while modifying enrollment of the Android device that carries the id '" +
@@ -307,11 +324,17 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         try {
             result = AndroidAPIUtils.getDeviceManagementService().disenrollDevice(deviceIdentifier);
             if (result) {
-                return Response.status(Response.Status.OK).entity("Android device that carries id '" + id +
+                Message responseMessage = new Message();
-                        "' has successfully dis-enrolled").build();
+                responseMessage.setResponseCode(Response.Status.OK.toString());
+                responseMessage.setResponseMessage("Android device that carries id '" + id +
+                        "' has successfully dis-enrolled");
+                return Response.status(Response.Status.OK).entity(responseMessage).build();
             } else {
-                return Response.status(Response.Status.NOT_FOUND).entity("Android device that carries id '" + id +
+                Message responseMessage = new Message();
-                        "' has not been dis-enrolled").build();
+                responseMessage.setResponseCode(Response.Status.NOT_FOUND.toString());
+                responseMessage.setResponseMessage("Android device that carries id '" + id +
+                        "' has not been dis-enrolled");
+                return Response.status(Response.Status.NOT_FOUND).entity(responseMessage).build();
             }
         } catch (DeviceManagementException e) {
             String msg = "Error occurred while dis-enrolling the Android device that carries the id '" + id + "'";

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js

@@ -42,8 +42,6 @@ function onRequest() {
             }
             var policyWizard = new File("/app/units/" + utility.getTenantedDeviceUnitName(deviceType, "policy-wizard"));
 
-            log.error("/app/units/" + utility.getTenantedDeviceUnitName(deviceType, "policy-wizard"));
-
             if (policyWizard.isExists()) {
                 content["icon"] = utility.getDeviceThumb(deviceType);
                 content["label"] = deviceTypeLabel;
@@ -52,7 +50,7 @@ function onRequest() {
         }
     }
 
-    var result = userModule.getRolesByUserStore();
+    var result = userModule.getRoles();
     if (result["status"] == "success") {
         viewModelData["roles"] = result["content"];
     }