Add userBenefitsApiUrl to schemas

guardian · Jan 15, 2025 · 36dece9 · 36dece9
1 parent 0099434
commit 36dece9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/dotcom-rendering/playwright/tests/user.features.e2e.spec.ts b/dotcom-rendering/playwright/tests/user.features.e2e.spec.ts
@@ -8,7 +8,7 @@ test.describe('User cookies tests', () => {
 	const userAttributesApiUrl =
 		'https://members-data-api.theguardian.com/user-attributes';
 	const userBenefitsApiUrl =
-		'https://user-benefits.code.dev-guardianapis.com';
+		'https://user-benefits.code.dev-guardianapis.com/me';
 	test(`Request to user features API is sent when no user features expiry cookie`, async ({
 		context,
 		page,
@@ -22,7 +22,7 @@ test.describe('User cookies tests', () => {
 		await disableCMP(context);
 
 		const userBenefitsApiPromise = page.waitForRequest(
-			`${userBenefitsApiUrl}/me`,
+			`${userBenefitsApiUrl}`,
 		);
 
 		await loadPageNoOkta(page, standardArticle, {
@@ -68,9 +68,7 @@ test.describe('User cookies tests', () => {
 
 		await disableCMP(context);
 
-		const userBenefitsApiPromise = page.waitForRequest(
-			`${userBenefitsApiUrl}/me`,
-		);
+		const userBenefitsApiPromise = page.waitForRequest(userBenefitsApiUrl);
 
 		await loadPageNoOkta(page, standardArticle, {
 			// user-features expects this config to be present

diff --git a/dotcom-rendering/scripts/perf/k6/article-nier-automata.json b/dotcom-rendering/scripts/perf/k6/article-nier-automata.json
@@ -1746,6 +1746,7 @@
 		"isPhotoEssay": false,
 		"ampIframeUrl": "https://assets.guim.co.uk/data/vendor/2533d5cb94302889e6a8f1b24b5329e7/amp-iframe.html",
 		"userAttributesApiUrl": "https://members-data-api.theguardian.com/user-attributes",
+		"userBenefitsApiUrl": "https://user-benefits.guardianapis.com/benefits/me",
 		"isLive": false,
 		"publication": "theguardian.com",
 		"brazeApiKey": "7f28c639-8bda-48ff-a3f6-24345abfc07c",

diff --git a/dotcom-rendering/src/client/userFeatures/userBenefitsApi.ts b/dotcom-rendering/src/client/userFeatures/userBenefitsApi.ts
@@ -14,10 +14,8 @@ export const syncDataFromUserBenefitsApi = async (
 	signedInAuthStatus: SignedInWithOkta | SignedInWithCookies,
 ): Promise<UserBenefits> => {
 	const response = await fetchJson(
-		`${
-			window.guardian.config.page.userBenefitsApiUrl ??
-			'https://user-benefits.code.dev-guardianapis.com/benefits/me'
-		}/me`,
+		window.guardian.config.page.userBenefitsApiUrl ??
+			'https://user-benefits.code.dev-guardianapis.com/benefits/me',
 		{
 			mode: 'cors',
 			...getOptionsHeadersWithOkta(signedInAuthStatus),

diff --git a/dotcom-rendering/src/model/front-schema.json b/dotcom-rendering/src/model/front-schema.json
@@ -84,6 +84,9 @@
                 "userAttributesApiUrl": {
                     "type": "string"
                 },
+				"userBenefitsApiUrl": {
+					"type": "string"
+				},
                 "host": {
                     "type": "string"
                 },
@@ -343,6 +346,7 @@
                 "supportUrl",
                 "switches",
                 "userAttributesApiUrl",
+				"userBenefitsApiUrl",
                 "webTitle"
             ]
         },
@@ -3873,4 +3877,4 @@
         }
     },
     "$schema": "http://json-schema.org/draft-07/schema#"
-}
+}
diff --git a/dotcom-rendering/src/model/tag-page-schema.json b/dotcom-rendering/src/model/tag-page-schema.json
@@ -977,6 +977,9 @@
                 "userAttributesApiUrl": {
                     "type": "string"
                 },
+				"userBenefitsApiUrl": {
+					"type": "string"
+				},
                 "host": {
                     "type": "string"
                 },
@@ -1236,6 +1239,7 @@
                 "supportUrl",
                 "switches",
                 "userAttributesApiUrl",
+				"userBenefitsApiUrl",
                 "webTitle"
             ]
         },
@@ -1937,4 +1941,4 @@
         }
     },
     "$schema": "http://json-schema.org/draft-07/schema#"
-}
+}
diff --git a/dotcom-rendering/src/types/front.ts b/dotcom-rendering/src/types/front.ts
@@ -470,6 +470,7 @@ export type FEFrontConfigType = {
 	ampIframeUrl: string;
 	beaconUrl: string;
 	userAttributesApiUrl: string;
+	userBenefitsApiUrl: string;
 	host: string;
 	brazeApiKey?: string;
 	calloutsUrl: string;