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

Author: priyambad

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/ApiKey/Index.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/Helper/GraphAPIAdapter.php

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

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

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

app/code/Meta/BusinessExtension/Model/Api/CustomApiKey/ApiKeyService.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/Authenticator.php

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

app/code/Meta/BusinessExtension/Model/MBEInstalls.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
@@ -151,7 +151,7 @@ public function save($response, $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);
@@ -285,7 +285,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(

app/code/Meta/BusinessExtension/Model/System/Config.php

@@ -158,7 +158,7 @@ class Config
      *
      * @var string|null
      */
-    private ?string $version = '1.4.1-dev';
+    private ?string $version = '1.4.3-dev';
 
     /**
      * Config class constructor

app/code/Meta/BusinessExtension/Model/System/Message/Notification.php

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Meta\BusinessExtension\Test\Unit\Api;
+
+use Meta\BusinessExtension\Model\Api\AdobeCloudConfig;
+use Meta\BusinessExtension\Api\AdobeCloudConfigInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class AdobeCloudConfigTest extends TestCase
+{
+    /**
+     * @var AdobeCloudConfig
+     */
+    private $adobeCloudConfig;
+
+    /**
+     * Class setup function
+     * 
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $objectManager = new ObjectManager($this);
+        
+        $this->adobeCloudConfig = $objectManager->getObject(
+            AdobeCloudConfig::class
+        );
+    }
+
+    /**
+     * Validate if seller is on Cloud
+     * 
+     * @return void
+     */
+    public function testIsSellerOnAdobeCloudReturnsTrueWhenEnvVarIsSet(): void
+    {
+        /** check if the envinorment is non-premise */
+        $_ENV['MAGENTO_CLOUD_ENVIRONMENT'] = 'MAGENTO_CLOUD_ENVIRONMENT';
+
+        $this->assertTrue($this->adobeCloudConfig->isSellerOnAdobeCloud());
+        unset($_ENV['MAGENTO_CLOUD_ENVIRONMENT']);
+    }
+
+    /**
+     * Validate if seller is on-premise
+     * 
+     * @return void
+     */
+    public function testIsSellerOnAdobeCloudReturnsFalseWhenEnvVarIsNotSet(): void
+    {
+        /** check if the envinorment is on-premise */
+        unset($_ENV['MAGENTO_CLOUD_ENVIRONMENT']);
+        
+        $this->assertFalse($this->adobeCloudConfig->isSellerOnAdobeCloud());
+    }
+
+    /**
+     * Validate if seller is on-premise
+     * 
+     * @return void
+     */
+    public function testGetCommercePartnerSellerPlatformType(): void
+    {
+        /** check if the envinorment is on-premise */
+        $_ENV['MAGENTO_CLOUD_ENVIRONMENT'] = 'MAGENTO_CLOUD_ENVIRONMENT';
+        
+        $this->assertSame(AdobeCloudConfigInterface::ADOBE_COMMERCE_CLOUD, $this->adobeCloudConfig->getCommercePartnerSellerPlatformType());
+    }
+
+    /**
+     * Validate if seller is on-premise
+     * 
+     * @return void
+     */
+    public function testGetCommercePartnerSellerPlatformTypeIsNotOnCloud(): void
+    {
+        /** check if the envinorment is on-premise */
+        unset($_ENV['MAGENTO_CLOUD_ENVIRONMENT']);
+        
+        $this->assertSame(AdobeCloudConfigInterface::MAGENTO_OPEN_SOURCE, $this->adobeCloudConfig->getCommercePartnerSellerPlatformType());
+    }
+}