Merge pull request #820 from algolia/update-b2b-permissions

Update B2B permissions condition

Author: bsuravech

Factory/CatalogPermissionsFactory.php

@@ -8,8 +8,6 @@
 
 class CatalogPermissionsFactory
 {
-    const CATALOG_PERMISSIONS_ENABLED_CONFIG_PATH = 'catalog/magento_catalogpermissions/enabled';
-
     private $scopeConfig;
     private $moduleManager;
     private $objectManager;
@@ -29,13 +27,8 @@ public function __construct(
 
     public function isCatalogPermissionsEnabled($storeId)
     {
-        $isEnabled = $this->scopeConfig->isSetFlag(
-            self::CATALOG_PERMISSIONS_ENABLED_CONFIG_PATH,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $storeId
-        );
-
-        return $isEnabled && $this->isCatalogPermissionsModuleEnabled();
+        return $this->isCatalogPermissionsModuleEnabled()
+            && $this->getCatalogPermissionsConfig()->isEnabled($storeId);
     }
 
     private function isCatalogPermissionsModuleEnabled()
@@ -53,6 +46,11 @@ public function getCatalogPermissionsHelper()
         return $this->objectManager->create('\Magento\CatalogPermissions\Helper\Data');
     }
 
+    public function getCatalogPermissionsConfig()
+    {
+        return $this->objectManager->create('\Magento\CatalogPermissions\App\Config');
+    }
+
     public function getCategoryPermissionsCollection()
     {
         if (!$this->categoryPermissionsCollection) {

Factory/SharedCatalogFactory.php

@@ -8,8 +8,6 @@
 
 class SharedCatalogFactory
 {
-    const SHARED_CATALOG_ENABLED_CONFIG_PATH = 'btob/website_configuration/sharedcatalog_active';
-
     private $scopeConfig;
     private $moduleManager;
     private $objectManager;
@@ -29,13 +27,11 @@ public function __construct(
 
     public function isSharedCatalogEnabled($storeId)
     {
-        $isEnabled = $this->scopeConfig->isSetFlag(
-            self::SHARED_CATALOG_ENABLED_CONFIG_PATH,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $storeId
-        );
-
-        return $isEnabled && $this->isSharedCatalogModuleEnabled();
+        return $this->isSharedCatalogModuleEnabled()
+            && $this->getSharedCatalogConfig()->isActive(
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeId
+            );
     }
 
     private function isSharedCatalogModuleEnabled()
@@ -58,6 +54,11 @@ public function getSharedCatalogResource()
         return $this->objectManager->create('\Magento\SharedCatalog\Model\ResourceModel\SharedCatalog');
     }
 
+    public function getSharedCatalogConfig()
+    {
+        return $this->objectManager->create('\Magento\SharedCatalog\Model\Config');
+    }
+
     public function getSharedCategoryCollection()
     {
         if (!$this->sharedCategoryCollection) {

Model/Observer/CatalogPermissions/ApplyProductPermissionsFilter.php

@@ -3,27 +3,44 @@
 namespace Algolia\AlgoliaSearch\Model\Observer\CatalogPermissions;
 
 use Algolia\AlgoliaSearch\Factory\CatalogPermissionsFactory;
+use Algolia\AlgoliaSearch\Factory\SharedCatalogFactory;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\StoreManager;
 
 class ApplyProductPermissionsFilter implements ObserverInterface
 {
+    /** @var CatalogPermissionsFactory */
     private $permissionsFactory;
+
+    /** @var SharedCatalogFactory */
+    private $sharedCatalogFactory;
+
+    /** @var StoreManager */
     private $storeManager;
 
+    /**
+     * @param CatalogPermissionsFactory $permissionsFactory
+     * @param SharedCatalogFactory $sharedCatalogFactory
+     * @param StoreManager $storeManager
+     */
     public function __construct(
         CatalogPermissionsFactory $permissionsFactory,
+        SharedCatalogFactory $sharedCatalogFactory,
         StoreManager $storeManager
     ) {
         $this->permissionsFactory = $permissionsFactory;
+        $this->sharedCatalogFactory = $sharedCatalogFactory;
         $this->storeManager = $storeManager;
     }
 
     public function execute(Observer $observer)
     {
         $storeId = $this->storeManager->getStore()->getId();
-        if (!$this->permissionsFactory->isCatalogPermissionsEnabled($storeId)) {
+        if (!$this->permissionsFactory->isCatalogPermissionsEnabled($storeId)
+            || ($this->permissionsFactory->getCatalogPermissionsHelper()->isAllowedCategoryView($storeId)
+                && !$this->sharedCatalogFactory->isSharedCatalogEnabled($storeId))
+        ) {
             return $this;
         }
 

Model/Observer/CatalogPermissions/CategoryCollectionAddPermissions.php

@@ -54,7 +54,11 @@ protected function addCatalogPermissionsData($collection, $categoryIds)
         foreach ($permissionsCollection as $categoryId => $permissions) {
             $permissions = explode(',', $permissions);
             foreach ($permissions as $permission) {
-                list($customerGroupId, $level) = explode('_', $permission);
+                $permission = explode('_', $permission);
+                if (count($permission) < 2) { // prevent undefined
+                    continue;
+                }
+                list($customerGroupId, $level) = $permission;
                 if ($category = $collection->getItemById($categoryId)) {
                     $category->setData('customer_group_permission_' . $customerGroupId, (($level == -2 || $level != -1
                         && !$catalogPermissionsHelper->isAllowedCategoryView()) ? 0 : 1));
@@ -79,7 +83,11 @@ protected function addSharedCatalogData($collection, $categoryIds, $storeId)
         foreach ($sharedCollection as $categoryId => $permissions) {
             $permissions = explode(',', $permissions);
             foreach ($permissions as $permission) {
-                list($customerGroupId, $level) = explode('_', $permission);
+                $permission = explode('_', $permission);
+                if (count($permission) < 2) { // prevent undefined
+                    continue;
+                }
+                list($customerGroupId, $level) = $permission;
                 if ($category = $collection->getItemById($categoryId)) {
                     $category->setData('shared_catalog_permission_' . $customerGroupId, $level == -1 ? 1 : 0);
                 }

Model/Observer/CatalogPermissions/ProductCollectionAddPermissions.php

@@ -63,7 +63,11 @@ protected function addProductPermissionsData($additionalData, $productIds, $stor
         foreach ($permissionsCollection as $productId => $permissions) {
             $permissions = explode(',', $permissions);
             foreach ($permissions as $permission) {
-                list($permissionStoreId, $customerGroupId, $level) = explode('_', $permission);
+                $permission = explode('_', $permission);
+                if (count($permission) < 3) { // prevent undefined
+                    continue;
+                }
+                list($permissionStoreId, $customerGroupId, $level) = $permission;
                 if ($permissionStoreId == $storeId) {
                     $additionalData->addProductData($productId, [
                         'customer_group_permission_' . $customerGroupId => (($level == -2 || $level != -1
@@ -89,7 +93,11 @@ protected function addSharedCatalogData($additionalData, $productIds)
         foreach ($sharedCollection as $productId => $permissions) {
             $permissions = explode(',', $permissions);
             foreach ($permissions as $permission) {
-                list($customerGroupId, $level) = explode('_', $permission);
+                $permission = explode('_', $permission);
+                if (count($permission) < 2) { // prevent undefined
+                    continue;
+                }
+                list($customerGroupId, $level) = $permission;
                 $additionalData->addProductData($productId, [
                     'shared_catalog_permission_' . $customerGroupId => $level,
                 ]);