Repository: stratos Updated Branches: refs/heads/master a42e84da8 -> bc884cc8a
STRATOS-1445 - Adding empty check for user roles Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bc884cc8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bc884cc8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bc884cc8 Branch: refs/heads/master Commit: bc884cc8a8a902a447bf21067532501d671d43e2 Parents: a42e84d Author: lasinducharith <[email protected]> Authored: Sun Jun 28 19:15:02 2015 +0530 Committer: lasinducharith <[email protected]> Committed: Sun Jun 28 19:15:02 2015 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/common/beans/UserInfoBean.java | 3 +++ .../manager/user/management/StratosUserManagerUtils.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/bc884cc8/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java index 88877ee..e62545c 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/UserInfoBean.java @@ -21,6 +21,9 @@ package org.apache.stratos.common.beans; import javax.xml.bind.annotation.XmlRootElement; +/** + * TODO : Should be able to support multiple roles for user + */ @XmlRootElement public class UserInfoBean { http://git-wip-us.apache.org/repos/asf/stratos/blob/bc884cc8/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java index 0f9deeb..dcfcdf4 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java @@ -36,6 +36,7 @@ import java.util.Map; /** * This Class provides the operations related to adding/updating/deleting and listing users using * the carbon UserStoreManager in the particular tenant space + * TODO : Update the util class to be able to support multiple roles for user */ public class StratosUserManagerUtils { @@ -161,7 +162,14 @@ public class StratosUserManagerUtils { for (String user : users) { UserInfoBean userInfoBean = new UserInfoBean(); userInfoBean.setUserName(user); - userInfoBean.setRole(getRefinedListOfRolesOfUser(userStoreManager, user)[0]); + String[] refinedListOfRolesOfUser = getRefinedListOfRolesOfUser(userStoreManager, user); + //TODO : Should support multiple roles for user + if (refinedListOfRolesOfUser.length != 0) { + userInfoBean.setRole(getRefinedListOfRolesOfUser(userStoreManager, user)[0]); + } + else{ + userInfoBean.setRole(INTERNAL_EVERYONE_ROLE); + } userList.add(userInfoBean); }
