Merge pull request #228 from rikwillems/pr/issue-182

Add module enabled check to plugin enabled
bitExpert · Oct 16, 2023 · e06f7a9 · e06f7a9
2 parents 4e2d8e9 + 143eaac
commit e06f7a9
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 5 deletions.
diff --git a/Plugin/AfterLoginPlugin.php b/Plugin/AfterLoginPlugin.php
@@ -11,6 +11,7 @@
 
 namespace BitExpert\ForceCustomerLogin\Plugin;
 
+use BitExpert\ForceCustomerLogin\Controller\ModuleCheck;
 use BitExpert\ForceCustomerLogin\Model\Session;
 use Magento\Customer\Controller\Account\LoginPost;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -37,14 +38,18 @@ class AfterLoginPlugin
      * @var Session
      */
     private $session;
-    /**
-     * @var string
-     */
-    private $defaultTargetUrl;
     /**
      * @var ScopeConfigInterface
      */
     private $scopeConfig;
+    /**
+     * @var ModuleCheck
+     */
+    private $moduleCheck;
+    /**
+     * @var string
+     */
+    private $defaultTargetUrl;
 
     /**
      * AfterLoginPlugin constructor.
@@ -56,10 +61,12 @@ class AfterLoginPlugin
     public function __construct(
         Session $session,
         ScopeConfigInterface $scopeConfig,
+        ModuleCheck $moduleCheck,
         $defaultTargetUrl
     ) {
         $this->session = $session;
         $this->scopeConfig = $scopeConfig;
+        $this->moduleCheck = $moduleCheck;
         $this->defaultTargetUrl = $defaultTargetUrl;
     }
 
@@ -72,6 +79,10 @@ public function __construct(
      */
     public function afterExecute(LoginPost $customerAccountLoginController, ResultInterface $resultRedirect)
     {
+        if ($this->moduleCheck->isModuleEnabled() === false) {
+            return $resultRedirect;
+        }
+
         if (self::REDIRECT_DASHBOARD_ENABLED ===
             $this->scopeConfig->getValue(self::REDIRECT_DASHBOARD_CONFIG)) {
             return $resultRedirect;

diff --git a/Test/Unit/Plugin/AfterLoginPluginUnitTest.php b/Test/Unit/Plugin/AfterLoginPluginUnitTest.php
@@ -11,6 +11,7 @@
 
 namespace BitExpert\ForceCustomerLogin\Test\Unit\Plugin;
 
+use BitExpert\ForceCustomerLogin\Controller\ModuleCheck;
 use BitExpert\ForceCustomerLogin\Model\Session;
 use BitExpert\ForceCustomerLogin\Plugin\AfterLoginPlugin;
 use Magento\Customer\Controller\Account\LoginPost;
@@ -41,9 +42,15 @@ public function runAfterExecuteWithRedirectDashboardOptionEnabled()
             ->with(AfterLoginPlugin::REDIRECT_DASHBOARD_CONFIG)
             ->willReturn(AfterLoginPlugin::REDIRECT_DASHBOARD_ENABLED);
 
+        $moduleCheck = $this->getModuleCheck();
+        $moduleCheck->expects($this->once())
+            ->method('isModuleEnabled')
+            ->willReturn(true);
+
         $plugin = new AfterLoginPlugin(
             $session,
             $scopeConfig,
+            $moduleCheck,
             'default-target-url'
         );
 
@@ -70,9 +77,15 @@ public function runAfterExecuteWithSpecificTargetUrl()
             ->with(AfterLoginPlugin::REDIRECT_DASHBOARD_CONFIG)
             ->willReturn(AfterLoginPlugin::REDIRECT_DASHBOARD_DISABLED);
 
+        $moduleCheck = $this->getModuleCheck();
+        $moduleCheck->expects($this->once())
+            ->method('isModuleEnabled')
+            ->willReturn(true);
+
         $plugin = new AfterLoginPlugin(
             $session,
             $scopeConfig,
+            $moduleCheck,
             'default-target-url'
         );
 
@@ -101,9 +114,15 @@ public function runAfterExecuteWithDefaultTargetUrl()
             ->with(AfterLoginPlugin::REDIRECT_DASHBOARD_CONFIG)
             ->willReturn(AfterLoginPlugin::REDIRECT_DASHBOARD_DISABLED);
 
+        $moduleCheck = $this->getModuleCheck();
+        $moduleCheck->expects($this->once())
+            ->method('isModuleEnabled')
+            ->willReturn(true);
+
         $plugin = new AfterLoginPlugin(
             $session,
             $scopeConfig,
+            $moduleCheck,
             'default-target-url'
         );
 
@@ -116,6 +135,39 @@ public function runAfterExecuteWithDefaultTargetUrl()
         $this->assertEquals($redirect, $plugin->afterExecute($loginPost, $redirect));
     }
 
+    /**
+     * @test
+     */
+    public function runAfterExecuteWithModuleDisabled()
+    {
+        $session = $this->getSession();
+        $session->expects($this->never())
+            ->method('getAfterLoginReferer');
+
+        $scopeConfig = $this->getScopeConfig();
+        $scopeConfig->expects($this->never())
+            ->method('getValue');
+
+        $moduleCheck = $this->getModuleCheck();
+        $moduleCheck->expects($this->once())
+            ->method('isModuleEnabled')
+            ->willReturn(false);
+
+        $plugin = new AfterLoginPlugin(
+            $session,
+            $scopeConfig,
+            $moduleCheck,
+            'default-target-url'
+        );
+
+        $loginPost = $this->getLoginPost();
+        $redirect = $this->getRedirect();
+        $redirect->expects($this->never())
+            ->method('setUrl');
+
+        $this->assertEquals($redirect, $plugin->afterExecute($loginPost, $redirect));
+    }
+
     /**
      * @return MockObject|Session
      */
@@ -139,6 +191,16 @@ private function getScopeConfig()
             ->getMock();
     }
 
+    /**
+     * @return MockObject|ModuleCheck
+     */
+    private function getModuleCheck()
+    {
+        return $this->getMockBuilder(ModuleCheck::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
     /**
      * @return MockObject|LoginPost
      */

diff --git a/phpstan.neon b/phpstan.neon
@@ -18,7 +18,7 @@ parameters:
         - Validator
         - view
     magento:
-            checkServiceContracts: false
+        checkServiceContracts: false
     ignoreErrors:
         -
             message: '~Parameter #1 \$modelId of method Magento\\Framework\\Model\\AbstractModel::load\(\) expects int, string given~'