Merge pull request #8 from digifactory/fix/cookies-error-handling

Fix/cookies error handling
digifactory · Apr 24, 2021 · 81e9eab · 81e9eab
2 parents f24d710 + 1acca72
commit 81e9eab
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,18 @@
 # Changelog
 
 All notable changes to `laravel-cookie-consent` will be documented in this file.
+## 1.0.4 - 2021-04-24
+- Updated error handling
+- Added tests for error handling
+
 ## 1.0.3 - 2021-02-10
 - Removed TravisCi
 - Added Github workflow actions
 - Support for PHP 8.0
 - Dropped support for PHP 7.3
 
 ## 1.0.2 - 2020-10-05
-Laravel 8 support.
+- Laravel 8 support.
 
 ## 1.0.1 - 2020-02-27
 - Renamed all occurences of `CookieBot` to `Cookiebot`

diff --git a/composer.json b/composer.json
@@ -13,6 +13,16 @@
             "name": "Mark Jansen",
             "email": "[email protected]",
             "role": "Developer"
+        },
+        {
+            "name": "Maurice Bosch",
+            "email": "[email protected]",
+            "role": "Developer"
+        },
+        {
+            "name": "Roel Pennings",
+            "email": "[email protected]",
+            "role": "Developer"
         }
     ],
     "require": {

diff --git a/src/Providers/Cookiebot.php b/src/Providers/Cookiebot.php
@@ -46,29 +46,36 @@ private function consentGiven(): Collection
                 $phpJson = preg_replace('/\s*:\s*([a-zA-Z0-9_]+?)([}\[,])/', ':"$1"$2', preg_replace('/([{\[,])\s*([a-zA-Z0-9_]+?):/', '$1"$2":', str_replace("'", '"', stripslashes($_COOKIE['CookieConsent']))));
                 $cookieConsent = json_decode($phpJson);
 
-                $consentFor = collect();
+                return $this->getConsentFor($cookieConsent);
+            }
+        } else {
+            //The user has not accepted cookies - set strictly necessary cookies only
+            return collect(CookieConsent::CONSENT_NECESSARY);
+        }
+    }
 
-                if (filter_var($cookieConsent->necessary, FILTER_VALIDATE_BOOLEAN)) {
-                    $consentFor->push(CookieConsent::CONSENT_NECESSARY);
-                }
+    private function getConsentFor($cookieConsent): Collection
+    {
+        $consentFor = collect();
 
-                if (filter_var($cookieConsent->preferences, FILTER_VALIDATE_BOOLEAN)) {
-                    $consentFor->push(CookieConsent::CONSENT_PREFERENCES);
-                }
+        if (is_object($cookieConsent)) {
+            if (filter_var($cookieConsent->necessary, FILTER_VALIDATE_BOOLEAN)) {
+                $consentFor->push(CookieConsent::CONSENT_NECESSARY);
+            }
 
-                if (filter_var($cookieConsent->statistics, FILTER_VALIDATE_BOOLEAN)) {
-                    $consentFor->push(CookieConsent::CONSENT_STATISTICS);
-                }
+            if (filter_var($cookieConsent->preferences, FILTER_VALIDATE_BOOLEAN)) {
+                $consentFor->push(CookieConsent::CONSENT_PREFERENCES);
+            }
 
-                if (filter_var($cookieConsent->marketing, FILTER_VALIDATE_BOOLEAN)) {
-                    $consentFor->push(CookieConsent::CONSENT_MARKETING);
-                }
+            if (filter_var($cookieConsent->statistics, FILTER_VALIDATE_BOOLEAN)) {
+                $consentFor->push(CookieConsent::CONSENT_STATISTICS);
+            }
 
-                return $consentFor;
+            if (filter_var($cookieConsent->marketing, FILTER_VALIDATE_BOOLEAN)) {
+                $consentFor->push(CookieConsent::CONSENT_MARKETING);
             }
-        } else {
-            //The user has not accepted cookies - set strictly necessary cookies only
-            return collect(CookieConsent::CONSENT_NECESSARY);
         }
+
+        return $consentFor;
     }
 }
diff --git a/tests/CookiebotProviderTest.php b/tests/CookiebotProviderTest.php
@@ -38,6 +38,40 @@ public function it_allows_necessary_cookies_without_cookie()
         $this->assertFalse($cookieConsent->forMarketing());
     }
 
+    /** @test */
+    public function it_does_not_allow_empty_cookies()
+    {
+        $_COOKIE['CookieConsent'] = '';
+
+        $view = view('consent-test')->render();
+
+        $this->assertMatchesSnapshot($view);
+
+        $cookieConsent = app('cookie-consent');
+
+        $this->assertFalse($cookieConsent->forNecessary());
+        $this->assertFalse($cookieConsent->forPreferences());
+        $this->assertFalse($cookieConsent->forStatistics());
+        $this->assertFalse($cookieConsent->forMarketing());
+    }
+
+    /** @test */
+    public function it_does_not_allow_non_object_cookies()
+    {
+        $_COOKIE['CookieConsent'] = '0';
+
+        $view = view('consent-test')->render();
+
+        $this->assertMatchesSnapshot($view);
+
+        $cookieConsent = app('cookie-consent');
+
+        $this->assertFalse($cookieConsent->forNecessary());
+        $this->assertFalse($cookieConsent->forPreferences());
+        $this->assertFalse($cookieConsent->forStatistics());
+        $this->assertFalse($cookieConsent->forMarketing());
+    }
+
     /** @test */
     public function it_does_not_allow_cookies()
     {
@@ -55,6 +89,23 @@ public function it_does_not_allow_cookies()
         $this->assertFalse($cookieConsent->forMarketing());
     }
 
+    /** @test */
+    public function it_allows_necessary_cookies()
+    {
+        $_COOKIE['CookieConsent'] = "{stamp:'digifactory/laravel-cookie-consent',necessary:true,preferences:false,statistics:false,marketing:false,ver:3,utc:1582284206975}";
+
+        $view = view('consent-test')->render();
+
+        $this->assertMatchesSnapshot($view);
+
+        $cookieConsent = app('cookie-consent');
+
+        $this->assertTrue($cookieConsent->forNecessary());
+        $this->assertFalse($cookieConsent->forPreferences());
+        $this->assertFalse($cookieConsent->forStatistics());
+        $this->assertFalse($cookieConsent->forMarketing());
+    }
+
     /** @test */
     public function it_allows_preference_cookies()
     {

diff --git a/tests/__snapshots__/CookiebotProviderTest__it_allows_necessary_cookies__1.txt b/tests/__snapshots__/CookiebotProviderTest__it_allows_necessary_cookies__1.txt
@@ -0,0 +1,14 @@
+Necessary cookies allowed
+
+
+Preferences cookies not allowed
+
+Preferences cookies not allowed
+
+Statistics cookies not allowed
+
+Statistics cookies not allowed
+
+Marketing cookies not allowed
+
+Marketing cookies not allowed
diff --git a/tests/__snapshots__/CookiebotProviderTest__it_does_not_allow_empty_cookies__1.txt b/tests/__snapshots__/CookiebotProviderTest__it_does_not_allow_empty_cookies__1.txt
@@ -0,0 +1,15 @@
+Necessary cookies not allowed 
+
+Necessary cookies not allowed
+
+Preferences cookies not allowed
+
+Preferences cookies not allowed
+
+Statistics cookies not allowed
+
+Statistics cookies not allowed
+
+Marketing cookies not allowed
+
+Marketing cookies not allowed
diff --git a/tests/__snapshots__/CookiebotProviderTest__it_does_not_allow_non_object_cookies__1.txt b/tests/__snapshots__/CookiebotProviderTest__it_does_not_allow_non_object_cookies__1.txt
@@ -0,0 +1,15 @@
+Necessary cookies not allowed 
+
+Necessary cookies not allowed
+
+Preferences cookies not allowed
+
+Preferences cookies not allowed
+
+Statistics cookies not allowed
+
+Statistics cookies not allowed
+
+Marketing cookies not allowed
+
+Marketing cookies not allowed