fix: cancel conditional passkey before trying again (#4247)

ory · Dec 20, 2024 · d9f6f75 · d9f6f75
1 parent 0bce294
commit d9f6f75
Show file tree

Hide file tree

Showing 29 changed files with 50 additions and 36 deletions.
diff --git a/....snapshots/TestFormHydration-method=PopulateLoginMethodIdentifierFirstIdentification.json b/....snapshots/TestFormHydration-method=PopulateLoginMethodIdentifierFirstIdentification.json
@@ -20,7 +20,7 @@
       "type": "text",
       "value": "",
       "required": true,
-      "autocomplete": "username email",
+      "autocomplete": "username webauthn",
       "disabled": false,
       "node_type": "input"
     },

diff --git a/selfservice/strategy/idfirst/strategy_login.go b/selfservice/strategy/idfirst/strategy_login.go
@@ -136,7 +136,7 @@ func (s *Strategy) Login(w http.ResponseWriter, r *http.Request, f *login.Flow,
 		if !ok {
 			continue
 		}
-		attrs.Autocomplete = "username email"
+		attrs.Autocomplete = "username webauthn"
 
 		attrs.Type = node.InputAttributeTypeHidden
 		f.UI.Nodes[k].Attributes = attrs
@@ -186,7 +186,7 @@ func (s *Strategy) PopulateLoginMethodIdentifierFirstIdentification(r *http.Requ
 	}
 
 	f.UI.SetNode(node.NewInputField("identifier", "", s.NodeGroup(), node.InputAttributeTypeText, node.WithInputAttributes(func(a *node.InputAttributes) {
-		a.Autocomplete = "username email"
+		a.Autocomplete = "username webauthn"
 		a.Required = true
 	})).WithMetaLabel(identifierLabel))
 	f.UI.GetNodes().Append(node.NewInputField("method", s.ID(), s.NodeGroup(), node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoNodeLabelContinue()))

diff --git a/...gy/passkey/.snapshots/TestCompleteLogin-flow=passwordless-case=passkey_button_exists.json b/...gy/passkey/.snapshots/TestCompleteLogin-flow=passwordless-case=passkey_button_exists.json
@@ -38,7 +38,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...apshots/TestCompleteLogin-flow=refresh-case=refresh_passwordless_credentials-browser.json b/...apshots/TestCompleteLogin-flow=refresh-case=refresh_passwordless_credentials-browser.json
@@ -30,7 +30,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/.../.snapshots/TestCompleteLogin-flow=refresh-case=refresh_passwordless_credentials-spa.json b/.../.snapshots/TestCompleteLogin-flow=refresh-case=refresh_passwordless_credentials-spa.json
@@ -30,7 +30,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...passkey/.snapshots/TestCompleteSettings-case=a_device_is_shown_which_can_be_unlinked.json b/...passkey/.snapshots/TestCompleteSettings-case=a_device_is_shown_which_can_be_unlinked.json
@@ -110,7 +110,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...trategy/passkey/.snapshots/TestCompleteSettings-case=one_activation_element_is_shown.json b/...trategy/passkey/.snapshots/TestCompleteSettings-case=one_activation_element_is_shown.json
@@ -62,7 +62,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/.../strategy/passkey/.snapshots/TestFormHydration-method=PopulateLoginMethodFirstFactor.json b/.../strategy/passkey/.snapshots/TestFormHydration-method=PopulateLoginMethodFirstFactor.json
@@ -52,7 +52,7 @@
       "async": true,
       "referrerpolicy": "no-referrer",
       "crossorigin": "anonymous",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "type": "text/javascript",
       "id": "webauthn_script",
       "node_type": "script"

diff --git a/...gy/passkey/.snapshots/TestFormHydration-method=PopulateLoginMethodFirstFactorRefresh.json b/...gy/passkey/.snapshots/TestFormHydration-method=PopulateLoginMethodFirstFactorRefresh.json
@@ -18,7 +18,7 @@
       "async": true,
       "referrerpolicy": "no-referrer",
       "crossorigin": "anonymous",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "type": "text/javascript",
       "id": "webauthn_script",
       "node_type": "script"

diff --git a/....snapshots/TestFormHydration-method=PopulateLoginMethodIdentifierFirstIdentification.json b/....snapshots/TestFormHydration-method=PopulateLoginMethodIdentifierFirstIdentification.json
@@ -52,7 +52,7 @@
       "async": true,
       "referrerpolicy": "no-referrer",
       "crossorigin": "anonymous",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "type": "text/javascript",
       "id": "webauthn_script",
       "node_type": "script"

diff --git a/...vice/strategy/passkey/.snapshots/TestRegistration-case=passkey_button_exists-browser.json b/...vice/strategy/passkey/.snapshots/TestRegistration-case=passkey_button_exists-browser.json
@@ -43,7 +43,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/selfservice/strategy/passkey/.snapshots/TestRegistration-case=passkey_button_exists-spa.json b/selfservice/strategy/passkey/.snapshots/TestRegistration-case=passkey_button_exists-spa.json
@@ -43,7 +43,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...s/TestCompleteLogin-flow=mfa-case=webauthn_payload_is_set_when_identity_has_webauthn.json b/...s/TestCompleteLogin-flow=mfa-case=webauthn_payload_is_set_when_identity_has_webauthn.json
@@ -42,7 +42,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...teLogin-flow=passwordless-case=should_fail_if_webauthn_login_is_invalid-type=browser.json b/...teLogin-flow=passwordless-case=should_fail_if_webauthn_login_is_invalid-type=browser.json
@@ -37,7 +37,7 @@
           "async": true,
           "referrerpolicy": "no-referrer",
           "crossorigin": "anonymous",
-          "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+          "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
           "type": "text/javascript",
           "node_type": "script"
         },

diff --git a/...mpleteLogin-flow=passwordless-case=should_fail_if_webauthn_login_is_invalid-type=spa.json b/...mpleteLogin-flow=passwordless-case=should_fail_if_webauthn_login_is_invalid-type=spa.json
@@ -37,7 +37,7 @@
           "async": true,
           "referrerpolicy": "no-referrer",
           "crossorigin": "anonymous",
-          "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+          "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
           "type": "text/javascript",
           "node_type": "script"
         },

diff --git a/...refresh-case=passwordless-passwordless_enabled=false-case=mfa_v0_credentials-browser.json b/...refresh-case=passwordless-passwordless_enabled=false-case=mfa_v0_credentials-browser.json
@@ -43,7 +43,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...low=refresh-case=passwordless-passwordless_enabled=false-case=mfa_v0_credentials-spa.json b/...low=refresh-case=passwordless-passwordless_enabled=false-case=mfa_v0_credentials-spa.json
@@ -43,7 +43,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...refresh-case=passwordless-passwordless_enabled=false-case=mfa_v1_credentials-browser.json b/...refresh-case=passwordless-passwordless_enabled=false-case=mfa_v1_credentials-browser.json
@@ -43,7 +43,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...low=refresh-case=passwordless-passwordless_enabled=false-case=mfa_v1_credentials-spa.json b/...low=refresh-case=passwordless-passwordless_enabled=false-case=mfa_v1_credentials-spa.json
@@ -43,7 +43,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...sh-case=passwordless-passwordless_enabled=true-case=passwordless_credentials-browser.json b/...sh-case=passwordless-passwordless_enabled=true-case=passwordless_credentials-browser.json
@@ -43,7 +43,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...efresh-case=passwordless-passwordless_enabled=true-case=passwordless_credentials-spa.json b/...efresh-case=passwordless-passwordless_enabled=true-case=passwordless_credentials-spa.json
@@ -43,7 +43,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...ebauthn/.snapshots/TestCompleteSettings-case=a_device_is_shown_which_can_be_unlinked.json b/...ebauthn/.snapshots/TestCompleteSettings-case=a_device_is_shown_which_can_be_unlinked.json
@@ -116,7 +116,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...rategy/webauthn/.snapshots/TestCompleteSettings-case=one_activation_element_is_shown.json b/...rategy/webauthn/.snapshots/TestCompleteSettings-case=one_activation_element_is_shown.json
@@ -68,7 +68,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...tion-method=PopulateLoginMethodRefresh-case=mfa_enabled_and_user_has_mfa_credentials.json b/...tion-method=PopulateLoginMethodRefresh-case=mfa_enabled_and_user_has_mfa_credentials.json
@@ -31,7 +31,7 @@
       "async": true,
       "referrerpolicy": "no-referrer",
       "crossorigin": "anonymous",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "type": "text/javascript",
       "id": "webauthn_script",
       "node_type": "script"

diff --git a/...teLoginMethodRefresh-case=passwordless_enabled_and_user_has_passwordless_credentials.json b/...teLoginMethodRefresh-case=passwordless_enabled_and_user_has_passwordless_credentials.json
@@ -31,7 +31,7 @@
       "async": true,
       "referrerpolicy": "no-referrer",
       "crossorigin": "anonymous",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "type": "text/javascript",
       "id": "webauthn_script",
       "node_type": "script"

diff --git a/....snapshots/TestFormHydration-method=PopulateLoginMethodSecondFactor-case=mfa_enabled.json b/....snapshots/TestFormHydration-method=PopulateLoginMethodSecondFactor-case=mfa_enabled.json
@@ -31,7 +31,7 @@
       "async": true,
       "referrerpolicy": "no-referrer",
       "crossorigin": "anonymous",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "type": "text/javascript",
       "id": "webauthn_script",
       "node_type": "script"

diff --git a/...ce/strategy/webauthn/.snapshots/TestRegistration-case=webauthn_button_exists-browser.json b/...ce/strategy/webauthn/.snapshots/TestRegistration-case=webauthn_button_exists-browser.json
@@ -94,7 +94,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/...ervice/strategy/webauthn/.snapshots/TestRegistration-case=webauthn_button_exists-spa.json b/...ervice/strategy/webauthn/.snapshots/TestRegistration-case=webauthn_button_exists-spa.json
@@ -94,7 +94,7 @@
       "async": true,
       "crossorigin": "anonymous",
       "id": "webauthn_script",
-      "integrity": "sha512-3Z1fDRo1yulzEUWcPb/35UhuKYyNgM/z70Pnidfr1pQGtRZz2xaFinaEyIiolwRTx+0B43ATFQcMsyaDJxC0tA==",
+      "integrity": "sha512-GJndj+bkFBMHiun3qBMmFh5eeGodY/eSh8tg50xHcNEdOBCIKnlofYd2slaBTtVpyI4opfkMc/zw+nwBjGdAbw==",
       "node_type": "script",
       "referrerpolicy": "no-referrer",
       "type": "text/javascript"

diff --git a/x/webauthnx/js/webauthn.js b/x/webauthnx/js/webauthn.js
@@ -143,8 +143,8 @@
     const identifierEl = document.getElementsByName("identifier")[0]
 
     if (!dataEl || !resultEl || !identifierEl) {
-      console.debug(
-        "__oryPasskeyLoginAutocompleteInit: mandatory fields not found",
+      console.error(
+        "Unable to initialize WebAuthn / Passkey autocomplete because one or more required form fields are missing.",
       )
       return
     }
@@ -154,9 +154,10 @@
       !window.PublicKeyCredential.isConditionalMediationAvailable ||
       window.Cypress // Cypress auto-fills the autocomplete, which we don't want
     ) {
-      console.log("This browser does not support WebAuthn!")
+      console.log("This browser does not support Passkey / WebAuthn!")
       return
     }
+
     const isCMA = await PublicKeyCredential.isConditionalMediationAvailable()
     if (!isCMA) {
       console.log(
@@ -172,6 +173,14 @@
     }
     opt.publicKey.challenge = __oryWebAuthnBufferDecode(opt.publicKey.challenge)
 
+    // If this is set we already have a request ongoing which we need to abort.
+    if (window.abortPasskeyConditionalUI) {
+      window.abortPasskeyConditionalUI.abort(
+        "Canceling Passkey autocomplete to complete trigger-based passkey login.",
+      )
+      window.abortPasskeyConditionalUI = undefined
+    }
+
     // Allow aborting through a global variable
     window.abortPasskeyConditionalUI = new AbortController()
 
@@ -182,7 +191,6 @@
         signal: abortPasskeyConditionalUI.signal,
       })
       .then(function (credential) {
-        console.trace(credential)
         resultEl.value = JSON.stringify({
           id: credential.id,
           rawId: __oryWebAuthnBufferEncode(credential.rawId),
@@ -214,7 +222,9 @@
     const resultEl = document.getElementsByName("passkey_login")[0]
 
     if (!dataEl || !resultEl) {
-      console.debug("__oryPasskeyLogin: mandatory fields not found")
+      console.error(
+        "Unable to initialize WebAuthn / Passkey autocomplete because one or more required form fields are missing.",
+      )
       return
     }
     if (!window.PublicKeyCredential) {
@@ -239,10 +249,12 @@
       )
     }
 
-    window.abortPasskeyConditionalUI &&
+    if (window.abortPasskeyConditionalUI) {
       window.abortPasskeyConditionalUI.abort(
         "Canceling Passkey autocomplete to complete trigger-based passkey login.",
       )
+      window.abortPasskeyConditionalUI = undefined
+    }
 
     navigator.credentials
       .get({
@@ -279,7 +291,9 @@
         }
 
         console.trace(err)
-        window.abortPasskeyConditionalUI && __oryPasskeyLoginAutocompleteInit()
+
+        // Try re-initializing autocomplete
+        return __oryPasskeyLoginAutocompleteInit()
       })
   }