From df3f91e84fdf5d28fe14cb569da9898c15f0255a Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Wed, 24 Mar 2021 08:33:58 +0200
Subject: [PATCH] Ignore Auto-Submit option for Site Preferences

---
 .eslintrc                                      | 1 +
 keepassxc-browser/_locales/en/messages.json    | 4 ++++
 keepassxc-browser/common/global.js             | 1 +
 keepassxc-browser/content/keepassxc-browser.js | 3 ++-
 keepassxc-browser/options/options.html         | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index ff25a2e..fed308d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -85,6 +85,7 @@
         "Icon": true,
         "isEdge": true,
         "isFirefox": true,
+        "IGNORE_AUTOSUBMIT": true,
         "IGNORE_FULL": true,
         "IGNORE_NORMAL": true,
         "IGNORE_NOTHING": true,
diff --git a/keepassxc-browser/_locales/en/messages.json b/keepassxc-browser/_locales/en/messages.json
index a461934..9c88dc6 100644
--- a/keepassxc-browser/_locales/en/messages.json
+++ b/keepassxc-browser/_locales/en/messages.json
@@ -895,6 +895,10 @@
         "message": "Disable new/modified credentials",
         "description": "Site preferences option selection."
     },
+    "optionsSelectionAutoSubmit": {
+        "message": "Disable Auto-Submit",
+        "description": "Site preferences option selection."
+    },
     "optionsSelectionFull": {
         "message": "Disable all features",
         "description": "Site preferences option selection."
diff --git a/keepassxc-browser/common/global.js b/keepassxc-browser/common/global.js
index 1044efd..bb7f7d7 100755
--- a/keepassxc-browser/common/global.js
+++ b/keepassxc-browser/common/global.js
@@ -2,6 +2,7 @@
 
 const IGNORE_NOTHING = 'ignoreNothing';
 const IGNORE_NORMAL = 'ignoreNormal';
+const IGNORE_AUTOSUBMIT = 'ignoreAutoSubmit';
 const IGNORE_FULL = 'ignoreFull';
 
 const schemeSegment = '(\\*|http|https|ws|wss|file|ftp)';
diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index 652ad60..ce56235 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -1029,7 +1029,8 @@ kpxc.fillInCredentials = async function(combination, predefinedUsername, uuid, p
     await sendMessage('page_set_manual_fill', ManualFill.NONE);
 
     // Auto-submit
-    if (kpxc.settings.autoSubmit && !skipAutoSubmit) {
+    const autoSubmitIgnoredForSite = await kpxc.siteIgnored(IGNORE_AUTOSUBMIT);
+    if (kpxc.settings.autoSubmit && !skipAutoSubmit && !autoSubmitIgnoredForSite) {
         const submitButton = kpxcForm.getFormSubmitButton(combination.form);
         if (submitButton !== undefined) {
             submitButton.click();
diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index e59e1ce..e0a7659 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -518,6 +518,7 @@
                             <select class="form-control form-control-sm" name="ignore" data-i18n="[title]optionsSitePreferencesSelect">
                               <option value="ignoreNothing" data-i18n="optionsSelectionNothing"></option>
                               <option value="ignoreNormal" data-i18n="optionsSelectionNormal"></option>
+                              <option value="ignoreAutoSubmit" data-i18n="optionsSelectionAutoSubmit"></option>
                               <option value="ignoreFull" data-i18n="optionsSelectionFull"></option>
                             </select>
                           </td>