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 branch 'fix/admin-user-role-assignment-issue' into 'master'

Browse Source 
Fix admin role not assigned issue during admin user creation

See merge request entgra/carbon-device-mgt!901
This commit is contained in:
Inosh Perara 2022-07-11 09:30:02 +00:00
commit 68956f0c92
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,9 @@ public class UserManagementServiceImpl implements UserManagementService {
private static final String API_BASE_PATH = "/users"; private static final String API_BASE_PATH = "/users";
private static final Log log = LogFactory.getLog(UserManagementServiceImpl.class); private static final Log log = LogFactory.getLog(UserManagementServiceImpl.class);
private static final String ADMIN_ROLE = "admin";
private static final String DEFAULT_DEVICE_USER = "Internal/devicemgt-user"; private static final String DEFAULT_DEVICE_USER = "Internal/devicemgt-user";
private static final String DEFAULT_DEVICE_ADMIN = "Internal/devicemgt-admin";
private static final String DEFAULT_SUBSCRIBER = "Internal/subscriber"; private static final String DEFAULT_SUBSCRIBER = "Internal/subscriber";
// Permissions that are given for a normal device user. // Permissions that are given for a normal device user.
@ -177,13 +179,19 @@ public class UserManagementServiceImpl implements UserManagementService {
tmpRoles.add(DEFAULT_DEVICE_USER); tmpRoles.add(DEFAULT_DEVICE_USER);
boolean subscriberFound = false; boolean subscriberFound = false;
boolean adminFound = false;
if (userInfoRoles != null) { if (userInfoRoles != null) {
//check if subscriber role is coming in the payload //check if subscriber role is coming in the payload
for (String r : userInfoRoles) { for (String r : userInfoRoles) {
if (!subscriberFound || !adminFound) {
if (DEFAULT_SUBSCRIBER.equals(r)) { if (DEFAULT_SUBSCRIBER.equals(r)) {
subscriberFound = true; subscriberFound = true;
} else if (ADMIN_ROLE.equals(r)) {
tmpRoles.add(DEFAULT_DEVICE_ADMIN);
adminFound = true;
}
} else {
break; break;
} }
} }