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

An (I think) interesting log message added and one fixed using variable

This commit is contained in:
Mauro Mugnaini 2021-01-27 18:47:46 +01:00
parent 14fbdd6fcf
commit 874d91537b
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ public class UserSitesToGroupsAndRolesMapper {
} catch (UserManagementSystemException | UserRetrievalFault | GroupRetrievalFault
| RoleRetrievalFault e) {
log.error("Can't remove user role '" + gcRoleName + "' from: " + actualSite.getName(), e);
log.error("Can't remove user role '" + gcRoleName + "' from: " + actualSiteName, e);
continue;
}
} else {
@ -237,18 +237,21 @@ public class UserSitesToGroupsAndRolesMapper {
for (Long actualGroupId : actualGroupAndRoles.keySet()) {
try {
String actualGroupName = groupManager.getGroup(actualGroupId).getGroupName();
if (groupManager.isVRE(actualGroupId) && !vreNames.contains(actualGroupName)) {
log.info("Removing user from VRE: " + actualGroupName);
try {
userManager.dismissUserFromGroup(actualGroupId, user.getUserId());
} catch (UserRetrievalFault e) {
log.error("Removing user from VRE: " + actualGroupName, e);
if (groupManager.isVRE(actualGroupId)) {
if (!vreNames.contains(actualGroupName)) {
log.info("Removing user from VRE: " + actualGroupName);
try {
userManager.dismissUserFromGroup(actualGroupId, user.getUserId());
} catch (UserRetrievalFault e) {
log.error("Removing user from VRE: " + actualGroupName, e);
}
} else {
if (log.isDebugEnabled()) {
log.debug("User still belong to VRE: " + actualGroupName);
}
}
} else {
if (log.isDebugEnabled()) {
log.debug("User still belong to VRE: " + actualGroupName);
}
log.debug("Do not check membership for non VRE: " + actualGroupName);
}
} catch (UserManagementSystemException | GroupRetrievalFault e) {
log.error("Checking if site group is a VRE", e);