From 874d91537bd1748b18027e72ebef4df0a893f5fe Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <themaxx76@gmail.com>
Date: Wed, 27 Jan 2021 18:47:46 +0100
Subject: [PATCH] An (I think) interesting log message added and one fixed
 using variable

---
 .../lr62/UserSitesToGroupsAndRolesMapper.java | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/gcube/portal/oidc/lr62/UserSitesToGroupsAndRolesMapper.java b/src/main/java/org/gcube/portal/oidc/lr62/UserSitesToGroupsAndRolesMapper.java
index 857843f..1f6625c 100644
--- a/src/main/java/org/gcube/portal/oidc/lr62/UserSitesToGroupsAndRolesMapper.java
+++ b/src/main/java/org/gcube/portal/oidc/lr62/UserSitesToGroupsAndRolesMapper.java
@@ -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);