Added a state property on cookie manager and use it to define when to…

… display the notice

src/CookiesManager.php

@@ -18,6 +18,7 @@ class CookiesManager
      * The user's current consent preferences.
      */
     protected ?array $preferences = null;
+    protected CookieConsentState $state;
 
     /**
      * Create a new Service Manager instance.
@@ -26,6 +27,7 @@ public function __construct(CookiesRegistrar $registrar, Request $request)
     {
         $this->registrar = $registrar;
         $this->preferences = $this->getCurrentConsentSettings($request);
+        $this->state = $this->preferences ? CookieConsentState::Configured : CookieConsentState::Pending;
     }
 
     /**
@@ -37,12 +39,12 @@ protected function getCurrentConsentSettings(Request $request): ?array
             ? json_decode($raw, true)
             : null;
 
-        if(! $preferences || ! is_int($preferences['consent_at'] ?? null)) {
+        if (!$preferences || !is_int($preferences['consent_at'] ?? null)) {
             return null;
         }
 
         // Check duration in case application settings have changed since the cookie was set.
-        if($preferences['consent_at'] + (config('cookieconsent.cookie.duration') * 60) < time()) {
+        if ($preferences['consent_at'] + (config('cookieconsent.cookie.duration') * 60) < time()) {
             return null;
         }
 
@@ -54,9 +56,9 @@ protected function getCurrentConsentSettings(Request $request): ?array
      */
     protected function makeConsentSettings(array $categories): array
     {
-        return array_reduce($this->registrar->getCategories(), function($values, $category) use ($categories) {
+        return array_reduce($this->registrar->getCategories(), function ($values, $category) use ($categories) {
             $state = in_array($category->key(), $categories);
-            return array_reduce($category->getCookies(), function($values, $cookie) use ($state) {
+            return array_reduce($category->getCookies(), function ($values, $cookie) use ($state) {
                 $values[$cookie->name] = $state;
                 return $values;
             }, $values);
@@ -77,13 +79,24 @@ public function __call(string $method, array $arguments)
      */
     public function shouldDisplayNotice(): bool
     {
-        if(! $this->preferences) {
-            return true;
+        if ($this->state === CookieConsentState::Configured) {
+            $this->state = $this->checkCurrentState() ? CookieConsentState::Pending : CookieConsentState::Configured;
         }
 
-        // Check if each defined cookie has been shown to the user yet.
-        return array_reduce($this->registrar->getCategories(), function($state, $category) {
-            return $state ? true : array_reduce($category->getCookies(), function(bool $state, Cookie $cookie) {
+        return $this->state->shouldDisplayNotice();
+    }
+
+    public function setCookieConsentState(CookieConsentState $state): self
+    {
+        $this->state = $state;
+
+        return $this;
+    }
+
+    protected function checkCurrentState(): bool
+    {
+        return array_reduce($this->registrar->getCategories(), function ($state, $category) {
+            return $state ? true : array_reduce($category->getCookies(), function (bool $state, Cookie $cookie) {
                 return $state ? true : !array_key_exists($cookie->name, $this->preferences);
             }, false);
         }, false);
@@ -94,13 +107,13 @@ public function shouldDisplayNotice(): bool
      */
     public function hasConsentFor(string $key): bool
     {
-        if(! $this->preferences) {
+        if ($this->state === CookieConsentState::Configured) {
             return false;
         }
 
-        $groups = array_reduce($this->registrar->getCategories(), function($results, $category) use ($key) {
-            return array_reduce($category->getDefined(), function(array $results, Cookie|CookiesGroup $instance) use ($key) {
-                if(is_a($instance, CookiesGroup::class) && $instance->name === $key) {
+        $groups = array_reduce($this->registrar->getCategories(), function ($results, $category) use ($key) {
+            return array_reduce($category->getDefined(), function (array $results, Cookie|CookiesGroup $instance) use ($key) {
+                if (is_a($instance, CookiesGroup::class) && $instance->name === $key) {
                     $results[] = $instance;
                 }
                 return $results;
@@ -111,8 +124,8 @@ public function hasConsentFor(string $key): bool
             ? array_unique(array_reduce($groups, fn($cookies, $group) => array_merge($cookies, array_map(fn($cookie) => $cookie->name, $group->getCookies())), []))
             : [$key];
 
-        foreach($cookies as $cookie) {
-            if(! boolval($this->preferences[$cookie] ?? false)) return false;
+        foreach ($cookies as $cookie) {
+            if (!boolval($this->preferences[$cookie] ?? false)) return false;
         }
 
         return true;
@@ -123,7 +136,7 @@ public function hasConsentFor(string $key): bool
      */
     public function accept(string|array $categories = '*'): ConsentResponse
     {
-        if(! is_array($categories) || ! $categories) {
+        if (!is_array($categories) || !$categories) {
             $categories = array_map(fn($category) => $category->key(), $this->registrar->getCategories());
         }
 
@@ -142,8 +155,8 @@ public function accept(string|array $categories = '*'): ConsentResponse
      */
     protected function getConsentResponse(): ConsentResponse
     {
-        return array_reduce($this->registrar->getCategories(), function($response, $category) {
-            return array_reduce($category->getDefined(), function(ConsentResponse $response, Cookie|CookiesGroup $instance) {
+        return array_reduce($this->registrar->getCategories(), function ($response, $category) {
+            return array_reduce($category->getDefined(), function (ConsentResponse $response, Cookie|CookiesGroup $instance) {
                 return $this->hasConsentFor($instance->name)
                     ? $response->handleConsent($instance)
                     : $response;
@@ -174,7 +187,7 @@ public function renderScripts(bool $withDefault = true): string
             ? $this->getNoticeScripts($withDefault)
             : $this->getConsentedScripts($withDefault);
 
-        if(strlen($output)) {
+        if (strlen($output)) {
             $output = '<!-- Cookie Consent -->' . $output;
         }
 
@@ -218,7 +231,7 @@ public function renderView(): string
 
     public function getNoticeMarkup(): string
     {
-        if($policy = config('cookieconsent.policy')) {
+        if ($policy = config('cookieconsent.policy')) {
             $policy = route($policy);
         }
 
@@ -241,13 +254,7 @@ public function renderButton(string $action, ?string $label = null, array $attri
             default => null,
         };
 
-        $state = match (true) {
-            request()->routeIs('cookieconsent.reset') => CookieConsentState::Reset,
-            // request()->routeIs('cookieconsent.update') => CookieConsentState::Updating,
-            default => CookieConsentState::Pending,
-        };
-
-        if(! $url) {
+        if (!$url) {
             throw new \InvalidArgumentException('Cookie consent action "' . $action . '" does not exist. Try one of these: "accept.all", "accept.essentials", "accept.configuration", "reset".');
         }
 
@@ -256,7 +263,7 @@ public function renderButton(string $action, ?string $label = null, array $attri
             'data-cookie-action' => $action,
         ], $attributes);
 
-        if(! ($attributes['class'] ?? null)) {
+        if (!($attributes['class'] ?? null)) {
             $attributes['class'] = 'cookiebtn';
         }
 
@@ -272,7 +279,7 @@ public function renderButton(string $action, ?string $label = null, array $attri
             'attributes' => $attributes,
             'basename' => $basename,
             'action' => $action,
-            'state' => $state,
+            'state' => $this->state,
         ])->render();
     }
 
@@ -291,7 +298,7 @@ public function replaceInfoTag(string $wysiwyg): string
         $cookieConsentInfo = view('cookie-consent::info', [
             'cookies' => $this->registrar,
         ])->render();
-        
+
         $formattedString = preg_replace(
             [
                 '/\<(\w)[^\>]+\>\@cookieconsentinfo\<\/\1\>/',

src/Enums/CookieConsentState.php

@@ -15,4 +15,13 @@ enum CookieConsentState
 
     // User had configured consent but chose to reset the settings (similar to "pending")
     case Reset;
+
+    public function shouldDisplayNotice(): bool
+    {
+        return match($this) {
+            static::Pending , static::Reset=> true,
+            static::Configured => false,
+//            static::Updating => true,
+        };
+    }
 }

src/Http/Controllers/AcceptAllController.php

@@ -4,11 +4,12 @@
 
 use Whitecube\LaravelCookieConsent\CookiesManager;
 use Illuminate\Http\Request;
+use Whitecube\LaravelCookieConsent\Enums\CookieConsentState;
 
 class AcceptAllController
 {
     public function __invoke(Request $request, CookiesManager $cookies)
     {
-        return $cookies->accept('*')->toResponse($request);
+        return $cookies->setCookieConsentState(CookieConsentState::Configured)->accept('*')->toResponse($request);
     }
 }

src/Http/Controllers/ResetController.php

@@ -4,11 +4,14 @@
 
 use Whitecube\LaravelCookieConsent\CookiesManager;
 use Illuminate\Http\Request;
+use Whitecube\LaravelCookieConsent\Enums\CookieConsentState;
 
 class ResetController
 {
     public function __invoke(Request $request, CookiesManager $cookies)
     {
+        $cookies->setCookieConsentState(CookieConsentState::Reset);
+
         $response = ! $request->expectsJson()
             ? redirect()->back()
             : response()->json([