-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into LA-164-Checking-Oauth-Access-token-regeneration
- Loading branch information
Showing
13 changed files
with
238 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,32 @@ | ||
| import { EthycaLogo, Link, LinkProps } from "fidesui"; | ||
|
|
||
| const BrandLink = (props: LinkProps) => ( | ||
| <Link | ||
| fontSize="8px" | ||
| color="gray.400" | ||
| isExternal | ||
| textDecoration="none" | ||
| _hover={{ textDecoration: "none" }} | ||
| {...props} | ||
| > | ||
| Powered by <EthycaLogo color="minos.500" h="20px" w="31px" /> | ||
| </Link> | ||
| ); | ||
| import { useSettings } from "~/features/common/settings.slice"; | ||
|
|
||
| const BrandLink = ({ | ||
| position = "absolute", | ||
| right = 6, | ||
| ...props | ||
| }: LinkProps) => { | ||
| const { SHOW_BRAND_LINK } = useSettings(); | ||
|
|
||
| if (!SHOW_BRAND_LINK) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <Link | ||
| fontSize="8px" | ||
| color="gray.400" | ||
| isExternal | ||
| position={position} | ||
| right={right} | ||
| textDecoration="none" | ||
| _hover={{ textDecoration: "none" }} | ||
| {...props} | ||
| > | ||
| Powered by <EthycaLogo color="minos.500" h="20px" w="31px" /> | ||
| </Link> | ||
| ); | ||
| }; | ||
|
|
||
| export default BrandLink; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| import { GetServerSideProps } from "next"; | ||
| import Head from "next/head"; | ||
| import { useRouter } from "next/router"; | ||
| import Script from "next/script"; | ||
|
|
||
| interface Props { | ||
| gtmContainerId: string | null; | ||
| privacyCenterUrl: string; | ||
| } | ||
|
|
||
| // Regex to ensure the provided GTM container ID appears valid (e.g. "GTM-ABCD123") | ||
| // NOTE: this also protects against XSS since this ID is added to a script template | ||
| const VALID_GTM_REGEX = /^[0-9a-zA-Z-]+$/; | ||
|
|
||
| /** | ||
| * Pass the following server-side ENV variables to the page: | ||
| * - FIDES_SAMPLE_APP__GOOGLE_TAG_MANAGER_CONTAINER_ID: configure a GTM container, e.g. "GTM-ABCD123" | ||
| * - FIDES_SAMPLE_APP__PRIVACY_CENTER_URL: configure Privacy Center URL, e.g. "http://localhost:3001" | ||
| */ | ||
| export const getServerSideProps: GetServerSideProps<Props> = async () => { | ||
| // Check for a valid FIDES_SAMPLE_APP__GOOGLE_TAG_MANAGER_CONTAINER_ID | ||
| let gtmContainerId = null; | ||
| if ( | ||
| process.env.FIDES_SAMPLE_APP__GOOGLE_TAG_MANAGER_CONTAINER_ID?.match( | ||
| VALID_GTM_REGEX, | ||
| ) | ||
| ) { | ||
| gtmContainerId = | ||
| process.env.FIDES_SAMPLE_APP__GOOGLE_TAG_MANAGER_CONTAINER_ID; | ||
| } | ||
|
|
||
| // Check for a valid FIDES_SAMPLE_APP__PRIVACY_CENTER_URL | ||
| const privacyCenterUrl = | ||
| process.env.FIDES_SAMPLE_APP__PRIVACY_CENTER_URL || "http://localhost:3001"; | ||
|
|
||
| // Pass the server-side props to the page | ||
| return { props: { gtmContainerId, privacyCenterUrl } }; | ||
| }; | ||
|
|
||
| const IndexPage = ({ gtmContainerId, privacyCenterUrl }: Props) => { | ||
| // Load the fides.js script from the Fides Privacy Center, assumed to be | ||
| // running at http://localhost:3001 | ||
| const fidesScriptTagUrl = new URL(`${privacyCenterUrl}/fides.js`); | ||
| const router = useRouter(); | ||
| // eslint-disable-next-line @typescript-eslint/naming-convention | ||
| const { geolocation, property_id } = router.query; | ||
|
|
||
| // If `geolocation=` or `property_id` query params exists, pass those along to the fides.js fetch | ||
| if (geolocation && typeof geolocation === "string") { | ||
| fidesScriptTagUrl.searchParams.append("geolocation", geolocation); | ||
| } | ||
| if (typeof property_id === "string") { | ||
| fidesScriptTagUrl.searchParams.append("property_id", property_id); | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| <Head> | ||
| <title>Cookie House</title> | ||
| {/* Require FidesJS to "embed" it's UI onto the page, instead of as an overlay over the <body> itself. (see https://ethyca.com/docs/dev-docs/js/reference/interfaces/FidesOptions#fides_embed) */} | ||
| <script>{`window.fides_overrides = { fides_embed: true, fides_disable_banner: true }`}</script> | ||
| {/* Allow the embedded consent modal to fill the screen */} | ||
| <style>{`#fides-embed-container { --fides-overlay-width: 'auto' }`}</style> | ||
| </Head> | ||
| {/** | ||
| Insert the fides.js script and run the GTM integration once ready | ||
| DEFER: using "beforeInteractive" here triggers a lint warning from NextJS | ||
| as it should only be used in the _document.tsx file. This still works and | ||
| ensures that fides.js fires earlier than other scripts, but isn't a best | ||
| practice. | ||
| */} | ||
| <Script | ||
| id="fides-js" | ||
| src={fidesScriptTagUrl.href} | ||
| onReady={() => { | ||
| // Enable the GTM integration, if GTM is configured | ||
| if (gtmContainerId) { | ||
| (window as any).Fides.gtm(); | ||
| } | ||
| }} | ||
| /> | ||
| {/* Insert the GTM script, if a container ID was provided */} | ||
| {gtmContainerId ? ( | ||
| <Script id="google-tag-manager" strategy="afterInteractive"> | ||
| {` | ||
| (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': | ||
| new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], | ||
| j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= | ||
| 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); | ||
| })(window,document,'script','dataLayer','${gtmContainerId}'); | ||
| `} | ||
| </Script> | ||
| ) : null} | ||
| <div id="fides-embed-container" /> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default IndexPage; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.