community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1133 from Kamidu/master

Browse Source 
Fixing https://github.com/wso2/product-iots/issues/1526
This commit is contained in:
Madawa Soysa 2017-12-14 17:13:42 +05:30 committed by GitHub
commit a5a5e72018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java
View File

@ -604,28 +604,20 @@ public class RoleManagementServiceImpl implements RoleManagementService {
private List<String> getRolesFromUserStore(String filter, String userStore) throws UserStoreException {
AbstractUserStoreManager userStoreManager = (AbstractUserStoreManager) DeviceMgtAPIUtils.getUserStoreManager();
String[] roles;
boolean filterRolesByName = (!((filter == null) || filter.isEmpty()));
if ((filter == null) || filter.isEmpty()) {
filter = "*";
}
if (log.isDebugEnabled()) {
log.debug("Getting the list of user roles");
}
if (userStore.equals("all")) {
roles = userStoreManager.getRoleNames("*", -1, false, true, true);
roles = userStoreManager.getRoleNames(filter, -1, true, true, true);
} else {
roles = userStoreManager.getRoleNames(userStore + "/*", -1, false, true, true);
roles = userStoreManager.getRoleNames(userStore + "/" + filter, -1, true, true, true);
}
// removing all internal roles, roles created for Service-providers and application related roles.
List<String> filteredRoles = new ArrayList<>();
for (String role : roles) {
if (!(role.startsWith("Internal/") || role.startsWith("Authentication/") || role.startsWith(
"Application/"))) {
if (!filterRolesByName) {
filteredRoles.add(role);
} else {
if (role.contains(filter)) {
filteredRoles.add(role);
}
}
}
filteredRoles.add(role);
}
return filteredRoles;
}