summaryrefslogtreecommitdiffstats
path: root/ecomp-portal-BE-common
diff options
context:
space:
mode:
authorMuni Mohan Kunchi <munmohan@att.com>2020-07-01 09:38:08 -0400
committerMuni Mohan Kunchi <munmohan@att.com>2020-07-01 09:38:39 -0400
commitfca38e174e85b66c67ab9e8b754a9b53d70fbfd9 (patch)
tree12c829a23a5ecac947934242e6270bcac61904a7 /ecomp-portal-BE-common
parent885648993b3b2a9e7d36ebfeb96c196674c32e78 (diff)
Fix for Meridian call and moving from 3.3.0 to 3.4.0 pom version
Issue-ID: PORTAL-909 Signed-off-by: Muni Mohan Kunchi <munmohan@att.com> Change-Id: Ie844576054aec05328675a758ead1041eedca3d8
Diffstat (limited to 'ecomp-portal-BE-common')
-rw-r--r--ecomp-portal-BE-common/pom.xml2
-rw-r--r--ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java7
2 files changed, 5 insertions, 4 deletions
diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index 8e89aa2c..85cf8757 100644
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.portal</groupId>
<artifactId>onap-portal-parent</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
</parent>
<artifactId>portal-be-common</artifactId>
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
index a97dc58b..7a7f9ee4 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
@@ -1127,8 +1127,7 @@ public class UserRolesCommonServiceImpl {
userRolesInLocalApp);
List<RoleInAppForUser> roleAppUserList = rolesInAppForUser.roles;
if (EcompPortalUtils.checkIfRemoteCentralAccessAllowed()) {
-
- // Apply changes in external Access system
+ // Apply changes in external Access system
updateUserRolesInExternalSystem(app, rolesInAppForUser.orgUserId, roleAppUserList,
epRequestValue,false,rolesGotDeletedFromApprover,checkIfUserisOnlyRoleAdmin);
}
@@ -1147,7 +1146,7 @@ public class UserRolesCommonServiceImpl {
if(!app.getRolesInAAF() && !app.getId().equals(PortalConstants.PORTAL_APP_ID)){
remoteAppUser = checkIfRemoteUserExits(userId, app, applicationsRestClientService);
-
+
if (remoteAppUser == null) {
remoteAppUser = addRemoteUser(roleInAppForUserList, userId, app, mapper, searchService, applicationsRestClientService);
}
@@ -1655,6 +1654,7 @@ public class UserRolesCommonServiceImpl {
// If adding just account admin role dont make remote application user call or
// if request has only single non admin role then make remote call
if (!(app.getId().equals(PortalConstants.PORTAL_APP_ID) && reqType.equals("DELETE"))
+ && (app.getAppAck() != null && app.getAppAck())
&& ((checkIfAdminRoleExists && roleInAppForUserList.size() > 1)
|| (!checkIfAdminRoleExists && roleInAppForUserList.size() >= 1))) {
// check if admin role exist then delete
@@ -1664,6 +1664,7 @@ public class UserRolesCommonServiceImpl {
return (role.getRoleId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID));
});
String orgUserIdNewOrExist = (userInfo.size() != 0 || !userInfo.isEmpty()) ? user.getOrgUserId() : orgUserId;
+
pushRemoteUser(remoteUserRoles, orgUserIdNewOrExist , app, mapper, searchService,
applicationsRestClientService,true);
}