diff options
author | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-18 14:37:47 -0400 |
---|---|---|
committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-18 14:39:46 -0400 |
commit | f03552714077df2a3f11fe33a81342558dfe1705 (patch) | |
tree | 2ad3b77f2b1fd1f0390a7d4614cd3d050b6f6f38 /ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java | |
parent | a2f5a35c06a526b05e4efd9fe275d6639bf22cd3 (diff) |
Repair centralized-role feature.
Also show ONAP logo in EPSDK-app header top left.
Issue: PORTAL-21, PORTAL-81
Change-Id: I46953123219d4f7a239ca6c5a05890a3769ed2ea
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java')
-rw-r--r-- | ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java | 52 |
1 files changed, 5 insertions, 47 deletions
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java index 270369c5..e5d380c9 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java @@ -6,14 +6,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; import org.openecomp.portalsdk.core.command.LoginBean; import org.openecomp.portalsdk.core.domain.Role; -import org.openecomp.portalsdk.core.domain.RoleFunction; import org.openecomp.portalsdk.core.domain.User; -import org.openecomp.portalsdk.core.domain.UserApp; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.menu.MenuBuilder; import org.openecomp.portalsdk.core.service.support.FusionService; @@ -23,8 +19,6 @@ import org.openecomp.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import com.fasterxml.jackson.databind.ObjectMapper; - @Transactional public class LoginServiceCentralizedImpl extends FusionService implements LoginService { @@ -39,6 +33,9 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS @Autowired RestApiRequestBuilder restApiRequestBuilder; + + @Autowired + UserService userService; @SuppressWarnings("unused") private MenuBuilder menuBuilder; @@ -132,51 +129,12 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS @SuppressWarnings("null") public User findUser(LoginBean bean) throws Exception { - User user = null; - - ObjectMapper mapper = new ObjectMapper(); - HashSet<RoleFunction> rolefun = null; - String repsonse = restApiRequestBuilder.getViaREST("/user/" + bean.getUserid(), true, bean.getUserid()); - - - user = mapper.readValue(repsonse, User.class); - - Set<RoleFunction> roleFunctionListNew = new HashSet<>(); - Set<RoleFunction> roleFunctionList = new HashSet<>(); - SortedSet<UserApp> UserAppSet = new TreeSet<>(); - - @SuppressWarnings("unchecked") - Set<UserApp> setAppsObj = user.getUserApps(); - - Iterator<UserApp> it = setAppsObj.iterator(); - while (it.hasNext()) { - Object next = it.next(); - - UserApp nextApp = mapper.convertValue(next, UserApp.class); - rolefun = new HashSet<>(); - Role role = nextApp.getRole(); - - roleFunctionList = role.getRoleFunctions(); - - Iterator<RoleFunction> itetaror = roleFunctionList.iterator(); - while (itetaror.hasNext()) { - Object nextValue = itetaror.next(); - RoleFunction roleFunction = mapper.convertValue(nextValue, RoleFunction.class); - roleFunctionListNew.add(roleFunction); - } - - role.setRoleFunctions(roleFunctionListNew); - nextApp.setRole(role); - nextApp.getRole().getRoleFunctions(); - - UserAppSet.add(nextApp); - user.setUserApps(UserAppSet); - } - + user = userService.userMapper(repsonse); return user; } + public User findUser(String loginId, String password) { |