From 19595526cfbfe8a0a970a8a000c76e1a41012031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20V=C3=A4nttinen?= <sami.vanttinen@protonmail.com>
Date: Fri, 7 Oct 2022 07:46:00 +0300
Subject: [PATCH] Fix detecting submit button on Microsoft Login page (#1741)

Fix detecting submit button on Microsoft Login page
---
 keepassxc-browser/common/sites.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/keepassxc-browser/common/sites.js b/keepassxc-browser/common/sites.js
index 55635f0..f6c42f2 100644
--- a/keepassxc-browser/common/sites.js
+++ b/keepassxc-browser/common/sites.js
@@ -10,6 +10,7 @@ const PREDEFINED_SITELIST = [
     'https://login.live.com/*',
     'https://odc.officeapps.live.com/*',
     'https://login.microsoftonline.com/*',
+    'https://login.microsoftonline.us/*',
     'https://www.amazon.ae/ap/*',
     'https://www.amazon.ca/ap/*',
     'https://www.amazon.cn/ap/*',
@@ -193,6 +194,18 @@ kpxcSites.formSubmitButtonExceptionFound = function(form) {
         if (button) {
             return button;
         }
+    } else if (
+        [
+            'outlook.live.com',
+            'login.live.com',
+            'odc.officeapps.live.com',
+            'login.microsoftonline.com',
+            'login.microsoftonline.us',
+        ].some(u => form.action.includes(u))) {
+        const buttons = Array.from(form.querySelectorAll(kpxcForm.formButtonQuery));
+        if (buttons && buttons.length > 1) {
+            return buttons[1];
+        }
     }
 
     return undefined;