Repository: syncope Updated Branches: refs/heads/2_0_X d87f829d6 -> 1c8432794
[SYNCOPE-1125] fixed password propagation on resource after update on enduser Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1c843279 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1c843279 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1c843279 Branch: refs/heads/2_0_X Commit: 1c8432794750401ed245cd2461e9e21dfc5705ad Parents: d87f829 Author: Andrea Patricelli <andreapatrice...@apache.org> Authored: Wed Jun 28 11:21:39 2017 +0200 Committer: Andrea Patricelli <andreapatrice...@apache.org> Committed: Wed Jun 28 11:21:39 2017 +0200 ---------------------------------------------------------------------- client/enduser/src/test/resources/customForm.json | 3 +++ .../main/java/org/apache/syncope/common/lib/AnyOperations.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/1c843279/client/enduser/src/test/resources/customForm.json ---------------------------------------------------------------------- diff --git a/client/enduser/src/test/resources/customForm.json b/client/enduser/src/test/resources/customForm.json index 0a8b4d3..3866474 100644 --- a/client/enduser/src/test/resources/customForm.json +++ b/client/enduser/src/test/resources/customForm.json @@ -14,6 +14,9 @@ "fullname": { "readonly": false }, + "userId": { + "readonly": false + }, "loginDate": { "readonly": false }, http://git-wip-us.apache.org/repos/asf/syncope/blob/1c843279/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java b/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java index 0008842..55ff54a 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java @@ -293,7 +293,9 @@ public final class AnyOperations { if (updated.getPassword() != null && (original.getPassword() == null || !original.getPassword().equals(updated.getPassword()))) { - result.setPassword(new PasswordPatch.Builder().value(updated.getPassword()).build()); + result.setPassword(new PasswordPatch.Builder() + .value(updated.getPassword()) + .resources(updated.getResources()).build()); } // 2. username
