From 89409f9521ccc9111c6d95327b4a8e3bb56ef53c Mon Sep 17 00:00:00 2001 From: Daniel Vu Date: Thu, 16 Jul 2026 01:28:50 +0700 Subject: [PATCH 1/3] 343: rename 2FA provider content blocks off the globally-unique 'content' name Each of these adminhtml layout files declared its provider-specific content block as name="content". Magento block names are globally unique across the merged layout regardless of container nesting, and the admin layout already registers a block/container named "content" elsewhere. Whichever declaration is merged last wins the registry slot, so on any instance where the ordinary "content" block/container also participates in these handles, the 2FA provider's own block gets silently dropped and the configuration screen renders blank. Renamed each block to a handle-specific name (e.g. tfa-google-configure-content) that can't collide. No template or layout file referenced these blocks by their old name, so this is a pure rename with no other behavior change. --- TwoFactorAuth/view/adminhtml/layout/tfa_authy_auth.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_authy_configure.xml | 2 +- .../view/adminhtml/layout/tfa_authy_verifyidentity.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_duo_auth.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_google_auth.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_google_configure.xml | 2 +- .../view/adminhtml/layout/tfa_google_verifyidentity.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_tfa_configure.xml | 2 +- .../view/adminhtml/layout/tfa_tfa_providerselection.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_tfa_requestconfig.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_u2f_auth.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_u2f_configure.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_auth.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_auth.xml index 207bc585..8bb836ad 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_auth.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_auth.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_configure.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_configure.xml index ca1ba68a..53373b7e 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_configure.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_configure.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml index 827cfefe..2454d4f3 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_duo_auth.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_duo_auth.xml index 7aa94134..a832fa47 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_duo_auth.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_duo_auth.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml index 48af41e1..073907eb 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_google_auth.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_google_auth.xml index dbd087fb..8124f377 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_google_auth.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_google_auth.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_google_configure.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_google_configure.xml index 999f640e..892f4d86 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_google_configure.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_google_configure.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml index ba10370d..2a81bd49 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_configure.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_configure.xml index b4e4a97e..dd185176 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_configure.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_configure.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml index 1f7f100a..487573b5 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml @@ -17,7 +17,7 @@ - + Magento\TwoFactorAuth\ViewModel\ProviderSelection diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_requestconfig.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_requestconfig.xml index 82b07e11..206fe76e 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_requestconfig.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_requestconfig.xml @@ -12,7 +12,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml index ba3138a3..71b8ee5f 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml @@ -12,7 +12,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_auth.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_auth.xml index 99454163..9462722b 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_auth.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_auth.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_configure.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_configure.xml index 9c98664d..ba96e30c 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_configure.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_configure.xml @@ -17,7 +17,7 @@ - diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml index a6755fb7..8c29cef8 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml @@ -17,7 +17,7 @@ - From 6dc8c203a0dfc149740f70cd92bbcd8ce4e56873 Mon Sep 17 00:00:00 2001 From: Daniel Vu Date: Thu, 16 Jul 2026 03:15:39 +0700 Subject: [PATCH 2/3] 343: normalize copyright headers flagged by the sanity check Six of the touched layout files carried 'Copyright 2025 Adobe.' with a trailing period, which the public-copyright sanity check rejects on any modified file. Dropped the period to match the required template. --- .../view/adminhtml/layout/tfa_authy_verifyidentity.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml | 2 +- .../view/adminhtml/layout/tfa_google_verifyidentity.xml | 2 +- .../view/adminhtml/layout/tfa_tfa_providerselection.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml index 2454d4f3..0039639c 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml @@ -1,7 +1,7 @@ diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml index 073907eb..b2dd1f91 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml @@ -1,7 +1,7 @@ diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml index 2a81bd49..2c9fc76e 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml @@ -1,7 +1,7 @@ diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml index 487573b5..88199aaa 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml @@ -1,7 +1,7 @@ diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml index 71b8ee5f..5d4811f8 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml @@ -1,7 +1,7 @@ diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml index 8c29cef8..e7288c1a 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml @@ -1,7 +1,7 @@ From 7064cc83129c3af535bbf845b19c27f79ab71338 Mon Sep 17 00:00:00 2001 From: Daniel Vu Date: Thu, 16 Jul 2026 04:20:38 +0700 Subject: [PATCH 3/3] 343: use the canonical All Rights Reserved capitalization The copyright sanity check rejected the lowercase 'All rights reserved.' variant on the previous run despite the template describing the match as case-insensitive; align the six headers byte-for-byte with the canonical form used by every other file in the module. --- .../view/adminhtml/layout/tfa_authy_verifyidentity.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml | 2 +- .../view/adminhtml/layout/tfa_google_verifyidentity.xml | 2 +- .../view/adminhtml/layout/tfa_tfa_providerselection.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml | 2 +- TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml index 0039639c..b979730d 100644 --- a/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml +++ b/TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml @@ -2,7 +2,7 @@