gCubeSystem
/
oidc-library-portal
18
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now root VO name string is used instead of group object

This commit is contained in:
Mauro Mugnaini 2020-06-18 12:12:59 +02:00
parent c9a7657fec
commit 00f049e4f9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/gcube/portal/oidc/lr62/UserSitesToGroupsAndRolesMapper.java
View File

@ -1,10 +1,14 @@
package com.nubisware.oidc.lr62; package org.gcube.portal.oidc.lr62;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import org.gcube.oidc.D4ScienceMappings;
import org.gcube.oidc.OIDCToSitesAndRolesMapper;
import org.gcube.oidc.Site;
import org.gcube.oidc.SitesMapperExecption;
import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.GroupManager;
import org.gcube.vomanagement.usermanagement.RoleManager; import org.gcube.vomanagement.usermanagement.RoleManager;
import org.gcube.vomanagement.usermanagement.UserManager; import org.gcube.vomanagement.usermanagement.UserManager;
@ -26,10 +30,6 @@ import com.liferay.portal.security.auth.PrincipalThreadLocal;
import com.liferay.portal.security.permission.PermissionCheckerFactoryUtil; import com.liferay.portal.security.permission.PermissionCheckerFactoryUtil;
import com.liferay.portal.security.permission.PermissionThreadLocal; import com.liferay.portal.security.permission.PermissionThreadLocal;
import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil;
import com.nubisware.oidc.gcube.D4ScienceMappings;
import com.nubisware.oidc.gcube.OIDCToSitesAndRolesMapper;
import com.nubisware.oidc.gcube.Site;
import com.nubisware.oidc.gcube.SitesMapperExecption;
public class UserSitesToGroupsAndRolesMapper { public class UserSitesToGroupsAndRolesMapper {
@ -40,7 +40,7 @@ public class UserSitesToGroupsAndRolesMapper {
protected UserManager userManager; protected UserManager userManager;
protected GroupManager groupManager; protected GroupManager groupManager;
protected RoleManager roleManager; protected RoleManager roleManager;
protected GCubeGroup rootVOGCubeGroup; protected String rootVOName;
protected Map<GCubeGroup, List<GCubeRole>> actualGroupAndRoles; protected Map<GCubeGroup, List<GCubeRole>> actualGroupAndRoles;
protected Map<String, GCubeRole> roleNameToRole; protected Map<String, GCubeRole> roleNameToRole;
@ -64,7 +64,7 @@ public class UserSitesToGroupsAndRolesMapper {
groupManager = new LiferayGroupManager(); groupManager = new LiferayGroupManager();
roleManager = new LiferayRoleManager(); roleManager = new LiferayRoleManager();
try { try {
this.rootVOGCubeGroup = groupManager.getRootVO(); this.rootVOName = groupManager.getRootVOName();
} catch (UserManagementSystemException | GroupRetrievalFault e) { } catch (UserManagementSystemException | GroupRetrievalFault e) {
log.error("Cannot get infrastructure's Root VO", e); log.error("Cannot get infrastructure's Root VO", e);
return; return;
@ -85,7 +85,7 @@ public class UserSitesToGroupsAndRolesMapper {
log.info("Mapping roles to sites for user: " + user.getScreenName()); log.info("Mapping roles to sites for user: " + user.getScreenName());
Site gwSitesTree = null; Site gwSitesTree = null;
try { try {
gwSitesTree = mapper.map(rootVOGCubeGroup.getGroupName()); gwSitesTree = mapper.map(rootVOName);
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Sites tree is: " + (gwSitesTree != null ? gwSitesTree.dump() : "null")); log.debug("Sites tree is: " + (gwSitesTree != null ? gwSitesTree.dump() : "null"));
} }