giving the nonce to the different generated script tags

Author: Debatty-Tom

src/AnalyticCookiesCategory.php

@@ -33,9 +33,9 @@ public function google(string $id, bool $anonymizeIp = true): static
                     ->description(__('cookieConsent::cookies.defaults._gat'))
                 )
                 ->accepted(fn(Consent $consent) => $consent
-                    ->script('<script async src="https://www.googletagmanager.com/gtag/js?id=' . $id . '"></script>')
+                    ->script('<script nonce="" async src="https://www.googletagmanager.com/gtag/js?id=' . $id . '"></script>')
                     ->script(
-                        '<script>window.dataLayer=window.dataLayer||[];function gtag(){dataLayer.push(arguments);}gtag(\'js\',new Date());gtag(\'config\',\'' . $id . '\', {\'anonymize_ip\':' . $anonymizeIp . '});</script>'
+                        '<script nonce="">window.dataLayer=window.dataLayer||[];function gtag(){dataLayer.push(arguments);}gtag(\'js\',new Date());gtag(\'config\',\'' . $id . '\', {\'anonymize_ip\':' . $anonymizeIp . '});</script>'
                     )
                 );
         });

src/ConsentResponse.php

@@ -26,7 +26,7 @@ class ConsentResponse
     /**
      * Transform the collected data into a JSON response-object.
      */
-    public function handleConsent(Cookie|CookiesGroup $instance): static
+    public function handleConsent(Cookie|CookiesGroup $instance, string|null $nonce): static
     {
         if(! $instance->hasConsentCallback()) {
             return $this;
@@ -35,7 +35,7 @@ public function handleConsent(Cookie|CookiesGroup $instance): static
         $consent = $instance->getConsentResult();
 
         $this->attachCookies($consent->getCookies());
-        $this->attachScripts($consent->getScripts());
+        $this->attachScripts($consent->getScripts(), $nonce);
 
         return $this;
     }
@@ -65,20 +65,24 @@ public function attachCookie(CookieComponent $cookie): static
     /**
      * Add multiple script tags to the consent response.
      */
-    public function attachScripts(array $tags): static
+    public function attachScripts(array $tags, string|null $nonce): static
     {
         foreach ($tags as $tag) {
-            $this->attachScript($tag);
+            $this->attachScript($tag, $nonce);
         }
-        
+
         return $this;
     }
 
     /**
      * Add a single script tag to the consent response.
      */
-    public function attachScript(string $tag): static
+    public function attachScript(string $tag, ?string $nonce = null): static
     {
+        if ($nonce && str_contains($tag, 'nonce=""')) {
+            $tag = str_replace('nonce=""', 'nonce="' . $nonce . '"', $tag);
+        }
+
         $this->scripts[] = $tag;
 
         return $this;

src/CookiesManager.php

@@ -8,6 +8,7 @@
 
 class CookiesManager
 {
+    protected string|null $nonce = null;
     /**
      * The cookies registrar.
      */
@@ -141,13 +142,22 @@ 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 $this->hasConsentFor($instance->name)
-                    ? $response->handleConsent($instance)
-                    : $response;
-            }, $response);
-        }, new ConsentResponse());
+        $nonce = $this->nonce;
+        return array_reduce(
+            $this->registrar->getCategories(),
+            function($response, $category) use ($nonce) {
+                return array_reduce(
+                    $category->getDefined(),
+                    function(ConsentResponse $response, Cookie|CookiesGroup $instance) use ($nonce) {
+                        return $this->hasConsentFor($instance->name)
+                            ? $response->handleConsent($instance, $nonce)
+                            : $response;
+                    },
+                    $response
+                );
+            },
+            new ConsentResponse()
+        );
     }
 
     /**
@@ -169,6 +179,7 @@ protected function makeConsentCookie(): CookieComponent
      */
     public function renderScripts(string|null $nonce, bool $withDefault = true): string
     {
+        $this->nonce = $nonce;
         $output = $this->shouldDisplayNotice()
             ? $this->getNoticeScripts($nonce, $withDefault)
             : $this->getConsentedScripts($nonce, $withDefault);
@@ -283,16 +294,14 @@ public function replaceInfoTag(string $wysiwyg): string
         $cookieConsentInfo = view('cookie-consent::info', [
             'cookies' => $this->registrar,
         ])->render();
-        
-        $formattedString = preg_replace(
+
+        return preg_replace(
             [
                 '/\<(\w)[^\>]+\>\@cookieconsentinfo\<\/\1\>/',
                 '/\@cookieconsentinfo/',
             ],
             $cookieConsentInfo,
             $wysiwyg,
         );
-
-        return $formattedString;
     }
 }