This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 1a7229230e6e058cbc2152530491e8c98fc5f433 Author: DmitriyBrashevets <[email protected]> AuthorDate: Tue May 18 18:51:07 2021 +0300 [SYNCOPE-1634] Provision group during user/group owner update (#263) --- .../java/data/GroupDataBinderImpl.java | 43 ++++++++++++++++++---- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java index cdca128..1994d57 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java @@ -209,15 +209,42 @@ public class GroupDataBinderImpl extends AbstractAnyDataBinder implements GroupD } // owner + PropagationByResource<String> ownerPropByRes = new PropagationByResource<>(); if (groupUR.getUserOwner() != null) { - group.setUserOwner(groupUR.getUserOwner().getValue() == null - ? null - : userDAO.find(groupUR.getUserOwner().getValue())); + if (groupUR.getUserOwner().getValue() == null) { + if (group.getUserOwner() != null) { + group.setUserOwner(null); + ownerPropByRes.addAll(ResourceOperation.UPDATE, groupDAO.findAllResourceKeys(group.getKey())); + } + } else { + User userOwner = userDAO.find(groupUR.getUserOwner().getValue()); + if (userOwner == null) { + LOG.debug("Unable to find user owner for group {} by key {}", + group.getKey(), groupUR.getUserOwner().getValue()); + group.setUserOwner(null); + } else { + group.setUserOwner(userOwner); + ownerPropByRes.addAll(ResourceOperation.UPDATE, groupDAO.findAllResourceKeys(group.getKey())); + } + } } if (groupUR.getGroupOwner() != null) { - group.setGroupOwner(groupUR.getGroupOwner().getValue() == null - ? null - : groupDAO.find(groupUR.getGroupOwner().getValue())); + if (groupUR.getGroupOwner().getValue() == null) { + if (group.getGroupOwner() != null) { + group.setGroupOwner(null); + ownerPropByRes.addAll(ResourceOperation.UPDATE, groupDAO.findAllResourceKeys(group.getKey())); + } + } else { + Group groupOwner = groupDAO.find(groupUR.getGroupOwner().getValue()); + if (groupOwner == null) { + LOG.debug("Unable to find group owner for group {} by key {}", + group.getKey(), groupUR.getGroupOwner().getValue()); + group.setGroupOwner(null); + } else { + group.setGroupOwner(groupOwner); + ownerPropByRes.addAll(ResourceOperation.UPDATE, groupDAO.findAllResourceKeys(group.getKey())); + } + } } // attributes and resources @@ -299,8 +326,10 @@ public class GroupDataBinderImpl extends AbstractAnyDataBinder implements GroupD group = groupDAO.save(group); // Build final information for next stage (propagation) - return propByRes( + PropagationByResource<String> propByRes = propByRes( beforeOnResources, onResources(group, groupDAO.findAllResourceKeys(group.getKey()), null, false)); + propByRes.merge(ownerPropByRes); + return propByRes; } @Override
