Merge pull request #23 from customgento/DEV-219-add-eu-cdn-support

Add eu option, DEV-219
customgento · Nov 30, 2023 · e4a62cd · e4a62cd
2 parents 1c2e47c + 011d8a6
commit e4a62cd
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 15 deletions.
diff --git a/Model/Config.php b/Model/Config.php
@@ -12,6 +12,7 @@ class Config
     public const XML_PATH_COOKIEBOT_ENABLED = 'web/cookiebot/enabled';
     public const XML_PATH_COOKIEBOT_ID = 'web/cookiebot/id';
     public const XML_PATH_DATA_CULTURE = 'web/cookiebot/data_culture';
+    public const XML_PATH_USE_EU_CDN = 'web/cookiebot/use_eu_cdn';
 
     /**
      * @var ScopeConfigInterface
@@ -37,4 +38,9 @@ public function getDataCulture(): string
     {
         return (string)$this->scopeConfig->getValue(self::XML_PATH_DATA_CULTURE, ScopeInterface::SCOPE_STORE);
     }
+
+    public function useEuCdn(): bool
+    {
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_USE_EU_CDN, ScopeInterface::SCOPE_STORE);
+    }
 }
diff --git a/Model/ScriptGenerator.php b/Model/ScriptGenerator.php
@@ -7,6 +7,7 @@
 class ScriptGenerator
 {
     private const COOKIEBOT_SCRIPT_FORMAT = '<script id="Cookiebot" data-cfasync="false" src="https://consent.cookiebot.com/uc.js" data-cbid="%s" %s type="text/javascript" async></script>';
+    private const EU_COOKIEBOT_SCRIPT_FORMAT = '<script id="Cookiebot" data-cfasync="false" src="https://consent.cookiebot.eu/uc.js" data-cbid="%s" %s type="text/javascript" async></script>';
 
     /**
      * @var Config
@@ -24,6 +25,10 @@ public function generate(): string
         $dataCulture = $this->config->getDataCulture() ?
             sprintf('data-culture="%s"', $this->config->getDataCulture()) : '';
 
+        if ($this->config->useEuCdn()) {
+            return sprintf(self::EU_COOKIEBOT_SCRIPT_FORMAT, $cookiebotId, $dataCulture);
+        }
+
         return sprintf(self::COOKIEBOT_SCRIPT_FORMAT, $cookiebotId, $dataCulture);
     }
 }
diff --git a/Test/Integration/AddScriptTest.php b/Test/Integration/AddScriptTest.php
@@ -14,52 +14,52 @@ class AddScriptTest extends AbstractController
      */
     private $script;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->script = $this->_objectManager->create(ScriptGenerator::class)->generate();
     }
 
     /**
-     * @magentoConfigFixture default/web/cookiebot/enabled 1
-     * @magentoConfigFixture default/web/cookiebot/id 123-456-789
+     * @magentoConfigFixture current_store web/cookiebot/enabled 1
+     * @magentoConfigFixture current_store web/cookiebot/id 123-456-789
      */
     public function testScriptAddedOnHomepage(): void
     {
         $this->dispatch('/');
-        self::assertContains($this->script, $this->getResponse()->getBody());
+        self::assertStringContainsString($this->script, $this->getResponse()->getBody());
     }
 
     /**
      * @magentoDataFixture   Magento/Catalog/_files/product_simple.php
-     * @magentoConfigFixture default/web/cookiebot/enabled 1
-     * @magentoConfigFixture default/web/cookiebot/id 123-456-789
+     * @magentoConfigFixture current_store web/cookiebot/enabled 1
+     * @magentoConfigFixture current_store web/cookiebot/id 123-456-789
      */
     public function testScriptAddedOnProductPage(): void
     {
         $this->dispatch('/catalog/product/view/id/1');
-        self::assertContains($this->script, $this->getResponse()->getBody());
+        self::assertStringContainsString($this->script, $this->getResponse()->getBody());
     }
 
     /**
      * @magentoDataFixture   Magento/Catalog/_files/category.php
-     * @magentoConfigFixture default/web/cookiebot/enabled 1
-     * @magentoConfigFixture default/web/cookiebot/id 123-456-789
+     * @magentoConfigFixture current_store web/cookiebot/enabled 1
+     * @magentoConfigFixture current_store web/cookiebot/id 123-456-789
      */
     public function testScriptAddedOnCategoryPage(): void
     {
         $this->dispatch('/catalog/category/view/id/333');
-        self::assertContains($this->script, $this->getResponse()->getBody());
+        self::assertStringContainsString($this->script, $this->getResponse()->getBody());
     }
 
     /**
      * @magentoDataFixture   Magento/Cms/_files/pages.php
-     * @magentoConfigFixture default/web/cookiebot/enabled 1
-     * @magentoConfigFixture default/web/cookiebot/id 123-456-789
+     * @magentoConfigFixture current_store web/cookiebot/enabled 1
+     * @magentoConfigFixture current_store web/cookiebot/id 123-456-789
      */
     public function testScriptAddedOnCmsPage(): void
     {
         $this->dispatch('/page100');
-        self::assertContains($this->script, $this->getResponse()->getBody());
+        self::assertStringContainsString($this->script, $this->getResponse()->getBody());
     }
 }
diff --git a/Test/Integration/Model/ConfigTest.php b/Test/Integration/Model/ConfigTest.php
@@ -34,7 +34,7 @@ public function testIsEnabledReturnsFalse(): void
     }
 
     /**
-     * @magentoConfigFixture default/web/cookiebot/enabled 1
+     * @magentoConfigFixture current_store web/cookiebot/enabled 1
      */
     public function testIsEnabledReturnsTrue(): void
     {
@@ -47,10 +47,31 @@ public function testGetIdReturnsEmptyStringByDefault(): void
     }
 
     /**
-     * @magentoConfigFixture default/web/cookiebot/id 123-456-789
+     * @magentoConfigFixture current_store web/cookiebot/id 123-456-789
      */
     public function testGetIdReturnsId(): void
     {
         self::assertEquals('123-456-789', $this->config->getId());
     }
+
+    public function testEuCdnEnabledReturnsFalseByDefault(): void
+    {
+        self::assertFalse($this->config->useEuCdn());
+    }
+
+    /**
+     * @magentoConfigFixture current_store web/cookiebot/use_eu_cdn 0
+     */
+    public function testIfEuCdnEnabledConfigFunctionReturnsFalse(): void
+    {
+        self::assertFalse($this->config->useEuCdn());
+    }
+
+    /**
+     * @magentoConfigFixture current_store web/cookiebot/use_eu_cdn 1
+     */
+    public function testIfEuCdnEnabledConfigFunctionReturnsTrue(): void
+    {
+        self::assertTrue($this->config->useEuCdn());
+    }
 }
diff --git a/Test/Integration/Model/ScriptGeneratorTest.php b/Test/Integration/Model/ScriptGeneratorTest.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CustomGento\Cookiebot\Test\Integration\Model;
+
+use CustomGento\Cookiebot\Model\Config;
+use CustomGento\Cookiebot\Model\ScriptGenerator;
+use Magento\Framework\App\ObjectManager;
+use Magento\TestFramework\ObjectManager as TestFrameworkObjectManager;
+use PHPUnit\Framework\TestCase;
+
+class ScriptGeneratorTest extends TestCase
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->config = TestFrameworkObjectManager::getInstance()->create(Config::class);
+    }
+
+    /**
+     * @magentoConfigFixture current_store web/cookiebot/use_eu_cdn 0
+     */
+    public function testDomainWhenUseEuCdnIsDisabled(): void
+    {
+        $generatedScript = ObjectManager::getInstance()->create(ScriptGenerator::class)->generate();
+        self::assertStringContainsString('https://consent.cookiebot.com/uc.js', $generatedScript);
+    }
+
+    /**
+     * @magentoConfigFixture current_store web/cookiebot/use_eu_cdn 1
+     */
+    public function testDomainWhenUseEuCdnIsEnabled(): void
+    {
+        $generatedScript = ObjectManager::getInstance()->create(ScriptGenerator::class)->generate();
+        self::assertStringContainsString('https://consent.cookiebot.eu/uc.js', $generatedScript);
+    }
+}
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -21,6 +21,10 @@
                         <field id="enabled">1</field>
                     </depends>
                 </field>
+                <field id="use_eu_cdn" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Use European CDN</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
         </section>
     </system>

diff --git a/etc/config.xml b/etc/config.xml
@@ -7,6 +7,7 @@
                 <enabled>0</enabled>
                 <id/>
                 <data_culture/>
+                <use_eu_cdn>0</use_eu_cdn>
             </cookiebot>
         </web>
     </default>