Merge pull request #1425 from guardian/user-benefits-api

Use user-benefits API to work out newspaper archive entitlement

Author: rupertbates

server/apiProxy.ts

@@ -185,6 +185,7 @@ export const authorizationOrCookieHeader = async ({
 	}
 	switch (host) {
 		case 'members-data-api.' + conf.DOMAIN:
+		case 'user-benefits.' + conf.API_DOMAIN:
 			return {
 				Authorization: `Bearer ${req.signedCookies[OAuthAccessTokenCookieName]}`,
 			};

server/routes/newspaperArchive.ts

@@ -18,8 +18,8 @@ const NewspapersResponseSchema = z.object({
 	url: z.string(),
 });
 
-const UserAttributesSchema = z.object({
-	contentAccess: z.record(z.string(), z.boolean()),
+const userBenefitsSchema = z.object({
+	benefits: z.array(z.string()),
 });
 
 type NewspaperArchiveConfig = {
@@ -47,13 +47,16 @@ router.get('/auth', async (req: Request, res: Response) => {
 			return res.sendStatus(500);
 		}
 
+		console.log('Checking supporter entitlement');
 		const hasCorrectEntitlement = await checkSupporterEntitlement(req);
 
 		if (!hasCorrectEntitlement) {
 			// ToDo: show the user an error/info page
+			console.log('User does not have the newspaper archive entitlement');
 			return res.redirect('/');
 		}
 
+		console.log('User has the newspaper archive entitlement');
 		const authHeader = base64(`${authString}`);
 		const requestBody: NewspapersRequestBody = {};
 
@@ -107,22 +110,16 @@ router.get('/auth', async (req: Request, res: Response) => {
 export { router };
 
 async function checkSupporterEntitlement(req: Request): Promise<boolean> {
-	const supporterAttributesResponse = await getSupporterStatus(req);
-	const supporterAttributes = UserAttributesSchema.parse(
-		await supporterAttributesResponse.json(),
-	);
-
-	// ToDo: this should return a flag that represents either Tier 3 or a newspaperArchive specific entitlement
-	return (
-		supporterAttributes.contentAccess['guardianWeeklySubscriber'] &&
-		supporterAttributes.contentAccess['supporterPlus']
-	);
+	const supporterAttributes = await getSupporterStatus(req)
+		.then((res) => res.json())
+		.then((json) => userBenefitsSchema.parse(json));
+	return supporterAttributes.benefits.includes('newspaperArchive');
 }
 
 async function getSupporterStatus(req: Request) {
-	const host = 'members-data-api.' + conf.DOMAIN;
+	const host = 'user-benefits.' + conf.API_DOMAIN;
 
-	return fetch(`https://${host}/user-attributes/me`, {
+	return fetch(`https://${host}/benefits/me`, {
 		method: 'GET',
 		headers: {
 			...(await authorizationOrCookieHeader({ req, host })),