Merge pull request #1538 from sharetribe/ga4-improvements

Add cookie_flags and relax google analytics domain
sharetribe · Jul 19, 2022 · 1f8faa8 · 1f8faa8
2 parents 818a636 + 45adf2d
commit 1f8faa8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern:
 
 ## Upcoming version 2022-XX-XX
 
+- [fix] Add cookie_flags and relax google analytics domain
+  [#1538](https://github.com/sharetribe/ftw-daily/pull/1538)
 - [fix] the import of customMediaQueries.css was somehow missed with these components:
   FieldReviewRating, SearchFiltersSecondary and TopbarMobileMenu.
   [#1537](https://github.com/sharetribe/ftw-daily/pull/1537)

diff --git a/server/csp.js b/server/csp.js
@@ -33,7 +33,7 @@ const defaultDirectives = {
 
     // Google Analytics
     'www.googletagmanager.com',
-    'www.google-analytics.com',
+    '*.google-analytics.com',
     'stats.g.doubleclick.net',
 
     'sentry.io',

diff --git a/server/renderer.js b/server/renderer.js
@@ -142,7 +142,9 @@ exports.render = function(requestUrl, context, data, renderApp, webExtractor) {
         function gtag(){dataLayer.push(arguments);}
         gtag('js', new Date());
       
-        gtag('config', '${googleAnalyticsId}');
+        gtag('config', '${googleAnalyticsId}', {
+          cookie_flags: 'SameSite=None;Secure',
+        });
       </script>
     `;
   const googleAnalyticsScript = hasGoogleAnalyticsv4Id ? gtagScripts : '';