Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve getRoles service of Role v2 management #5275

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Improve getRoles service of Role v2 management #5275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions ...java/org/wso2/carbon/identity/application/mgt/listener/DefaultRoleManagementListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,19 @@ public void preGetRoles(Integer limit, Integer offset, String sortBy, String sor
}

@Override
public void postGetRoles(List<RoleBasicInfo> roleBasicInfoList, Integer limit, Integer offset,
public void postGetRoles(List<Role> roleInfoList, Integer limit, Integer offset,
String sortBy, String sortOrder, String tenantDomain)
throws IdentityRoleManagementException {

Iterator<RoleBasicInfo> iterator = roleBasicInfoList.iterator();
Iterator<Role> iterator = roleInfoList.iterator();
while (iterator.hasNext()) {
RoleBasicInfo roleBasicInfo = iterator.next();
if (APPLICATION.equalsIgnoreCase(roleBasicInfo.getAudience())) {
String applicationName = getApplicationName(roleBasicInfo.getAudienceId(), tenantDomain);
Role roleInfo = iterator.next();
if (APPLICATION.equalsIgnoreCase(roleInfo.getAudience())) {
String applicationName = getApplicationName(roleInfo.getAudienceId(), tenantDomain);
if (applicationName == null) {
iterator.remove();
}
roleBasicInfo.setAudienceName(applicationName);
roleInfo.setAudienceName(applicationName);
}
}
}
Expand All @@ -132,13 +132,13 @@ public void preGetRoles(String filter, Integer limit, Integer offset, String sor
}

@Override
public void postGetRoles(List<RoleBasicInfo> roleBasicInfoList, String filter, Integer limit, Integer offset,
public void postGetRoles(List<Role> roleInfoList, String filter, Integer limit, Integer offset,
String sortBy, String sortOrder, String tenantDomain)
throws IdentityRoleManagementException {

for (RoleBasicInfo roleBasicInfo : roleBasicInfoList) {
if (APPLICATION.equalsIgnoreCase(roleBasicInfo.getAudience())) {
roleBasicInfo.setAudienceName(getApplicationName(roleBasicInfo.getAudienceId(), tenantDomain));
for (Role roleInfo : roleInfoList) {
if (APPLICATION.equalsIgnoreCase(roleInfo.getAudience())) {
roleInfo.setAudienceName(getApplicationName(roleInfo.getAudienceId(), tenantDomain));
}
}
}
Expand Down
33 changes: 17 additions & 16 deletions ...t.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/RoleManagementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,32 +55,33 @@ RoleBasicInfo addRole(String roleName, List<String> userList, List<String> group
/**
* Retrieve available roles.
*
* @param limit Limit value.
* @param offset Offset value.
* @param sortBy SortBy value.
* @param sortOrder Sort order value.
* @param tenantDomain Tenant domain.
* @param limit Limit value.
* @param offset Offset value.
* @param sortBy SortBy value.
* @param sortOrder Sort order value.
* @param tenantDomain Tenant domain.
* @param requiredAttributes Required attributes.
* @return List of roles.
* @throws IdentityRoleManagementException IdentityRoleManagementException.
*/
List<RoleBasicInfo> getRoles(Integer limit, Integer offset, String sortBy, String sortOrder, String tenantDomain)
throws IdentityRoleManagementException;
List<Role> getRoles(Integer limit, Integer offset, String sortBy, String sortOrder, String tenantDomain,
List<String> requiredAttributes) throws IdentityRoleManagementException;

/**
* Retrieve available roles.
*
* @param filter Filter for the Role ID.
* @param limit Limit value.
* @param offset Offset value.
* @param sortBy SortBy value.
* @param sortOrder Sort order value.
* @param tenantDomain Tenant domain.
* @param filter Filter for the Role ID.
* @param limit Limit value.
* @param offset Offset value.
* @param sortBy SortBy value.
* @param sortOrder Sort order value.
* @param tenantDomain Tenant domain.
* @param requiredAttributes Required attributes.
* @return List of roles.
* @throws IdentityRoleManagementException IdentityRoleManagementException.
*/
List<RoleBasicInfo> getRoles(String filter, Integer limit, Integer offset, String sortBy, String sortOrder,
String tenantDomain)
throws IdentityRoleManagementException;
List<Role> getRoles(String filter, Integer limit, Integer offset, String sortBy, String sortOrder,
String tenantDomain, List<String> requiredAttributes) throws IdentityRoleManagementException;

/**
* Retrieve the given role.
Expand Down
22 changes: 11 additions & 11 deletions ...re/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/RoleManagementServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ public RoleBasicInfo addRole(String roleName, List<String> userList, List<String
}

@Override
public List<RoleBasicInfo> getRoles(Integer limit, Integer offset, String sortBy, String sortOrder,
String tenantDomain) throws IdentityRoleManagementException {
public List<Role> getRoles(Integer limit, Integer offset, String sortBy, String sortOrder, String tenantDomain,
List<String> requiredAttributes) throws IdentityRoleManagementException {

List<RoleManagementListener> roleManagementListenerList = RoleManagementServiceComponentHolder.getInstance()
.getRoleManagementListenerList();
Expand All @@ -151,23 +151,23 @@ public List<RoleBasicInfo> getRoles(Integer limit, Integer offset, String sortBy
.getInstance();
roleManagementEventPublisherProxy.publishPreGetRolesWithException(limit, offset, sortBy, sortOrder,
tenantDomain);
List<RoleBasicInfo> roleBasicInfoList = roleDAO.getRoles(limit, offset, sortBy, sortOrder, tenantDomain);
List<Role> roleList = roleDAO.getRoles(limit, offset, sortBy, sortOrder, tenantDomain, requiredAttributes);
roleManagementEventPublisherProxy.publishPostGetRoles(limit, offset, sortBy, sortOrder, tenantDomain);
for (RoleManagementListener roleManagementListener : roleManagementListenerList) {
if (roleManagementListener.isEnable()) {
roleManagementListener.postGetRoles(roleBasicInfoList, limit, offset, sortBy, sortOrder,
roleManagementListener.postGetRoles(roleList, limit, offset, sortBy, sortOrder,
tenantDomain);
}
}
if (log.isDebugEnabled()) {
log.debug(String.format("%s get roles successfully.", getUser(tenantDomain)));
}
return roleBasicInfoList;
return roleList;
}

@Override
public List<RoleBasicInfo> getRoles(String filter, Integer limit, Integer offset, String sortBy, String sortOrder,
String tenantDomain)
public List<Role> getRoles(String filter, Integer limit, Integer offset, String sortBy, String sortOrder,
String tenantDomain, List<String> requiredAttributes)
throws IdentityRoleManagementException {

List<RoleManagementListener> roleManagementListenerList = RoleManagementServiceComponentHolder.getInstance()
Expand All @@ -182,19 +182,19 @@ public List<RoleBasicInfo> getRoles(String filter, Integer limit, Integer offset
roleManagementEventPublisherProxy.publishPreGetRolesWithException(filter, limit, offset, sortBy, sortOrder,
tenantDomain);
List<ExpressionNode> expressionNodes = getExpressionNodes(filter);
List<RoleBasicInfo> roleBasicInfoList = roleDAO.getRoles(expressionNodes, limit, offset, sortBy,
sortOrder, tenantDomain);
List<Role> roleInfoList = roleDAO.getRoles(expressionNodes, limit, offset, sortBy,
sortOrder, tenantDomain, requiredAttributes);
roleManagementEventPublisherProxy.publishPostGetRoles(filter, limit, offset, sortBy, sortOrder, tenantDomain);
for (RoleManagementListener roleManagementListener : roleManagementListenerList) {
if (roleManagementListener.isEnable()) {
roleManagementListener.postGetRoles(roleBasicInfoList, filter, limit, offset, sortBy, sortOrder,
roleManagementListener.postGetRoles(roleInfoList, filter, limit, offset, sortBy, sortOrder,
tenantDomain);
}
}
if (log.isDebugEnabled()) {
log.debug(String.format("%s get filtered roles successfully.", getUser(tenantDomain)));
}
return roleBasicInfoList;
return roleInfoList;
}

@Override
Expand Down
31 changes: 17 additions & 14 deletions ...role.v2.mgt.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/dao/RoleDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,31 +56,34 @@ RoleBasicInfo addRole(String roleName, List<String> userList, List<String> group
/**
* Retrieve available roles.
*
* @param limit Limit value.
* @param offset Offset value.
* @param sortBy SortBy value.
* @param sortOrder Sort order value.
* @param tenantDomain Tenant domain.
* @param limit Limit value.
* @param offset Offset value.
* @param sortBy SortBy value.
* @param sortOrder Sort order value.
* @param tenantDomain Tenant domain.
* @param requiredAttributes Required attributes.
* @return List of roles.
* @throws IdentityRoleManagementException IdentityRoleManagementException.
*/
List<RoleBasicInfo> getRoles(Integer limit, Integer offset, String sortBy, String sortOrder, String tenantDomain)
List<Role> getRoles(Integer limit, Integer offset, String sortBy, String sortOrder, String tenantDomain,
List<String> requiredAttributes)
throws IdentityRoleManagementException;

/**
* Retrieve available roles matching the provided filter.
*
* @param expressionNodes List of expressionNodes.
* @param limit Limit value.
* @param offset Offset value.
* @param sortBy SortBy value.
* @param sortOrder Sort order value.
* @param tenantDomain Tenant domain.
* @param expressionNodes List of expressionNodes.
* @param limit Limit value.
* @param offset Offset value.
* @param sortBy SortBy value.
* @param sortOrder Sort order value.
* @param tenantDomain Tenant domain.
* @param requiredAttributes Required attributes.
* @return List of roles.
* @throws IdentityRoleManagementException IdentityRoleManagementException.
*/
List<RoleBasicInfo> getRoles(List<ExpressionNode> expressionNodes, Integer limit, Integer offset, String sortBy,
String sortOrder, String tenantDomain)
List<Role> getRoles(List<ExpressionNode> expressionNodes, Integer limit, Integer offset, String sortBy,
String sortOrder, String tenantDomain, List<String> requiredAttributes)
throws IdentityRoleManagementException;

/**
Expand Down
61 changes: 54 additions & 7 deletions ....v2.mgt.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/dao/RoleDAOImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@ public class RoleDAOImpl implements RoleDAO {
private final GroupIDResolver groupIDResolver = new GroupIDResolver();
private final UserIDResolver userIDResolver = new UserIDResolver();
private final Set<String> systemRoles = getSystemRoles();
private final String users = "users";
private final String groups = "groups";
private final String permissions = "permissions";
private final String associatedApplications = "associatedApplications";

@Override
public RoleBasicInfo addRole(String roleName, List<String> userList, List<String> groupList,
Expand Down Expand Up @@ -280,8 +284,8 @@ public RoleBasicInfo addRole(String roleName, List<String> userList, List<String
}

@Override
public List<RoleBasicInfo> getRoles(Integer limit, Integer offset, String sortBy, String sortOrder,
String tenantDomain) throws IdentityRoleManagementException {
public List<Role> getRoles(Integer limit, Integer offset, String sortBy, String sortOrder, String tenantDomain,
List<String> requiredAttributes) throws IdentityRoleManagementException {

int tenantId = IdentityTenantUtil.getTenantId(tenantDomain);
limit = validateLimit(limit);
Expand All @@ -300,12 +304,12 @@ public List<RoleBasicInfo> getRoles(Integer limit, Integer offset, String sortBy
throw new IdentityRoleManagementServerException(UNEXPECTED_SERVER_ERROR.getCode(),
"Error while listing roles in tenantDomain: " + tenantDomain, e);
}
return roles;
return getRolesRequestedAttributes(roles, requiredAttributes, tenantDomain);
}

@Override
public List<RoleBasicInfo> getRoles(List<ExpressionNode> expressionNodes, Integer limit, Integer offset,
String sortBy, String sortOrder, String tenantDomain)
public List<Role> getRoles(List<ExpressionNode> expressionNodes, Integer limit, Integer offset, String sortBy,
String sortOrder, String tenantDomain, List<String> requiredAttributes)
throws IdentityRoleManagementException {

int tenantId = IdentityTenantUtil.getTenantId(tenantDomain);
Expand Down Expand Up @@ -335,7 +339,50 @@ public List<RoleBasicInfo> getRoles(List<ExpressionNode> expressionNodes, Intege
throw new IdentityRoleManagementServerException(RoleConstants.Error.UNEXPECTED_SERVER_ERROR.getCode(),
"Error while listing roles in tenantDomain: " + tenantDomain, e);
}
return roles;
return getRolesRequestedAttributes(roles, requiredAttributes, tenantDomain);
}

private List<Role> getRolesRequestedAttributes(List<RoleBasicInfo> roles, List<String> requiredAttributes,
String tenantDomain)
throws IdentityRoleManagementException {

List<Role> rolesList = new ArrayList();
for (RoleBasicInfo roleBasicInfo : roles) {
Role role = new Role();
role.setId(roleBasicInfo.getId());
role.setName(roleBasicInfo.getName());
role.setAudienceId(roleBasicInfo.getAudienceId());
role.setAudienceName(roleBasicInfo.getAudienceName());
role.setAudience(roleBasicInfo.getAudience());
if (requiredAttributes != null && !requiredAttributes.isEmpty()) {
if (requiredAttributes.contains(users)) {
role.setUsers(getUserListOfRole(roleBasicInfo.getId(), tenantDomain));
}
if (requiredAttributes.contains(groups)) {
role.setGroups(getGroupListOfRole(roleBasicInfo.getId(), tenantDomain));
role.setIdpGroups(getIdpGroupListOfRole(roleBasicInfo.getId(), tenantDomain));
}
if (requiredAttributes.contains(permissions)) {
if (isSharedRole(roleBasicInfo.getId(), tenantDomain)) {
role.setPermissions(getPermissionsOfSharedRole(roleBasicInfo.getId(), tenantDomain));
} else {
role.setPermissions(getPermissions(roleBasicInfo.getId(), tenantDomain));
}
}
if (requiredAttributes.contains(associatedApplications)) {
if (ORGANIZATION.equals(roleBasicInfo.getAudience())) {
role.setAssociatedApplications(getAssociatedAppsById(roleBasicInfo.getId(), tenantDomain));
} else if (APPLICATION.equals(roleBasicInfo.getAudience())) {
List<AssociatedApplication> associatedApplications = new ArrayList<>();
associatedApplications.add(new AssociatedApplication(roleBasicInfo.getAudienceId(),
roleBasicInfo.getAudienceName()));
role.setAssociatedApplications(associatedApplications);
}
}
}
rolesList.add(role);
}
return rolesList;
}

@Override
Expand Down Expand Up @@ -3169,7 +3216,7 @@ private void deleteSharedHybridRoles(String roleId, int mainTenantId, Connection
try (ResultSet resultSet = selectStatement.executeQuery()) {
while (resultSet.next()) {
idsToDelete.add(new AbstractMap.SimpleEntry<>(
resultSet.getInt(1), resultSet.getInt(2)));
resultSet.getInt(1), resultSet.getInt(2)));
}
}
try (NamedPreparedStatement deleteStatement = new NamedPreparedStatement(connection, DELETE_SHARED_ROLE)) {
Expand Down
4 changes: 2 additions & 2 deletions ...va/org/wso2/carbon/identity/role/v2/mgt/core/listener/AbstractRoleManagementListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void preGetRoles(Integer limit, Integer offset, String sortBy, String sor
}

@Override
public void postGetRoles(List<RoleBasicInfo> roleBasicInfoList, Integer limit, Integer offset, String sortBy,
public void postGetRoles(List<Role> roleBasicInfoList, Integer limit, Integer offset, String sortBy,
String sortOrder, String tenantDomain) throws IdentityRoleManagementException {

}
Expand All @@ -66,7 +66,7 @@ public void preGetRoles(String filter, Integer limit, Integer offset, String sor
}

@Override
public void postGetRoles(List<RoleBasicInfo> roleBasicInfoList, String filter, Integer limit, Integer offset,
public void postGetRoles(List<Role> roleInfoList, String filter, Integer limit, Integer offset,
String sortBy, String sortOrder, String tenantDomain)
throws IdentityRoleManagementException {

Expand Down
Loading
Loading