[MBO-1170] Check if container is set before calling method (#603)

* Check if container is set before calling method * Use simple SQL query to get MBO Api user
PrestaShopCorp · Jul 24, 2023 · 02165a0 · 02165a0
1 parent 760c668
commit 02165a0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/ps_mbo.php b/ps_mbo.php
@@ -366,7 +366,7 @@ public function getAdminAuthenticationProvider(): AdminAuthenticationProvider
             $this->container = SymfonyContainer::getInstance();
         }
 
-        return $this->container->has('mbo.security.admin_authentication.provider') ?
+        return null !== $this->container && $this->container->has('mbo.security.admin_authentication.provider') ?
             $this->get('mbo.security.admin_authentication.provider') :
             new AdminAuthenticationProvider(
                 $this->get('doctrine.dbal.default_connection'),

diff --git a/src/Traits/Hooks/UseActionObjectEmployeeUpdateBefore.php b/src/Traits/Hooks/UseActionObjectEmployeeUpdateBefore.php
@@ -21,6 +21,8 @@
 
 namespace PrestaShop\Module\Mbo\Traits\Hooks;
 
+use PrestaShop\Module\Mbo\Helpers\Config;
+
 trait UseActionObjectEmployeeUpdateBefore
 {
     /**
@@ -31,7 +33,7 @@ public function hookActionObjectEmployeeUpdateBefore($params): void
         if (empty($params) || empty($params['object']) || !$params['object'] instanceof \Employee) {
             return;
         }
-        $currentApiUser = $this->getAdminAuthenticationProvider()->getApiUser();
+        $currentApiUser = $this->getApiUser();
         if (!$currentApiUser) {
             return;
         }
@@ -44,4 +46,17 @@ public function hookActionObjectEmployeeUpdateBefore($params): void
             $params['object']->active = true;
         }
     }
+
+    private function getApiUser()
+    {
+        $apiUserId = \Db::getInstance()->getValue(
+            'SELECT `id_employee` FROM `' . _DB_PREFIX_ . 'employee` WHERE `email` = "' . pSQL(Config::getShopMboAdminMail()) . '" AND active = 1'
+        );
+
+        if (!$apiUserId) {
+            return null;
+        }
+
+        return new \Employee((int) $apiUserId);
+    }
 }