fix for 9571 self service possword change ignore scripting in credent…

…ial/password
Evolveum · Apr 18, 2024 · 65e1267 · 65e1267
1 parent f99e984
commit 65e1267
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/page/self/credentials/PropagatePasswordPanel.java b/...ain/java/com/evolveum/midpoint/gui/impl/page/self/credentials/PropagatePasswordPanel.java
@@ -567,9 +567,11 @@ private List<StringLimitationResult> getLimitationsForActualPassword(ValuePolicy
     }
 
     protected void collectDeltas(Collection<ObjectDelta<? extends ObjectType>> deltas, ProtectedStringType currentPassword, ItemPath valuePath) {
-        List<PasswordAccountDto> selectedAccounts = Lists.newArrayList(provider.internalIterator(0, provider.size()));
-        selectedAccounts.removeIf(account -> !account.isSelected());
-        selectedAccounts.removeIf(account -> !isPasswordPropagationEnabled(account));
+        if (isMidpointAccountSelected()) {
+            //let's use the unified code of changing password for current user
+            super.collectDeltas(deltas, currentPassword, valuePath);
+        }
+        List<PasswordAccountDto> selectedAccounts = getAccountsListToChangePassword();
 
         SchemaRegistry registry = getPrismContext().getSchemaRegistry();
         selectedAccounts.forEach(account -> {
@@ -685,4 +687,16 @@ protected void updateNewPasswordValuePerformed(AjaxRequestTarget target) {
     protected boolean removePasswordValueAttribute() {
         return false;
     }
+
+    private List<PasswordAccountDto> getAccountsListToChangePassword() {
+        List<PasswordAccountDto> result = Lists.newArrayList(provider.internalIterator(0, provider.size()));
+        result.removeIf(account -> !account.isSelected());
+        result.removeIf(account -> !isPasswordPropagationEnabled(account));
+        result.removeIf(PasswordAccountDto::isMidpoint);    //midpoint account is handled in super class
+        if (isMidpointAccountSelected()) {
+            //fix for 9571: outbound mapping was already processed during midpoint account change execution
+            result.removeIf(PasswordAccountDto::isPasswordOutbound);
+        }
+        return result;
+    }
 }