Merge pull request #12 from YouweGit/feature/revert-changes

revert changes use only controller dispatch event obsever

Author: kaplansin

Observer/TfaFrontendCheck.php

@@ -94,7 +94,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
         $this->logger->info('TfaFrontendCheck isLoggedIn true');
-        if (in_array($this->request->getFullActionName(), $this->getAllowedRoutes($customer))) {
+        if (in_array($observer->getEvent()->getRequest()->getFullActionName(), $this->getAllowedRoutes($customer))) {
             $this->logger->info('TfaFrontendCheck getAllowedRoutes true');
             return $this;
         }
@@ -108,20 +108,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             // Redirect to 2FA authentication page
             $redirectionUrl = $this->url->getUrl(self::FRONTEND_2_FA_ACCOUNT_AUTHENTICATE_PATH);
             $this->logger->info('TfaFrontendCheck is2faConfiguredForCustomer redirect',[$redirectionUrl]);
-            $this->redirect->setRedirect($redirectionUrl);
-
-            return;
+            $observer->getControllerAction()->getResponse()->setRedirect($redirectionUrl);
         } elseif ($this->isCustomerInForced2faGroup($customer)) {
             // Redirect to 2FA setup page
             $this->messageManager->addNoticeMessage(__('You need to set up Two Factor Authentication before continuing.'));
             $redirectionUrl = $this->url->getUrl(self::FRONTEND_2_FA_ACCOUNT_SETUP_PATH);
-            $this->redirect->setRedirect($redirectionUrl);
-
-            return;
+            $observer->getControllerAction()->getResponse()->setRedirect($redirectionUrl);
         }
 
-
-
         return $this;
     }
 

etc/frontend/events.xml

@@ -7,8 +7,4 @@
         <observer name="customer_2fa_check_logout"
                   instance="Elgentos\Frontend2FA\Observer\CustomerAuthObserver" />
     </event>
-    <event name="customer_login">
-        <observer name="customer_2fa_login"
-                  instance="Elgentos\Frontend2FA\Observer\TfaFrontendCheck" />
-    </event>
 </config>