From 3e7145fc12ed8475ba10bb2a3c63004d41aa42bc Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Fri, 7 Jul 2017 07:21:10 -0400 Subject: [PORTAL-25] Role Centralization Bump EP SDK version to 1.3.0-SNAPSHOT Support Role Centralization & Common Set of Roles across All ONAP On-Boarded Applications Change-Id: Icfc1bbfddaf2c7c7176b4cf7bb7017d853c63100 Signed-off-by: Christopher Lott (cl778h) --- .../org/openecomp/portalapp/service/OnBoardingApiServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/service/OnBoardingApiServiceImpl.java') diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/service/OnBoardingApiServiceImpl.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/service/OnBoardingApiServiceImpl.java index cb822494..7303cfc4 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/service/OnBoardingApiServiceImpl.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/service/OnBoardingApiServiceImpl.java @@ -222,9 +222,9 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService { } @Override - public List getAvailableRoles() throws PortalAPIException { + public List getAvailableRoles(String requestedLoginId) throws PortalAPIException { try { - List roles = roleService.getActiveRoles(); + List roles = roleService.getActiveRoles(requestedLoginId); List ecompRoles = new ArrayList(); for (Role role : roles) ecompRoles.add(UserUtils.convertToEcompRole(role)); @@ -251,7 +251,7 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService { */ SortedSet roles = new TreeSet(); for (EcompRole role : rolesJson) { - roles.add(roleService.getRole(role.getId())); + roles.add(roleService.getRole(loginId,role.getId())); } // Replace existing roles with new ones replaceExistingRoles(roles, user); -- cgit 1.2.3-korg