From ce557266ecca90ed3b27e9e6b4ae5f6d092f1db8 Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Wed, 1 Jun 2016 00:10:30 +0530
Subject: [PATCH] Fixed issues in RoleManagementService

---
 .../service/impl/RoleManagementServiceImpl.java  | 14 +++++++++++++-
 .../src/main/webapp/META-INF/permissions.xml     | 16 ++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java
index 2007821939..94df0875c9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java
@@ -170,6 +170,10 @@ public class RoleManagementServiceImpl implements RoleManagementService {
     @POST
     @Override
     public Response addRole(RoleWrapper roleWrapper) {
+        if (roleWrapper == null) {
+            log.error("Request body is incorrect or empty");
+            return Response.status(Response.Status.BAD_REQUEST).build();
+        }
         try {
             UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
             if (log.isDebugEnabled()) {
@@ -197,6 +201,10 @@ public class RoleManagementServiceImpl implements RoleManagementService {
     @Path("/{roleName}")
     @Override
     public Response updateRole(@PathParam("roleName") String roleName, RoleWrapper roleWrapper) {
+        if (roleWrapper == null) {
+            log.error("Request body is incorrect or empty");
+            return Response.status(Response.Status.BAD_REQUEST).build();
+        }
         String newRoleName = roleWrapper.getRoleName();
         try {
             final UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
@@ -256,10 +264,14 @@ public class RoleManagementServiceImpl implements RoleManagementService {
         return Response.status(Response.Status.OK).build();
     }
 
-    @POST
+    @PUT
     @Path("/{roleName}/users")
     @Override
     public Response updateUsersOfRole(@PathParam("roleName") String roleName, List<String> users) {
+        if (users == null || users.size() == 0) {
+            log.error("No users are found");
+            return Response.status(Response.Status.BAD_REQUEST).build();
+        }
         try {
             final UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
             if (log.isDebugEnabled()) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
index a886c71925..dbf4de5cc4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
@@ -460,7 +460,7 @@
     <Permission>
         <name>List roles</name>
         <path>/device-mgt/admin/roles/list</path>
-        <url>/roles/permissions</url>
+        <url>/roles/*/permissions</url>
         <method>GET</method>
     </Permission>
 
@@ -481,22 +481,14 @@
     <Permission>
         <name>Update role</name>
         <path>/device-mgt/admin/roles/update</path>
-        <url>/roles</url>
+        <url>/roles/*</url>
         <method>PUT</method>
     </Permission>
 
-    <!--<Permission>-->
-        <!--<name>Update a specific role</name>-->
-        <!--<path>/device-mgt/roles/update</path>-->
-        <!--<url>/roles/*</url>-->
-        <!--<method>PUT</method>-->
-        <!---->
-    <!--</Permission>-->
-
     <Permission>
         <name>Update role</name>
         <path>/device-mgt/admin/roles/update</path>
-        <url>/roles/users</url>
+        <url>/roles/*/users</url>
         <method>PUT</method>
     </Permission>
 
@@ -510,7 +502,7 @@
     <Permission>
         <name>Remove role</name>
         <path>/device-mgt/admin/roles/remove</path>
-        <url>/roles</url>
+        <url>/roles/*</url>
         <method>DELETE</method>
     </Permission>