This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 3e1bfa6 [SYNCOPE-1634] Provision group during user/group owner update
(#263)
3e1bfa6 is described below
commit 3e1bfa6c4a337d6eb1789fbb9d0459b7f78a5255
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 | 48 ++++++++++++++++++----
1 file changed, 40 insertions(+), 8 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 e61ef8a..1771735 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
@@ -207,16 +207,43 @@ public class GroupDataBinderImpl extends
AbstractAnyDataBinder implements GroupD
group.setName(groupPatch.getName().getValue());
}
+ PropagationByResource<String> ownerPropByRes = new
PropagationByResource<>();
// owner
if (groupPatch.getUserOwner() != null) {
- group.setUserOwner(groupPatch.getUserOwner().getValue() == null
- ? null
- : userDAO.find(groupPatch.getUserOwner().getValue()));
+ if (groupPatch.getUserOwner().getValue() == null) {
+ if (group.getUserOwner() != null) {
+ group.setUserOwner(null);
+ ownerPropByRes.addAll(ResourceOperation.UPDATE,
groupDAO.findAllResourceKeys(group.getKey()));
+ }
+ } else {
+ User userOwner =
userDAO.find(groupPatch.getUserOwner().getValue());
+ if (userOwner == null) {
+ LOG.debug("Unable to find user owner for group {} by key
{}",
+ group.getKey(),
groupPatch.getUserOwner().getValue());
+ group.setUserOwner(null);
+ } else {
+ group.setUserOwner(userOwner);
+ ownerPropByRes.addAll(ResourceOperation.UPDATE,
groupDAO.findAllResourceKeys(group.getKey()));
+ }
+ }
}
if (groupPatch.getGroupOwner() != null) {
- group.setGroupOwner(groupPatch.getGroupOwner().getValue() == null
- ? null
- : groupDAO.find(groupPatch.getGroupOwner().getValue()));
+ if (groupPatch.getGroupOwner().getValue() == null) {
+ if (group.getGroupOwner() != null) {
+ group.setGroupOwner(null);
+ ownerPropByRes.addAll(ResourceOperation.UPDATE,
groupDAO.findAllResourceKeys(group.getKey()));
+ }
+ } else {
+ Group groupOwner =
groupDAO.find(groupPatch.getGroupOwner().getValue());
+ if (groupOwner == null) {
+ LOG.debug("Unable to find group owner for group {} by key
{}",
+ group.getKey(),
groupPatch.getGroupOwner().getValue());
+ group.setGroupOwner(null);
+ } else {
+ group.setGroupOwner(groupOwner);
+ ownerPropByRes.addAll(ResourceOperation.UPDATE,
groupDAO.findAllResourceKeys(group.getKey()));
+ }
+ }
}
// attributes and resources
@@ -298,8 +325,13 @@ public class GroupDataBinderImpl extends
AbstractAnyDataBinder implements GroupD
group = groupDAO.save(group);
// Build final information for next stage (propagation)
- return propByRes(
- beforeOnResources, onResources(group,
groupDAO.findAllResourceKeys(group.getKey()), null, false));
+ PropagationByResource<String> propByResource = propByRes(
+ beforeOnResources,
+ onResources(group,
groupDAO.findAllResourceKeys(group.getKey()), null, false)
+ );
+ propByResource.merge(ownerPropByRes);
+
+ return propByResource;
}
@Override