Merge branch 'main' into ADO-313-capi-changes

Author: priyambad

app/code/Meta/BusinessExtension/Block/Adminhtml/Setup.php

@@ -174,16 +174,6 @@ public function getAccessTokenAjaxRoute()
         return $this->fbeHelper->getUrl('fbeadmin/ajax/fbtoken');
     }
 
-    /**
-     * Get profiles ajax route
-     *
-     * @return mixed
-     */
-    public function getProfilesAjaxRoute()
-    {
-        return $this->fbeHelper->getUrl('fbeadmin/ajax/fbprofiles');
-    }
-
     /**
      * Get aam settings route
      *

app/code/Meta/BusinessExtension/Block/Adminhtml/System/Config/DeleteConnection.php

@@ -120,7 +120,7 @@ public function getButtonHtml()
      *
      * @return mixed
      */
-    protected function getStoreId()
+    public function getStoreId()
     {
         $storeId = $this->getRequest()->getParam('store');
         if ($storeId === null && $this->systemConfig->isSingleStoreMode()) {

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/Fbdeleteasset.php

@@ -172,7 +172,6 @@ private function deleteConfigKeys($storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_COMMERCE_ACCOUNT_ID, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_ID, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_AAM_SETTINGS, $storeId)
-            ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PROFILES, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_CATALOG_ID, $storeId)
             ->deleteConfig(
                 SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_COMMERCE_PARTNER_INTEGRATION_ID,

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/Fbprofiles.php

@@ -29,17 +29,17 @@ class Index extends Action
     /**
      * @var KeyGenerator
      */
-    protected $apiKeyGenerator;
+    public $apiKeyGenerator;
 
     /**
      * @var WriterInterface
      */
-    protected $configWriter;
+    public $configWriter;
 
     /**
      * @var LoggerInterface
      */
-    protected $logger;
+    public $logger;
 
     /**
      * Index constructor

app/code/Meta/BusinessExtension/Controller/Adminhtml/ApiKey/Index.php

@@ -55,7 +55,7 @@ class GraphAPIAdapter
     /**
      * @var string
      */
-    private $graphAPIVersion = 'v20.0';
+    private $graphAPIVersion = 'v22.0';
 
     /**
      * @var Client

app/code/Meta/BusinessExtension/Helper/GraphAPIAdapter.php

@@ -29,7 +29,7 @@ class CoreConfigFactory
      *
      * @var ObjectManagerInterface
      */
-    protected ObjectManagerInterface $objectManager;
+    public ObjectManagerInterface $objectManager;
 
     /**
      * @param ObjectManagerInterface $objectManager

app/code/Meta/BusinessExtension/Model/Api/CoreConfigFactory.php

@@ -33,22 +33,22 @@ class ApiKeyService
     /**
      * @var KeyGenerator
      */
-    protected $apiKeyGenerator;
+    public $apiKeyGenerator;
 
     /**
      * @var WriterInterface
      */
-    protected $configWriter;
+    public $configWriter;
 
     /**
      * @var ScopeConfigInterface
      */
-    protected $scopeConfig;
+    public $scopeConfig;
 
     /**
      * @var LoggerInterface
      */
-    protected $logger;
+    public $logger;
 
     /**
      * @param KeyGenerator         $apiKeyGenerator

app/code/Meta/BusinessExtension/Model/Api/CustomApiKey/ApiKeyService.php

@@ -31,7 +31,7 @@ class Authenticator
     /**
      * @var ScopeConfigInterface
      */
-    protected $scopeConfig;
+    public $scopeConfig;
 
     /**
      * @var Http

app/code/Meta/BusinessExtension/Model/Api/CustomApiKey/Authenticator.php

@@ -134,7 +134,7 @@ public function save($response, $storeId)
         $data = $response[0];
         $catalogId = $data['catalog_id'] ?? '';
         $pixelId = $data['pixel_id'] ?? '';
-        $onsite_eligible = $data['onsite_eligible'] ?? false;
+        $onsite_eligible = filter_var($data['onsite_eligible'], FILTER_VALIDATE_BOOLEAN) ?? false;
         $commercePartnerIntegrationId = $data['commerce_partner_integration_id'] ?? '';
 
         // we will update catalog config if catalog has been updated in Meta
@@ -147,11 +147,10 @@ public function save($response, $storeId)
         );
 
         $this->savePixelId($pixelId, $storeId);
-        $this->saveProfiles($data['profiles'] ?? '', $storeId);
         $this->savePages($data['pages'] ?? '', $storeId);
         $this->saveCatalogId($catalogId, $storeId);
         $this->saveCommercePartnerIntegrationId($commercePartnerIntegrationId, $storeId);
-        $this->saveIsOnsiteEligible($onsite_eligible, $storeId);
+        $this->saveIsOnsiteEligible($onsite_eligible, (int)$storeId);
         $this->saveMerchantSettingsId($data['commerce_merchant_settings_id'] ?? '', $storeId);
         $this->saveInstalledFeatures($data['installed_features'] ?? '', $storeId);
         $this->setInstalledFlag($storeId);
@@ -186,25 +185,6 @@ private function savePixelId($pixelId, $storeId)
         }
     }
 
-    /**
-     * Save profiles
-     *
-     * @param array $profiles
-     * @param int   $storeId
-     */
-    private function saveProfiles($profiles, $storeId)
-    {
-        if ($profiles) {
-            $profiles = json_encode($profiles);
-            $this->systemConfig->saveConfig(
-                SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PROFILES,
-                $profiles,
-                $storeId
-            );
-            $this->fbeHelper->log("Saved fbe_installs profiles --- {$profiles} for storeID: {$storeId}");
-        }
-    }
-
     /**
      * Save pages
      *
@@ -285,7 +265,7 @@ public function saveCommercePartnerIntegrationId($commercePartnerIntegrationId,
      * @param int $storeId
      * @return $this
      */
-    public function saveIsOnsiteEligible(bool $onsite_eligible, int $storeId): MBEInstalls
+    public function saveIsOnsiteEligible($onsite_eligible, $storeId): MBEInstalls
     {
         if ($onsite_eligible) {
             $this->fbeHelper->log(