Merge pull request #18 from YouweGit/feature/change-route

change routes
YouweGit · Jan 2, 2024 · b212385 · b212385
2 parents 58894a0 + 73eaea0
commit b212385
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/Api/TfaCheckInterface.php b/Api/TfaCheckInterface.php
@@ -9,11 +9,11 @@
 interface TfaCheckInterface
 {
 
-    const FRONTEND_2_FA_ACCOUNT_SETUP_ROUTE = 'customer_account_setup';
-    const FRONTEND_2_FA_ACCOUNT_AUTHENTICATE_ROUTE = 'customer_account_authenticate';
+    const FRONTEND_2_FA_ACCOUNT_SETUP_ROUTE = 'customer_account_setuptfa';
+    const FRONTEND_2_FA_ACCOUNT_AUTHENTICATE_ROUTE = 'customer_account_authenticatetfa';
     const CUSTOMER_ACCOUNT_LOGOUT_ROUTE = 'customer_account_logout';
-    const FRONTEND_2_FA_ACCOUNT_SETUP_PATH = 'customer/account/setup';
-    const FRONTEND_2_FA_ACCOUNT_AUTHENTICATE_PATH = 'customer/account/authenticate';
+    const FRONTEND_2_FA_ACCOUNT_SETUP_PATH = 'customer/account/setuptfa';
+    const FRONTEND_2_FA_ACCOUNT_AUTHENTICATE_PATH = 'customer/account/authenticatetfa';
 
     public function isCustomerInForced2faGroup(\Magento\Customer\Model\Customer $customer): bool;
 

diff --git a/Controller/Account/Authenticate.php → Controller/Account/AuthenticateTfa.php b/Controller/Account/Authenticate.php → Controller/Account/AuthenticateTfa.php
@@ -14,7 +14,7 @@
 use Magento\Framework\Url\DecoderInterface;
 use Psr\Log\LoggerInterface;
 
-class Authenticate extends \Magento\Framework\App\Action\Action
+class AuthenticateTfa extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Neyamtux\Authenticator\Lib\PHPGangsta\GoogleAuthenticator

diff --git a/Controller/Account/Setup.php → Controller/Account/SetupTfa.php b/Controller/Account/Setup.php → Controller/Account/SetupTfa.php
@@ -14,7 +14,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\View\LayoutFactory;
 
-class Setup extends \Magento\Framework\App\Action\Action
+class SetupTfa extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Customer\Model\Session
@@ -85,7 +85,7 @@ public function execute()
                 $this->messageManager->addErrorMessage(
                     __('Invalid 2FA Authentication Code')
                 );
-                $this->_redirect('frontend2fa/account/setup');
+                $this->_redirect('customer/account/setuptfa');
             }
 
             return;

diff --git a/view/frontend/layout/customer_account.xml b/view/frontend/layout/customer_account.xml
@@ -4,11 +4,11 @@
         <referenceBlock name="customer_account_navigation">
             <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-2fa-frontend">
                 <arguments>
-                    <argument name="path" xsi:type="string">frontend2fa/account/setup</argument>
+                    <argument name="path" xsi:type="string">customer/account/setuptfa</argument>
                     <argument name="label" xsi:type="string" translate="true">Two-Factor Authentication</argument>
                     <argument name="sortOrder" xsi:type="number">40</argument>
                 </arguments>
             </block>
         </referenceBlock>
     </body>
-</page>
+</page>
diff --git a/.../layout/customer_account_authenticate.xml → ...yout/customer_account_authenticatetfa.xml b/.../layout/customer_account_authenticate.xml → ...yout/customer_account_authenticatetfa.xml
@@ -3,7 +3,7 @@
     <update handle="customer_account"/>
     <body>
         <referenceContainer name="content">
-            <block template="Elgentos_Frontend2FA::authenticate.phtml" class="Elgentos\Frontend2FA\Block\Authenticator" name="authenticate" cacheable="false" />
+            <block template="Elgentos_Frontend2FA::authenticatetfa.phtml" class="Elgentos\Frontend2FA\Block\Authenticator" name="authenticate" cacheable="false" />
         </referenceContainer>
         <referenceBlock name="root">
             <action method="setHeaderTitle">

diff --git a/...rontend/layout/customer_account_setup.xml → ...tend/layout/customer_account_setuptfa.xml b/...rontend/layout/customer_account_setup.xml → ...tend/layout/customer_account_setuptfa.xml
@@ -3,7 +3,7 @@
     <update handle="customer_account"/>
     <body>
         <referenceContainer name="content">
-            <block template="Elgentos_Frontend2FA::setup.phtml" class="Elgentos\Frontend2FA\Block\Authenticator" name="setup" cacheable="false" />
+            <block template="Elgentos_Frontend2FA::setuptfa.phtml" class="Elgentos\Frontend2FA\Block\Authenticator" name="setup" cacheable="false" />
         </referenceContainer>
         <referenceBlock name="root">
             <action method="setHeaderTitle">

diff --git a/view/frontend/templates/authenticate.phtml → .../frontend/templates/authenticatetfa.phtml b/view/frontend/templates/authenticate.phtml → .../frontend/templates/authenticatetfa.phtml
diff --git a/view/frontend/templates/setup.phtml → view/frontend/templates/setuptfa.phtml b/view/frontend/templates/setup.phtml → view/frontend/templates/setuptfa.phtml