Skip to content

Rename 2FA content blocks off the globally-unique 'content' name (#343) #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thai2301 wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Rename 2FA content blocks off the globally-unique 'content' name (#343) #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89409f9
343: rename 2FA provider content blocks off the globally-unique 'cont…
Jul 15, 2026
6dc8c20
343: normalize copyright headers flagged by the sanity check
Jul 15, 2026
7064cc8
343: use the canonical All Rights Reserved capitalization
Jul 15, 2026
1d8c1cd
Merge remote-tracking branch 'origin/develop' into 343-fix-content-bl…
Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_authy_auth.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\Authy\Auth" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\Authy\Auth" name="tfa-authy-auth-content"
template="Magento_TwoFactorAuth::tfa/provider/auth.phtml">

<arguments>
Expand Down
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_authy_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\Authy\Configure" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\Authy\Configure" name="tfa-authy-configure-content"
template="Magento_TwoFactorAuth::tfa/provider/configure.phtml">

<arguments>
Expand Down
6 changes: 3 additions & 3 deletions TwoFactorAuth/view/adminhtml/layout/tfa_authy_verifyidentity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!--
/**
* Copyright 2025 Adobe.
* All rights reserved.
* Copyright 2025 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\Authy\VerifyIdentity" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\Authy\VerifyIdentity" name="tfa-authy-verifyidentity-content"
template="Magento_TwoFactorAuth::tfa/provider/auth.phtml">
<arguments>
<argument name="jsLayout" xsi:type="array">
Expand Down
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_duo_auth.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\Duo\Auth" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\Duo\Auth" name="tfa-duo-auth-content"
template="Magento_TwoFactorAuth::tfa/provider/auth.phtml">

<arguments>
Expand Down
6 changes: 3 additions & 3 deletions TwoFactorAuth/view/adminhtml/layout/tfa_duo_verifyidentity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!--
/**
* Copyright 2025 Adobe.
* All rights reserved.
* Copyright 2025 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\Duo\Auth" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\Duo\Auth" name="tfa-duo-verifyidentity-content"
template="Magento_TwoFactorAuth::tfa/provider/auth.phtml">

<arguments>
Expand Down
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_google_auth.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\Google\Auth" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\Google\Auth" name="tfa-google-auth-content"
template="Magento_TwoFactorAuth::tfa/provider/auth.phtml">

<arguments>
Expand Down
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_google_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\Google\Configure" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\Google\Configure" name="tfa-google-configure-content"
template="Magento_TwoFactorAuth::tfa/provider/configure.phtml">

<arguments>
Expand Down
6 changes: 3 additions & 3 deletions TwoFactorAuth/view/adminhtml/layout/tfa_google_verifyidentity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!--
/**
* Copyright 2025 Adobe.
* All rights reserved.
* Copyright 2025 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\Google\VerifyIdentity" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\Google\VerifyIdentity" name="tfa-google-verifyidentity-content"
template="Magento_TwoFactorAuth::tfa/provider/auth.phtml">
<arguments>
<argument name="jsLayout" xsi:type="array">
Expand Down
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_tfa_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Configure" name="content"
<block class="Magento\TwoFactorAuth\Block\Configure" name="tfa-tfa-configure-content"
template="Magento_TwoFactorAuth::tfa/configure.phtml" />
</referenceContainer>
</body>
Expand Down
6 changes: 3 additions & 3 deletions TwoFactorAuth/view/adminhtml/layout/tfa_tfa_providerselection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!--
/**
* Copyright 2025 Adobe.
* All rights reserved.
* Copyright 2025 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block name="content" template="Magento_TwoFactorAuth::tfa/providerselection.phtml">
<block name="tfa-tfa-providerselection-content" template="Magento_TwoFactorAuth::tfa/providerselection.phtml">
<arguments>
<argument name="view_model" xsi:type="object">Magento\TwoFactorAuth\ViewModel\ProviderSelection</argument>
</arguments>
Expand Down
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_tfa_requestconfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\Backend\Block\Template" name="content"
<block class="Magento\Backend\Block\Template" name="tfa-tfa-requestconfig-content"
template="Magento_TwoFactorAuth::tfa/request_config.phtml" />
</referenceContainer>
</body>
Expand Down
6 changes: 3 additions & 3 deletions TwoFactorAuth/view/adminhtml/layout/tfa_tfa_verifyidentity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!--
/**
* Copyright 2025 Adobe.
* All rights reserved.
* Copyright 2025 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -12,7 +12,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\Backend\Block\Template" name="content"
<block class="Magento\Backend\Block\Template" name="tfa-tfa-verifyidentity-content"
template="Magento_TwoFactorAuth::tfa/verify_identity.phtml" />
</referenceContainer>
</body>
Expand Down
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_u2f_auth.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\U2fKey\Auth" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\U2fKey\Auth" name="tfa-u2f-auth-content"
template="Magento_TwoFactorAuth::tfa/provider/auth.phtml">

<arguments>
Expand Down
2 changes: 1 addition & 1 deletion TwoFactorAuth/view/adminhtml/layout/tfa_u2f_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\U2fKey\Configure" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\U2fKey\Configure" name="tfa-u2f-configure-content"
template="Magento_TwoFactorAuth::tfa/provider/configure.phtml">
<arguments>
<argument name="jsLayout" xsi:type="array">
Expand Down
6 changes: 3 additions & 3 deletions TwoFactorAuth/view/adminhtml/layout/tfa_u2f_verifyidentity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!--
/**
* Copyright 2025 Adobe.
* All rights reserved.
* Copyright 2025 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -17,7 +17,7 @@

<body>
<referenceContainer name="login.content">
<block class="Magento\TwoFactorAuth\Block\Provider\U2fKey\VerifyIdentity" name="content"
<block class="Magento\TwoFactorAuth\Block\Provider\U2fKey\VerifyIdentity" name="tfa-u2f-verifyidentity-content"
template="Magento_TwoFactorAuth::tfa/provider/auth.phtml">
<arguments>
<argument name="jsLayout" xsi:type="array">
Expand Down