From 9a32e8c0c4d70cfeb8a2b6ea298e67e8936fe77c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20V=C3=A4nttinen?= <sami.vanttinen@varjolintu.fi>
Date: Sat, 1 Nov 2025 15:27:44 +0200
Subject: [PATCH] Requery form if password input has changed (#2738)

Requery form if password input has changed
---
 keepassxc-browser/content/fill.js | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/keepassxc-browser/content/fill.js b/keepassxc-browser/content/fill.js
index 7378386..59e2c60 100644
--- a/keepassxc-browser/content/fill.js
+++ b/keepassxc-browser/content/fill.js
@@ -245,6 +245,17 @@ kpxcFill.fillInCredentials = async function(combination, predefinedUsername, uui
         skipAutoSubmit = selectedCredentials.skipAutoSubmit === 'true';
     }
 
+    // Update the password field if form has been updated with a new identical element (Moodle).
+    // If found, replace the new input field to the combination.
+    if (combination?.form && combination?.password && !combination.form.contains(combination.password)) {
+        const formInputs = kpxcObserverHelper.getInputs(combination.form);
+        const newPasswordField = formInputs?.find((formInput) =>
+            formInput?.getLowerCaseAttribute('type') === 'password');
+        if (newPasswordField && areNamedNodeMapsEqual(combination.password.attributes, newPasswordField.attributes)) {
+            combination.password = newPasswordField;
+        }
+    }
+
     // Fill password
     if (combination.password && matchesWithNodeName(combination.password, 'INPUT')) {
         // Show a notification if password length exceeds the length defined in input
@@ -427,3 +438,26 @@ const showErrorNotification = async function(errorMessage, notificationType = 'e
         kpxcUI.createNotification(notificationType, errorMessage);
     }
 };
+
+// Checks if two NamedNodeMaps (attribute lists) are equal
+const areNamedNodeMapsEqual = function(currentNodeMap, newNodeMap) {
+    if (!currentNodeMap || !newNodeMap) {
+        return false;
+    }
+
+    const fieldAttributes = Array.from(currentNodeMap);
+    const newFieldAttributes = Array.from(newNodeMap);
+
+    if (fieldAttributes.length !== newFieldAttributes.length) {
+        return false;
+    }
+
+    for (const attr of fieldAttributes) {
+        const newAttr = newFieldAttributes.find((newAttr) => newAttr?.name === attr?.name);
+        if (!newAttr || newAttr?.value !== attr?.value) {
+            return false;
+        }
+    }
+
+    return true;
+};