From 57d9e920672fd159860af791561590ce4acacf93 Mon Sep 17 00:00:00 2001
From: Debatty-Tom <145542891+Debatty-Tom@users.noreply.github.com>
Date: Mon, 6 Oct 2025 12:25:19 +0200
Subject: [PATCH 1/6] Overwrite the consent cookie by a session cookie to keep
 user preferences in session while managing preferences

---
 src/CookiesManager.php                   |  2 +-
 src/Http/Controllers/ResetController.php | 44 ++++++++++++++++++------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/CookiesManager.php b/src/CookiesManager.php
index 58b387c..a4124cf 100644
--- a/src/CookiesManager.php
+++ b/src/CookiesManager.php
@@ -16,7 +16,7 @@ class CookiesManager
     /**
      * The user's current consent preferences.
      */
-    protected ?array $preferences = null;
+    public ?array $preferences = null;
 
     /**
      * Create a new Service Manager instance.
diff --git a/src/Http/Controllers/ResetController.php b/src/Http/Controllers/ResetController.php
index 47121ca..a372cc5 100644
--- a/src/Http/Controllers/ResetController.php
+++ b/src/Http/Controllers/ResetController.php
@@ -2,6 +2,8 @@
 
 namespace Whitecube\LaravelCookieConsent\Http\Controllers;
 
+use Illuminate\Support\Facades\Cookie as CookieFacade;
+use Whitecube\LaravelCookieConsent\ConsentResponse;
 use Whitecube\LaravelCookieConsent\CookiesManager;
 use Illuminate\Http\Request;
 
@@ -9,17 +11,39 @@ class ResetController
 {
     public function __invoke(Request $request, CookiesManager $cookies)
     {
-        $response = ! $request->expectsJson()
-            ? redirect()->back()
-            : response()->json([
-                'status' => 'ok',
-                'scripts' => $cookies->getNoticeScripts(true),
-                'notice' => $cookies->getNoticeMarkup(),
-            ]);
-
-        return $response->withoutCookie(
-            cookie: config('cookieconsent.cookie.name'),
+
+        $categories = $cookies->getCategories();
+
+        $currentPreferences = $cookies->preferences ?? [];
+
+        $cookiesData = [
+            'consent_at' => $currentPreferences['consent_at'] ?? time(),
+            'categories' => [],
+        ];
+
+        foreach ($categories as $category) {
+            $cookieNames = collect($category->getCookies())->pluck('name');
+
+            $allAccepted = $cookieNames->every(fn($name) => !empty($currentPreferences[$name]));
+
+            $cookiesData['categories'][$category->key()] = $allAccepted;
+        }
+
+        $cookie = CookieFacade::make(
+            name: config('cookieconsent.cookie.name'),
+            value: json_encode($cookiesData),
+            minutes: 0,
             domain: config('cookieconsent.cookie.domain'),
+            secure: (config('app.env') == 'local') ? false : true
         );
+
+        $response = $request->expectsJson()
+            ? response()->json([
+                'status' => 'updated',
+                'preferences' => $cookiesData,
+            ])
+            : redirect()->back();
+
+        return $response->withCookie($cookie);
     }
 }

From 772a2dffc0d4c8f1ba7db5a954139434684a27b9 Mon Sep 17 00:00:00 2001
From: Debatty-Tom <145542891+Debatty-Tom@users.noreply.github.com>
Date: Mon, 6 Oct 2025 12:26:14 +0200
Subject: [PATCH 2/6] update view to pre-check categories depending of the user
 preferences

---
 resources/views/cookies.blade.php | 83 ++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 34 deletions(-)

diff --git a/resources/views/cookies.blade.php b/resources/views/cookies.blade.php
index e194d00..4c0d7ae 100644
--- a/resources/views/cookies.blade.php
+++ b/resources/views/cookies.blade.php
@@ -1,4 +1,5 @@
-<aside id="cookies-policy" class="cookies cookies--no-js" data-text="{{ json_encode(__('cookieConsent::cookies.details')) }}">
+<aside id="cookies-policy" class="cookies cookies--no-js"
+       data-text="{{ json_encode(__('cookieConsent::cookies.details')) }}">
     <div class="cookies__alert">
         <div class="cookies__container">
             <div class="cookies__wrapper">
@@ -15,48 +16,62 @@
                 </div>
             </div>
         </div>
-            <a href="#cookies-policy-customize" class="cookies__btn cookies__btn--customize">
-                <span>@lang('cookieConsent::cookies.customize')</span>
-                <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-                    <path d="M14.7559 11.9782C15.0814 11.6527 15.0814 11.1251 14.7559 10.7996L10.5893 6.63297C10.433 6.47669 10.221 6.3889 10 6.38889C9.77899 6.38889 9.56703 6.47669 9.41075 6.63297L5.24408 10.7996C4.91864 11.1251 4.91864 11.6527 5.24408 11.9782C5.56951 12.3036 6.09715 12.3036 6.42259 11.9782L10 8.40074L13.5774 11.9782C13.9028 12.3036 14.4305 12.3036 14.7559 11.9782Z" fill="#2C2E30"/>
-                </svg>
-            </a>
+        <a href="#cookies-policy-customize" class="cookies__btn cookies__btn--customize">
+            <span>@lang('cookieConsent::cookies.customize')</span>
+            <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"
+                 aria-hidden="true">
+                <path d="M14.7559 11.9782C15.0814 11.6527 15.0814 11.1251 14.7559 10.7996L10.5893 6.63297C10.433 6.47669 10.221 6.3889 10 6.38889C9.77899 6.38889 9.56703 6.47669 9.41075 6.63297L5.24408 10.7996C4.91864 11.1251 4.91864 11.6527 5.24408 11.9782C5.56951 12.3036 6.09715 12.3036 6.42259 11.9782L10 8.40074L13.5774 11.9782C13.9028 12.3036 14.4305 12.3036 14.7559 11.9782Z"
+                      fill="#2C2E30"/>
+            </svg>
+        </a>
         <div class="cookies__expandable cookies__expandable--custom" id="cookies-policy-customize">
             <form action="{{ route('cookieconsent.accept.configuration') }}" method="post" class="cookies__customize">
                 @csrf
                 <div class="cookies__sections">
+                    @php
+                        $cookieName = config('cookieconsent.cookie.name');
+                        $cookieValue = $_COOKIE[$cookieName] ?? null;
+                        $preferences = $cookieValue ? json_decode($cookieValue) : [];
+                    @endphp
                     @foreach($cookies->getCategories() as $category)
-                    <div class="cookies__section">
-                        <label for="cookies-policy-check-{{ $category->key() }}" class="cookies__category">
-                            @if ($category->key() === 'essentials')
-                                <input type="hidden" name="categories[]" value="{{ $category->key() }}" />
-                                <input type="checkbox" name="categories[]" value="{{ $category->key() }}" id="cookies-policy-check-{{ $category->key() }}" checked="checked" disabled="disabled" />
-                            @else
-                                <input type="checkbox" name="categories[]" value="{{ $category->key() }}" id="cookies-policy-check-{{ $category->key() }}" />
-                            @endif
-                            <span class="cookies__box">
+                        @php
+                            $isChecked = !empty($preferences['categories'][$category->key()] ?? null);
+                        @endphp
+                        <div class="cookies__section">
+                            <label for="cookies-policy-check-{{ $category->key() }}" class="cookies__category">
+                                @if ($category->key() === 'essentials')
+                                    <input type="hidden" name="categories[]" value="{{ $category->key() }}"/>
+                                    <input type="checkbox" name="categories[]" value="{{ $category->key() }}"
+                                           id="cookies-policy-check-{{ $category->key() }}" checked="checked"
+                                           disabled="disabled"/>
+                                @else
+                                    <input type="checkbox" name="categories[]" value="{{ $category->key() }}"
+                                           id="cookies-policy-check-{{ $category->key() }}" @checked($isChecked)/>
+                                @endif
+                                <span class="cookies__box">
                                 <strong class="cookies__label">{{ $category->title }}</strong>
                             </span>
-                            @if($category->description)
-                                <p class="cookies__info">{{ $category->description }}</p>
-                            @endif
-                        </label>
+                                @if($category->description)
+                                    <p class="cookies__info">{{ $category->description }}</p>
+                                @endif
+                            </label>
 
-                        <div class="cookies__expandable" id="cookies-policy-{{ $category->key() }}">
-                            <ul class="cookies__definitions">
-                                @foreach($category->getCookies() as $cookie)
-                                <li class="cookies__cookie">
-                                    <p class="cookies__name">{{ $cookie->name }}</p>
-                                    <p class="cookies__duration">{{ \Carbon\CarbonInterval::minutes($cookie->duration)->cascade() }}</p>
-                                    @if($cookie->description)
-                                        <p class="cookies__description">{{ $cookie->description }}</p>
-                                    @endif
-                                </li>
-                                @endforeach
-                            </ul>
+                            <div class="cookies__expandable" id="cookies-policy-{{ $category->key() }}">
+                                <ul class="cookies__definitions">
+                                    @foreach($category->getCookies() as $cookie)
+                                        <li class="cookies__cookie">
+                                            <p class="cookies__name">{{ $cookie->name }}</p>
+                                            <p class="cookies__duration">{{ \Carbon\CarbonInterval::minutes($cookie->duration)->cascade() }}</p>
+                                            @if($cookie->description)
+                                                <p class="cookies__description">{{ $cookie->description }}</p>
+                                            @endif
+                                        </li>
+                                    @endforeach
+                                </ul>
+                            </div>
+                            <a href="#cookies-policy-{{ $category->key() }}"
+                               class="cookies__details">@lang('cookieConsent::cookies.details.more')</a>
                         </div>
-                        <a href="#cookies-policy-{{ $category->key() }}" class="cookies__details">@lang('cookieConsent::cookies.details.more')</a>
-                    </div>
                     @endforeach
                 </div>
                 <div class="cookies__save">

From 79145431ef57898197da429444406040eeab75fc Mon Sep 17 00:00:00 2001
From: Debatty-Tom <145542891+Debatty-Tom@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:54:04 +0200
Subject: [PATCH 3/6] Added an editController to separate reset and edit
 feature

---
 routes/web.php                            |  4 ++
 src/Http/Controllers/EditController.php   | 33 ++++++++++++++++
 src/Http/Controllers/ResetController.php  | 46 ++++++-----------------
 src/Http/Controllers/ScriptController.php |  1 +
 4 files changed, 49 insertions(+), 35 deletions(-)
 create mode 100644 src/Http/Controllers/EditController.php

diff --git a/routes/web.php b/routes/web.php
index 26b0311..8ac74cd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
+use Whitecube\LaravelCookieConsent\Http\Controllers\EditController;
 use Whitecube\LaravelCookieConsent\Http\Controllers\ResetController;
 use Whitecube\LaravelCookieConsent\Http\Controllers\ScriptController;
 use Whitecube\LaravelCookieConsent\Http\Controllers\AcceptAllController;
@@ -27,4 +28,7 @@
 
     Route::post('reset', ResetController::class)
         ->name('reset');
+
+    Route::post('edit', EditController::class)
+        ->name('edit');
 });
diff --git a/src/Http/Controllers/EditController.php b/src/Http/Controllers/EditController.php
new file mode 100644
index 0000000..8ad1a07
--- /dev/null
+++ b/src/Http/Controllers/EditController.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Whitecube\LaravelCookieConsent\Http\Controllers;
+
+use Illuminate\Support\Facades\Cookie as CookieFacade;
+use Whitecube\LaravelCookieConsent\CookiesManager;
+use Illuminate\Http\Request;
+
+class EditController
+{
+    public function __invoke(Request $request, CookiesManager $cookies)
+    {
+        $editCookie = CookieFacade::make(
+            name: 'edit-cookie',
+            value: json_encode(true),
+            minutes: 0,
+            domain: config('cookieconsent.cookie.domain'),
+            secure: (config('app.env') == 'local') ? false : true
+        );
+
+        $response = ! $request->expectsJson()
+            ? redirect()->back()
+            : response()->json([
+            'status' => 'ok',
+            'scripts' => $cookies->getNoticeScripts(true),
+            'notice' => $cookies->getNoticeMarkup(),
+        ]);
+
+        return $response->withCookie(
+            $editCookie
+        );
+    }
+}
diff --git a/src/Http/Controllers/ResetController.php b/src/Http/Controllers/ResetController.php
index a372cc5..d0e8389 100644
--- a/src/Http/Controllers/ResetController.php
+++ b/src/Http/Controllers/ResetController.php
@@ -2,8 +2,6 @@
 
 namespace Whitecube\LaravelCookieConsent\Http\Controllers;
 
-use Illuminate\Support\Facades\Cookie as CookieFacade;
-use Whitecube\LaravelCookieConsent\ConsentResponse;
 use Whitecube\LaravelCookieConsent\CookiesManager;
 use Illuminate\Http\Request;
 
@@ -11,39 +9,17 @@ class ResetController
 {
     public function __invoke(Request $request, CookiesManager $cookies)
     {
-
-        $categories = $cookies->getCategories();
-
-        $currentPreferences = $cookies->preferences ?? [];
-
-        $cookiesData = [
-            'consent_at' => $currentPreferences['consent_at'] ?? time(),
-            'categories' => [],
-        ];
-
-        foreach ($categories as $category) {
-            $cookieNames = collect($category->getCookies())->pluck('name');
-
-            $allAccepted = $cookieNames->every(fn($name) => !empty($currentPreferences[$name]));
-
-            $cookiesData['categories'][$category->key()] = $allAccepted;
-        }
-
-        $cookie = CookieFacade::make(
-            name: config('cookieconsent.cookie.name'),
-            value: json_encode($cookiesData),
-            minutes: 0,
+        $response = ! $request->expectsJson()
+            ? redirect()->back()
+            : response()->json([
+                'status' => 'ok',
+                'scripts' => $cookies->getNoticeScripts(true),
+                'notice' => $cookies->getNoticeMarkup(),
+            ]);
+
+        return $response->withoutCookie(
+            cookie: config('cookieconsent.cookie.name'),
             domain: config('cookieconsent.cookie.domain'),
-            secure: (config('app.env') == 'local') ? false : true
         );
-
-        $response = $request->expectsJson()
-            ? response()->json([
-                'status' => 'updated',
-                'preferences' => $cookiesData,
-            ])
-            : redirect()->back();
-
-        return $response->withCookie($cookie);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Http/Controllers/ScriptController.php b/src/Http/Controllers/ScriptController.php
index 80f7b24..c2aadfb 100644
--- a/src/Http/Controllers/ScriptController.php
+++ b/src/Http/Controllers/ScriptController.php
@@ -20,6 +20,7 @@ protected function generateConfig(): string
             'accept.essentials' => route('cookieconsent.accept.essentials'),
             'accept.configuration' => route('cookieconsent.accept.configuration'),
             'reset' => route('cookieconsent.reset'),
+            'edit' => route('cookieconsent.edit'),
         ]);
     }
 }

From c4fb50031595f5f328594324d204870096e01f9a Mon Sep 17 00:00:00 2001
From: Debatty-Tom <145542891+Debatty-Tom@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:54:57 +0200
Subject: [PATCH 4/6] Check if edit mode to show cookie modal even with a saved
 cookie

---
 src/CookiesManager.php | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/CookiesManager.php b/src/CookiesManager.php
index a4124cf..176fcf8 100644
--- a/src/CookiesManager.php
+++ b/src/CookiesManager.php
@@ -16,7 +16,8 @@ class CookiesManager
     /**
      * The user's current consent preferences.
      */
-    public ?array $preferences = null;
+    protected ?array $preferences = null;
+    protected bool $editPreferences = false;
 
     /**
      * Create a new Service Manager instance.
@@ -25,6 +26,32 @@ public function __construct(CookiesRegistrar $registrar, Request $request)
     {
         $this->registrar = $registrar;
         $this->preferences = $this->getCurrentConsentSettings($request);
+        $this->editPreferences = $this->isEditMode($request);
+    }
+
+    protected function isEditMode(Request $request): bool
+    {
+        $raw = $request->cookie('edit-cookie');
+
+        if (! $raw) {
+            return false;
+        }
+
+        $edit = json_decode($raw, true);
+
+        $forgetCookie = CookieFacade::make(
+            name: 'edit-cookie',
+            value: null,
+            minutes: -3600,
+            domain: config('cookieconsent.cookie.domain'),
+            secure: (config('app.env') == 'local') ? false : true
+        );
+
+        CookieFacade::queue(
+            $forgetCookie
+        );
+
+        return $edit;
     }
 
     /**
@@ -80,6 +107,10 @@ public function shouldDisplayNotice(): bool
             return true;
         }
 
+        if ($this->editPreferences) {
+            return true;
+        }
+
         // 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) {
@@ -237,6 +268,7 @@ public function renderButton(string $action, ?string $label = null, array $attri
             'accept.essentials' => route('cookieconsent.accept.essentials'),
             'accept.configuration' => route('cookieconsent.accept.configuration'),
             'reset' => route('cookieconsent.reset'),
+            'edit' => route('cookieconsent.edit'),
             default => null,
         };
 

From a5bdf9ab19591eebe3213e6dd7e863688b0dfeed Mon Sep 17 00:00:00 2001
From: Debatty-Tom <145542891+Debatty-Tom@users.noreply.github.com>
Date: Wed, 8 Oct 2025 12:58:04 +0200
Subject: [PATCH 5/6] Fix pre-selection of cookies for the edit feature

---
 resources/views/cookies.blade.php       |  7 +----
 src/CookiesManager.php                  | 28 ++++++++++++++---
 src/Http/Controllers/EditController.php | 41 ++++++++++++++++++++-----
 3 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/resources/views/cookies.blade.php b/resources/views/cookies.blade.php
index 4c0d7ae..125584b 100644
--- a/resources/views/cookies.blade.php
+++ b/resources/views/cookies.blade.php
@@ -28,14 +28,9 @@
             <form action="{{ route('cookieconsent.accept.configuration') }}" method="post" class="cookies__customize">
                 @csrf
                 <div class="cookies__sections">
-                    @php
-                        $cookieName = config('cookieconsent.cookie.name');
-                        $cookieValue = $_COOKIE[$cookieName] ?? null;
-                        $preferences = $cookieValue ? json_decode($cookieValue) : [];
-                    @endphp
                     @foreach($cookies->getCategories() as $category)
                         @php
-                            $isChecked = !empty($preferences['categories'][$category->key()] ?? null);
+                            $isChecked = !empty(\Whitecube\LaravelCookieConsent\CookiesManager::$editPreferencesData[$category->key()] ?? null);
                         @endphp
                         <div class="cookies__section">
                             <label for="cookies-policy-check-{{ $category->key() }}" class="cookies__category">
diff --git a/src/CookiesManager.php b/src/CookiesManager.php
index 176fcf8..faba3c9 100644
--- a/src/CookiesManager.php
+++ b/src/CookiesManager.php
@@ -16,8 +16,9 @@ class CookiesManager
     /**
      * The user's current consent preferences.
      */
-    protected ?array $preferences = null;
+    public ?array $preferences = null;
     protected bool $editPreferences = false;
+    public static ?array $editPreferencesData = null;
 
     /**
      * Create a new Service Manager instance.
@@ -29,6 +30,9 @@ public function __construct(CookiesRegistrar $registrar, Request $request)
         $this->editPreferences = $this->isEditMode($request);
     }
 
+    /**
+     * Check if edit mode activated.
+     */
     protected function isEditMode(Request $request): bool
     {
         $raw = $request->cookie('edit-cookie');
@@ -37,8 +41,26 @@ protected function isEditMode(Request $request): bool
             return false;
         }
 
-        $edit = json_decode($raw, true);
+        $this->setEditData($raw);
+
+        $this->deleteEditCookie();
+
+        return true;
+    }
 
+    /**
+     * Set edit datas in static variable.
+     */
+    protected function setEditData($raw): void
+    {
+        self::$editPreferencesData = json_decode($raw, true) ?? null;
+    }
+
+    /**
+     * Unset the temp cookie.
+     */
+    protected function deleteEditCookie(): void
+    {
         $forgetCookie = CookieFacade::make(
             name: 'edit-cookie',
             value: null,
@@ -50,8 +72,6 @@ protected function isEditMode(Request $request): bool
         CookieFacade::queue(
             $forgetCookie
         );
-
-        return $edit;
     }
 
     /**
diff --git a/src/Http/Controllers/EditController.php b/src/Http/Controllers/EditController.php
index 8ad1a07..89a5492 100644
--- a/src/Http/Controllers/EditController.php
+++ b/src/Http/Controllers/EditController.php
@@ -3,6 +3,7 @@
 namespace Whitecube\LaravelCookieConsent\Http\Controllers;
 
 use Illuminate\Support\Facades\Cookie as CookieFacade;
+use Symfony\Component\HttpFoundation\Cookie;
 use Whitecube\LaravelCookieConsent\CookiesManager;
 use Illuminate\Http\Request;
 
@@ -10,13 +11,9 @@ class EditController
 {
     public function __invoke(Request $request, CookiesManager $cookies)
     {
-        $editCookie = CookieFacade::make(
-            name: 'edit-cookie',
-            value: json_encode(true),
-            minutes: 0,
-            domain: config('cookieconsent.cookie.domain'),
-            secure: (config('app.env') == 'local') ? false : true
-        );
+        $cookieData = $this->getEditCookieData($cookies);
+
+        $editCookie = $this->getEditCookie($cookieData);
 
         $response = ! $request->expectsJson()
             ? redirect()->back()
@@ -30,4 +27,34 @@ public function __invoke(Request $request, CookiesManager $cookies)
             $editCookie
         );
     }
+
+    protected function getEditCookieData(CookiesManager $cookies) : array
+    {
+        $categories = $cookies->getCategories();
+
+        $currentPreferences = $cookies->preferences ?? [];
+
+        $cookiesData = [];
+
+        foreach ($categories as $category) {
+            $cookieNames = collect($category->getCookies())->pluck('name');
+
+            $allAccepted = $cookieNames->every(fn($name) => !empty($currentPreferences[$name]));
+
+            $cookiesData[$category->key()] = $allAccepted;
+        }
+
+        return $cookiesData;
+    }
+
+    protected function getEditCookie(array $cookieData): Cookie
+    {
+        return CookieFacade::make(
+            name: 'edit-cookie',
+            value: json_encode($cookieData),
+            minutes: 0,
+            domain: config('cookieconsent.cookie.domain'),
+            secure: (config('app.env') == 'local') ? false : true
+        );
+    }
 }

From 5f79299a7a025ba28424ba535923f83997fb5941 Mon Sep 17 00:00:00 2001
From: Debatty-Tom <145542891+Debatty-Tom@users.noreply.github.com>
Date: Fri, 10 Oct 2025 11:24:21 +0200
Subject: [PATCH 6/6] fix indentation

---
 resources/views/cookies.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/cookies.blade.php b/resources/views/cookies.blade.php
index 125584b..a4c560f 100644
--- a/resources/views/cookies.blade.php
+++ b/resources/views/cookies.blade.php
@@ -44,8 +44,8 @@
                                            id="cookies-policy-check-{{ $category->key() }}" @checked($isChecked)/>
                                 @endif
                                 <span class="cookies__box">
-                                <strong class="cookies__label">{{ $category->title }}</strong>
-                            </span>
+                                    <strong class="cookies__label">{{ $category->title }}</strong>
+                                </span>
                                 @if($category->description)
                                     <p class="cookies__info">{{ $category->description }}</p>
                                 @endif