Now root VO name string is used instead of group object
This commit is contained in:
parent
c9a7657fec
commit
00f049e4f9
|
@ -1,10 +1,14 @@
|
|||
package com.nubisware.oidc.lr62;
|
||||
package org.gcube.portal.oidc.lr62;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
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.RoleManager;
|
||||
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.PermissionThreadLocal;
|
||||
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 {
|
||||
|
||||
|
@ -40,7 +40,7 @@ public class UserSitesToGroupsAndRolesMapper {
|
|||
protected UserManager userManager;
|
||||
protected GroupManager groupManager;
|
||||
protected RoleManager roleManager;
|
||||
protected GCubeGroup rootVOGCubeGroup;
|
||||
protected String rootVOName;
|
||||
protected Map<GCubeGroup, List<GCubeRole>> actualGroupAndRoles;
|
||||
protected Map<String, GCubeRole> roleNameToRole;
|
||||
|
||||
|
@ -64,7 +64,7 @@ public class UserSitesToGroupsAndRolesMapper {
|
|||
groupManager = new LiferayGroupManager();
|
||||
roleManager = new LiferayRoleManager();
|
||||
try {
|
||||
this.rootVOGCubeGroup = groupManager.getRootVO();
|
||||
this.rootVOName = groupManager.getRootVOName();
|
||||
} catch (UserManagementSystemException | GroupRetrievalFault e) {
|
||||
log.error("Cannot get infrastructure's Root VO", e);
|
||||
return;
|
||||
|
@ -85,7 +85,7 @@ public class UserSitesToGroupsAndRolesMapper {
|
|||
log.info("Mapping roles to sites for user: " + user.getScreenName());
|
||||
Site gwSitesTree = null;
|
||||
try {
|
||||
gwSitesTree = mapper.map(rootVOGCubeGroup.getGroupName());
|
||||
gwSitesTree = mapper.map(rootVOName);
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Sites tree is: " + (gwSitesTree != null ? gwSitesTree.dump() : "null"));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue