refactor: pageToReturnTo, forYouUrl

Author: elvinasv

src/app/contexts/AccountContext/index.tsx

@@ -5,7 +5,9 @@ import onClient from '#app/lib/utilities/onClient';
 import { AccountContextProps, IdctaConfig } from '#app/models/types/account';
 import appendCtaQueryParams from '#app/lib/idcta/appendCtaQueryParams';
 
-export const AccountContext = createContext<AccountContextProps | null>(null);
+export const AccountContext = createContext<AccountContextProps>(
+  {} as AccountContextProps,
+);
 
 const getSignedInCookie = (cookieName = 'ckns_id') => {
   return onClient() ? Cookie.get(cookieName) : false;
@@ -19,24 +21,25 @@ export const AccountProvider = ({
   initialConfig: IdctaConfig | null;
 }) => {
   const { locale } = use(ServiceContext);
-  const [ptrt, setPtrt] = useState<string | undefined>(undefined);
+  const [pageToReturnTo, setPageToReturnTo] = useState<string | null>(null);
 
   useEffect(() => {
-    setPtrt(window.location.href);
+    setPageToReturnTo(window.location.href);
   }, []);
 
   const idIdctaAvailable = initialConfig?.['id-availability'] === 'GREEN';
 
   const buildAccountUrl = (url?: string) => {
     return idIdctaAvailable && url
-      ? appendCtaQueryParams(url, { ptrt, lang: locale })
+      ? appendCtaQueryParams(url, { pageToReturnTo, lang: locale })
       : initialConfig?.unavailable_url;
   };
 
   const signInUrl = buildAccountUrl(initialConfig?.signin_url);
   const registerUrl = buildAccountUrl(initialConfig?.register_url);
   const settingsUrl = buildAccountUrl(initialConfig?.settings_url);
   const signOutUrl = buildAccountUrl(initialConfig?.signout_url);
+  const forYouUrl = buildAccountUrl(initialConfig?.foryou_url);
 
   const cookieName = initialConfig?.identity.idSignedInCookieName;
   const isSignedIn = idIdctaAvailable
@@ -51,8 +54,10 @@ export const AccountProvider = ({
       signOutUrl,
       registerUrl,
       settingsUrl,
+      forYouUrl,
     }),
     [
+      forYouUrl,
       idIdctaAvailable,
       isSignedIn,
       registerUrl,

src/app/lib/idcta/appendCtaQueryParams.ts

@@ -1,12 +1,12 @@
 type Params = {
-  ptrt?: string;
-  lang?: string;
+  pageToReturnTo?: string | null;
+  lang?: string | null;
 };
 
-export default (url: string, { ptrt, lang }: Params = {}): string => {
+export default (url: string, { pageToReturnTo, lang }: Params = {}): string => {
   const ctaUrl = new URL(url);
 
-  if (ptrt) ctaUrl.searchParams.set('ptrt', ptrt);
+  if (pageToReturnTo) ctaUrl.searchParams.set('ptrt', pageToReturnTo);
   if (lang) ctaUrl.searchParams.set('lang', lang);
 
   return ctaUrl.toString();

src/app/models/types/account.ts

@@ -8,6 +8,7 @@ export type IdctaConfig = {
   register_url: string;
   settings_url: string;
   signout_url: string;
+  foryou_url: string;
   identity: {
     idSignedInCookieName: string;
   };
@@ -20,4 +21,5 @@ export type AccountContextProps = {
   registerUrl?: string;
   settingsUrl?: string;
   signOutUrl?: string;
+  forYouUrl?: string;
 };