From 6c5ffcbc9ced52cc8076fbd90c64e2f67744cd5c Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 11 Jun 2024 11:09:36 +0200 Subject: [PATCH] fixed the method getLiferayHighestRoleInOrg --- .../view/GCubeCkanDataCatalogPanel.java | 1 - .../gcubeckandatacatalog/server/UserUtil.java | 196 ++++++++++-------- 2 files changed, 110 insertions(+), 87 deletions(-) diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java index 1f0d60b..435911e 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java @@ -36,7 +36,6 @@ import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Frame; -import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.ScrollPanel; diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java index 6bec2c9..e4495dd 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java @@ -6,6 +6,7 @@ package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpSession; @@ -31,32 +32,30 @@ import org.gcube.vomanagement.usermanagement.model.GatewayRolesNames; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; - - - /** * The Class UserUtil. + * * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @author Costantino Perciante costantino.perciante@isti.cnr.it - * Jun 21, 2016 + * @author Costantino Perciante costantino.perciante@isti.cnr.it Jun 21, 2016 */ public class UserUtil { - //private static Logger LOG = LoggerFactory.getLogger(UserUtil.class); + // private static Logger LOG = LoggerFactory.getLogger(UserUtil.class); private static final Log logger = LogFactoryUtil.getLog(UserUtil.class); private static final String ADD_USER_TO_OTHER_ORG_KEY = "ADD_USER_TO_OTHER_ORG_KEY"; /** - * Gets the list vre for user and the role the user has in them. - * retrieve the groups to whom a given user belongs (given the user EMail) - * @param userEMail the user e mail - * @param httpSession - * @param pathVre + * Gets the list vre for user and the role the user has in them. retrieve the + * groups to whom a given user belongs (given the user EMail) + * + * @param userEMail the user e mail + * @param httpSession + * @param pathVre * @return the list vre for user */ - public static Map getVreRoleForUser(String userEMail, String context, DataCatalogue instance, boolean isViewPerVREEnabled, - HttpSession httpSession){ + public static Map getVreRoleForUser(String userEMail, String context, DataCatalogue instance, + boolean isViewPerVREEnabled, HttpSession httpSession) { GroupManager groupManager = new LiferayGroupManager(); UserManager userManager = new LiferayUserManager(); @@ -66,58 +65,55 @@ public class UserUtil { try { user = userManager.getUserByEmail(userEMail); - // filter according the current context: if it is a VO/VRE, we send all the VRES under the VO. If it is the root vo, we send all user's vres. + // filter according the current context: if it is a VO/VRE, we send all the VRES + // under the VO. If it is the root vo, we send all user's vres. long groupIdContext = groupManager.getGroupIdFromInfrastructureScope(context); GCubeGroup currentVRE = groupManager.getGroup(groupIdContext); - String localRoleInThisVre = RolesCkanGroupOrOrg.convertToCkanCapacity(getLiferayHighestRoleInOrg(roleManager.listRolesByUserAndGroup(user.getUserId(), currentVRE.getGroupId()))); + String localRoleInThisVre = RolesCkanGroupOrOrg.convertToCkanCapacity(getLiferayHighestRoleInOrg( + roleManager.listRolesByUserAndGroup(user.getUserId(), currentVRE.getGroupId()))); // ckan-connector will do it - mapRoleByGroupSingleVre.put(currentVRE.getGroupName().toLowerCase(), - localRoleInThisVre); + mapRoleByGroupSingleVre.put(currentVRE.getGroupName().toLowerCase(), localRoleInThisVre); // perform further checks - if(!isViewPerVREEnabled){ + if (!isViewPerVREEnabled) { String keyPerScope = context + ADD_USER_TO_OTHER_ORG_KEY; - Boolean alreadyAdded = (Boolean)httpSession.getAttribute(keyPerScope); + Boolean alreadyAdded = (Boolean) httpSession.getAttribute(keyPerScope); - if(alreadyAdded == null || !alreadyAdded){ - new AddUserToOrganizationThread( - instance, - user, - groupManager.listGroupsByUser(user.getUserId()), - isViewPerVREEnabled, - groupIdContext, - roleManager, - groupManager, - localRoleInThisVre). - start(); + if (alreadyAdded == null || !alreadyAdded) { + new AddUserToOrganizationThread(instance, user, groupManager.listGroupsByUser(user.getUserId()), + isViewPerVREEnabled, groupIdContext, roleManager, groupManager, localRoleInThisVre).start(); httpSession.setAttribute(keyPerScope, true); } } logger.debug("Returning Map to the ckan connector : " + mapRoleByGroupSingleVre); return mapRoleByGroupSingleVre; - }catch (UserManagementSystemException | UserRetrievalFault | GroupRetrievalFault e) { - logger.error("An error occurred during get list of VREs for user: "+userEMail, e); + } catch (UserManagementSystemException | UserRetrievalFault | GroupRetrievalFault e) { + logger.error("An error occurred during get list of VREs for user: " + userEMail, e); return null; } } - /** - * Retrieve the highest ckan role the user has and also retrieve the list of organizations (scopes) in which the user has the ckan-admin or ckan-editor role - * @param currentScope the current scope - * @param username the current username - * @param groupName the current groupName - * @param gcubeCkanDataCatalogServiceImpl - * @param orgsInWhichAdminRole - * @param ckanUtils ckanUtils + * Retrieve the highest ckan role the user has and also retrieve the list of + * organizations (scopes) in which the user has the ckan-admin or ckan-editor + * role + * + * @param currentScope the current scope + * @param username the current username + * @param groupName the current groupName + * @param gcubeCkanDataCatalogServiceImpl + * @param orgsInWhichAdminRole + * @param ckanUtils ckanUtils */ - public static RolesCkanGroupOrOrg getHighestRole(String currentScope, String username, String groupName, GcubeCkanDataCatalogServiceImpl gcubeCkanDataCatalogServiceImpl, List orgsInWhichAtLeastEditorRole){ + public static RolesCkanGroupOrOrg getHighestRole(String currentScope, String username, String groupName, + GcubeCkanDataCatalogServiceImpl gcubeCkanDataCatalogServiceImpl, + List orgsInWhichAtLeastEditorRole) { // base role as default value RolesCkanGroupOrOrg toReturn = RolesCkanGroupOrOrg.MEMBER; - try{ + try { UserManager userManager = new LiferayUserManager(); RoleManager roleManager = new LiferayRoleManager(); @@ -135,83 +131,92 @@ public class UserUtil { List groups = groupManager.listGroupsByUser(userid); // root (so check into the root, the VOs and the VRES) - if(groupManager.isRootVO(currentGroupId)){ + if (groupManager.isRootVO(currentGroupId)) { - logger.info("The current scope is the Root Vo, so the list of organizations of the user " + username + " is " + groups); + logger.info("The current scope is the Root Vo, so the list of organizations of the user " + username + + " is " + groups); for (GCubeGroup gCubeGroup : groups) { - if(!groupManager.isVRE(gCubeGroup.getGroupId())) + if (!groupManager.isVRE(gCubeGroup.getGroupId())) continue; // get the name of this group String gCubeGroupName = gCubeGroup.getGroupName(); // get the role of the users in this group - List roles = roleManager.listRolesByUserAndGroup(userid, groupManager.getGroupId(gCubeGroupName)); + List roles = roleManager.listRolesByUserAndGroup(userid, + groupManager.getGroupId(gCubeGroupName)); // get highest role RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles); // be sure it is so - checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(), - correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); + checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(), + correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, + orgsInWhichAtLeastEditorRole); toReturn = RolesCkanGroupOrOrg.getHigher(toReturn, correspondentRoleToCheck); } - }else if(groupManager.isVO(currentGroupId)){ + } else if (groupManager.isVO(currentGroupId)) { - logger.debug("The list of organizations of the user " + username + " to scan is the one under the VO " + groupName); + logger.debug("The list of organizations of the user " + username + " to scan is the one under the VO " + + groupName); for (GCubeGroup gCubeGroup : groups) { // if the gCubeGroup is not under the VO or it is not the VO continue - if(currentGroupId != gCubeGroup.getParentGroupId() || currentGroupId != gCubeGroup.getGroupId()) + if (currentGroupId != gCubeGroup.getParentGroupId() || currentGroupId != gCubeGroup.getGroupId()) continue; String gCubeGroupName = gCubeGroup.getGroupName(); - List roles = roleManager.listRolesByUserAndGroup(userid, groupManager.getGroupId(gCubeGroupName)); + List roles = roleManager.listRolesByUserAndGroup(userid, + groupManager.getGroupId(gCubeGroupName)); // get highest role RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles); // be sure it is so - checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(), - correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); + checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(), + correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, + orgsInWhichAtLeastEditorRole); toReturn = RolesCkanGroupOrOrg.getHigher(toReturn, correspondentRoleToCheck); } - }else if(groupManager.isVRE(currentGroupId)){ - List roles = roleManager.listRolesByUserAndGroup(userManager.getUserId(username), groupManager.getGroupId(groupName)); + } else if (groupManager.isVRE(currentGroupId)) { + List roles = roleManager.listRolesByUserAndGroup(userManager.getUserId(username), + groupManager.getGroupId(groupName)); logger.debug("The current scope is the vre " + groupName); // get highest role RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles); - // the ckan connector already did the job for us but we need name and title - checkIfRoleIsSetInCkanInstance(username, groupName, currentGroupId, - correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); + // the ckan connector already did the job for us but we need name and title + checkIfRoleIsSetInCkanInstance(username, groupName, currentGroupId, correspondentRoleToCheck, + groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); toReturn = correspondentRoleToCheck; } - }catch(Exception e){ + } catch (Exception e) { logger.error("Unable to retrieve the role information for this user. Returning member role", e); return RolesCkanGroupOrOrg.MEMBER; } // return the role - logger.debug("Returning role " + toReturn + " for user " + username); + logger.debug("Returning role " + toReturn + " for user " + username); return toReturn; } /** - * Check if the role admin/editor is set or must be set into the ckan instance at this scope + * Check if the role admin/editor is set or must be set into the ckan instance + * at this scope + * * @param username * @param gCubeGroupName * @param groupId @@ -222,47 +227,66 @@ public class UserUtil { * @throws UserManagementSystemException * @throws GroupRetrievalFault */ - private static void checkIfRoleIsSetInCkanInstance(String username, - String gCubeGroupName, long groupId, - RolesCkanGroupOrOrg correspondentRoleToCheck, - GroupManager groupManager, - GcubeCkanDataCatalogServiceImpl gcubeCkanDataCatalogServiceImpl, List orgsInWhichAtLeastEditorRole) throws UserManagementSystemException, GroupRetrievalFault { + private static void checkIfRoleIsSetInCkanInstance(String username, String gCubeGroupName, long groupId, + RolesCkanGroupOrOrg correspondentRoleToCheck, GroupManager groupManager, + GcubeCkanDataCatalogServiceImpl gcubeCkanDataCatalogServiceImpl, + List orgsInWhichAtLeastEditorRole) + throws UserManagementSystemException, GroupRetrievalFault { - // with this invocation, we check if the role is present in ckan and if it is not it will be added - DataCatalogue catalogue = gcubeCkanDataCatalogServiceImpl.getCatalogue(groupManager.getInfrastructureScope(groupId)); + // with this invocation, we check if the role is present in ckan and if it is + // not it will be added + DataCatalogue catalogue = gcubeCkanDataCatalogServiceImpl + .getCatalogue(groupManager.getInfrastructureScope(groupId)); // if there is an instance of ckan in this scope.. - if(catalogue != null){ + if (catalogue != null) { boolean res = catalogue.checkRoleIntoOrganization(username, gCubeGroupName, correspondentRoleToCheck); - if(res && !correspondentRoleToCheck.equals(RolesCkanGroupOrOrg.MEMBER)){ + if (res && !correspondentRoleToCheck.equals(RolesCkanGroupOrOrg.MEMBER)) { // get the orgs of the user and retrieve its title and name CkanOrganization organization = catalogue.getOrganizationByName(gCubeGroupName.toLowerCase()); - orgsInWhichAtLeastEditorRole.add(new OrganizationBean(organization.getTitle(), organization.getName(), true)); + orgsInWhichAtLeastEditorRole + .add(new OrganizationBean(organization.getTitle(), organization.getName(), true)); } - } - else - logger.warn("It seems there is no ckan instance into scope " + groupManager.getInfrastructureScope(groupId)); + } else + logger.warn( + "It seems there is no ckan instance into scope " + groupManager.getInfrastructureScope(groupId)); } /** * Retrieve the ckan role among a list of liferay roles + * * @param roles * @return MEMBER/EDITOR/ADMIN role */ - public static RolesCkanGroupOrOrg getLiferayHighestRoleInOrg( - List roles) { + public static RolesCkanGroupOrOrg getLiferayHighestRoleInOrg(List roles) { + logger.info("getLiferayHighestRoleInOrg in: " + roles); - // NOTE: it is supposed that there is just one role for this person correspondent to the one in the catalog - for (GCubeRole gCubeRole : roles) { - if(gCubeRole.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_ADMIN.getRoleName())){ - return RolesCkanGroupOrOrg.ADMIN; - } - if(gCubeRole.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_EDITOR.getRoleName())){ - return RolesCkanGroupOrOrg.EDITOR; - } + RolesCkanGroupOrOrg highestRoleFound = null; + + List adminList = roles.stream() + .filter(a -> a.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_ADMIN.getRoleName())) + .collect(Collectors.toList()); + + if (adminList != null && adminList.size() > 0) { + highestRoleFound = RolesCkanGroupOrOrg.ADMIN; + logger.info("getLiferayHighestRoleInOrg returns: " + roles); + return highestRoleFound; } - return RolesCkanGroupOrOrg.MEMBER; + + List editorList = roles.stream() + .filter(a -> a.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_EDITOR.getRoleName())) + .collect(Collectors.toList()); + + if (editorList != null && editorList.size() > 0) { + highestRoleFound = RolesCkanGroupOrOrg.EDITOR; + logger.info("getLiferayHighestRoleInOrg returns: " + roles); + return highestRoleFound; + } + + highestRoleFound = RolesCkanGroupOrOrg.MEMBER; + logger.info("getLiferayHighestRoleInOrg returns: " + roles); + return highestRoleFound; } }