Support secure cookies over https

Author: iMattPro

event/listener.php

@@ -80,6 +80,7 @@ public function load_google_analytics()
 			'GOOGLEANALYTICS_TAG'		=> $this->config['googleanalytics_tag'],
 			'GOOGLEANALYTICS_USER_ID'	=> $this->user->data['user_id'],
 			'S_ANONYMIZE_IP'			=> $this->config['ga_anonymize_ip'],
+			'S_COOKIE_SECURE'			=> $this->config['cookie_secure'],
 		]);
 	}
 

styles/all/template/event/overall_header_stylesheets_after.html

@@ -13,6 +13,7 @@
 				{%- EVENT phpbb_googleanalytics_gtag_options -%}
 				{%- if S_REGISTERED_USER %}'user_id': '{{ GOOGLEANALYTICS_USER_ID }}',{% endif -%}
 				{%- if S_ANONYMIZE_IP %}'anonymize_ip': true,{% endif -%}
+				{%- if S_COOKIE_SECURE -%}'cookie_flags': 'samesite=none;secure',{%- endif -%}
 			});
 		</script>
 	{% else %}
@@ -25,6 +26,7 @@
 			ga('create', '{{ GOOGLEANALYTICS_ID }}', 'auto');
 			{% if S_REGISTERED_USER %}ga('set', 'userId', {{ GOOGLEANALYTICS_USER_ID }});{% endif %}
 			{% if S_ANONYMIZE_IP %}ga('set', 'anonymizeIp', true);{% endif %}
+			{% if S_COOKIE_SECURE %}ga('set', 'cookie_flags', 'samesite=none;secure');{% endif %}
 			{% EVENT phpbb_googleanalytics_alter_ga_requirements -%}
 			ga('send', 'pageview');
 		</script>

tests/event/listener_test.php

@@ -48,7 +48,9 @@ protected function setUp(): void
 		// Load/Mock classes required by the event listener class
 		$this->config = new \phpbb\config\config([
 			'googleanalytics_id' => 'UA-000000-01',
+			'googleanalytics_tag' => 1,
 			'ga_anonymize_ip' => 0,
+			'cookie_secure' => 0,
 		]);
 		$this->template = $this->getMockBuilder('\phpbb\template\template')
 			->getMock();
@@ -108,6 +110,7 @@ public function test_load_google_analytics()
 				'GOOGLEANALYTICS_TAG'		=> $this->config['googleanalytics_tag'],
 				'GOOGLEANALYTICS_USER_ID'	=> $this->user->data['user_id'],
 				'S_ANONYMIZE_IP'			=> $this->config['ga_anonymize_ip'],
+				'S_COOKIE_SECURE'			=> $this->config['cookie_secure'],
 			]);
 
 		$dispatcher = new \phpbb\event\dispatcher();