Remove Identity Cookie and Refactor Authentication for Okta only (#13537)

* Remove OKTA test code

Author: DanielCliftonGuardian

dotcom-rendering/fixtures/generated/football-live.ts

@@ -1008,7 +1008,6 @@ export const footballData: FEFootballDataPage = {
 			extendedMostPopular: true,
 			ampContentAbTesting: false,
 			prebidCriteo: true,
-			okta: true,
 			imrWorldwide: true,
 			acast: true,
 			twitterUwt: true,

dotcom-rendering/scripts/perf/k6/article-nier-automata.json

@@ -1579,7 +1579,6 @@
 			"ampContentAbTesting": false,
 			"prebidCriteo": true,
 			"verticalVideoSurvey": false,
-			"okta": true,
 			"abDeeplyReadArticleFooter": false,
 			"imrWorldwide": true,
 			"acast": true,

dotcom-rendering/src/client/bootCmp.ts

@@ -2,7 +2,7 @@ import type { ConsentState } from '@guardian/libs';
 import { cmp, onConsent } from '@guardian/libs';
 import { getCookie, log } from '@guardian/libs';
 import { getLocaleCode } from '../lib/getCountryCode';
-import { isUserLoggedInOktaRefactor } from '../lib/identity';
+import { isUserLoggedIn } from '../lib/identity';
 import type { RenderingTarget } from '../types/renderingTarget';
 import { getOphan } from './ophan/ophan';
 import { allowRejectAll } from './userFeatures/cookies/allowRejectAll';
@@ -61,7 +61,7 @@ const initialiseCmp = async () => {
 	const code = await getLocaleCode();
 	const browserId = getCookie({ name: 'bwid', shouldMemoize: true });
 	const { pageViewId } = window.guardian.config.ophan;
-	const isUserSignedIn = await isUserLoggedInOktaRefactor();
+	const isUserSignedIn = await isUserLoggedIn();
 	// If user has the "reject all" benefit then show the reduced, "non-advertised" list
 	const useNonAdvertisedList = allowRejectAll(isUserSignedIn);
 

dotcom-rendering/src/client/userFeatures/user-features.test.ts

@@ -2,7 +2,7 @@ import { getCookie } from '@guardian/libs';
 import type { AuthStatus } from '../../lib/identity';
 import {
 	getAuthStatus as getAuthStatus_,
-	isUserLoggedInOktaRefactor as isUserLoggedInOktaRefactor_,
+	isUserLoggedIn as isUserLoggedIn_,
 } from '../../lib/identity';
 import { AD_FREE_USER_COOKIE, getAdFreeCookie } from './cookies/adFree';
 import {
@@ -42,17 +42,16 @@ jest.mock('./fetchJson', () => {
 });
 
 jest.mock('../../lib/identity', () => ({
-	isUserLoggedInOktaRefactor: jest.fn(),
+	isUserLoggedIn: jest.fn(),
 	getAuthStatus: jest.fn(),
-	getOptionsHeadersWithOkta: jest.fn(),
+	getOptionsHeaders: jest.fn(),
 }));
 
 const fetchJsonSpy = fetchJson as jest.MockedFunction<typeof fetchJson>;
 
-const isUserLoggedInOktaRefactor =
-	isUserLoggedInOktaRefactor_ as jest.MockedFunction<
-		typeof isUserLoggedInOktaRefactor_
-	>;
+const isUserLoggedIn = isUserLoggedIn_ as jest.MockedFunction<
+	typeof isUserLoggedIn_
+>;
 
 const getAuthStatus = getAuthStatus_ as jest.MockedFunction<
 	typeof getAuthStatus_
@@ -99,9 +98,9 @@ describe('Refreshing the benefits data', () => {
 	describe('If user signed in', () => {
 		beforeEach(() => {
 			jest.resetAllMocks();
-			isUserLoggedInOktaRefactor.mockResolvedValue(true);
+			isUserLoggedIn.mockResolvedValue(true);
 			getAuthStatus.mockResolvedValue({
-				kind: 'SignedInWithOkta',
+				kind: 'SignedIn',
 			} as AuthStatus);
 			fetchJsonSpy.mockReturnValue(Promise.resolve(fakeUserBenefits));
 		});
@@ -148,7 +147,7 @@ describe('Refreshing the benefits data', () => {
 describe('If user signed out', () => {
 	beforeEach(() => {
 		jest.resetAllMocks();
-		isUserLoggedInOktaRefactor.mockResolvedValue(false);
+		isUserLoggedIn.mockResolvedValue(false);
 		fetchJsonSpy.mockReturnValue(Promise.resolve(noBenefits));
 	});
 
@@ -192,9 +191,9 @@ describe('Benefit to cookie mapping', () => {
 	) => {
 		jest.resetAllMocks();
 		deleteAllCookies();
-		isUserLoggedInOktaRefactor.mockResolvedValue(true);
+		isUserLoggedIn.mockResolvedValue(true);
 		getAuthStatus.mockResolvedValue({
-			kind: 'SignedInWithOkta',
+			kind: 'SignedIn',
 		} as AuthStatus);
 
 		// Mock the fetchJson function to return the current benefit only

dotcom-rendering/src/client/userFeatures/user-features.ts

@@ -4,7 +4,7 @@
  * https://github.com/guardian/commercial/blob/1a429d6be05657f20df4ca909df7d01a5c3d7402/src/lib/user-features.ts
  */
 
-import { getAuthStatus, isUserLoggedInOktaRefactor } from '../../lib/identity';
+import { getAuthStatus, isUserLoggedIn } from '../../lib/identity';
 import { AD_FREE_USER_COOKIE } from './cookies/adFree';
 import { ALLOW_REJECT_ALL_COOKIE } from './cookies/allowRejectAll';
 import { createOrRenewCookie } from './cookies/cookieHelpers';
@@ -22,20 +22,14 @@ export type UserBenefits = {
 };
 
 const refresh = async (): Promise<void> => {
-	if (
-		(await isUserLoggedInOktaRefactor()) &&
-		userBenefitsDataNeedsRefreshing()
-	) {
+	if ((await isUserLoggedIn()) && userBenefitsDataNeedsRefreshing()) {
 		await requestNewData();
 	}
 };
 
 const requestNewData = async () => {
 	const authStatus = await getAuthStatus();
-	if (
-		authStatus.kind !== 'SignedInWithCookies' &&
-		authStatus.kind !== 'SignedInWithOkta'
-	) {
+	if (authStatus.kind !== 'SignedIn') {
 		return Promise.reject('The user is not signed in');
 	}
 	return syncDataFromUserBenefitsApi(authStatus).then(persistResponse);

dotcom-rendering/src/client/userFeatures/userBenefitsApi.ts

@@ -1,25 +1,21 @@
 import { isObject } from '@guardian/libs';
-import {
-	getOptionsHeadersWithOkta,
-	type SignedInWithCookies,
-	type SignedInWithOkta,
-} from '../../lib/identity';
+import { getOptionsHeaders, type SignedIn } from '../../lib/identity';
 import { fetchJson } from './fetchJson';
 import type { UserBenefits } from './user-features';
 
 type UserBenefitsResponse = {
 	benefits: string[];
 };
 export const syncDataFromUserBenefitsApi = async (
-	signedInAuthStatus: SignedInWithOkta | SignedInWithCookies,
+	signedInAuthStatus: SignedIn,
 ): Promise<UserBenefits> => {
 	const url = window.guardian.config.page.userBenefitsApiUrl;
 	if (!url) {
 		throw new Error('userBenefitsApiUrl is not defined');
 	}
 	const response = await fetchJson(url, {
 		mode: 'cors',
-		...getOptionsHeadersWithOkta(signedInAuthStatus),
+		...getOptionsHeaders(signedInAuthStatus),
 	});
 	if (!validateResponse(response)) {
 		throw new Error('invalid response');

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

@@ -1,6 +1,6 @@
 import { joinUrl } from '@guardian/libs';
 import type { GetDiscussionSuccess, UserProfile } from '../lib/discussion';
-import { getOptionsHeadersWithOkta } from '../lib/identity';
+import { getOptionsHeaders } from '../lib/identity';
 import { useApi } from '../lib/useApi';
 import { useAuthStatus } from '../lib/useAuthStatus';
 import { useCommentCount } from '../lib/useCommentCount';
@@ -30,17 +30,15 @@ export const DiscussionMeta = ({
 	);
 
 	const { data: userData } = useApi<{ userProfile: UserProfile }>(
-		authStatus.kind === 'SignedInWithOkta' ||
-			authStatus.kind === 'SignedInWithCookies'
+		authStatus.kind === 'SignedIn'
 			? joinUrl(
 					discussionApiUrl,
 					'profile/me?strict_sanctions_check=false',
 			  )
 			: undefined,
 		{},
-		authStatus.kind === 'SignedInWithOkta' ||
-			authStatus.kind === 'SignedInWithCookies'
-			? getOptionsHeadersWithOkta(authStatus)
+		authStatus.kind === 'SignedIn'
+			? getOptionsHeaders(authStatus)
 			: undefined,
 	);
 

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

@@ -10,8 +10,8 @@ import {
 	reportAbuse,
 	unPickComment,
 } from '../lib/discussionApi';
-import type { SignedInWithCookies, SignedInWithOkta } from '../lib/identity';
-import { getOptionsHeadersWithOkta } from '../lib/identity';
+import type { SignedIn } from '../lib/identity';
+import { getOptionsHeaders } from '../lib/identity';
 import { useAuthStatus } from '../lib/useAuthStatus';
 import { useHydrated } from '../lib/useHydrated';
 import type { Props as DiscussionProps } from './Discussion';
@@ -23,11 +23,11 @@ const getUser = async ({
 	authStatus,
 }: {
 	discussionApiUrl: string;
-	authStatus: SignedInWithCookies | SignedInWithOkta;
+	authStatus: SignedIn;
 }): Promise<SignedInUser | undefined> => {
 	const data: unknown = await fetch(
 		joinUrl(discussionApiUrl, 'profile/me?strict_sanctions_check=false'),
-		getOptionsHeadersWithOkta(authStatus),
+		getOptionsHeaders(authStatus),
 	)
 		.then((r) => r.json())
 		.catch(() => undefined);
@@ -94,8 +94,7 @@ export const DiscussionWeb = (
 
 	useEffect(() => {
 		if (authStatus.kind === 'Pending') return;
-		if (authStatus.kind === 'SignedOutWithCookies') return;
-		if (authStatus.kind === 'SignedOutWithOkta') return;
+		if (authStatus.kind === 'SignedOut') return;
 
 		getUser({ discussionApiUrl: props.discussionApiUrl, authStatus })
 			.then(setUser)

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

@@ -148,7 +148,7 @@ const buildFormData = (
 const resolveEmailIfSignedIn = async (): Promise<string | undefined> => {
 	const { idApiUrl } = window.guardian.config.page;
 	if (!idApiUrl) return;
-	const fetchedEmail = await lazyFetchEmailWithTimeout(idApiUrl)();
+	const fetchedEmail = await lazyFetchEmailWithTimeout()();
 	if (!fetchedEmail) return;
 	return fetchedEmail;
 };

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

@@ -6,7 +6,7 @@ import {
 } from '../lib/contributions';
 import { getDailyArticleCount, getToday } from '../lib/dailyArticleCount';
 import type { EditionId } from '../lib/edition';
-import { isUserLoggedInOktaRefactor } from '../lib/identity';
+import { isUserLoggedIn } from '../lib/identity';
 import { parseCheckoutCompleteCookieData } from '../lib/parser/parseCheckoutOutCookieData';
 import { constructQuery } from '../lib/querystring';
 import { useAB } from '../lib/useAB';
@@ -233,9 +233,7 @@ const SignInGateSelectorDefault = ({
 	switches,
 }: PropsDefault) => {
 	const authStatus = useAuthStatus();
-	const isSignedIn =
-		authStatus.kind === 'SignedInWithOkta' ||
-		authStatus.kind === 'SignedInWithCookies';
+	const isSignedIn = authStatus.kind === 'SignedIn';
 	const [isGateDismissed, setIsGateDismissed] = useState<boolean | undefined>(
 		undefined,
 	);
@@ -685,7 +683,7 @@ const SignInGateSelectorAuxia = ({
 	useOnce(() => {
 		void (async () => {
 			// Only make a request to Auxia if user is signed out. This means signed-in users will never receive an Auxia treatment, and therefore never see a sign-in gate
-			const isSignedIn = await isUserLoggedInOktaRefactor();
+			const isSignedIn = await isUserLoggedIn();
 
 			// Although the component is returning null if we are in preview or it's a paid content
 			// We need to guard against the API possibly being called before the component returns.