diff options
| author |   Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2018-11-01 19:22:47 +0200 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2018-11-05 19:00:41 +0000 |
| commit | ae6315fe84629d67aff39cf5100ab81b94c781d7 (patch) | |
| tree | a8f2ca584b47dfa5e420ed27976d958d77eddcbc /vid-app-common/src | |
| parent | e4c1493b35c4a3f3ee2232eccdf8e254ede74a85 (diff) | |
Enable role management
Change-Id: I08915fffa5da50c957d2f80ce88ef279fef3a1b2
Issue-ID: VID-257
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
Diffstat (limited to 'vid-app-common/src')
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java | 4 | ||||
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java index 6d6ffb31b..3a3acd8ee 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java +++ b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java @@ -106,9 +106,7 @@ public class VidController extends RestrictedBaseController { SecureServices secureServices = new SecureServices(); List<Role> roles = roleProvider.getUserRoles(request); secureServices.setServices(aaiService.getServicesByDistributionStatus()); - //Disable roles until AAF integration finishes - //secureServices.setReadOnly(roleProvider.userPermissionIsReadOnly(roles)); - secureServices.setReadOnly(false); + secureServices.setReadOnly(roleProvider.userPermissionIsReadOnly(roles)); return secureServices; } catch (Exception t) { diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java b/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java index 45835d459..b268c98ce 100644 --- a/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java +++ b/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java @@ -51,10 +51,10 @@ public class RoleProvider { LOG.debug(EELFLoggerDelegate.debugLogger, logPrefix + "Entering to get user role for user " + UserUtils.getUserId(request)); List<Role> roleList = new ArrayList<>(); - //Disable roles until AAF integration finishes - /*HashMap roles = UserUtils.getRoles(request); + + Map roles = UserUtils.getRoles(request); for (Object role : roles.keySet()) { - org.openecomp.portalsdk.core.domain.Role sdkRol = (org.openecomp.portalsdk.core.domain.Role) roles.get(role); + org.onap.portalsdk.core.domain.Role sdkRol = (org.onap.portalsdk.core.domain.Role) roles.get(role); LOG.debug(EELFLoggerDelegate.debugLogger, logPrefix + "Role " + sdkRol.getName() + " is being proccessed"); try { @@ -71,7 +71,7 @@ public class RoleProvider { LOG.error(logPrefix + " Failed to parse permission"); } - }*/ + } return roleList; } |