charithag
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #234 from ayyoob/das-ext

Browse Source 
few changes while creating a role for android sense and virtual fi…
revert-dabc3590
Ruwan 9 years ago
parent 525fc5f5e9 f0c17184f8
commit b4371c3fc3
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File

9
components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/util/APIUtil.java
Unescape View File

@ -26,6 +26,7 @@ import org.wso2.carbon.user.api.UserStoreManager;
import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.service.RealmService;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -176,21 +177,23 @@ public class APIUtil {
return deviceAccessAuthorizationService; return deviceAccessAuthorizationService;
} }
public static void registerApiAccessRoles(String user) { public static void registerApiAccessRoles(String user) {
UserStoreManager userStoreManager = null; UserStoreManager userStoreManager = null;
try { try {
userStoreManager = getUserStoreManager(); userStoreManager = getUserStoreManager();
String[] userList = new String[]{user}; String[] userList = new String[]{user};
if (userStoreManager != null) { if (userStoreManager != null) {
String rolesOfUser[] = userStoreManager.getRoleListOfUser(user);
if (!userStoreManager.isExistingRole(Constants.DEFAULT_ROLE_NAME)) { if (!userStoreManager.isExistingRole(Constants.DEFAULT_ROLE_NAME)) {
userStoreManager.addRole(Constants.DEFAULT_ROLE_NAME, userList, Constants.DEFAULT_PERMISSION); userStoreManager.addRole(Constants.DEFAULT_ROLE_NAME, userList, Constants.DEFAULT_PERMISSION);
} else if (rolesOfUser != null && Arrays.asList(rolesOfUser).contains(Constants.DEFAULT_ROLE_NAME)) {
return;
} else { } else {
userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, null, userList); userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, new String[0], userList);
} }
} }
} catch (UserStoreException e) { } catch (UserStoreException e) {
log.error("Error while creating a role and adding a user for android_sense.", e); log.error("Error while creating a role and adding a user for virtual_firealarm.", e);
} }
} }

6
components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java
Unescape View File

@ -22,6 +22,7 @@ import org.wso2.carbon.user.api.UserStoreManager;
import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.service.RealmService;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -192,10 +193,13 @@ public class APIUtil {
userStoreManager = getUserStoreManager(); userStoreManager = getUserStoreManager();
String[] userList = new String[]{user}; String[] userList = new String[]{user};
if (userStoreManager != null) { if (userStoreManager != null) {
String rolesOfUser[] = userStoreManager.getRoleListOfUser(user);
if (!userStoreManager.isExistingRole(Constants.DEFAULT_ROLE_NAME)) { if (!userStoreManager.isExistingRole(Constants.DEFAULT_ROLE_NAME)) {
userStoreManager.addRole(Constants.DEFAULT_ROLE_NAME, userList, Constants.DEFAULT_PERMISSION); userStoreManager.addRole(Constants.DEFAULT_ROLE_NAME, userList, Constants.DEFAULT_PERMISSION);
} else if (rolesOfUser != null && Arrays.asList(rolesOfUser).contains(Constants.DEFAULT_ROLE_NAME)) {
return;
} else { } else {
userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, null, userList); userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, new String[0], userList);
} }
} }
} catch (UserStoreException e) { } catch (UserStoreException e) {

Write Preview
Loading…
Cancel
Save