From 225aba40c50a6466ff3f2e3aa9602ca5ed9b598f Mon Sep 17 00:00:00 2001
From: shewood <shewood01@gmail.com>
Date: Tue, 4 Jun 2024 12:16:29 -0400
Subject: [PATCH 1/4] update footer links

---
 components/Layout.js | 57 ++++++++++++++++++++++++++++++--------------
 locales/en.js        | 10 ++++++--
 locales/fr.js        |  9 +++++--
 3 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/components/Layout.js b/components/Layout.js
index 45f948e4b..2edcd5d27 100644
--- a/components/Layout.js
+++ b/components/Layout.js
@@ -145,24 +145,45 @@ export default function Layout(props) {
 
       <IdleTimeout locale={props.locale} refPageAA={props.refPageAA} />
 
-      <Footer
-        lang={!props.locale ? 'en' : props.locale}
-        brandLinks={[
-          {
-            href: t.footerTermsAndConditionURL,
-            id: 'linkTC',
-            text: t.footerTermsAndCondition,
-          },
-          {
-            href: t.footerPrivacyURL,
-            id: 'linkPR',
-            text: t.footerPrivacy,
-          },
-        ]}
-        contactLink={contactLink}
-        btnLink="#top"
-        id="page-footer"
-      />
+      {process.env.ENVIRONMENT === 'production' ? (
+        <Footer
+          lang={!props.locale ? 'en' : props.locale}
+          brandLinks={[
+            {
+              href: t.footerTermsAndConditionURL,
+              id: 'linkTC',
+              text: t.footerTermsAndCondition,
+            },
+            {
+              href: t.footerPrivacyURL,
+              id: 'linkPR',
+              text: t.footerPrivacy,
+            },
+          ]}
+          contactLink={contactLink}
+          btnLink="#top"
+          id="page-footer"
+        />
+      ) : (
+        <Footer
+          lang={!props.locale ? 'en' : props.locale}
+          brandLinks={[
+            {
+              href: t.footerTermsAndConditionURLtest,
+              id: 'linkTC',
+              text: t.footerTermsAndCondition,
+            },
+            {
+              href: t.footerPrivacyURLtest,
+              id: 'linkPR',
+              text: t.footerPrivacy,
+            },
+          ]}
+          contactLink={contactLink}
+          btnLink="#top"
+          id="page-footer"
+        />
+      )}
     </>
   )
 }
diff --git a/locales/en.js b/locales/en.js
index 7d8125f08..3ea71a4ab 100644
--- a/locales/en.js
+++ b/locales/en.js
@@ -125,12 +125,18 @@ export default {
   footerAboutURL: 'https://www.canada.ca/en/government/about.html',
   footerAbout: 'About Canada.ca',
 
+  footerTermsAndConditionURLtest:
+    'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=eng',
   footerTermsAndConditionURL:
-    '/privacy-notice-terms-conditions#termsAndConditions',
+    'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=eng',
+
   footerTermsAndCondition: 'Terms and conditions',
   footerTermsAndConditionAnchor: 'termsAndConditions',
 
-  footerPrivacyURL: '/privacy-notice-terms-conditions',
+  footerPrivacyURLtest:
+    'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=eng',
+  footerPrivacyURL:
+    'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=eng',
   footerPrivacy: 'Privacy',
   footerPrivacyAnchor: 'privacy',
 
diff --git a/locales/fr.js b/locales/fr.js
index 59c4259ed..60674ed62 100644
--- a/locales/fr.js
+++ b/locales/fr.js
@@ -120,12 +120,17 @@ export default {
   footerAboutURL: 'https://www.canada.ca/en/government/about.html',
   footerAbout: 'À propos de Canada.ca',
 
+  footerTermsAndConditionURLtest:
+    'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerTermsAndConditionURL:
-    '/fr/avis-confidentialite-modalites#termesEtConditions',
+    'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerTermsAndCondition: 'Avis',
   footerTermsAndConditionAnchor: 'termesEtConditions',
 
-  footerPrivacyURL: '/fr/avis-confidentialite-modalites/',
+  footerPrivacyURLtest:
+    'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=fra',
+  footerPrivacyURL:
+    'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerPrivacy: 'Confidentialité',
   footerPrivacyAnchor: 'confidentialité',
 

From 6e61b8d9e387a5cfdaafae5411c9f7090e807522 Mon Sep 17 00:00:00 2001
From: shewood <shewood01@gmail.com>
Date: Tue, 4 Jun 2024 16:29:23 -0400
Subject: [PATCH 2/4] removed references for t and c privacy

---
 __mocks__/utils.mock.ts                       |   3 +
 .../privacy-notice-terms-conditions.test.js   | 106 ---------------
 cypress/e2e/termsConditions.cy.js             |  80 ------------
 .../privacy-notice-terms-conditions.ts        | 123 ------------------
 next.config.js                                |   4 -
 pages/profile.js                              |   4 +-
 pages/security-settings.js                    |   4 +-
 7 files changed, 5 insertions(+), 319 deletions(-)
 delete mode 100644 __tests__/pages/privacy-notice-terms-conditions.test.js
 delete mode 100644 cypress/e2e/termsConditions.cy.js
 delete mode 100644 graphql/mappers/privacy-notice-terms-conditions.ts

diff --git a/__mocks__/utils.mock.ts b/__mocks__/utils.mock.ts
index db3cb4975..31161b76a 100644
--- a/__mocks__/utils.mock.ts
+++ b/__mocks__/utils.mock.ts
@@ -1,3 +1,6 @@
 import { TextEncoder, TextDecoder } from 'util'
 
 Object.assign(global, { TextDecoder, TextEncoder })
+
+// for testing locally comment.
+// process.env.AUTH_DISABLED= "true"
diff --git a/__tests__/pages/privacy-notice-terms-conditions.test.js b/__tests__/pages/privacy-notice-terms-conditions.test.js
deleted file mode 100644
index 701dcd63f..000000000
--- a/__tests__/pages/privacy-notice-terms-conditions.test.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-import { render, screen } from '@testing-library/react'
-import '@testing-library/jest-dom'
-import PrivacyCondition from '../../pages/privacy-notice-terms-conditions'
-
-import { useRouter } from 'next/router'
-
-// mocks useRouter to be able to use component' router.asPath
-jest.mock('next/router', () => ({
-  useRouter: jest.fn(),
-}))
-
-// mocks useRouter to be able to use component' router.asPath
-jest.mock('../../lib/auth', () => ({
-  AuthIsDisabled: () => {
-    return true
-  },
-  AuthIsValid: () => {
-    return true
-  },
-  Redirect: jest.fn(),
-}))
-
-describe('Privacy Notice Terms Conditions page', () => {
-  const content = {
-    id: 'privacy-notice-terms-conditions',
-    breadcrumb: [
-      { link: 'my-dashboard', text: 'My dashboard', id: 'my-dashboard' },
-    ],
-    pageName: 'privacy-notice-terms-conditions',
-    heading: 'Privacy notice and terms and conditions',
-    alert: {
-      type: 'info',
-      text: 'You may wish to print this page for future reference since it contains important information.\n',
-    },
-    content:
-      'testing ## Terms and conditions of use testing 1. **Your credentials** testing',
-  }
-  const contentFr = {
-    id: 'privacy-notice-terms-conditions',
-    breadcrumb: [
-      {
-        link: 'mon-tableau-de-bord',
-        text: 'Mon tableau de bord',
-        id: 'my-dashboard',
-      },
-    ],
-    pageName: 'avis-confidentialite-modalites',
-    heading: 'Avis de confidentialité et modalités',
-    alert: {
-      type: 'info',
-      text:
-        'Vous pouvez imprimer cette page pour vous y référer ultérieurement car elle contient des informations importantes.\n' +
-        '\n' +
-        ' ',
-    },
-    content:
-      'testing ## Conditions d’utilisation testing 1. **Vos identifiants** testing',
-  }
-  const popupContent = {}
-
-  beforeEach(() => {
-    useRouter.mockImplementation(() => ({
-      pathname: '/',
-      asPath: '/',
-    }))
-  })
-
-  it('should render the page in English', () => {
-    render(
-      <PrivacyCondition
-        locale="en"
-        content={content}
-        popupContent={popupContent}
-        popupContentNA={popupContent}
-        meta={{}}
-        breadCrumbItems={content.breadcrumb}
-        langToggleLink={''}
-      />
-    )
-    const PrivacyConditionDiv = screen.getByTestId(
-      'terms-conditionsContent-test'
-    )
-    expect(PrivacyConditionDiv).toBeInTheDocument()
-  })
-
-  it('should render the page in French', () => {
-    render(
-      <PrivacyCondition
-        locale="fr"
-        content={contentFr}
-        popupContent={popupContent}
-        popupContentNA={popupContent}
-        meta={{}}
-        breadCrumbItems={content.breadcrumb}
-        langToggleLink={''}
-      />
-    )
-    const PrivacyConditionDiv = screen.getByTestId(
-      'terms-conditionsContent-test'
-    )
-    expect(PrivacyConditionDiv).toBeInTheDocument()
-  })
-})
diff --git a/cypress/e2e/termsConditions.cy.js b/cypress/e2e/termsConditions.cy.js
deleted file mode 100644
index 6a800ad15..000000000
--- a/cypress/e2e/termsConditions.cy.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/// <reference types="cypress" />
-
-describe('Validate Terms and Conditions Page', () => {
-  beforeEach(() => {
-    cy.visit('/privacy-notice-terms-conditions')
-  })
-
-  it('Terms and conditions and Privacy has no detectable a11y violations on load', () => {
-    cy.injectAxe()
-    cy.checkA11y()
-  })
-
-  it('validate the "Privacy" click on dashboard page goes to T&C page EN', () => {
-    cy.visit('/my-dashboard')
-    cy.get('#footerLink1').click()
-    cy.location('pathname', { timeout: 10000 })
-      .should('equal', '/en/privacy-notice-terms-conditions')
-    cy.get('#PrivacyCondition-heading')
-      .should('be.visible')
-      .and('have.text', 'Privacy notice and terms and conditions')
-    cy.get('#privacy-notice').should('be.visible')
-    cy.get('#digital-identity-verification--consent').should('be.visible')
-    cy.get('#system-requirements').should('be.visible')
-    cy.get('[data-cy="breadcrumb-My dashboard"]')
-      .should('be.visible')
-      .and('have.text', 'My dashboard')
-      .and('have.attr', 'href', '/en/my-dashboard')
-  })
-
-  it('validate the "Privacy" click on dashboard page goes to T&C page FR', () => {
-    cy.visit('/my-dashboard')
-    cy.changeLang().should('have.text', 'English')
-    cy.url().should('contains', '/fr/mon-tableau-de-bord')
-    cy.get('#footerLink1').click()
-    cy.location('pathname', { timeout: 10000 }).should(
-      'equal',
-      '/fr/avis-confidentialite-modalites'
-    )
-    cy.get('#PrivacyCondition-heading')
-      .should('be.visible')
-      .and('have.text', 'Avis de confidentialité et modalités')
-    cy.get('#avis-de-confidentialite').should('be.visible')
-    cy.get('#verification-de-lidentite-numerique---consentement').should(
-      'be.visible'
-    )
-    cy.get('#exigences-du-systeme').should('be.visible')
-    cy.get('[data-cy="breadcrumb-Mon tableau de bord"]')
-      .should('be.visible')
-      .and('have.text', 'Mon tableau de bord')
-      .and('have.attr', 'href', '/fr/mon-tableau-de-bord')
-  })
-
-  it('validate the "terms and conditions" click on dashboard page goes to T&C page EN', () => {
-    cy.visit('/my-dashboard')
-    cy.get('#footerLink0').click()
-    cy.location('pathname', { timeout: 10000 }).should(
-      'equal',
-      '/en/privacy-notice-terms-conditions'
-    )
-    cy.get('#termsAndConditions').should('be.visible')
-    cy.get('#terms-and-conditions-of-use').should('be.visible')
-  })
-
-  it('validate the "terms and conditions" click on dashboard page goes to T&C page FR', () => {
-    cy.visit('/my-dashboard')
-    cy.changeLang().should('have.text', 'English')
-    cy.url().should('contains', '/fr/mon-tableau-de-bord')
-    cy.get('#footerLink0').click()
-    cy.location('pathname', { timeout: 10000 }).should(
-      'equal',
-      '/fr/avis-confidentialite-modalites'
-    )
-    cy.get('#conditions-dutilisation').should('be.visible')
-    cy.get('#termesEtConditions').should('be.visible')
-  })
-
-  it('Validate the "Back to Dashboard" click navigates to dashboard page', () => {
-    cy.get('#back-to-dashboard-button').should('be.visible')
-  })
-})
diff --git a/graphql/mappers/privacy-notice-terms-conditions.ts b/graphql/mappers/privacy-notice-terms-conditions.ts
deleted file mode 100644
index 61b9696c3..000000000
--- a/graphql/mappers/privacy-notice-terms-conditions.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { cachified } from 'cachified'
-import { lruCache as cache, defaultTtl as ttl } from '../../lib/cache-utils'
-
-interface GetSchPrivacyNoticeTermsConditionsV1 {
-  data: {
-    schPageV1ByPath: {
-      item: {
-        scId: string
-        scPageNameEn: string
-        scPageNameFr: string
-        scTitleEn: string
-        scTitleFr: string
-        scDateModifiedOverwrite: string
-        scBreadcrumbParentPages: Array<{
-          scId: string
-          scTitleEn: string
-          scTitleFr: string
-          scPageNameEn: string
-          scPageNameFr: string
-        }>
-        scFragments: Array<{
-          scId: string
-          scContentEn?: {
-            markdown: string
-          }
-          scContentFr?: {
-            markdown: string
-          }
-          scTitleEn?: string
-          scTitleFr?: string
-          scDestinationURLEn?: string
-          scDestinationURLFr?: string
-        }>
-      }
-    }
-  }
-}
-
-const getCachedContent = () => {
-  return cachified({
-    key: `content-privacy-and-toc`,
-    cache,
-    getFreshValue: async () => {
-      const response = await fetch(
-        `${process.env.AEM_GRAPHQL_ENDPOINT}getSchPrivacyNoticeTermsConditionsV1`,
-      )
-      if (!response.ok) return null
-      return (await response.json()) as GetSchPrivacyNoticeTermsConditionsV1
-    },
-    ttl,
-  })
-}
-
-export async function getPrivacyConditionContent() {
-  const response = await getCachedContent()
-
-  const alertFragment = findFragmentByScId(
-    response,
-    'privacy-terms-conditions-alert',
-  )
-
-  const privacyTermsConditionsFragment = findFragmentByScId(
-    response,
-    'privacy-terms-conditions-content',
-  )
-
-  const mappedPrivacyConditions = {
-    en: {
-      id: response?.data.schPageV1ByPath.item.scId,
-      dateModified: response?.data.schPageV1ByPath.item.scDateModifiedOverwrite,
-      breadcrumb:
-        response?.data.schPageV1ByPath.item.scBreadcrumbParentPages.map(
-          (level) => {
-            return {
-              link: level.scPageNameEn,
-              text: level.scTitleEn,
-              id: level.scId,
-            }
-          },
-        ),
-      pageName: response?.data.schPageV1ByPath.item.scPageNameEn,
-      heading: response?.data.schPageV1ByPath.item.scTitleEn,
-      alert: {
-        type: 'information',
-        text: alertFragment?.scContentEn?.markdown,
-      },
-      content: privacyTermsConditionsFragment?.scContentEn?.markdown,
-    },
-    fr: {
-      id: response?.data.schPageV1ByPath.item.scId,
-      dateModified: response?.data.schPageV1ByPath.item.scDateModifiedOverwrite,
-      breadcrumb:
-        response?.data.schPageV1ByPath.item.scBreadcrumbParentPages.map(
-          (level) => {
-            return {
-              link: level.scPageNameFr,
-              text: level.scTitleFr,
-              id: level.scId,
-            }
-          },
-        ),
-      pageName: response?.data.schPageV1ByPath.item.scPageNameFr,
-      heading: response?.data.schPageV1ByPath.item.scTitleFr,
-      alert: {
-        type: 'information',
-        text: alertFragment?.scContentFr?.markdown,
-      },
-      content: privacyTermsConditionsFragment?.scContentFr?.markdown,
-    },
-  }
-  return mappedPrivacyConditions
-}
-
-const findFragmentByScId = (
-  res: GetSchPrivacyNoticeTermsConditionsV1 | null,
-  id: string,
-) => {
-  return (
-    res?.data.schPageV1ByPath.item.scFragments.find(
-      (element) => element.scId === id,
-    ) ?? null
-  )
-}
diff --git a/next.config.js b/next.config.js
index 78792b9cb..7f27caf4e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -29,10 +29,6 @@ const REWRITES = [
     source: '/contactez-nous/communiquer-regime-pensions-canada',
     destination: '/contact-us/contact-canada-pension-plan',
   },
-  {
-    source: '/avis-confidentialite-modalites',
-    destination: '/privacy-notice-terms-conditions',
-  },
   {
     source: '/demande-revision',
     destination: '/decision-reviews',
diff --git a/pages/profile.js b/pages/profile.js
index d4778385b..0c3ad526f 100644
--- a/pages/profile.js
+++ b/pages/profile.js
@@ -37,9 +37,7 @@ export default function Profile(props) {
         errType={errorCode}
         isAuth={false}
         homePageLink={
-          props.locale === 'en'
-            ? 'en/privacy-notice-terms-conditions'
-            : 'fr/avis-confidentialite-modalites'
+          props.locale === 'en' ? 'en/my-dashboard' : 'fr/mon-tableau-de-bord'
         }
         accountPageLink={
           props?.locale === 'en'
diff --git a/pages/security-settings.js b/pages/security-settings.js
index fa0086ccc..4e517d503 100644
--- a/pages/security-settings.js
+++ b/pages/security-settings.js
@@ -34,9 +34,7 @@ export default function SecuritySettings(props) {
         errType={errorCode}
         isAuth={false}
         homePageLink={
-          props.locale === 'en'
-            ? 'en/privacy-notice-terms-conditions'
-            : 'fr/avis-confidentialite-modalites'
+          props.locale === 'en' ? 'en/my-dashboard' : 'fr/mon-tableau-de-bord'
         }
         accountPageLink={
           props?.locale === 'en'

From 1df88af69e1846a1cc12b102aae6253925b7fe9f Mon Sep 17 00:00:00 2001
From: shewood <shewood01@gmail.com>
Date: Tue, 4 Jun 2024 16:40:44 -0400
Subject: [PATCH 3/4] remove privacy page

---
 pages/privacy-notice-terms-conditions.js | 317 -----------------------
 1 file changed, 317 deletions(-)
 delete mode 100644 pages/privacy-notice-terms-conditions.js

diff --git a/pages/privacy-notice-terms-conditions.js b/pages/privacy-notice-terms-conditions.js
deleted file mode 100644
index 68fdd35d1..000000000
--- a/pages/privacy-notice-terms-conditions.js
+++ /dev/null
@@ -1,317 +0,0 @@
-import { useEffect, useCallback, useMemo, useState } from 'react'
-import PropTypes from 'prop-types'
-import Date from '../components/Date'
-import Heading from '../components/Heading'
-import ContextualAlert from '../components/ContextualAlert'
-import en from '../locales/en'
-import fr from '../locales/fr'
-import { getPrivacyConditionContent } from '../graphql/mappers/privacy-notice-terms-conditions'
-import { getLogger } from '../logging/log-util'
-import {
-  AuthIsDisabled,
-  AuthIsValid,
-  ValidateSession,
-  Redirect,
-  getIdToken,
-} from '../lib/auth'
-import { authOptions } from '../pages/api/auth/[...nextauth]'
-import { getServerSession } from 'next-auth/next'
-import BackToButton from '../components/BackToButton'
-import Markdown from 'markdown-to-jsx'
-import { getAuthModalsContent } from '../graphql/mappers/auth-modals'
-import React from 'react'
-import ErrorPage from '../components/ErrorPage'
-
-export default function PrivacyCondition(props) {
-  const t = props.locale === 'en' ? en : fr
-
-  const errorCode =
-    props.content?.err ||
-    props.bannerContent?.err ||
-    props.popupContent?.err ||
-    props.popupContentNA?.err ||
-    props.authModals?.err
-  if (errorCode !== undefined) {
-    return (
-      <ErrorPage
-        lang={props.locale !== undefined ? props.locale : 'en'}
-        errType={errorCode}
-        isAuth={false}
-        homePageLink={
-          props.locale === 'en'
-            ? 'en/privacy-notice-terms-conditions'
-            : 'fr/avis-confidentialite-modalites'
-        }
-        accountPageLink={
-          props?.locale === 'en'
-            ? 'https://srv136.services.gc.ca/sc/msca-mdsc/portal-portail/pro/home-accueil?Lang=eng'
-            : 'https://srv136.services.gc.ca/sc/msca-mdsc/portal-portail/pro/home-accueil?Lang=fra'
-        }
-      />
-    )
-  }
-
-  const pageContent = props.content.content
-
-  const [privacy, ...termsAndConditions] = pageContent.split(
-    props.locale === 'en'
-      ? /(?=## Terms and conditions of use|1\. \*\*Your credentials\*\*)/
-      : /(?=## Conditions d’utilisation|1\. \*\*Vos identifiants\*\*)/,
-  )
-
-  return (
-    <div data-cy="terms-conditions" data-testid="terms-conditionsContent-test">
-      <Heading
-        id="PrivacyCondition-heading"
-        title={props.content.heading}
-        className="mb-2"
-      />
-      <ul>
-        <ContextualAlert
-          id="PrivacyCondition-alert"
-          type={props.content.alert.type}
-          alertBody={props.content.alert.text}
-          alert_icon_alt_text={`${props.content.alert.type} ${
-            props.locale === 'fr' ? 'Icônes' : 'icon'
-          }`}
-          alert_icon_id="alert-icon-id"
-        />
-      </ul>
-      <section id={t.footerPrivacyAnchor}>
-        <Markdown
-          options={{
-            overrides: {
-              h2: {
-                props: {
-                  className:
-                    'text-3xl text-gray-darker font-display font-bold mt-10 mb-3',
-                },
-              },
-              p: {
-                props: {
-                  className: 'mb-3 text-gray-darker',
-                },
-              },
-              ol: {
-                props: {
-                  className:
-                    'list-[lower-latin] [&>li>ol]:list-[lower-latin] [&>li>ol>li]:list-[lower-roman] [&>li>ol>li>ol]:list-[lower-roman] ml-4 sm:mx-8 mb-3 text-gray-darker',
-                },
-              },
-              a: {
-                props: {
-                  className: 'underline text-deep-blue-dark cursor-pointer',
-                },
-              },
-            },
-          }}
-        >
-          {privacy}
-        </Markdown>
-      </section>
-      <section id={t.footerTermsAndConditionAnchor}>
-        <Markdown
-          options={{
-            overrides: {
-              h2: {
-                props: {
-                  className:
-                    'text-3xl font-display font-bold mt-10 mb-3 text-gray-darker',
-                },
-              },
-              p: {
-                props: {
-                  className: 'mb-3 text-gray-darker',
-                },
-              },
-              ol: {
-                props: {
-                  className:
-                    'break-all xs:break-normal list-[lower-latin] ml-2 sm:mx-8 mb-3 text-gray-darker',
-                },
-              },
-            },
-          }}
-        >
-          {termsAndConditions[0]}
-        </Markdown>
-        <Markdown
-          options={{
-            overrides: {
-              h2: {
-                props: {
-                  className:
-                    'text-3xl font-display font-bold mt-10 mb-3 text-gray-darker',
-                },
-              },
-              p: {
-                props: {
-                  className: 'mb-3 text-gray-darker',
-                },
-              },
-              ol: {
-                props: {
-                  className:
-                    'break-all xs:break-normal list-[lower-decimal] [&>li>ol]:list-[lower-latin] [&>li>ol>li>ol]:list-[lower-roman] ml-2 sm:mx-8 mb-3 text-gray-darker',
-                },
-              },
-              a: {
-                props: {
-                  className: 'underline text-deep-blue-dark cursor-pointer',
-                },
-              },
-            },
-          }}
-        >
-          {termsAndConditions[1]}
-        </Markdown>
-      </section>
-      <BackToButton
-        buttonHref={t.url_dashboard}
-        buttonId="back-to-dashboard-button"
-        buttonLinkText={t.backToDashboard}
-        refPageAA={props.aaPrefix}
-        id={t.id_dashboard}
-      />
-      <Date
-        id="termsConditionsDateModified"
-        date={props.content.dateModified}
-        label={t.dateModified}
-      />
-    </div>
-  )
-}
-
-export async function getServerSideProps({ req, res, locale }) {
-  const session = await getServerSession(req, res, authOptions)
-
-  if (!AuthIsDisabled() && !(await AuthIsValid(req, session)))
-    return Redirect(locale)
-
-  const token = await getIdToken(req)
-
-  //If Next-Auth session is valid, check to see if ECAS session is and redirect to logout if not
-  if (!AuthIsDisabled() && (await AuthIsValid(req, session))) {
-    const sessionValid = await ValidateSession(
-      process.env.CLIENT_ID,
-      token?.sid,
-    )
-    if (!sessionValid) {
-      return {
-        redirect: {
-          destination: `/${locale}/auth/logout`,
-          permanent: false,
-        },
-      }
-    }
-  }
-
-  //The below sets the minimum logging level to error and surpresses everything below that
-  const logger = getLogger('privacy-notice-terms-and-conditions')
-  logger.level = 'error'
-
-  const content = await getPrivacyConditionContent().catch((error) => {
-    logger.error(error)
-    return { err: '500' }
-  })
-
-  const authModals = await getAuthModalsContent().catch((error) => {
-    logger.error(error)
-    return { err: '500' }
-  })
-
-  /* istanbul ignore next */
-  const langToggleLink =
-    locale === 'en'
-      ? '/fr/avis-confidentialite-modalites'
-      : '/en/privacy-notice-terms-conditions'
-
-  const breadCrumbItems =
-    locale === 'en'
-      ? content.en.breadcrumb?.map(({ link, text }) => {
-          return { text, link: '/' + locale + '/' + link }
-        })
-      : content.fr.breadcrumb?.map(({ link, text }) => {
-          return { text, link: '/' + locale + '/' + link }
-        })
-  /* Place-holder Meta Data Props */
-  const meta = {
-    data_en: {
-      title:
-        'Privacy notice and terms and conditions - My Service Canada Account',
-      desc: 'English',
-      author: 'Service Canada',
-      keywords: '',
-      service: 'ESDC-EDSC_MSCA-MSDC-SCH',
-      creator: 'Employment and Social Development Canada',
-      accessRights: '1',
-    },
-    data_fr: {
-      title:
-        'Avis de confidentialité et modalités - Mon dossier Service Canada',
-      desc: 'Français',
-      author: 'Service Canada',
-      keywords: '',
-      service: 'ESDC-EDSC_MSCA-MSDC-SCH',
-      creator: 'Emploi et Développement social Canada',
-      accessRights: '1',
-    },
-  }
-
-  return {
-    props: {
-      locale,
-      langToggleLink,
-      content:
-        content?.err !== undefined
-          ? content
-          : locale === 'en'
-            ? content.en
-            : content.fr,
-      meta,
-      breadCrumbItems,
-      aaPrefix:
-        content?.err !== undefined
-          ? ''
-          : `ESDC-EDSC_MSCA-MSDC-SCH:${content.en?.heading || content.en?.title}`,
-      aaMenuPrefix:
-        content?.err !== undefined ? '' : `ESDC-EDSC_MSCA-MSDC-SCH:Nav Menu`,
-      popupStaySignedIn:
-        authModals?.err !== undefined
-          ? authModals
-          : locale === 'en'
-            ? authModals.mappedPopupStaySignedIn.en
-            : authModals.mappedPopupStaySignedIn.fr,
-      popupYouHaveBeenSignedout:
-        authModals?.err !== undefined
-          ? authModals
-          : locale === 'en'
-            ? authModals.mappedPopupSignedOut.en
-            : authModals.mappedPopupSignedOut.fr,
-    },
-  }
-}
-
-PrivacyCondition.propTypes = {
-  /**
-   * current locale in the address
-   */
-  locale: PropTypes.string,
-
-  /*
-   * Language link toggle text
-   */
-  langToggleLink: PropTypes.string,
-
-  /*
-   * Content Tags
-   */
-
-  content: PropTypes.object,
-
-  /*
-   * Meta Tags
-   */
-
-  meta: PropTypes.object,
-}

From 5c8d42424e187b733dcfaf380943b5a2470c48f0 Mon Sep 17 00:00:00 2001
From: shewood <shewood01@gmail.com>
Date: Thu, 27 Jun 2024 09:29:44 -0400
Subject: [PATCH 4/4] updated names for testing url

---
 components/Layout.js | 4 ++--
 locales/en.js        | 4 ++--
 locales/fr.js        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/Layout.js b/components/Layout.js
index a5285b7bb..c31dbef64 100644
--- a/components/Layout.js
+++ b/components/Layout.js
@@ -171,12 +171,12 @@ export default function Layout(props) {
           lang={!props.locale ? 'en' : props.locale}
           brandLinks={[
             {
-              href: t.footerTermsAndConditionURLtest,
+              href: t.footerTermsAndConditionDevURL,
               id: 'linkTC',
               text: t.footerTermsAndCondition,
             },
             {
-              href: t.footerPrivacyURLtest,
+              href: t.footerPrivacyDevURL,
               id: 'linkPR',
               text: t.footerPrivacy,
             },
diff --git a/locales/en.js b/locales/en.js
index 90514d913..d70d08fdf 100644
--- a/locales/en.js
+++ b/locales/en.js
@@ -125,7 +125,7 @@ export default {
   footerAboutURL: 'https://www.canada.ca/en/government/about.html',
   footerAbout: 'About Canada.ca',
 
-  footerTermsAndConditionURLtest:
+  footerTermsAndConditionDevURL:
     'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=eng',
   footerTermsAndConditionURL:
     'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=eng',
@@ -133,7 +133,7 @@ export default {
   footerTermsAndCondition: 'Terms and conditions',
   footerTermsAndConditionAnchor: 'termsAndConditions',
 
-  footerPrivacyURLtest:
+  footerPrivacyDevURL:
     'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=eng',
   footerPrivacyURL:
     'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=eng',
diff --git a/locales/fr.js b/locales/fr.js
index 18b93a09a..f16c8d5b5 100644
--- a/locales/fr.js
+++ b/locales/fr.js
@@ -120,14 +120,14 @@ export default {
   footerAboutURL: 'https://www.canada.ca/en/government/about.html',
   footerAbout: 'À propos de Canada.ca',
 
-  footerTermsAndConditionURLtest:
+  footerTermsAndConditionDevURL:
     'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerTermsAndConditionURL:
     'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerTermsAndCondition: 'Avis',
   footerTermsAndConditionAnchor: 'termesEtConditions',
 
-  footerPrivacyURLtest:
+  footerPrivacyDevURL:
     'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerPrivacyURL:
     'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=fra',