resolved conflict

Author: priyambad

app/code/Meta/BusinessExtension/Setup/InstallData.php

@@ -44,6 +44,8 @@ class ProductFeedUpload extends AbstractAjax
     private $systemConfig;
 
     /**
+     * Construct
+     *
      * @param Context $context
      * @param JsonFactory $resultJsonFactory
      * @param FBEHelper $fbeHelper
@@ -64,6 +66,8 @@ public function __construct(
     }
 
     /**
+     * Execute for json
+     *
      * @return array
      * @throws NoSuchEntityException
      */
@@ -82,9 +86,11 @@ public function executeForJson()
             $storeName = $this->systemConfig->getStoreManager()->getStore($storeId)->getName();
         }
 
-        if (!$this->systemConfig->getAccessToken()) {
+        if (!$this->systemConfig->getAccessToken($storeId)) {
             $response['success'] = false;
-            $response['message'] = __(sprintf('Before uploading products, set up the extension for \'%s\'.', $storeName));
+            $response['message'] = __(
+                sprintf('Before uploading products, set up the extension for \'%s\'.', $storeName)
+            );
             return $response;
         }
 

app/code/Meta/BusinessExtension/Setup/InstallSchema.php

@@ -29,6 +29,7 @@
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Escaper;
+use Magento\Framework\Filter\StripTagsFactory;
 use Magento\Customer\Model\GroupManagement;
 
 class Builder
@@ -114,6 +115,11 @@ class Builder
      */
     private $escaper;
 
+    /**
+     * @var StripTagsFactory
+     */
+    private $stripTags;
+
     /**
      * Constructor
      *
@@ -125,6 +131,7 @@ class Builder
      * @param CatalogHelper $catalogHelper
      * @param InventoryInterface $inventory
      * @param Escaper $escaper
+     * @param StripTagsFactory $stripTags
      */
     public function __construct(
         FBEHelper                 $fbeHelper,
@@ -134,9 +141,9 @@ public function __construct(
         ProductIdentifier         $productIdentifier,
         CatalogHelper             $catalogHelper,
         InventoryInterface        $inventory,
-        Escaper                   $escaper
-    )
-    {
+        Escaper                   $escaper,
+        StripTagsFactory          $stripTags
+    ) {
         $this->fbeHelper = $fbeHelper;
         $this->systemConfig = $systemConfig;
         $this->categoryCollectionFactory = $categoryCollectionFactory;
@@ -145,6 +152,7 @@ public function __construct(
         $this->catalogHelper = $catalogHelper;
         $this->inventory = $inventory;
         $this->escaper = $escaper;
+        $this->stripTags = $stripTags;
     }
 
     /**
@@ -402,8 +410,12 @@ private function getRichDescription(Product $product)
         if (!$description) {
             $description = $product->getShortDescription();
         }
+        if (!$description) {
+            return '';
+        }
+        $stripTags = $this->stripTags->create([$this->escaper, self::ALLOWED_TAGS_FOR_RICH_TEXT_DESCRIPTION]);
         return $this->trimAttribute(self::ATTR_RICH_DESCRIPTION,
-            strip_tags($description, self::ALLOWED_TAGS_FOR_RICH_TEXT_DESCRIPTION));
+        $stripTags->filter($description));
     }
 
     /**