Get bwid client side

Author: ioannakok

dotcom-rendering/src/components/Metrics.importable.tsx

@@ -9,8 +9,9 @@ import {
 	bypassCoreWebVitalsSampling,
 	initCoreWebVitals,
 } from '@guardian/core-web-vitals';
-import { getCookie, isString, isUndefined } from '@guardian/libs';
+import { isUndefined } from '@guardian/libs';
 import { useCallback, useEffect, useState } from 'react';
+import { useBrowserId } from '../lib/metrics';
 import { useAB, useBetaAB } from '../lib/useAB';
 import { useAdBlockInUse } from '../lib/useAdBlockInUse';
 import { useDetectAdBlock } from '../lib/useDetectAdBlock';
@@ -41,20 +42,6 @@ const shouldCollectMetricsForBetaTests = (userTestParticipations: string[]) => {
 	);
 };
 
-const useBrowserId = () => {
-	const [browserId, setBrowserId] = useState<string>();
-
-	useEffect(() => {
-		const cookie = getCookie({ name: 'bwid', shouldMemoize: true });
-
-		const id = isString(cookie) ? cookie : 'no-browser-id-available';
-
-		setBrowserId(id);
-	}, []);
-
-	return browserId;
-};
-
 const useDev = () => {
 	const [isDev, setIsDev] = useState<boolean>();
 

dotcom-rendering/src/components/SecureSignup.importable.tsx

@@ -26,6 +26,7 @@ import { useAuthStatus, useIsSignedIn } from '../lib/useAuthStatus';
 import { palette } from '../palette';
 import type { RenderingTarget } from '../types/renderingTarget';
 import { useConfig } from './ConfigContext';
+import { useBrowserId } from '../lib/metrics';
 
 // The Google documentation specifies that if the 'recaptcha-badge' is hidden,
 // their T+C's must be displayed instead. While this component hides the
@@ -136,6 +137,7 @@ const buildFormData = (
 	newsletterId: string,
 	token: string,
 	marketingOptIn?: boolean,
+	browserId?: string,
 ): FormData => {
 	const pageRef = window.location.origin + window.location.pathname;
 	const refViewId = window.guardian.ophan?.pageViewId ?? '';
@@ -155,6 +157,10 @@ const buildFormData = (
 		formData.append('marketing', marketingOptIn ? 'true' : 'false');
 	}
 
+	if (browserId !== undefined) {
+		formData.append('browserId', browserId);
+	}
+
 	return formData;
 };
 
@@ -304,6 +310,7 @@ export const SecureSignup = ({
 		});
 	}, []);
 	const { renderingTarget } = useConfig();
+	const browserId = useBrowserId();
 
 	const hasResponse = typeof responseOk === 'boolean';
 
@@ -319,6 +326,7 @@ export const SecureSignup = ({
 			newsletterId,
 			token,
 			marketingOptIn,
+			browserId,
 		);
 
 		const response = await postFormData(

dotcom-rendering/src/lib/metrics.ts

@@ -0,0 +1,16 @@
+import { getCookie, isString } from '@guardian/libs';
+import { useEffect, useState } from 'react';
+
+export const useBrowserId = (): string | undefined => {
+	const [browserId, setBrowserId] = useState<string>();
+
+	useEffect(() => {
+		const cookie = getCookie({ name: 'bwid', shouldMemoize: true });
+
+		const id = isString(cookie) ? cookie : 'no-browser-id-available';
+
+		setBrowserId(id);
+	}, []);
+
+	return browserId;
+};

dotcom-rendering/src/lib/newsletter-sign-up-requests.ts

@@ -1,4 +1,3 @@
-import { getCookie } from '@guardian/libs';
 import type { TAction } from '@guardian/ophan-tracker-js';
 import { submitComponentEvent } from '../client/ophan/ophan';
 import type { RenderingTarget } from '../types/renderingTarget';
@@ -11,8 +10,6 @@ const buildNewsletterSignUpFormData = (
 ): FormData => {
 	const pageRef = window.location.origin + window.location.pathname;
 	const refViewId = window.guardian.ophan?.pageViewId ?? '';
-	const browserId =
-		getCookie({ name: 'bwid', shouldMemoize: true }) ?? undefined;
 
 	const formData = new FormData();
 	formData.append('email', emailAddress);
@@ -37,10 +34,6 @@ const buildNewsletterSignUpFormData = (
 		formData.append('marketing', marketingOptIn ? 'true' : 'false');
 	}
 
-	if (browserId !== undefined) {
-		formData.append('browserId', browserId);
-	}
-
 	return formData;
 };