diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceGroupShare.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceGroupShare.java deleted file mode 100644 index af436c80f8..0000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceGroupShare.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.wso2.carbon.device.mgt.jaxrs.beans; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.List; - - -/** - * This class holds Device Group user name and assigned roles of user for particular group. Exposed to external access. - */ -@ApiModel(value = "DeviceGroupShare", description = "This class carries roles assigned to a user of a managed device group.") -public class DeviceGroupShare implements Serializable { - - private static final long serialVersionUID = 1998141711L; - - @ApiModelProperty(name = "username", value = "Username of the user.", required = true) - private String username; - - @ApiModelProperty(name = "roles", value = "List of roles assigned to user from the group.") - private List groupRoles; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public List getGroupRoles() { - return groupRoles; - } - - public void setGroupRoles(List groupRoles) { - this.groupRoles = groupRoles; - } -} - diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceGroupUsersList.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceGroupUsersList.java deleted file mode 100644 index 40823d002f..0000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceGroupUsersList.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.wso2.carbon.device.mgt.jaxrs.beans; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.device.mgt.common.group.mgt.GroupUser; - -import java.util.ArrayList; -import java.util.List; - -public class DeviceGroupUsersList extends BasePaginatedResult { - - @ApiModelProperty(value = "List of device group users returned") - @JsonProperty("users") - private List users = new ArrayList<>(); - - public List getList() { - return users; - } - - public void setList(List users) { - this.users = users; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("{\n"); - - sb.append(" count: ").append(getCount()).append(",\n"); - sb.append(" users: [").append(users).append("\n"); - sb.append("]}\n"); - return sb.toString(); - } - -} - diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java index b7630f1643..a982a3c3d5 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java @@ -19,26 +19,37 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api; -import io.swagger.annotations.SwaggerDefinition; -import io.swagger.annotations.Info; -import io.swagger.annotations.ExtensionProperty; -import io.swagger.annotations.Extension; -import io.swagger.annotations.Tag; import io.swagger.annotations.Api; -import io.swagger.annotations.AuthorizationScope; -import io.swagger.annotations.Authorization; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; +import io.swagger.annotations.AuthorizationScope; +import io.swagger.annotations.Extension; +import io.swagger.annotations.ExtensionProperty; +import io.swagger.annotations.Info; import io.swagger.annotations.ResponseHeader; +import io.swagger.annotations.SwaggerDefinition; +import io.swagger.annotations.Tag; import org.apache.axis2.transport.http.HTTPConstants; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup; -import org.wso2.carbon.device.mgt.jaxrs.beans.*; +import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceGroupList; +import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList; +import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse; +import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList; import javax.validation.Valid; -import javax.ws.rs.*; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +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; import java.util.List; @@ -58,12 +69,14 @@ import java.util.List; } ), tags = { - @Tag(name = "device_management", description = "") + @Tag(name = "device_management", description = "Device group related REST-API. " + + "This can be used to manipulated device group related " + + "details.") } ) @Path("/groups") -@Api(value = "Device Group Management", description = "This API carries all device group management related operations " + - "such as get all the available groups, etc.") +@Api(value = "Device Group Management", description = "This API carries all device group management related " + + "operations such as get all the available groups, etc.") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) public interface GroupManagementService { @@ -470,130 +483,10 @@ public interface GroupManagementService { required = true) @PathParam("groupId") int groupId, @ApiParam( - name = "deviceGroupShare", - value = "User name and the assigned roles for the share.", + name = "userRoles", + value = "User roles to share group with.", required = true) - @Valid DeviceGroupShare deviceGroupShare); - - @Path("/id/{groupId}/users") - @GET - @ApiOperation( - produces = MediaType.APPLICATION_JSON, - httpMethod = HTTPConstants.HEADER_GET, - value = "View list of users of a device group.", - notes = "Returns details of users which particular group has been shared with.", - tags = "Device Group Management", - authorizations = { - @Authorization( - value="permission", - scopes = { @AuthorizationScope(scope = "/device-mgt/groups/users/view", - description = "View users") } - ) - } - ) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "OK. \n Successfully fetched the users.", - response = DeviceGroupUsersList.class, - responseHeaders = { - @ResponseHeader( - name = "Content-Type", - description = "The content type of the body"), - @ResponseHeader( - name = "ETag", - description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), - @ResponseHeader( - name = "Last-Modified", - description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), - }), - @ApiResponse( - code = 304, - message = "Not Modified. \n Empty body because the client has already the latest version of " + - "the requested resource."), - @ApiResponse( - code = 404, - message = "No groups found.", - response = ErrorResponse.class), - @ApiResponse( - code = 406, - message = "Not Acceptable.\n The requested media type is not supported."), - @ApiResponse( - code = 500, - message = "Internal Server Error. \n Server error occurred while fetching the users.", - response = ErrorResponse.class) - }) - Response getUsersOfGroup(@ApiParam( - name = "groupId", - value = "ID of the group.", - required = true) - @PathParam("groupId") int groupId); - - - @Path("id/{groupId}/roles/create") - @POST - @ApiOperation( - produces = MediaType.APPLICATION_JSON, - httpMethod = HTTPConstants.HEADER_GET, - value = "Create a group sharing role to a device group.", - notes = "Group sharing is done through a group sharing role.", - tags = "Device Group Management", - authorizations = { - @Authorization( - value="permission", - scopes = { @AuthorizationScope(scope = "/device-mgt/groups/roles/create", - description = "Create roles") } - ) - } - ) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "OK. \n Successfully created the role.", - response = DeviceGroupUsersList.class, - responseHeaders = { - @ResponseHeader( - name = "Content-Type", - description = "The content type of the body"), - @ResponseHeader( - name = "ETag", - description = "Entity Tag of the response resource.\n" + - "Used by caches, or in conditional requests."), - @ResponseHeader( - name = "Last-Modified", - description = "Date and time the resource has been modified the last time.\n" + - "Used by caches, or in conditional requests."), - }), - @ApiResponse( - code = 304, - message = "Not Modified. \n Empty body because the client has already the latest version of " + - "the requested resource."), - @ApiResponse( - code = 404, - message = "No groups found.", - response = ErrorResponse.class), - @ApiResponse( - code = 406, - message = "Not Acceptable.\n The requested media type is not supported."), - @ApiResponse( - code = 500, - message = "Internal Server Error. \n Server error occurred while creating the role.", - response = ErrorResponse.class) - }) - Response createGroupSharingRole( - @ApiParam( - name = "groupId", - value = "ID of the group.", - required = true) - @PathParam("groupId") int groupId, - @ApiParam( - name = "userName", - value = "User name of the current user.", - required = false) - @QueryParam("userName") String userName, - @ApiParam( - name = "roleInfo", - value = "Group role information with permissions and users", - required = true) - @Valid RoleInfo roleInfo); + @Valid List userRoles); @Path("/id/{groupId}/roles") @GET @@ -613,7 +506,7 @@ public interface GroupManagementService { ) @ApiResponses(value = { @ApiResponse(code = 200, message = "OK. \n Successfully fetched the users.", - response = DeviceGroupUsersList.class, + response = RoleList.class, responseHeaders = { @ResponseHeader( name = "Content-Type", @@ -647,12 +540,7 @@ public interface GroupManagementService { name = "groupId", value = "ID of the group.", required = true) - @PathParam("groupId") int groupId, - @ApiParam( - name = "userName", - value = "User name of the current user.", - required = false) - @QueryParam("userName") String userName); + @PathParam("groupId") int groupId); @Path("/id/{groupId}/devices") @GET diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java index cc2fef4ff2..cc894b9c0b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java @@ -356,6 +356,70 @@ public interface RoleManagementService { value = "The properties required to add a new role.", required = true) RoleInfo role); + @POST + @Path("/create-combined-role/{roleName}") + @ApiOperation( + consumes = MediaType.APPLICATION_JSON, + produces = MediaType.APPLICATION_JSON, + httpMethod = "POST", + value = "Adding a combined Role", + notes = "WSO2 EMM supports role-based access control (RBAC) and role management. Add a new combined role to WSO2 EMM using this REST API.", + tags = "Role Management", + authorizations = { + @Authorization( + value="permission", + scopes = { @AuthorizationScope(scope = "/device-mgt/roles/manage", + description = "Manage Roles") } + ) + } + ) + @ApiResponses(value = { + @ApiResponse( + code = 201, + message = "Created. \n Successfully created the role.", + responseHeaders = { + @ResponseHeader( + name = "Content-Location", + description = "The URL to the newly added role."), + @ResponseHeader( + name = "Content-Type", + description = "The content type of the body"), + @ResponseHeader( + name = "ETag", + description = "Entity Tag of the response resource.\n" + + "Used by caches, or in conditional requests."), + @ResponseHeader( + name = "Last-Modified", + description = "Date and time the resource has been modified the last time.\n" + + "Used by caches, or in conditional requests.")}), + @ApiResponse( + code = 303, + message = "See Other. \n The source can be retrieved from the URL specified in the location header.", + responseHeaders = { + @ResponseHeader( + name = "Content-Location", + description = "The Source URL of the document.")}), + @ApiResponse( + code = 400, + message = "Bad Request. \n Invalid request or validation error.", + response = ErrorResponse.class), + @ApiResponse( + code = 415, + message = "Unsupported media type. \n The format of the requested entity was not supported.", + response = ErrorResponse.class), + @ApiResponse( + code = 500, + message = "Internal Server Error. \n Server error occurred while adding a new role.", + response = ErrorResponse.class) + }) + Response addCombinedRole( + @ApiParam( + name = "roles", + value = "List of roles names required to add a new combined role.", + required = true) List roles, + @PathParam("roleName") String roleName, + @QueryParam("user-store") String userStoreName); + @PUT @Path("/{roleName}") @ApiOperation( diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java index 90208d4409..4d7f4319fa 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java @@ -31,19 +31,16 @@ import org.wso2.carbon.device.mgt.common.PaginationResult; import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup; import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyExistException; import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException; -import org.wso2.carbon.device.mgt.common.group.mgt.GroupUser; import org.wso2.carbon.device.mgt.common.group.mgt.RoleDoesNotExistException; import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService; -import org.wso2.carbon.device.mgt.jaxrs.beans.*; +import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceGroupList; +import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList; +import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList; import org.wso2.carbon.device.mgt.jaxrs.service.api.GroupManagementService; import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil; import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; -import org.wso2.carbon.user.api.UserStoreException; -import org.wso2.carbon.user.api.UserStoreManager; -import org.wso2.carbon.user.core.multiplecredentials.UserDoesNotExistException; import javax.ws.rs.core.Response; -import java.util.Date; import java.util.List; public class GroupManagementServiceImpl implements GroupManagementService { @@ -100,8 +97,6 @@ public class GroupManagementServiceImpl implements GroupManagementService { return Response.status(Response.Status.BAD_REQUEST).build(); } group.setOwner(owner); - group.setDateOfCreation(new Date().getTime()); - group.setDateOfLastUpdate(new Date().getTime()); try { DeviceMgtAPIUtils.getGroupManagementProviderService().createGroup(group, DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_PERMISSIONS); return Response.status(Response.Status.CREATED).build(); @@ -168,69 +163,24 @@ public class GroupManagementServiceImpl implements GroupManagementService { } @Override - public Response manageGroupSharing(int groupId, DeviceGroupShare deviceGroupShare) { + public Response manageGroupSharing(int groupId, List userRoles) { try { DeviceMgtAPIUtils.getGroupManagementProviderService() - .manageGroupSharing(groupId, deviceGroupShare.getUsername(), deviceGroupShare.getGroupRoles()); + .manageGroupSharing(groupId, userRoles); return Response.status(Response.Status.OK).build(); } catch (GroupManagementException e) { String msg = "Error occurred while managing group share."; log.error(msg, e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); - } catch (RoleDoesNotExistException | UserDoesNotExistException e) { + } catch (RoleDoesNotExistException e) { return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build(); } } @Override - public Response getUsersOfGroup(int groupId) { + public Response getRolesOfGroup(int groupId) { try { - List groupUsers = DeviceMgtAPIUtils.getGroupManagementProviderService().getUsers(groupId); - if (groupUsers != null && groupUsers.size() > 0) { - DeviceGroupUsersList deviceGroupUsersList = new DeviceGroupUsersList(); - deviceGroupUsersList.setList(groupUsers); - deviceGroupUsersList.setCount(groupUsers.size()); - return Response.status(Response.Status.OK).entity(deviceGroupUsersList).build(); - } else { - return Response.status(Response.Status.NOT_FOUND).build(); - } - } catch (GroupManagementException e) { - String msg = "Error occurred while getting users of the group."; - log.error(msg, e); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); - } - } - - @Override - public Response createGroupSharingRole(int groupId, String userName, RoleInfo roleInfo) { - try { - DeviceMgtAPIUtils.getGroupManagementProviderService() - .addGroupSharingRole(userName, groupId, roleInfo.getRoleName(), roleInfo.getPermissions()); - return Response.status(Response.Status.CREATED).build(); - } catch (GroupManagementException e) { - String msg = "Error occurred while creating group sharing role."; - log.error(msg, e); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); - } - } - - @Override - public Response getRolesOfGroup(int groupId, String userName) { - try { - List groupRoles; - if(userName != null) { - UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager(); - if (!userStoreManager.isExistingUser(userName)) { - // returning response with bad request state - return Response.status(Response.Status.CONFLICT).entity( - new ErrorResponse.ErrorResponseBuilder().setMessage("User by username: " + - userName + " doesn't exists. Therefore, request made to get user " + - "was refused.").build()).build(); - } - groupRoles = DeviceMgtAPIUtils.getGroupManagementProviderService().getRoles(userName, groupId); - } else { - groupRoles = DeviceMgtAPIUtils.getGroupManagementProviderService().getRoles(groupId); - } + List groupRoles = DeviceMgtAPIUtils.getGroupManagementProviderService().getRoles(groupId); if(groupRoles != null && groupRoles.size() > 0) { RoleList deviceGroupRolesList = new RoleList(); @@ -244,10 +194,6 @@ public class GroupManagementServiceImpl implements GroupManagementService { String msg = "Error occurred while getting roles of the group."; log.error(msg, e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); - } catch (UserStoreException e) { - String msg = "Error while retrieving the user."; - log.error(msg, e); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); } } 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 29db06c3d0..35ccabfab3 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 @@ -30,13 +30,26 @@ import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.FilteringUtil; import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil; import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; import org.wso2.carbon.device.mgt.jaxrs.util.SetReferenceTransformer; -import org.wso2.carbon.user.api.*; +import org.wso2.carbon.user.api.AuthorizationManager; +import org.wso2.carbon.user.api.Permission; +import org.wso2.carbon.user.api.UserRealm; +import org.wso2.carbon.user.api.UserStoreException; +import org.wso2.carbon.user.api.UserStoreManager; import org.wso2.carbon.user.core.common.AbstractUserStoreManager; import org.wso2.carbon.user.mgt.UserRealmProxy; import org.wso2.carbon.user.mgt.common.UIPermissionNode; import org.wso2.carbon.user.mgt.common.UserAdminException; -import javax.ws.rs.*; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +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; import java.io.UnsupportedEncodingException; @@ -45,7 +58,9 @@ import java.net.URISyntaxException; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import static org.wso2.carbon.device.mgt.jaxrs.util.Constants.PRIMARY_USER_STORE; @@ -69,7 +84,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { RoleList targetRoles = new RoleList(); //if user store is null set it to primary - if(userStore == null || "".equals(userStore)){ + if (userStore == null || "".equals(userStore)) { userStore = PRIMARY_USER_STORE; } @@ -94,7 +109,8 @@ public class RoleManagementServiceImpl implements RoleManagementService { @Path("/{roleName}/permissions") @Override public Response getPermissionsOfRole(@PathParam("roleName") String roleName, - @QueryParam("user-store") String userStoreName, @HeaderParam("If-Modified-Since") String ifModifiedSince) { + @QueryParam("user-store") String userStoreName, + @HeaderParam("If-Modified-Since") String ifModifiedSince) { if (userStoreName != null && !userStoreName.isEmpty()) { roleName = userStoreName + "/" + roleName; } @@ -166,7 +182,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { @Path("/{roleName}") @Override public Response getRole(@PathParam("roleName") String roleName, @QueryParam("user-store") String userStoreName, - @HeaderParam("If-Modified-Since") String ifModifiedSince) { + @HeaderParam("If-Modified-Since") String ifModifiedSince) { if (log.isDebugEnabled()) { log.debug("Getting the list of user roles"); } @@ -181,7 +197,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { if (!userStoreManager.isExistingRole(roleName)) { return Response.status(404).entity( new ErrorResponse.ErrorResponseBuilder().setMessage("No role exists with the name '" + - roleName + "'").build()).build(); + roleName + "'").build()).build(); } roleInfo.setRoleName(roleName); roleInfo.setUsers(userStoreManager.getUserListOfRole(roleName)); @@ -235,7 +251,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { //TODO fix what's returned in the entity return Response.created(new URI(API_BASE_PATH + "/" + URLEncoder.encode(roleInfo.getRoleName(), "UTF-8"))). entity("Role '" + roleInfo.getRoleName() + "' has " + "successfully been" - + " added").build(); + + " added").build(); } catch (UserStoreException e) { String msg = "Error occurred while adding role '" + roleInfo.getRoleName() + "'"; log.error(msg, e); @@ -255,11 +271,76 @@ public class RoleManagementServiceImpl implements RoleManagementService { } } + @POST + @Path("/create-combined-role/{roleName}") + @Override + public Response addCombinedRole(List roles, @PathParam("roleName") String roleName, + @QueryParam("user-store") String userStoreName) { + if (userStoreName != null && !userStoreName.isEmpty()) { + roleName = userStoreName + "/" + roleName; + } + if (roles.size() < 2) { + return Response.status(400).entity( + new ErrorResponse.ErrorResponseBuilder().setMessage("Combining Roles requires at least two roles.") + .build() + ).build(); + } + for (String role : roles) { + RequestValidationUtil.validateRoleName(role); + } + try { + UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager(); + if (log.isDebugEnabled()) { + log.debug("Persisting the role in the underlying user store"); + } + + HashSet permsSet = new HashSet<>(); + try { + for (String role : roles) { + mergePermissions(new UIPermissionNode[]{getRolePermissions(role)}, permsSet); + } + } catch (IllegalArgumentException e) { + return Response.status(404).entity( + new ErrorResponse.ErrorResponseBuilder().setMessage(e.getMessage()).build() + ).build(); + } + + Permission[] permissions = permsSet.toArray(new Permission[permsSet.size()]); + userStoreManager.addRole(roleName, new String[0], permissions); + + //TODO fix what's returned in the entity + return Response.created(new URI(API_BASE_PATH + "/" + URLEncoder.encode(roleName, "UTF-8"))). + entity("Role '" + roleName + "' has " + "successfully been" + + " added").build(); + } catch (UserAdminException e) { + String msg = "Error occurred while retrieving the permissions of role '" + roleName + "'"; + log.error(msg, e); + return Response.serverError().entity( + new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); + } catch (UserStoreException e) { + String msg = "Error occurred while adding role '" + roleName + "'"; + log.error(msg, e); + return Response.serverError().entity( + new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); + } catch (URISyntaxException e) { + String msg = "Error occurred while composing the URI at which the information of the newly created role " + + "can be retrieved"; + log.error(msg, e); + return Response.serverError().entity( + new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); + } catch (UnsupportedEncodingException e) { + String msg = "Error occurred while encoding role name"; + log.error(msg, e); + return Response.serverError().entity( + new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); + } + } + @PUT @Path("/{roleName}") @Override public Response updateRole(@PathParam("roleName") String roleName, RoleInfo roleInfo, - @QueryParam("user-store") String userStoreName) { + @QueryParam("user-store") String userStoreName) { if (userStoreName != null && !userStoreName.isEmpty()) { roleName = userStoreName + "/" + roleName; } @@ -271,7 +352,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { if (!userStoreManager.isExistingRole(roleName)) { return Response.status(404).entity( new ErrorResponse.ErrorResponseBuilder().setMessage("No role exists with the name '" + - roleName + "'").build()).build(); + roleName + "'").build()).build(); } final AuthorizationManager authorizationManager = userRealm.getAuthorizationManager(); @@ -287,7 +368,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { if (roleInfo.getUsers() != null) { SetReferenceTransformer transformer = new SetReferenceTransformer<>(); transformer.transform(Arrays.asList(userStoreManager.getUserListOfRole(newRoleName)), - Arrays.asList(roleInfo.getUsers())); + Arrays.asList(roleInfo.getUsers())); final String[] usersToAdd = transformer.getObjectsToAdd().toArray(new String[transformer .getObjectsToAdd().size()]); final String[] usersToDelete = transformer.getObjectsToRemove().toArray(new String[transformer @@ -307,7 +388,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { } //TODO: Need to send the updated role information in the entity back to the client return Response.status(Response.Status.OK).entity("Role '" + roleInfo.getRoleName() + "' has " + - "successfully been updated").build(); + "successfully been updated").build(); } catch (UserStoreException e) { String msg = "Error occurred while updating role '" + roleName + "'"; log.error(msg, e); @@ -330,7 +411,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { if (!userStoreManager.isExistingRole(roleName)) { return Response.status(404).entity( new ErrorResponse.ErrorResponseBuilder().setMessage("No role exists with the name '" + - roleName + "'").build()).build(); + roleName + "'").build()).build(); } final AuthorizationManager authorizationManager = userRealm.getAuthorizationManager(); @@ -354,7 +435,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { @Path("/{roleName}/users") @Override public Response updateUsersOfRole(@PathParam("roleName") String roleName, - @QueryParam("user-store") String userStoreName, List users) { + @QueryParam("user-store") String userStoreName, List users) { if (userStoreName != null && !userStoreName.isEmpty()) { roleName = userStoreName + "/" + roleName; } @@ -367,7 +448,7 @@ public class RoleManagementServiceImpl implements RoleManagementService { } SetReferenceTransformer transformer = new SetReferenceTransformer<>(); transformer.transform(Arrays.asList(userStoreManager.getUserListOfRole(roleName)), - users); + users); final String[] usersToAdd = transformer.getObjectsToAdd().toArray(new String[transformer .getObjectsToAdd().size()]); final String[] usersToDelete = transformer.getObjectsToRemove().toArray(new String[transformer @@ -376,7 +457,8 @@ public class RoleManagementServiceImpl implements RoleManagementService { userStoreManager.updateUserListOfRole(roleName, usersToDelete, usersToAdd); return Response.status(Response.Status.OK).entity("Role '" + roleName + "' has " + - "successfully been updated with the user list").build(); + "successfully been updated with the user list") + .build(); } catch (UserStoreException e) { String msg = "Error occurred while updating the users of the role '" + roleName + "'"; log.error(msg, e); @@ -400,7 +482,8 @@ public class RoleManagementServiceImpl implements RoleManagementService { // removing all internal roles, roles created for Service-providers and application related roles. List filteredRoles = new ArrayList<>(); for (String role : roles) { - if (!(role.startsWith("Internal/") || role.startsWith("Authentication/") || role.startsWith("Application/"))) { + if (!(role.startsWith("Internal/") || role.startsWith("Authentication/") || role.startsWith( + "Application/"))) { if (!filterRolesByName) { filteredRoles.add(role); } else { @@ -413,4 +496,31 @@ public class RoleManagementServiceImpl implements RoleManagementService { return filteredRoles; } + private Set mergePermissions(UIPermissionNode[] permissionNodes, Set permissions) + throws UserStoreException, UserAdminException { + for (UIPermissionNode permissionNode : permissionNodes) { + if (permissionNode.getNodeList().length > 0) { + mergePermissions(permissionNode.getNodeList(), permissions); + } + if (permissionNode.isSelected()) { + permissions.add(new Permission(permissionNode.getResourcePath(), CarbonConstants.UI_PERMISSION_ACTION)); + } + } + return permissions; + } + + private UIPermissionNode getRolePermissions(String roleName) throws UserStoreException, UserAdminException { + final UserRealm userRealm = DeviceMgtAPIUtils.getUserRealm(); + if (!userRealm.getUserStoreManager().isExistingRole(roleName)) { + throw new IllegalArgumentException("No role exists with the name '" + roleName + "'"); + } + + final UIPermissionNode rolePermissions = this.getUIPermissionNode(roleName, userRealm); + if (rolePermissions == null) { + if (log.isDebugEnabled()) { + log.debug("No permissions found for the role '" + roleName + "'"); + } + } + return rolePermissions; + } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroup.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroup.java index 6617ab3bc8..b107d79e87 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroup.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroup.java @@ -20,10 +20,7 @@ package org.wso2.carbon.device.mgt.common.group.mgt; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; -import java.util.List; /** * Holds Device Group details and expose to external access @@ -44,8 +41,6 @@ public class DeviceGroup implements Serializable { required = true) private String name; - private Long dateOfCreation; - private Long dateOfLastUpdate; private String owner; public DeviceGroup() {} @@ -78,22 +73,6 @@ public class DeviceGroup implements Serializable { this.name = name; } - public Long getDateOfCreation() { - return dateOfCreation; - } - - public void setDateOfCreation(Long dateOfCreation) { - this.dateOfCreation = dateOfCreation; - } - - public Long getDateOfLastUpdate() { - return dateOfLastUpdate; - } - - public void setDateOfLastUpdate(Long dateOfLastUpdate) { - this.dateOfLastUpdate = dateOfLastUpdate; - } - public String getOwner() { return owner; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/GroupDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/GroupDAO.java index b367d2c347..2536aa40e2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/GroupDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/GroupDAO.java @@ -86,6 +86,18 @@ public interface GroupDAO { */ List getGroups(GroupPaginationRequest paginationRequest, int tenantId) throws GroupManagementDAOException; + /** + * Get paginated list of Device Groups in tenant with specified device group ids. + * + * @param paginationRequest to filter results. + * @param deviceGroupIds of groups required. + * @param tenantId of user's tenant. + * @return List of all Device Groups in tenant. + * @throws GroupManagementDAOException + */ + List getGroups(GroupPaginationRequest paginationRequest, List deviceGroupIds, + int tenantId) throws GroupManagementDAOException; + /** * Get the list of Device Groups in tenant. * @@ -178,4 +190,94 @@ public interface GroupDAO { List getDevices(int groupId, int startIndex, int rowCount, int tenantId) throws GroupManagementDAOException; + /** + * Get all user roles for device group. + * + * @param groupId of the group + * @param tenantId of user's tenant. + * @return list of roles + * @throws GroupManagementDAOException + */ + List getRoles(int groupId, int tenantId) throws GroupManagementDAOException; + + /** + * Add user role for device group. + * + * @param groupId of the group. + * @param role to be added. + * @param tenantId of user's tenant. + * @throws GroupManagementDAOException + */ + void addRole(int groupId, String role, int tenantId) throws GroupManagementDAOException; + + /** + * Add user role for device group. + * + * @param groupId of the group. + * @param role to be removed. + * @param tenantId of user's tenant. + * @throws GroupManagementDAOException + */ + void removeRole(int groupId, String role, int tenantId) throws GroupManagementDAOException; + + /** + * Get all device groups which shared with a user role. + * + * @param roles of the group. + * @param tenantId of user's tenant. + * @return list of device groups. + * @throws GroupManagementDAOException + */ + List getGroups(String[] roles, int tenantId) throws GroupManagementDAOException; + + /** + * Get all device group ids which shared with a user role. + * + * @param roles of the group. + * @param tenantId of user's tenant. + * @return list of device group ids. + * @throws GroupManagementDAOException + */ + List getGroupIds(String[] roles, int tenantId) throws GroupManagementDAOException; + + /** + * Get count of all device groups which shared with a user role. + * + * @param roles of the group. + * @param tenantId of user's tenant. + * @return count of device groups. + * @throws GroupManagementDAOException + */ + int getGroupsCount(String[] roles, int tenantId) throws GroupManagementDAOException; + + /** + * Get all device groups which owned by user. + * + * @param username of the owner. + * @param tenantId of user's tenant. + * @return list of device groups. + * @throws GroupManagementDAOException + */ + List getOwnGroups(String username, int tenantId) throws GroupManagementDAOException; + + /** + * Get all device group ids which owned by user. + * + * @param username of the owner. + * @param tenantId of user's tenant. + * @return list of device group ids. + * @throws GroupManagementDAOException + */ + List getOwnGroupIds(String username, int tenantId) throws GroupManagementDAOException; + + /** + * Get count of device groups which owned by user. + * + * @param username of the owner. + * @param tenantId of user's tenant. + * @return count of device groups. + * @throws GroupManagementDAOException + */ + int getOwnGroupsCount(String username, int tenantId) throws GroupManagementDAOException; + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/GroupDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/GroupDAOImpl.java index 5a8e089f8f..52dba3579a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/GroupDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/GroupDAOImpl.java @@ -22,9 +22,9 @@ import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.GroupPaginationRequest; import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup; import org.wso2.carbon.device.mgt.core.dao.GroupDAO; -import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOException; import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory; +import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; import org.wso2.carbon.device.mgt.core.dao.util.GroupManagementDAOUtil; import java.sql.Connection; @@ -32,7 +32,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -47,15 +46,12 @@ public class GroupDAOImpl implements GroupDAO { int groupId = -1; try { Connection conn = GroupManagementDAOFactory.getConnection(); - String sql = "INSERT INTO DM_GROUP(DESCRIPTION, GROUP_NAME, DATE_OF_CREATE, DATE_OF_LAST_UPDATE, " - + "OWNER, TENANT_ID) VALUES (?, ?, ?, ?, ?, ?)"; + String sql = "INSERT INTO DM_GROUP(DESCRIPTION, GROUP_NAME, OWNER, TENANT_ID) VALUES (?, ?, ?, ?)"; stmt = conn.prepareStatement(sql, new String[]{"ID"}); stmt.setString(1, deviceGroup.getDescription()); stmt.setString(2, deviceGroup.getName()); - stmt.setLong(3, new Date().getTime()); - stmt.setLong(4, new Date().getTime()); - stmt.setString(5, deviceGroup.getOwner()); - stmt.setInt(6, tenantId); + stmt.setString(3, deviceGroup.getOwner()); + stmt.setInt(4, tenantId); stmt.executeUpdate(); rs = stmt.getGeneratedKeys(); if (rs.next()) { @@ -64,7 +60,7 @@ public class GroupDAOImpl implements GroupDAO { return groupId; } catch (SQLException e) { throw new GroupManagementDAOException("Error occurred while adding deviceGroup '" + - deviceGroup.getName() + "'", e); + deviceGroup.getName() + "'", e); } finally { GroupManagementDAOUtil.cleanupResources(stmt, null); } @@ -76,19 +72,18 @@ public class GroupDAOImpl implements GroupDAO { PreparedStatement stmt = null; try { Connection conn = GroupManagementDAOFactory.getConnection(); - String sql = "UPDATE DM_GROUP SET DESCRIPTION = ?, GROUP_NAME = ?, DATE_OF_LAST_UPDATE = ?, OWNER = ? " - + "WHERE ID = ? AND TENANT_ID = ?"; + String sql = + "UPDATE DM_GROUP SET DESCRIPTION = ?, GROUP_NAME = ?, OWNER = ? WHERE ID = ? AND TENANT_ID = ?"; stmt = conn.prepareStatement(sql); stmt.setString(1, deviceGroup.getDescription()); stmt.setString(2, deviceGroup.getName()); - stmt.setLong(3, deviceGroup.getDateOfLastUpdate()); - stmt.setString(4, deviceGroup.getOwner()); - stmt.setInt(5, groupId); - stmt.setInt(6, tenantId); + stmt.setString(3, deviceGroup.getOwner()); + stmt.setInt(4, groupId); + stmt.setInt(5, tenantId); stmt.executeUpdate(); } catch (SQLException e) { throw new GroupManagementDAOException("Error occurred while updating deviceGroup '" + - deviceGroup.getName() + "'", e); + deviceGroup.getName() + "'", e); } finally { GroupManagementDAOUtil.cleanupResources(stmt, null); } @@ -100,7 +95,12 @@ public class GroupDAOImpl implements GroupDAO { PreparedStatement stmt = null; try { conn = GroupManagementDAOFactory.getConnection(); - String sql = "DELETE FROM DM_DEVICE_GROUP_MAP WHERE GROUP_ID = ? AND TENANT_ID = ?"; + String sql = "DELETE FROM DM_ROLE_GROUP_MAP WHERE GROUP_ID = ? AND TENANT_ID = ?"; + stmt = conn.prepareStatement(sql); + stmt.setInt(1, groupId); + stmt.setInt(2, tenantId); + stmt.executeUpdate(); + sql = "DELETE FROM DM_DEVICE_GROUP_MAP WHERE GROUP_ID = ? AND TENANT_ID = ?"; stmt = conn.prepareStatement(sql); stmt.setInt(1, groupId); stmt.setInt(2, tenantId); @@ -131,8 +131,7 @@ public class GroupDAOImpl implements GroupDAO { ResultSet resultSet = null; try { Connection conn = GroupManagementDAOFactory.getConnection(); - String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, DATE_OF_CREATE, DATE_OF_LAST_UPDATE, OWNER " - + "FROM DM_GROUP WHERE ID = ? AND TENANT_ID = ?"; + String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER FROM DM_GROUP WHERE ID = ? AND TENANT_ID = ?"; stmt = conn.prepareStatement(sql); stmt.setInt(1, groupId); stmt.setInt(2, tenantId); @@ -144,7 +143,7 @@ public class GroupDAOImpl implements GroupDAO { } } catch (SQLException e) { throw new GroupManagementDAOException("Error occurred while obtaining information of Device Group '" + - groupId + "'", e); + groupId + "'", e); } finally { GroupManagementDAOUtil.cleanupResources(stmt, resultSet); } @@ -157,15 +156,15 @@ public class GroupDAOImpl implements GroupDAO { List deviceGroupBuilders = new ArrayList<>(); try { Connection conn = GroupManagementDAOFactory.getConnection(); - String sql = "SELECT G.ID, G.GROUP_NAME, G.DESCRIPTION, G.DATE_OF_CREATE, G.DATE_OF_LAST_UPDATE, \n" + - "G.OWNER FROM DM_GROUP G INNER JOIN DM_DEVICE_GROUP_MAP GM ON G.ID = GM.GROUP_ID " + + String sql = "SELECT G.ID, G.GROUP_NAME, G.DESCRIPTION, G.OWNER FROM DM_GROUP G " + + "INNER JOIN DM_DEVICE_GROUP_MAP GM ON G.ID = GM.GROUP_ID " + "WHERE GM.DEVICE_ID = ? AND GM.TENANT_ID = ?"; stmt = conn.prepareStatement(sql); stmt.setInt(1, deviceId); stmt.setInt(2, tenantId); resultSet = stmt.executeQuery(); while (resultSet.next()) { - deviceGroupBuilders.add(GroupManagementDAOUtil.loadGroup(resultSet)); + deviceGroupBuilders.add(GroupManagementDAOUtil.loadGroup(resultSet)); } } catch (SQLException e) { throw new GroupManagementDAOException("Error occurred while obtaining information of Device Groups ", e); @@ -190,8 +189,65 @@ public class GroupDAOImpl implements GroupDAO { try { Connection conn = GroupManagementDAOFactory.getConnection(); - String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, DATE_OF_CREATE, DATE_OF_LAST_UPDATE, OWNER " - + "FROM DM_GROUP WHERE TENANT_ID = ?"; + String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER FROM DM_GROUP WHERE TENANT_ID = ?"; + if (groupName != null && !groupName.isEmpty()) { + sql += " AND GROUP_NAME LIKE ?"; + hasGroupName = true; + } + if (owner != null && !owner.isEmpty()) { + sql += " AND OWNER LIKE ?"; + hasOwner = true; + } + if (hasLimit) { + sql += " LIMIT ?, ?"; + } + + int paramIndex = 1; + stmt = conn.prepareStatement(sql); + stmt.setInt(paramIndex++, tenantId); + if (hasGroupName) { + stmt.setString(paramIndex++, groupName + "%"); + } + if (hasOwner) { + stmt.setString(paramIndex++, owner + "%"); + } + if (hasLimit) { + stmt.setInt(paramIndex++, request.getStartIndex()); + stmt.setInt(paramIndex, request.getRowCount()); + } + resultSet = stmt.executeQuery(); + deviceGroupList = new ArrayList<>(); + while (resultSet.next()) { + deviceGroupList.add(GroupManagementDAOUtil.loadGroup(resultSet)); + } + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while listing all groups in tenant: " + tenantId, e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, resultSet); + } + return deviceGroupList; + } + + @Override + public List getGroups(GroupPaginationRequest request, List deviceGroupIds, + int tenantId) throws GroupManagementDAOException { + int deviceGroupIdsCount = deviceGroupIds.size(); + if (deviceGroupIdsCount == 0) { + return new ArrayList<>(); + } + PreparedStatement stmt = null; + ResultSet resultSet = null; + List deviceGroupList = null; + + String groupName = request.getGroupName(); + boolean hasGroupName = false; + String owner = request.getOwner(); + boolean hasOwner = false; + boolean hasLimit = request.getRowCount() != 0; + + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER FROM DM_GROUP WHERE TENANT_ID = ?"; if (groupName != null && !groupName.isEmpty()) { sql += " AND GROUP_NAME LIKE ?"; hasGroupName = true; @@ -200,6 +256,11 @@ public class GroupDAOImpl implements GroupDAO { sql += " AND OWNER LIKE ?"; hasOwner = true; } + sql += " AND ID IN ("; + for (int i = 0; i < deviceGroupIdsCount; i++) { + sql += (deviceGroupIdsCount - 1 != i) ? "?," : "?"; + } + sql += ")"; if (hasLimit) { sql += " LIMIT ?, ?"; } @@ -208,11 +269,14 @@ public class GroupDAOImpl implements GroupDAO { stmt = conn.prepareStatement(sql); stmt.setInt(paramIndex++, tenantId); if (hasGroupName) { - stmt.setString(paramIndex++, groupName + "%"); + stmt.setString(paramIndex++, groupName + "%"); } if (hasOwner) { stmt.setString(paramIndex++, owner + "%"); } + for (Integer deviceGroupId : deviceGroupIds) { + stmt.setInt(paramIndex++, deviceGroupId); + } if (hasLimit) { stmt.setInt(paramIndex++, request.getStartIndex()); stmt.setInt(paramIndex, request.getRowCount()); @@ -237,8 +301,7 @@ public class GroupDAOImpl implements GroupDAO { List deviceGroupList = null; try { Connection conn = GroupManagementDAOFactory.getConnection(); - String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, DATE_OF_CREATE, DATE_OF_LAST_UPDATE, OWNER " - + "FROM DM_GROUP WHERE TENANT_ID = ?"; + String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER FROM DM_GROUP WHERE TENANT_ID = ?"; stmt = conn.prepareStatement(sql); stmt.setInt(1, tenantId); resultSet = stmt.executeQuery(); @@ -327,8 +390,8 @@ public class GroupDAOImpl implements GroupDAO { ResultSet resultSet = null; try { Connection conn = GroupManagementDAOFactory.getConnection(); - String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, DATE_OF_CREATE, DATE_OF_LAST_UPDATE, OWNER " + - "FROM DM_GROUP WHERE GROUP_NAME = ? AND TENANT_ID = ?"; + String sql = + "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER FROM DM_GROUP WHERE GROUP_NAME = ? AND TENANT_ID = ?"; stmt = conn.prepareStatement(sql); stmt.setString(1, groupName); stmt.setInt(2, tenantId); @@ -356,7 +419,6 @@ public class GroupDAOImpl implements GroupDAO { stmt.setInt(2, groupId); stmt.setInt(3, tenantId); stmt.executeUpdate(); - stmt.getGeneratedKeys(); } catch (SQLException e) { throw new GroupManagementDAOException("Error occurred while adding device to Group.", e); } finally { @@ -376,7 +438,6 @@ public class GroupDAOImpl implements GroupDAO { stmt.setInt(2, groupId); stmt.setInt(3, tenantId); stmt.executeUpdate(); - stmt.getGeneratedKeys(); } catch (SQLException e) { throw new GroupManagementDAOException("Error occurred while removing device from Group.", e); } finally { @@ -411,7 +472,8 @@ public class GroupDAOImpl implements GroupDAO { ResultSet resultSet = null; try { Connection conn = GroupManagementDAOFactory.getConnection(); - String sql = "SELECT COUNT(ID) AS DEVICE_COUNT FROM DM_DEVICE_GROUP_MAP WHERE GROUP_ID = ? AND TENANT_ID = ?"; + String sql = + "SELECT COUNT(ID) AS DEVICE_COUNT FROM DM_DEVICE_GROUP_MAP WHERE GROUP_ID = ? AND TENANT_ID = ?"; stmt = conn.prepareStatement(sql); stmt.setInt(1, groupId); stmt.setInt(2, tenantId); @@ -428,7 +490,6 @@ public class GroupDAOImpl implements GroupDAO { } } - //TODO: Move this to device mgt @Override public List getDevices(int groupId, int startIndex, int rowCount, int tenantId) throws GroupManagementDAOException { @@ -439,13 +500,15 @@ public class GroupDAOImpl implements GroupDAO { try { conn = GroupManagementDAOFactory.getConnection(); String sql = "SELECT d1.DEVICE_ID, d1.DESCRIPTION, d1.NAME AS DEVICE_NAME, d1.DEVICE_TYPE, " + - "d1.DEVICE_IDENTIFICATION, e.OWNER, e.OWNERSHIP, e.STATUS, e.DATE_OF_LAST_UPDATE, " + - "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, " + - "(SELECT gd.DEVICE_ID, gd.DESCRIPTION, gd.NAME, gd.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM " + - "(SELECT d.ID AS DEVICE_ID, d.DESCRIPTION, d.NAME, d.DEVICE_IDENTIFICATION, d.DEVICE_TYPE_ID FROM DM_DEVICE d, (" + - "SELECT dgm.DEVICE_ID FROM DM_DEVICE_GROUP_MAP dgm WHERE dgm.GROUP_ID = ?) dgm1 " + - "WHERE d.ID = dgm1.DEVICE_ID AND d.TENANT_ID = ?) gd, DM_DEVICE_TYPE t " + - "WHERE gd.DEVICE_TYPE_ID = t.ID) d1 WHERE d1.DEVICE_ID = e.DEVICE_ID AND TENANT_ID = ? LIMIT ? , ?"; + "d1.DEVICE_IDENTIFICATION, e.OWNER, e.OWNERSHIP, e.STATUS, e.DATE_OF_LAST_UPDATE, " + + "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, " + + "(SELECT gd.DEVICE_ID, gd.DESCRIPTION, gd.NAME, gd.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE " + + "FROM " + + "(SELECT d.ID AS DEVICE_ID, d.DESCRIPTION, d.NAME, d.DEVICE_IDENTIFICATION, d.DEVICE_TYPE_ID FROM" + + " DM_DEVICE d, (" + + "SELECT dgm.DEVICE_ID FROM DM_DEVICE_GROUP_MAP dgm WHERE dgm.GROUP_ID = ?) dgm1 " + + "WHERE d.ID = dgm1.DEVICE_ID AND d.TENANT_ID = ?) gd, DM_DEVICE_TYPE t " + + "WHERE gd.DEVICE_TYPE_ID = t.ID) d1 WHERE d1.DEVICE_ID = e.DEVICE_ID AND TENANT_ID = ? LIMIT ? , ?"; stmt = conn.prepareStatement(sql); stmt.setInt(1, groupId); @@ -463,11 +526,257 @@ public class GroupDAOImpl implements GroupDAO { } } catch (SQLException e) { throw new GroupManagementDAOException("Error occurred while retrieving information of all " + - "registered devices", e); + "registered devices", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } return devices; } + @Override + public List getRoles(int groupId, int tenantId) throws GroupManagementDAOException { + PreparedStatement stmt = null; + ResultSet resultSet = null; + List userRoles; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "SELECT ROLE FROM DM_ROLE_GROUP_MAP WHERE GROUP_ID = ? AND TENANT_ID = ?"; + stmt = conn.prepareStatement(sql); + stmt.setInt(1, groupId); + stmt.setInt(2, tenantId); + resultSet = stmt.executeQuery(); + userRoles = new ArrayList<>(); + while (resultSet.next()) { + userRoles.add(resultSet.getString("ROLE")); + } + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while listing all groups in tenant: " + tenantId, e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, resultSet); + } + return userRoles; + } + + @Override + public void addRole(int groupId, String role, int tenantId) throws GroupManagementDAOException { + PreparedStatement stmt = null; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "INSERT INTO DM_ROLE_GROUP_MAP(GROUP_ID, ROLE, TENANT_ID) VALUES (?, ?, ?)"; + stmt = conn.prepareStatement(sql); + stmt.setInt(1, groupId); + stmt.setString(2, role); + stmt.setInt(3, tenantId); + stmt.executeUpdate(); + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while adding new user role to Group.", e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, null); + } + } + + @Override + public void removeRole(int groupId, String role, int tenantId) throws GroupManagementDAOException { + PreparedStatement stmt = null; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "DELETE FROM DM_ROLE_GROUP_MAP WHERE GROUP_ID = ? AND ROLE = ? AND TENANT_ID = ?"; + stmt = conn.prepareStatement(sql); + stmt.setInt(1, groupId); + stmt.setString(2, role); + stmt.setInt(3, tenantId); + stmt.executeUpdate(); + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while removing device from Group.", e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, null); + } + } + + @Override + public List getGroups(String[] roles, int tenantId) throws GroupManagementDAOException { + int rolesCount = roles.length; + if (rolesCount == 0) { + return new ArrayList<>(); + } + PreparedStatement stmt = null; + ResultSet resultSet = null; + List deviceGroupList = null; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER FROM DM_GROUP g, " + + "(SELECT GROUP_ID FROM DM_ROLE_GROUP_MAP WHERE ROLE IN ("; + + int index = 0; + while (index++ < rolesCount - 1) { + sql += "?,"; + } + sql += "?)) gr WHERE g.ID = gr.GROUP_ID AND TENANT_ID = ? GROUP BY g.ID"; + + stmt = conn.prepareStatement(sql); + index = 0; + while (index++ < rolesCount) { + stmt.setString(index, roles[index - 1]); + } + stmt.setInt(index, tenantId); + resultSet = stmt.executeQuery(); + deviceGroupList = new ArrayList<>(); + while (resultSet.next()) { + deviceGroupList.add(GroupManagementDAOUtil.loadGroup(resultSet)); + } + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while listing all groups in tenant: " + tenantId, e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, resultSet); + } + return deviceGroupList; + } + + @Override + public List getGroupIds(String[] roles, int tenantId) throws GroupManagementDAOException { + if (roles.length == 0) { + return new ArrayList<>(); + } + PreparedStatement stmt = null; + ResultSet resultSet = null; + List deviceGroupIdList = null; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "SELECT ID FROM DM_GROUP g, (SELECT GROUP_ID FROM DM_ROLE_GROUP_MAP WHERE ROLE IN ("; + + int rolesCount = roles.length; + for (int i = 0; i < rolesCount; i++) { + sql += (rolesCount - 1 != i) ? "?," : "?"; + } + sql += ")) gr WHERE g.ID = gr.GROUP_ID AND TENANT_ID = ? GROUP BY g.ID"; + + stmt = conn.prepareStatement(sql); + int index = 0; + while (index++ < rolesCount) { + stmt.setString(index, roles[index - 1]); + } + stmt.setInt(index, tenantId); + resultSet = stmt.executeQuery(); + deviceGroupIdList = new ArrayList<>(); + while (resultSet.next()) { + deviceGroupIdList.add(resultSet.getInt("ID")); + } + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while listing all groups in tenant: " + tenantId, e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, resultSet); + } + return deviceGroupIdList; + } + + @Override + public int getGroupsCount(String[] roles, int tenantId) throws GroupManagementDAOException { + int rolesCount = roles.length; + if (rolesCount == 0) { + return 0; + } + PreparedStatement stmt = null; + ResultSet resultSet = null; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "SELECT COUNT(ID) AS GROUP_COUNT FROM DM_GROUP g, " + + "(SELECT GROUP_ID FROM DM_ROLE_GROUP_MAP WHERE ROLE IN ("; + for (int i = 0; i < rolesCount; i++) { + sql += (rolesCount - 1 != i) ? "?," : "?"; + } + sql += ")) gr WHERE g.ID = gr.GROUP_ID AND TENANT_ID = ? GROUP BY g.ID"; + + stmt = conn.prepareStatement(sql); + int index = 0; + while (index++ < rolesCount) { + stmt.setString(index, roles[index - 1]); + } + stmt.setInt(index, tenantId); + resultSet = stmt.executeQuery(); + if (resultSet.next()) { + return resultSet.getInt("GROUP_COUNT"); + } else { + return 0; + } + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while getting permitted groups count.", e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, resultSet); + } + } + + @Override + public List getOwnGroups(String username, int tenantId) throws GroupManagementDAOException { + PreparedStatement stmt = null; + ResultSet resultSet = null; + List deviceGroupList = null; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER FROM DM_GROUP WHERE OWNER = ? AND TENANT_ID = ?"; + stmt = conn.prepareStatement(sql); + stmt.setString(1, username); + stmt.setInt(2, tenantId); + resultSet = stmt.executeQuery(); + deviceGroupList = new ArrayList<>(); + while (resultSet.next()) { + deviceGroupList.add(GroupManagementDAOUtil.loadGroup(resultSet)); + } + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while getting own groups of user '" + + username + "'", e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, resultSet); + } + return deviceGroupList; + } + + @Override + public List getOwnGroupIds(String username, int tenantId) throws GroupManagementDAOException { + PreparedStatement stmt = null; + ResultSet resultSet = null; + List deviceGroupIdList = null; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "SELECT ID FROM DM_GROUP WHERE OWNER = ? AND TENANT_ID = ?"; + stmt = conn.prepareStatement(sql); + stmt.setString(1, username); + stmt.setInt(2, tenantId); + resultSet = stmt.executeQuery(); + deviceGroupIdList = new ArrayList<>(); + while (resultSet.next()) { + deviceGroupIdList.add(resultSet.getInt("ID")); + } + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while getting own groups of user '" + + username + "'", e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, resultSet); + } + return deviceGroupIdList; + } + + @Override + public int getOwnGroupsCount(String username, int tenantId) throws GroupManagementDAOException { + PreparedStatement stmt = null; + ResultSet resultSet = null; + try { + Connection conn = GroupManagementDAOFactory.getConnection(); + String sql = "SELECT COUNT(ID) AS GROUP_COUNT FROM DM_GROUP WHERE OWNER = ? AND TENANT_ID = ?"; + stmt = conn.prepareStatement(sql); + stmt.setString(1, username); + stmt.setInt(2, tenantId); + resultSet = stmt.executeQuery(); + if (resultSet.next()) { + return resultSet.getInt("GROUP_COUNT"); + } else { + return 0; + } + } catch (SQLException e) { + throw new GroupManagementDAOException("Error occurred while getting own groups count of user '" + + username + "'", e); + } finally { + GroupManagementDAOUtil.cleanupResources(stmt, resultSet); + } + } + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/GroupManagementDAOUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/GroupManagementDAOUtil.java index a7b0fa0977..3923bf5de0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/GroupManagementDAOUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/GroupManagementDAOUtil.java @@ -84,8 +84,6 @@ public final class GroupManagementDAOUtil { group.setGroupId(resultSet.getInt("ID")); group.setDescription(resultSet.getString("DESCRIPTION")); group.setName(resultSet.getString("GROUP_NAME")); - group.setDateOfCreation(resultSet.getLong("DATE_OF_CREATE")); - group.setDateOfLastUpdate(resultSet.getLong("DATE_OF_LAST_UPDATE")); group.setOwner(resultSet.getString("OWNER")); return group; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index eeac1846d4..4053c641e3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -21,7 +21,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.context.CarbonContext; -import org.wso2.carbon.device.mgt.common.*; +import org.wso2.carbon.device.mgt.common.Device; +import org.wso2.carbon.device.mgt.common.DeviceIdentifier; +import org.wso2.carbon.device.mgt.common.DeviceManagementException; +import org.wso2.carbon.device.mgt.common.DeviceManager; +import org.wso2.carbon.device.mgt.common.DeviceNotFoundException; +import org.wso2.carbon.device.mgt.common.DeviceTypeIdentifier; +import org.wso2.carbon.device.mgt.common.EnrolmentInfo; +import org.wso2.carbon.device.mgt.common.FeatureManager; +import org.wso2.carbon.device.mgt.common.InvalidDeviceException; +import org.wso2.carbon.device.mgt.common.PaginationRequest; +import org.wso2.carbon.device.mgt.common.PaginationResult; +import org.wso2.carbon.device.mgt.common.TransactionManagementException; import org.wso2.carbon.device.mgt.common.app.mgt.Application; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; @@ -37,8 +48,12 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; import org.wso2.carbon.device.mgt.core.DeviceManagementPluginRepository; -import org.wso2.carbon.device.mgt.core.config.identity.IdentityConfigurations; -import org.wso2.carbon.device.mgt.core.dao.*; +import org.wso2.carbon.device.mgt.core.dao.ApplicationDAO; +import org.wso2.carbon.device.mgt.core.dao.DeviceDAO; +import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; +import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; +import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO; +import org.wso2.carbon.device.mgt.core.dao.EnrollmentDAO; import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsDAO; import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsMgtDAOException; import org.wso2.carbon.device.mgt.core.dto.DeviceType; @@ -53,7 +68,13 @@ import org.wso2.carbon.email.sender.core.TypedValue; import org.wso2.carbon.user.api.UserStoreException; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; public class DeviceManagementProviderServiceImpl implements DeviceManagementProviderService, PluginInitializationListener { @@ -1855,7 +1876,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv try { DeviceGroup defaultGroup = createDefaultGroup(groupManagementProviderService, ownership.toString()); if (defaultGroup != null) { - groupManagementProviderService.addDevice(defaultGroup.getGroupId(), deviceIdentifier); + List deviceIdentifiers = new ArrayList<>(); + deviceIdentifiers.add(deviceIdentifier); + groupManagementProviderService.addDevices(defaultGroup.getGroupId(), deviceIdentifiers); } } catch (DeviceNotFoundException e) { throw new DeviceManagementException("Unable to find the device with the id: '" + deviceIdentifier.getId(), @@ -1880,8 +1903,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv defaultGroup = new DeviceGroup(groupName); // Setting system level user (wso2.system.user) as the owner defaultGroup.setOwner(CarbonConstants.REGISTRY_SYSTEM_USERNAME); - defaultGroup.setDateOfCreation(new Date().getTime()); - defaultGroup.setDateOfLastUpdate(new Date().getTime()); try { service.createGroup(defaultGroup, DeviceGroupConstants.Roles.DEFAULT_ADMIN_ROLE, DeviceGroupConstants.Permissions.DEFAULT_ADMIN_PERMISSIONS); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java index 3aded5fc07..875cc859e5 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java @@ -22,15 +22,11 @@ import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceNotFoundException; import org.wso2.carbon.device.mgt.common.GroupPaginationRequest; -import org.wso2.carbon.device.mgt.common.PaginationRequest; import org.wso2.carbon.device.mgt.common.PaginationResult; import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup; import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyExistException; import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException; -import org.wso2.carbon.device.mgt.common.group.mgt.GroupUser; import org.wso2.carbon.device.mgt.common.group.mgt.RoleDoesNotExistException; -import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOException; -import org.wso2.carbon.user.core.multiplecredentials.UserDoesNotExistException; import java.util.List; @@ -142,36 +138,12 @@ public interface GroupManagementProviderService { /** * Manage device group sharing with user with list of roles. * - * @param username of the user * @param groupId of the group * @param newRoles to be shared * @throws GroupManagementException UserDoesNotExistException */ - void manageGroupSharing(int groupId, String username, List newRoles) - throws GroupManagementException, UserDoesNotExistException, RoleDoesNotExistException; - - /** - * Add new sharing role for device group - * - * @param userName of the user - * @param groupId of the group - * @param roleName to add - * @param permissions to bind with role - * @return is role added - * @throws GroupManagementException - */ - boolean addGroupSharingRole(String userName, int groupId, String roleName, String[] permissions) - throws GroupManagementException; - - /** - * Remove existing sharing role for device group - * - * @param groupId of the group - * @param roleName to remove - * @return is role removed - * @throws GroupManagementException - */ - boolean removeGroupSharingRole(int groupId, String roleName) throws GroupManagementException; + void manageGroupSharing(int groupId, List newRoles) + throws GroupManagementException, RoleDoesNotExistException; /** * Get all sharing roles for device group @@ -182,25 +154,6 @@ public interface GroupManagementProviderService { */ List getRoles(int groupId) throws GroupManagementException; - /** - * Get specific device group sharing roles for user - * - * @param userName of the user - * @param groupId of the group - * @return list of roles - * @throws GroupManagementException UserDoesNotExistException - */ - List getRoles(String userName, int groupId) throws GroupManagementException, UserDoesNotExistException; - - /** - * Get device group users - * - * @param groupId of the group - * @return list of group users - * @throws GroupManagementException - */ - List getUsers(int groupId) throws GroupManagementException; - /** * Get all devices in device group as paginated result. * @@ -221,19 +174,10 @@ public interface GroupManagementProviderService { */ int getDeviceCount(int groupId) throws GroupManagementException; - /** - * @param groupId of the group. - * @param deviceIdentifier of the device to add. - * @throws DeviceNotFoundException If device does not exist. - * @throws GroupManagementException If unable to add device to the group. - */ - void addDevice(int groupId, DeviceIdentifier deviceIdentifier) - throws DeviceNotFoundException, GroupManagementException; - /** * Add device to device group. * - * @param groupId of the group. + * @param groupId of the group. * @param deviceIdentifiers of devices. * @throws GroupManagementException */ @@ -249,17 +193,6 @@ public interface GroupManagementProviderService { */ void removeDevice(int groupId, List deviceIdentifiers) throws GroupManagementException, DeviceNotFoundException; - - /** - * Get device group permissions of user. - * - * @param username of the user. - * @param groupId of the group - * @return array of permissions. - * @throws GroupManagementException UserDoesNotExistException - */ - String[] getPermissions(String username, int groupId) throws GroupManagementException, UserDoesNotExistException; - /** * Get device groups of user with permission. * @@ -271,10 +204,10 @@ public interface GroupManagementProviderService { List getGroups(String username, String permission) throws GroupManagementException; /** - * Get the group of device. + * Get groups which contains particular device. * - * @param deviceIdentifier - * @return + * @param deviceIdentifier of the device. + * @return groups contain the device. * @throws GroupManagementException */ List getGroups(DeviceIdentifier deviceIdentifier) throws GroupManagementException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java index a711a45da6..94b480978e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java @@ -33,23 +33,18 @@ import org.wso2.carbon.device.mgt.common.TransactionManagementException; import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup; import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyExistException; import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException; -import org.wso2.carbon.device.mgt.common.group.mgt.GroupUser; import org.wso2.carbon.device.mgt.common.group.mgt.RoleDoesNotExistException; import org.wso2.carbon.device.mgt.core.dao.GroupDAO; import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOException; import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; -import org.wso2.carbon.user.api.Permission; import org.wso2.carbon.user.api.UserRealm; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.user.api.UserStoreManager; -import org.wso2.carbon.user.core.multiplecredentials.UserDoesNotExistException; -import org.wso2.carbon.user.core.util.UserCoreUtil; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -77,12 +72,11 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid throw new GroupManagementException("DeviceGroup cannot be null.", new NullPointerException()); } int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - int groupId = -1; try { GroupManagementDAOFactory.beginTransaction(); DeviceGroup existingGroup = this.groupDAO.getGroup(deviceGroup.getName(), tenantId); if (existingGroup == null) { - groupId = this.groupDAO.addGroup(deviceGroup, tenantId); + this.groupDAO.addGroup(deviceGroup, tenantId); GroupManagementDAOFactory.commitTransaction(); } else { throw new GroupAlreadyExistException("Group exist with name " + deviceGroup.getName()); @@ -97,7 +91,6 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid GroupManagementDAOFactory.closeConnection(); } - addGroupSharingRole(deviceGroup.getOwner(), groupId, defaultRole, defaultPermissions); if (log.isDebugEnabled()) { log.debug("DeviceGroup added: " + deviceGroup.getName()); } @@ -117,7 +110,6 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid GroupManagementDAOFactory.beginTransaction(); DeviceGroup existingGroup = this.groupDAO.getGroup(deviceGroup.getName(), tenantId); if (existingGroup == null || existingGroup.getGroupId() == groupId) { - deviceGroup.setDateOfLastUpdate(new Date().getTime()); this.groupDAO.updateGroup(deviceGroup, groupId, tenantId); GroupManagementDAOFactory.commitTransaction(); } else { @@ -139,18 +131,10 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid */ @Override public boolean deleteGroup(int groupId) throws GroupManagementException { - String roleName; DeviceGroup deviceGroup = getGroup(groupId); if (deviceGroup == null) { return false; } - List groupRoles = getRoles(groupId); - for (String role : groupRoles) { - if (role != null) { - roleName = role.replace("Internal/group-" + deviceGroup.getGroupId() + "-", ""); - removeGroupSharingRole(deviceGroup.getGroupId(), roleName); - } - } try { GroupManagementDAOFactory.beginTransaction(); this.groupDAO.deleteGroup(groupId, CarbonContext.getThreadLocalCarbonContext().getTenantId()); @@ -227,14 +211,6 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid @Override public PaginationResult getGroups(GroupPaginationRequest request) throws GroupManagementException { request = DeviceManagerUtil.validateGroupListPageSize(request); - List deviceGroups = getPlainDeviceGroups(request); - PaginationResult groupResult = new PaginationResult(); - groupResult.setData(deviceGroups); - groupResult.setRecordsTotal(getGroupCount(request)); - return groupResult; - } - - private List getPlainDeviceGroups(GroupPaginationRequest request) throws GroupManagementException { List deviceGroups = new ArrayList<>(); try { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); @@ -247,7 +223,10 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid } finally { GroupManagementDAOFactory.closeConnection(); } - return deviceGroups; + PaginationResult groupResult = new PaginationResult(); + groupResult.setData(deviceGroups); + groupResult.setRecordsTotal(getGroupCount(request)); + return groupResult; } @Override @@ -259,57 +238,70 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) .getUserStoreManager(); String[] roleList = userStoreManager.getRoleListOfUser(username); - for (String role : roleList) { - if (role != null && role.contains("Internal/group-")) { - DeviceGroup deviceGroup = checkAndExtractNonExistingGroup(groups, role); - if (deviceGroup != null) { - groups.put(deviceGroup.getGroupId(), deviceGroup); - } - } + GroupManagementDAOFactory.openConnection(); + List deviceGroups = this.groupDAO.getOwnGroups(username, tenantId); + for (DeviceGroup deviceGroup : deviceGroups) { + groups.put(deviceGroup.getGroupId(), deviceGroup); + } + deviceGroups = this.groupDAO.getGroups(roleList, tenantId); + for (DeviceGroup deviceGroup : deviceGroups) { + groups.put(deviceGroup.getGroupId(), deviceGroup); } } catch (UserStoreException e) { throw new GroupManagementException("Error occurred while getting user store manager.", e); + } catch (SQLException e) { + throw new GroupManagementException("Error occurred while retrieving all groups accessible to user.", e); + } catch (GroupManagementDAOException e) { + throw new GroupManagementException(e); + } finally { + GroupManagementDAOFactory.closeConnection(); } return new ArrayList<>(groups.values()); } - public PaginationResult getGroups(String currentUser, GroupPaginationRequest request) throws GroupManagementException { - request = DeviceManagerUtil.validateGroupListPageSize(request); - int startIndex = request.getStartIndex(); - int count = request.getRowCount(); - int index = 0; - request.setRowCount(0); - List allMatchingGroups = this.getPlainDeviceGroups(request); - List deviceGroups = new ArrayList<>(); + private List getGroupIds(String username) throws GroupManagementException { + UserStoreManager userStoreManager; + List deviceGroupIds = new ArrayList<>(); try { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - UserStoreManager userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) + userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) .getUserStoreManager(); - String[] roleList = userStoreManager.getRoleListOfUser(currentUser); - List groupIds = new ArrayList<>(); - for (String role : roleList) { - if (role != null && role.contains("Internal/group-")) { - int groupId = Integer.parseInt(role.split("-")[1]); - if (!groupIds.contains(groupId)) { - groupIds.add(groupId); - } - } - } - for (DeviceGroup group : allMatchingGroups) { - int groupId = group.getGroupId(); - if (groupIds.contains(groupId)) { - if (startIndex <= index && index < count) { - deviceGroups.add(group); - } - index++; - } - } + String[] roleList = userStoreManager.getRoleListOfUser(username); + GroupManagementDAOFactory.openConnection(); + deviceGroupIds = this.groupDAO.getOwnGroupIds(username, tenantId); + deviceGroupIds.addAll(this.groupDAO.getGroupIds(roleList, tenantId)); } catch (UserStoreException e) { throw new GroupManagementException("Error occurred while getting user store manager.", e); + } catch (SQLException e) { + throw new GroupManagementException("Error occurred while retrieving all groups accessible to user.", e); + } catch (GroupManagementDAOException e) { + throw new GroupManagementException(e); + } finally { + GroupManagementDAOFactory.closeConnection(); + } + return deviceGroupIds; + } + + @Override + public PaginationResult getGroups(String currentUser, GroupPaginationRequest request) + throws GroupManagementException { + request = DeviceManagerUtil.validateGroupListPageSize(request); + List allDeviceGroupIdsOfUser = getGroupIds(currentUser); + List allMatchingGroups = new ArrayList<>(); + try { + int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); + GroupManagementDAOFactory.openConnection(); + allMatchingGroups = this.groupDAO.getGroups(request, allDeviceGroupIdsOfUser, tenantId); + } catch (GroupManagementDAOException e) { + throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e); + } catch (SQLException e) { + throw new GroupManagementException("Error occurred while opening a connection to the data source.", e); + } finally { + GroupManagementDAOFactory.closeConnection(); } PaginationResult groupResult = new PaginationResult(); - groupResult.setData(deviceGroups); - groupResult.setRecordsTotal(index); + groupResult.setData(allMatchingGroups); + groupResult.setRecordsTotal(getGroupCount(currentUser)); return groupResult; } @@ -348,25 +340,24 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid @Override public int getGroupCount(String username) throws GroupManagementException { UserStoreManager userStoreManager; - int count = 0; + int count; try { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) .getUserStoreManager(); String[] roleList = userStoreManager.getRoleListOfUser(username); - List groupIds = new ArrayList<>(); - for (String role : roleList) { - if (role != null && role.contains("Internal/group-")) { - int groupId = Integer.parseInt(role.split("-")[1]); - if (!groupIds.contains(groupId)) { - groupIds.add(groupId); - count++; - } - } - } + GroupManagementDAOFactory.openConnection(); + count = groupDAO.getOwnGroupsCount(username, tenantId); + count += groupDAO.getGroupsCount(roleList, tenantId); return count; } catch (UserStoreException e) { throw new GroupManagementException("Error occurred while getting user store manager.", e); + } catch (GroupManagementDAOException e) { + throw new GroupManagementException("Error occurred while retrieving group count of user '" + username + "'", e); + } catch (SQLException e) { + throw new GroupManagementException("Error occurred while opening a connection to the data source.", e); + } finally { + GroupManagementDAOFactory.closeConnection(); } } @@ -374,103 +365,41 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid * {@inheritDoc} */ @Override - @SuppressWarnings("Duplicates") - public void manageGroupSharing(int groupId, String username, List newRoles) - throws GroupManagementException, UserDoesNotExistException, RoleDoesNotExistException { + public void manageGroupSharing(int groupId, List newRoles) + throws GroupManagementException, RoleDoesNotExistException { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); UserStoreManager userStoreManager; try { userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm( tenantId).getUserStoreManager(); - if (!userStoreManager.isExistingUser(username)) { - throw new UserDoesNotExistException("User not exists with name " + username); - } - List currentGroupRoles = getRoles(groupId); - List currentUserRoles = getRoles(username, groupId); - List rolesToAdd = new ArrayList<>(); - List rolesToRemove = new ArrayList<>(); - String roleNamePrefix = "Internal/group-" + groupId + "-"; + List currentUserRoles = getRoles(groupId); + GroupManagementDAOFactory.beginTransaction(); for (String role : newRoles) { - if (currentGroupRoles.contains(role)) { - if (!currentUserRoles.contains(role)) { - rolesToAdd.add(roleNamePrefix + role); - } - } else { - throw new RoleDoesNotExistException("Role '" + role + "' is not exists in requested group."); + if (!userStoreManager.isExistingRole(role)) { + throw new RoleDoesNotExistException("Role '" + role + "' does not exists in the user store."); + } + // Removing role from current user roles of the group will return true if role exist. + // So we don't need to add it to the db again. + if (!currentUserRoles.remove(role)) { + // If group doesn't have the role, it is adding to the db. + groupDAO.addRole(groupId, role, tenantId); } } for (String role : currentUserRoles) { - if (currentGroupRoles.contains(role)) { - if (!newRoles.contains(role)) { - rolesToRemove.add(roleNamePrefix + role); - } - } else { - throw new RoleDoesNotExistException("Role '" + role + "' is not exists in requested group."); - } + // Removing old roles from db which are not available in the new roles list. + groupDAO.removeRole(groupId, role, tenantId); } - userStoreManager.updateRoleListOfUser(username, - rolesToRemove.toArray(new String[rolesToRemove.size()]), - rolesToAdd.toArray(new String[rolesToAdd.size()])); + GroupManagementDAOFactory.commitTransaction(); + } catch (GroupManagementDAOException e) { + GroupManagementDAOFactory.rollbackTransaction(); + throw new GroupManagementException(e); } catch (UserStoreException e) { - if (e instanceof UserDoesNotExistException) { - throw (UserDoesNotExistException) e; - } throw new GroupManagementException("User store error in updating sharing roles.", e); - } - } - - /** - * {@inheritDoc} - */ - @Override - public boolean addGroupSharingRole(String username, int groupId, String roleName, String[] permissions) - throws GroupManagementException { - if (groupId == -1) { - return false; - } - UserStoreManager userStoreManager; - String role; - String[] userNames = new String[1]; - try { - int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) - .getUserStoreManager(); - role = "Internal/group-" + groupId + "-" + roleName; - userNames[0] = username; - Permission[] carbonPermissions = new Permission[permissions.length]; - for (int i = 0; i < permissions.length; i++) { - carbonPermissions[i] = new Permission(permissions[i], CarbonConstants.UI_PERMISSION_ACTION); - } - userStoreManager.addRole(role, userNames, carbonPermissions); - return true; - } catch (UserStoreException e) { - String errorMsg = "User store error in adding role to group id:" + groupId; - throw new GroupManagementException(errorMsg, e); - } - } - - /** - * {@inheritDoc} - */ - @Override - public boolean removeGroupSharingRole(int groupId, String roleName) throws GroupManagementException { - if (groupId == -1) { - return false; - } - UserStoreManager userStoreManager; - String role; - try { - int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) - .getUserStoreManager(); - role = "Internal/group-" + groupId + "-" + roleName; - userStoreManager.deleteRole(role); - return true; - } catch (UserStoreException userStoreEx) { - String errorMsg = "User store error in adding role to group id:" + groupId; - log.error(errorMsg, userStoreEx); - throw new GroupManagementException(errorMsg, userStoreEx); + } catch (TransactionManagementException e) { + throw new GroupManagementException(e); + } finally { + GroupManagementDAOFactory.closeConnection(); } } @@ -479,92 +408,16 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid */ @Override public List getRoles(int groupId) throws GroupManagementException { - UserStoreManager userStoreManager; - String[] roles; - List groupRoles; - try { - int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) - .getUserStoreManager(); - roles = userStoreManager.getRoleNames(); - groupRoles = new ArrayList<>(); - for (String r : roles) { - if (r != null && r.contains("Internal/group-" + groupId + "-")) { - groupRoles.add(r.replace("Internal/group-" + groupId + "-", "")); - } - } - return groupRoles; - } catch (UserStoreException userStoreEx) { - String errorMsg = "User store error in adding role to group id:" + groupId; - log.error(errorMsg, userStoreEx); - throw new GroupManagementException(errorMsg, userStoreEx); - } - } - - /** - * {@inheritDoc} - */ - @Override - public List getRoles(String username, int groupId) - throws GroupManagementException, UserDoesNotExistException { - UserStoreManager userStoreManager; - List groupRoleList = new ArrayList<>(); try { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) - .getUserStoreManager(); - if (!userStoreManager.isExistingUser(username)) { - throw new UserDoesNotExistException("User not exists with name " + username); - } - String[] roleList = userStoreManager.getRoleListOfUser(username); - for (String role : roleList) { - if (role != null && role.contains("Internal/group-" + groupId)) { - String roleName = role.replace("Internal/group-" + groupId + "-", ""); - groupRoleList.add(roleName); - } - } - return groupRoleList; - } catch (UserStoreException e) { - if (e instanceof UserDoesNotExistException) { - throw (UserDoesNotExistException) e; - } - throw new GroupManagementException("Error occurred while getting user store manager.", e); - } - } - - /** - * {@inheritDoc} - */ - @Override - public List getUsers(int groupId) throws GroupManagementException { - UserStoreManager userStoreManager; - Map groupUserHashMap = new HashMap<>(); - try { - int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId) - .getUserStoreManager(); - List rolesForGroup = this.getRoles(groupId); - for (String role : rolesForGroup) { - String[] users = userStoreManager.getUserListOfRole("Internal/group-" + groupId + "-" + role); - for (String user : users) { - GroupUser groupUser; - if (groupUserHashMap.containsKey(user)) { - groupUser = groupUserHashMap.get(user); - groupUser.getGroupRoles().add(role); - } else { - groupUser = new GroupUser(); - groupUser.setUsername(user); - groupUser.setGroupRoles(new ArrayList()); - groupUser.getGroupRoles().add(role); - groupUserHashMap.put(user, groupUser); - } - } - } - return new ArrayList<>(groupUserHashMap.values()); - } catch (UserStoreException e) { - String errorMsg = "User store error in fetching user list for group id:" + groupId; - log.error(errorMsg, e); - throw new GroupManagementException(errorMsg, e); + GroupManagementDAOFactory.openConnection(); + return groupDAO.getRoles(groupId, tenantId); + } catch (GroupManagementDAOException e) { + throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e); + } catch (SQLException e) { + throw new GroupManagementException("Error occurred while opening a connection to the data source.", e); + } finally { + GroupManagementDAOFactory.closeConnection(); } } @@ -606,36 +459,6 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid } } - /** - * {@inheritDoc} - */ - @Override - public void addDevice(int groupId, DeviceIdentifier deviceIdentifier) - throws DeviceNotFoundException, GroupManagementException { - Device device; - try { - int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - GroupManagementDAOFactory.beginTransaction(); - device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevice(deviceIdentifier); - if (device == null) { - throw new DeviceNotFoundException("Device not found for id '" + deviceIdentifier.getId() + "'"); - } - if (!this.groupDAO.isDeviceMappedToGroup(groupId, device.getId(), tenantId)) { - this.groupDAO.addDevice(groupId, device.getId(), tenantId); - } - GroupManagementDAOFactory.commitTransaction(); - } catch (DeviceManagementException e) { - throw new GroupManagementException("Error occurred while retrieving device.", e); - } catch (GroupManagementDAOException e) { - GroupManagementDAOFactory.rollbackTransaction(); - throw new GroupManagementException("Error occurred while adding device to group.", e); - } catch (TransactionManagementException e) { - throw new GroupManagementException("Error occurred while initiating transaction.", e); - } finally { - GroupManagementDAOFactory.closeConnection(); - } - } - /** * {@inheritDoc} */ @@ -702,58 +525,26 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid * {@inheritDoc} */ @Override - public String[] getPermissions(String username, int groupId) - throws GroupManagementException, UserDoesNotExistException { + public List getGroups(String username, String permission) throws GroupManagementException { + List deviceGroups = getGroups(username); + Map permittedDeviceGroups = new HashMap<>(); UserRealm userRealm; - List roles = getRoles(username, groupId); int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); try { userRealm = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId); - List lstPermissions = new ArrayList<>(); - String[] resourceIds = userRealm.getAuthorizationManager().getAllowedUIResourcesForUser(username, "/"); - if (resourceIds != null) { - for (String resourceId : resourceIds) { - for (String roleName : roles) { - if (userRealm.getAuthorizationManager(). - isRoleAuthorized("Internal/group-" + groupId + "-" + roleName, resourceId, - CarbonConstants.UI_PERMISSION_ACTION)) { - lstPermissions.add(resourceId); - } + for (DeviceGroup deviceGroup : deviceGroups) { + List roles = getRoles(deviceGroup.getGroupId()); + for (String roleName : roles) { + if (userRealm.getAuthorizationManager(). + isRoleAuthorized(roleName, permission, CarbonConstants.UI_PERMISSION_ACTION)) { + permittedDeviceGroups.put(deviceGroup.getGroupId(), deviceGroup); } } } - String[] permissions = lstPermissions.toArray(new String[lstPermissions.size()]); - return UserCoreUtil.optimizePermissions(permissions); - } catch (UserStoreException e) { - throw new GroupManagementException("Error occurred while getting user realm.", e); - } - } - - /** - * {@inheritDoc} - */ - @Override - public List getGroups(String username, String permission) - throws GroupManagementException { - UserRealm userRealm; - int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - Map groups = new HashMap<>(); - try { - userRealm = DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId); - String[] roles = userRealm.getUserStoreManager().getRoleListOfUser(username); - for (String role : roles) { - if (role != null && role.contains("Internal/group-") && userRealm.getAuthorizationManager() - .isRoleAuthorized(role, permission, CarbonConstants.UI_PERMISSION_ACTION)) { - DeviceGroup group = checkAndExtractNonExistingGroup(groups, role); - if (group != null) { - groups.put(group.getGroupId(), group); - } - } - } - return new ArrayList<>(groups.values()); } catch (UserStoreException e) { throw new GroupManagementException("Error occurred while getting user realm.", e); } + return new ArrayList<>(permittedDeviceGroups.values()); } @Override @@ -774,26 +565,4 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid GroupManagementDAOFactory.closeConnection(); } } - - /** - * This method returns group belongs to particular role, if it is not existed in groups map. - * - * @param groups existing groups map. - * @param role group related role which needs to evaluate. - * @return device group if it is not existing in the groups map. - * @throws GroupManagementException - */ - private DeviceGroup checkAndExtractNonExistingGroup(Map groups, String role) - throws GroupManagementException { - try { - int groupId = Integer.parseInt(role.split("-")[1]); - if (!groups.containsKey(groupId)) { - return getGroup(groupId); - } - } catch (NumberFormatException e) { - log.error("Unable to extract groupId from role " + role, e); - } - return null; - } - } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java index 895deab36c..812e7c5cf8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java @@ -78,8 +78,6 @@ public class TestDataHolder { DeviceGroup deviceGroup = new DeviceGroup(); deviceGroup.setName("Test device group"); deviceGroup.setDescription("Test description"); - deviceGroup.setDateOfCreation(new Date().getTime()); - deviceGroup.setDateOfLastUpdate(new Date().getTime()); deviceGroup.setOwner(OWNER); return deviceGroup; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/GroupPersistTests.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/GroupPersistTests.java index 1747a2773b..1115faeab1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/GroupPersistTests.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/GroupPersistTests.java @@ -31,7 +31,7 @@ import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest; import org.wso2.carbon.device.mgt.core.common.TestDataHolder; import java.sql.SQLException; -import java.util.Date; +import java.util.ArrayList; import java.util.List; public class GroupPersistTests extends BaseDeviceManagementTest { @@ -48,7 +48,7 @@ public class GroupPersistTests extends BaseDeviceManagementTest { } @Test - public void testAddGroupTest() { + public void addGroupTest() { DeviceGroup deviceGroup = TestDataHolder.generateDummyGroupData(); try { GroupManagementDAOFactory.beginTransaction(); @@ -73,7 +73,7 @@ public class GroupPersistTests extends BaseDeviceManagementTest { log.debug("Group name: " + group.getName()); } - @Test(dependsOnMethods = {"testAddGroupTest"}) + @Test(dependsOnMethods = {"addGroupTest"}) public void getGroupTest() { try { GroupManagementDAOFactory.openConnection(); @@ -97,7 +97,82 @@ public class GroupPersistTests extends BaseDeviceManagementTest { } } - @Test(dependsOnMethods = {"testAddGroupTest"}) + @Test(dependsOnMethods = {"addGroupTest"}) + public void shareGroupTest() { + try { + GroupManagementDAOFactory.beginTransaction(); + List addedRoles = new ArrayList<>(); + for (int i = 0; i < 3; i++) { + String role = "role-" + i; + groupDAO.addRole(groupId, role, TestDataHolder.SUPER_TENANT_ID); + addedRoles.add(role); + } + GroupManagementDAOFactory.commitTransaction(); + List roles = groupDAO.getRoles(groupId, TestDataHolder.SUPER_TENANT_ID); + Assert.assertEquals(roles, addedRoles, "Added roles are not equal to returned roles."); + log.debug("Group shared with roles."); + } catch (GroupManagementDAOException e) { + String msg = "Error occurred while find group by name."; + log.error(msg, e); + Assert.fail(msg, e); + } catch (TransactionManagementException e) { + String msg = "Error occurred while opening a connection to the data source."; + log.error(msg, e); + Assert.fail(msg, e); + } finally { + GroupManagementDAOFactory.closeConnection(); + } + } + + @Test(dependsOnMethods = {"shareGroupTest"}) + public void getShareGroupTest() { + try { + GroupManagementDAOFactory.openConnection(); + List roles = groupDAO.getRoles(groupId, TestDataHolder.SUPER_TENANT_ID); + roles.remove(0); + List deviceGroups = groupDAO.getGroups(roles.toArray(new String[roles.size()]), TestDataHolder.SUPER_TENANT_ID); + Assert.assertEquals(deviceGroups.size(), 1, "Unexpected number of device groups found with role."); + Assert.assertEquals(deviceGroups.get(0).getGroupId(), groupId, "Unexpected groupId found with role."); + log.debug("Group found for given roles."); + } catch (GroupManagementDAOException e) { + String msg = "Error occurred while getting groups shared with roles."; + log.error(msg, e); + Assert.fail(msg, e); + } catch (SQLException e) { + String msg = "Error occurred while opening a connection to the data source."; + log.error(msg, e); + Assert.fail(msg, e); + } finally { + GroupManagementDAOFactory.closeConnection(); + } + } + + @Test(dependsOnMethods = {"getShareGroupTest"}) + public void unshareGroupTest() { + try { + GroupManagementDAOFactory.beginTransaction(); + List rolesToRemove = groupDAO.getRoles(groupId, TestDataHolder.SUPER_TENANT_ID); + for (String role : rolesToRemove) { + groupDAO.removeRole(groupId, role, TestDataHolder.SUPER_TENANT_ID); + } + GroupManagementDAOFactory.commitTransaction(); + List roles = groupDAO.getRoles(groupId, TestDataHolder.SUPER_TENANT_ID); + Assert.assertNotEquals(roles, rolesToRemove, "Roles not removed."); + log.debug("Group unshared with given roles."); + } catch (GroupManagementDAOException e) { + String msg = "Error occurred while find group by name."; + log.error(msg, e); + Assert.fail(msg, e); + } catch (TransactionManagementException e) { + String msg = "Error occurred while opening a connection to the data source."; + log.error(msg, e); + Assert.fail(msg, e); + } finally { + GroupManagementDAOFactory.closeConnection(); + } + } + + @Test(dependsOnMethods = {"addGroupTest"}) public void addDeviceToGroupTest() { Device initialTestDevice = TestDataHolder.initialTestDevice; DeviceGroup deviceGroup = getGroupById(groupId); @@ -163,14 +238,12 @@ public class GroupPersistTests extends BaseDeviceManagementTest { } } - @Test(dependsOnMethods = {"removeDeviceFromGroupTest"}) + @Test(dependsOnMethods = {"removeDeviceFromGroupTest", "unshareGroupTest"}) public void updateGroupTest() { - long time = new Date().getTime(); String name = "Test Updated"; String desc = "Desc updated"; DeviceGroup group = getGroupById(groupId); Assert.assertNotNull(group, "Group is null"); - group.setDateOfLastUpdate(time); group.setName(name); group.setDescription(desc); try { @@ -195,7 +268,6 @@ public class GroupPersistTests extends BaseDeviceManagementTest { Assert.assertNotNull(group, "Group is null"); Assert.assertEquals(group.getName(), name, "Group name"); Assert.assertEquals(group.getDescription(), desc, "Group description"); - Assert.assertEquals((long) group.getDateOfLastUpdate(), time, "Update time"); } @Test(dependsOnMethods = {"updateGroupTest"}) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql index a93bc172f4..eb06e9adcb 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql @@ -10,13 +10,21 @@ CREATE TABLE IF NOT EXISTS DM_GROUP ( ID INTEGER AUTO_INCREMENT NOT NULL, GROUP_NAME VARCHAR(100) DEFAULT NULL, DESCRIPTION TEXT DEFAULT NULL, - DATE_OF_CREATE BIGINT DEFAULT NULL, - DATE_OF_LAST_UPDATE BIGINT DEFAULT NULL, OWNER VARCHAR(45) DEFAULT NULL, TENANT_ID INTEGER DEFAULT 0, PRIMARY KEY (ID) ); +CREATE TABLE IF NOT EXISTS DM_ROLE_GROUP_MAP ( + ID INTEGER AUTO_INCREMENT NOT NULL, + GROUP_ID INTEGER DEFAULT NULL, + ROLE VARCHAR(45) DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID), + CONSTRAINT fk_DM_ROLE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) ON DELETE NO ACTION ON UPDATE NO ACTION +); + CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE ( ID INTEGER auto_increment NOT NULL, SERIAL_NUMBER VARCHAR(500) DEFAULT NULL, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs index 5bc33e4377..ad4c096949 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs @@ -80,7 +80,7 @@
+ {{#if permissions.CREATE_GROUP_ROLES}} + + New Role + + + New Role from Selection + + {{/if}} Next - - - Cancel - -
-
- - -
-
-

- - - - - Group Sharing - -

- -
-
- -
-

- Select sharing roles -

-

-
- {{#if permissions.CREATE_GROUP_ROLES}} -
- - Add New Role - -
- {{/if}} -
-
-
- - OK - - - - Cancel - -
@@ -201,25 +171,10 @@

Enter Group Sharing Role Name

- -

- Role Permissions +

- - - {{#each groupPermissions}} - - - - - {{/each}} - -
{{this}} - - - -
@@ -239,7 +194,43 @@
-

Group sharing updated successfully.

+

Group was successfully updated.

+
+ Do you need to Add / Remove users to the chosen roles? +
+ + Yes + + + + No + +
+
+
+
+
+
+ +
+
+
+
+

New Role was successfully created.

+
+ Do you need to Add / Remove users to the chosen roles? +
+ + Yes + + + + No + +
+
@@ -256,7 +247,8 @@ Yes - + Cancel
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js index 0c04f9bb2d..f432193231 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js @@ -23,6 +23,10 @@ function onRequest(context) { var groupPermissions = require("/app/pages/cdmf.page.groups/public/group-permissions.json"); var currentUser = session.get(constants.USER_SESSION_KEY); var page = {}; + var rolesResult = userModule.getRoles(); + if (rolesResult.status == "success") { + page.userRoles = rolesResult.content; + } if (currentUser) { page.permissions = userModule.getUIPermissions(); page.permissions.list = stringify(page.permissions); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js index 1770cd26c4..1548ff4c71 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js @@ -110,12 +110,12 @@ function loadGroups() { var objects = []; $(data.deviceGroups).each(function (index) { objects.push({ - groupId: data.deviceGroups[index].id, - name: data.deviceGroups[index].name, - description: data.deviceGroups[index].description, - owner: data.deviceGroups[index].owner, - dateOfCreation: data.deviceGroups[index].dateOfCreation - }) + groupId: data.deviceGroups[index].id, + name: data.deviceGroups[index].name, + description: data.deviceGroups[index].description, + owner: data.deviceGroups[index].owner, + dateOfCreation: data.deviceGroups[index].dateOfCreation + }) }); var json = { "recordsTotal": data.count, @@ -154,34 +154,50 @@ function loadGroups() { class: 'text-right content-fill text-left-on-grid-view no-wrap', render: function (id, type, row, meta) { var html; - if ($.hasPermission("VIEW_GROUP_DEVICES")){ - html = '' + - '' + - ''; - - html += '' + - '' + - ''; + if ($.hasPermission("VIEW_GROUP_DEVICES")) { + html = '' + + '' + + + ''; + + html += '' + + '' + + + ''; } else { html = ''; } - if($.hasPermission("SHARE_GROUP")) { - html += ''; } else { html += ''; } - if($.hasPermission("UPDATE_GROUP")) { - html += '' + + if ($.hasPermission("UPDATE_GROUP")) { + html += + '' + ''; } else { html += ''; } if ($.hasPermission("REMOVE_GROUP")) { - html += '' + + html += + '' + + ''; } else { html += ''; @@ -336,7 +352,7 @@ function hidePopup() { $(modalPopupContent).html(""); $(modalPopupContent).removeClass("operation-data"); $(modalPopup).modal('hide'); - $('body').removeClass('modal-open').css('padding-right','0px'); + $('body').removeClass('modal-open').css('padding-right', '0px'); $('.modal-backdrop').remove(); } @@ -352,33 +368,37 @@ function attachEvents() { $("a.share-group-link").click(function () { var groupId = $(this).data("group-id"); var groupOwner = $(this).data("group-owner"); + $(modalPopupContent).html($('#share-group-w1-modal-content').html()); - $("a#share-group-next-link").show(); showPopup(); - $("a#share-group-next-link").click(function () { - var successCallback = function (data) { - if(data === 'true') { - getAllRoles(groupId, selectedUser); - } else { - var errorMsgWrapper = "#notification-error-msg"; - var errorMsg = "#notification-error-msg span"; - $(errorMsg).text("User does not exist."); - $(errorMsgWrapper).removeClass("hidden"); + + markAlreadySavedUsersRoles(groupId); + var shareGroupNextLink = $("a#share-group-next-link"); + shareGroupNextLink.click(function () { + var roles = []; + $('.modal .roleCheckBoxes').each( + function () { + if ($(this).is(':checked')) { + roles.push($(this).data('role-name')); + } } - } - var selectedUser = $('#share-user-selector').val(); - if (selectedUser == $("#group-listing").data("current-user")) { - $("#user-names").html("Please specify a user other than current user."); - $("a#share-group-next-link").hide(); - } else { - invokerUtil.get("/api/device-mgt/v1.0/users/checkUser?username=" + selectedUser, - successCallback, function (message) { - displayErrors(message); - }); - } + ); + updateGroupShare(groupId, roles); }); - $("a#share-group-w1-cancel-link").click(function () { - hidePopup(); + + var shareGroupNewRoleFromSelectionLink = $("a#share-group-new-role-from-selection"); + shareGroupNewRoleFromSelectionLink.click(function () { + var roles = []; + $('.modal .roleCheckBoxes').each( + function () { + if ($(this).is(':checked')) { + roles.push($(this).data('role-name')); + } + } + ); + addNewRole(roles); + // $(modalPopupContent).html($('#share-group-w3-modal-content').html()); + // createNewRole(roles); }); }); @@ -408,8 +428,8 @@ function attachEvents() { }; invokerUtil.delete("/api/device-mgt/v1.0/groups/id/" + groupId, - successCallback, function (message) { - displayErrors(message); + successCallback, function (message) { + displayErrors(message); }); }); @@ -453,8 +473,8 @@ function attachEvents() { }; invokerUtil.put("/api/device-mgt/v1.0/groups/id/" + groupId, group, - successCallback, function (message) { - displayErrors(message); + successCallback, function (message) { + displayErrors(message); }); }); @@ -464,16 +484,22 @@ function attachEvents() { }); } -function getAllRoles(groupId, selectedUser) { - $(modalPopupContent).html($('#share-group-w2-modal-content').html()); - $("a#share-group-yes-link").hide(); +function markAlreadySavedUsersRoles(groupId) { var successCallback = function (data, textStatus, xhr) { data = JSON.parse(data); if (xhr.status == 200) { if (data.roles.length > 0) { - generateRoleMap(groupId, selectedUser, data.roles); + for (var i = 0; i < data.roles.length; i++) { + $('.roleCheckBoxes').each( + function () { + if (data.roles[i] == $(this).data('role-name')) { + $(this).attr('checked', true); + } + } + ); + } } else { - $('#user-roles').html("There is no any roles for this group."); + return; } } else { displayErrors(xhr); @@ -481,98 +507,17 @@ function getAllRoles(groupId, selectedUser) { }; invokerUtil.get("/api/device-mgt/v1.0/groups/id/" + groupId + "/roles", - successCallback, function (message) { - displayErrors(message); - }); - - $("a#share-group-w2-cancel-link").click(function () { - hidePopup(); - }); -} - -function generateRoleMap(groupId, selectedUser, allRoles) { - var successCallback = function (data, textStatus, xhr) { - data = JSON.parse(data); - if (xhr.status == 200) { - var userRoles = []; - if(data != "EMPTY") { - userRoles = data.roles; - } - var str = $('#user-roles').html(); - - for (var i = 0; i < allRoles.length; i++) { - var isChecked = ''; - for (var j = 0; j < userRoles.length; j++) { - if (allRoles[i] == userRoles[j]) { - isChecked = 'checked'; - break; - } - } - str += '

'; - } - - $('#user-roles').html(str); - $("a#share-group-yes-link").show(); - $("a#share-group-yes-link").show(); - $("a#share-group-yes-link").click(function () { - var roles = []; - for (var i = 0; i < allRoles.length; i++) { - if ($('#user-role-' + allRoles[i]).is(':checked')) { - roles.push(allRoles[i]); - } - } - updateGroupShare(groupId, selectedUser, roles); - }); - $("a#share-group-w2-add-new-role-link").click(function () { - addNewRole(groupId, selectedUser, allRoles); - }); - } else { - displayErrors(xhr); - } - }; - - invokerUtil.get("/api/device-mgt/v1.0/groups/id/" + groupId + "/roles?userName=" + selectedUser, - successCallback, function (message) { + successCallback, function (message) { displayErrors(message); }); - - $("a#share-group-w2-cancel-link").click(function () { - hidePopup(); - }); } -function addNewRole(groupId, selectedUser, allRoles) { +function addNewRole(roles) { $(modalPopupContent).html($('#share-group-w3-modal-content').html()); - function getPermissions() { - var PERMISSION_PREFIX = '/permission/admin/'; - var permissions = []; - $('#permission-table-container').find('tr').each(function () { - var row = $(this).closest('tr'); - var permission = $(row).find('td:nth-child(1)').text(); - var check = $(row).find('td:nth-child(2) a').data('value'); - if(check === 'checked') { - permission = PERMISSION_PREFIX + permission; - permissions.push(permission); - } - }); - return permissions; - }; $("a#share-group-w3-yes-link").click(function () { - var successCallback = function (data, status, jqXHR) { - if(status == "success") { - getAllRoles(groupId, selectedUser); - } - } var roleName = $('#group-sharing-role-name').val(); - var users = []; - if(roleName) { - var groupRoleInfo = {"roleName": roleName, "permissions": getPermissions(), "users": users}; - var currentUser = $("#group-listing").data("current-user"); - invokerUtil.post("/api/device-mgt/v1.0/groups/id/" + groupId + "/roles/create?userName=" + currentUser, - groupRoleInfo, successCallback, function (message) { - displayErrors(message); - }); + if (roleName) { + createNewCombinedRole(roleName, roles); } else { var errorMsgWrapper = "#notification-error-msg"; var errorMsg = "#notification-error-msg span"; @@ -588,7 +533,7 @@ function addNewRole(groupId, selectedUser, allRoles) { function togglePermissionAction(element) { $(element).data('value', 'checked'); var icon = $(element).find("i")[1]; - if($(icon).hasClass('fw-minus')) { + if ($(icon).hasClass('fw-minus')) { $(icon).removeClass('fw-minus'); $(icon).addClass('fw-add'); $(element).data('value', 'unchecked'); @@ -599,7 +544,7 @@ function togglePermissionAction(element) { } } -function updateGroupShare(groupId, selectedUser, roles) { +function updateGroupShare(groupId, roles) { var successCallback = function (data) { $(modalPopupContent).html($('#share-group-200-content').html()); setTimeout(function () { @@ -608,11 +553,21 @@ function updateGroupShare(groupId, selectedUser, roles) { }, 2000); }; - var deviceGroupShare = {"username": selectedUser, "groupRoles": roles }; invokerUtil.post("/api/device-mgt/v1.0/groups/id/" + groupId + "/share", - deviceGroupShare, successCallback, function (message) { - displayErrors(message); - }); + roles, successCallback, function (message) { + displayErrors(message); + }); +} + +function createNewCombinedRole(roleName, roleList) { + var successCallback = function (data, status, jqXHR, isLast) { + $(modalPopupContent).html($('#create-combined-role-200-content').html()); + showPopup(); + }; + invokerUtil.post("/api/device-mgt/v1.0/roles/create-combined-role/" + roleName, roleList, + successCallback, function (message) { + displayErrors(message); + }); } function displayErrors(jqXHR) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js index 0bf58e868f..de38fad9a6 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js @@ -131,7 +131,7 @@ function loadRoles() { class: "fade-edge", data: "name", render: function (name, type, row, meta) { - return '

' + name + 'role

'; + return '

' + name + '

'; } }, { diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql index 848ab0d37c..8a5195b4cd 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql @@ -10,13 +10,21 @@ CREATE TABLE IF NOT EXISTS DM_GROUP ( ID INTEGER AUTO_INCREMENT NOT NULL, GROUP_NAME VARCHAR(100) DEFAULT NULL, DESCRIPTION TEXT DEFAULT NULL, - DATE_OF_CREATE BIGINT DEFAULT NULL, - DATE_OF_LAST_UPDATE BIGINT DEFAULT NULL, OWNER VARCHAR(45) DEFAULT NULL, TENANT_ID INTEGER DEFAULT 0, PRIMARY KEY (ID) ); +CREATE TABLE IF NOT EXISTS DM_ROLE_GROUP_MAP ( + ID INTEGER AUTO_INCREMENT NOT NULL, + GROUP_ID INTEGER DEFAULT NULL, + ROLE VARCHAR(45) DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID), + CONSTRAINT fk_DM_ROLE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) ON DELETE NO ACTION ON UPDATE NO ACTION +); + CREATE TABLE IF NOT EXISTS DM_DEVICE ( ID INTEGER auto_increment NOT NULL, DESCRIPTION TEXT DEFAULT NULL, diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql index 414cad3662..900eeefde1 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql @@ -11,6 +11,33 @@ CREATE TABLE DM_DEVICE_TYPE ( IF NOT EXISTS (SELECT * FROM SYS.INDEXES WHERE NAME = 'IDX_DEVICE_TYPE' AND OBJECT_ID = OBJECT_ID('DM_DEVICE_TYPE')) CREATE INDEX IDX_DEVICE_TYPE ON DM_DEVICE_TYPE (NAME); +IF NOT EXISTS(SELECT * + FROM SYS.OBJECTS + WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_GROUP]') AND TYPE IN (N'U')) + CREATE TABLE DM_GROUP ( + ID INTEGER IDENTITY (1, 1) NOT NULL, + GROUP_NAME VARCHAR(100) DEFAULT NULL, + DESCRIPTION VARCHAR(MAX) DEFAULT NULL, + OWNER VARCHAR(45) DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID) + ); + +IF NOT EXISTS(SELECT * + FROM SYS.OBJECTS + WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_ROLE_GROUP_MAP]') AND TYPE IN (N'U')) + CREATE TABLE DM_ROLE_GROUP_MAP ( + ID INTEGER IDENTITY (1, 1) NOT NULL, + GROUP_ID INTEGER DEFAULT NULL, + ROLE VARCHAR(45) DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID), + CONSTRAINT FK_DM_ROLE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) + ON DELETE NO ACTION + ON UPDATE NO ACTION + ); + IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_DEVICE]') AND TYPE IN (N'U')) CREATE TABLE DM_DEVICE ( ID INTEGER IDENTITY(1,1) NOT NULL, @@ -25,6 +52,25 @@ CREATE TABLE DM_DEVICE ( REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION ); +IF NOT EXISTS(SELECT * + FROM SYS.OBJECTS + WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_DEVICE_GROUP_MAP]') AND TYPE IN (N'U')) + CREATE TABLE DM_DEVICE_GROUP_MAP ( + ID INTEGER IDENTITY (1, 1) NOT NULL, + DEVICE_ID INTEGER DEFAULT NULL, + GROUP_ID INTEGER DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID), + CONSTRAINT FK_DM_DEVICE_GROUP_MAP_DM_DEVICE2 FOREIGN KEY (DEVICE_ID) + REFERENCES DM_DEVICE (ID) + ON DELETE NO ACTION + ON UPDATE NO ACTION, + CONSTRAINT FK_DM_DEVICE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) + ON DELETE NO ACTION + ON UPDATE NO ACTION + ); + IF NOT EXISTS (SELECT * FROM SYS.INDEXES WHERE NAME = 'IDX_DM_DEVICE' AND OBJECT_ID = OBJECT_ID('DM_DEVICE')) CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID); diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql index 75a416018c..e5c79b2f39 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql @@ -8,6 +8,29 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE ( CREATE INDEX IDX_DEVICE_TYPE ON DM_DEVICE_TYPE (NAME); +CREATE TABLE IF NOT EXISTS DM_GROUP ( + ID INTEGER AUTO_INCREMENT NOT NULL, + GROUP_NAME VARCHAR(100) DEFAULT NULL, + DESCRIPTION TEXT DEFAULT NULL, + OWNER VARCHAR(45) DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID) +) + ENGINE = InnoDB; + +CREATE TABLE IF NOT EXISTS DM_ROLE_GROUP_MAP ( + ID INTEGER AUTO_INCREMENT NOT NULL, + GROUP_ID INTEGER DEFAULT NULL, + ROLE VARCHAR(45) DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID), + CONSTRAINT DM_ROLE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) + ON DELETE NO ACTION + ON UPDATE NO ACTION +) + ENGINE = InnoDB; + CREATE TABLE IF NOT EXISTS DM_DEVICE ( ID INTEGER AUTO_INCREMENT NOT NULL, DESCRIPTION TEXT DEFAULT NULL, @@ -23,6 +46,23 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE ( CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID); +CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP ( + ID INTEGER AUTO_INCREMENT NOT NULL, + DEVICE_ID INTEGER DEFAULT NULL, + GROUP_ID INTEGER DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID), + CONSTRAINT fk_DM_DEVICE_GROUP_MAP_DM_DEVICE2 FOREIGN KEY (DEVICE_ID) + REFERENCES DM_DEVICE (ID) + ON DELETE NO ACTION + ON UPDATE NO ACTION, + CONSTRAINT fk_DM_DEVICE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) + ON DELETE NO ACTION + ON UPDATE NO ACTION +) + ENGINE = InnoDB; + CREATE TABLE IF NOT EXISTS DM_OPERATION ( ID INTEGER AUTO_INCREMENT NOT NULL, TYPE VARCHAR(20) NOT NULL, diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql index 9f5013c47c..c29c6bcb53 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql @@ -25,8 +25,6 @@ CREATE TABLE DM_GROUP ( ID NUMBER(10) NOT NULL, DESCRIPTION CLOB DEFAULT NULL, GROUP_NAME VARCHAR2(100) DEFAULT NULL, - DATE_OF_CREATE TIMESTAMP(0) DEFAULT NULL, - DATE_OF_LAST_UPDATE TIMESTAMP(0) DEFAULT NULL, OWNER VARCHAR2(45) DEFAULT NULL, TENANT_ID NUMBER(10) DEFAULT 0, CONSTRAINT PK_DM_GROUP PRIMARY KEY (ID) @@ -46,6 +44,32 @@ WHEN (NEW.ID IS NULL) END; / +CREATE TABLE DM_ROLE_GROUP_MAP ( + ID NUMBER(10) NOT NULL, + GROUP_ID NUMBER(10) DEFAULT NULL, + ROLE VARCHAR2(45) DEFAULT NULL, + TENANT_ID NUMBER(10) DEFAULT 0, + CONSTRAINT PK_DM_GROUP PRIMARY KEY (ID), + CONSTRAINT fk_DM_ROLE_GROUP_MAP_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) +) +/ +-- Generate ID using sequence and trigger +CREATE SEQUENCE DM_ROLE_GROUP_MAP_seq START WITH 1 INCREMENT BY 1 NOCACHE +/ +CREATE OR REPLACE TRIGGER DM_ROLE_GROUP_MAP_seq_tr +BEFORE INSERT +ON DM_ROLE_GROUP_MAP +REFERENCING NEW AS NEW +FOR EACH ROW +WHEN (NEW.ID IS NULL) + BEGIN + SELECT DM_ROLE_GROUP_MAP_seq.NEXTVAL + INTO :NEW.ID + FROM DUAL; + END; +/ + CREATE TABLE DM_DEVICE ( ID NUMBER(10) NOT NULL, DESCRIPTION CLOB DEFAULT NULL, diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql index 54489b8157..a5ea7af042 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql @@ -8,6 +8,24 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE ( CREATE INDEX IDX_DEVICE_TYPE ON DM_DEVICE_TYPE (NAME); +CREATE TABLE IF NOT EXISTS DM_GROUP ( + ID BIGSERIAL NOT NULL PRIMARY KEY, + DESCRIPTION TEXT DEFAULT NULL, + NAME VARCHAR(100) DEFAULT NULL, + OWNER VARCHAR(45) DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0 +); + +CREATE TABLE IF NOT EXISTS DM_ROLE_GROUP_MAP ( + ID BIGSERIAL NOT NULL PRIMARY KEY, + GROUP_ID INTEGER DEFAULT NULL, + ROLE VARCHAR(45) DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID), + CONSTRAINT fk_DM_ROLE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) ON DELETE NO ACTION ON UPDATE NO ACTION +); + CREATE TABLE IF NOT EXISTS DM_DEVICE ( ID BIGSERIAL NOT NULL PRIMARY KEY, DESCRIPTION TEXT DEFAULT NULL, @@ -22,6 +40,18 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE ( CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID); +CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP ( + ID BIGSERIAL NOT NULL PRIMARY KEY, + DEVICE_ID INTEGER DEFAULT NULL, + GROUP_ID INTEGER DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + PRIMARY KEY (ID), + CONSTRAINT fk_DM_DEVICE_GROUP_MAP_DM_DEVICE2 FOREIGN KEY (DEVICE_ID) + REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT fk_DM_DEVICE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID) + REFERENCES DM_GROUP (ID) ON DELETE NO ACTION ON UPDATE NO ACTION +); + CREATE TABLE IF NOT EXISTS DM_OPERATION ( ID BIGSERIAL NOT NULL PRIMARY KEY, TYPE VARCHAR(50) NOT NULL,