refactor

ethyca · Sep 19, 2023 · 7bce7a5 · 7bce7a5
1 parent 99913af
commit 7bce7a5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/clients/fides-js/src/fides.ts b/clients/fides-js/src/fides.ts
@@ -72,7 +72,8 @@ import {
 import {
   constructFidesRegionString,
   debugLog,
-  experienceIsValid,
+  experienceIsValidAndHasNotices,
+  experienceHasNotices,
   transformConsentToFidesUserPreference,
   validateOptions,
 } from "./lib/consent-utils";
@@ -133,7 +134,7 @@ const automaticallyApplyGPCPreferences = (
   fidesRegionString: string | null,
   fidesApiUrl: string,
   debug: boolean,
-  effectiveExperience?: PrivacyExperience | null
+  effectiveExperience?: PrivacyExperience
 ) => {
   if (!effectiveExperience || !effectiveExperience.privacy_notices) {
     return;
@@ -216,7 +217,7 @@ const init = async ({
     _Fides.geolocation = geolocation;
     _Fides.options = options;
     _Fides.initialized = true;
-    if (experience && Object.keys(experience).length >= 0) {
+    if (experienceHasNotices(experience)) {
       // at this point, pre-fetched experience contains no user consent, so we populate with the Fides cookie
       updateExperienceFromCookieConsent(
         experience as PrivacyExperience,
@@ -253,7 +254,7 @@ const init = async ({
         `User location could not be obtained. Skipping overlay initialization.`
       );
       shouldInitOverlay = false;
-    } else if (!effectiveExperience) {
+    } else if (!experienceHasNotices(experience)) {
       effectiveExperience = await fetchExperience(
         fidesRegionString,
         options.fidesApiUrl,
@@ -262,11 +263,7 @@ const init = async ({
       );
     }
 
-    if (
-      effectiveExperience &&
-      Object.keys(effectiveExperience).length >= 0 &&
-      experienceIsValid(effectiveExperience as PrivacyExperience, options)
-    ) {
+    if (experienceIsValidAndHasNotices(effectiveExperience, options)) {
       // Overwrite cookie consent with experience-based consent values
       cookie.consent = buildCookieConsentForExperiences(
         effectiveExperience as PrivacyExperience,
@@ -285,7 +282,7 @@ const init = async ({
     }
   }
   if (shouldInitOverlay) {
-    if (effectiveExperience && Object.keys(effectiveExperience).length >= 0) {
+    if (experienceHasNotices(effectiveExperience)) {
       automaticallyApplyGPCPreferences(
         cookie,
         fidesRegionString,

diff --git a/clients/fides-js/src/lib/consent-utils.ts b/clients/fides-js/src/lib/consent-utils.ts
@@ -26,6 +26,22 @@ export const debugLog = (
   }
 };
 
+/**
+ * Returns true if privacy experience has notices
+ */
+export const experienceHasNotices = (
+  experience: PrivacyExperience | undefined | {}
+): boolean => {
+  if (experience && Object.keys(experience).length >= 0) {
+    const privacyExperience = experience as PrivacyExperience;
+    return Boolean(
+      privacyExperience.privacy_notices &&
+        privacyExperience.privacy_notices.length > 0
+    );
+  }
+  return false;
+};
+
 /**
  * Construct user location str to be ingested by Fides API
  * Returns null if geolocation cannot be constructed by provided params, e.g. us_ca
@@ -139,37 +155,26 @@ export const validateOptions = (options: FidesOptions): boolean => {
 /**
  * Determines whether experience is valid and relevant notices exist within the experience
  */
-export const experienceIsValid = (
-  effectiveExperience: PrivacyExperience | undefined,
+export const experienceIsValidAndHasNotices = (
+  effectiveExperience: PrivacyExperience | undefined | {},
   options: FidesOptions
 ): boolean => {
-  if (!effectiveExperience) {
-    debugLog(
-      options.debug,
-      `No relevant experience found. Skipping overlay initialization.`
-    );
-    return false;
-  }
-  if (
-    !(
-      effectiveExperience.privacy_notices &&
-      effectiveExperience.privacy_notices.length > 0
-    )
-  ) {
+  if (!experienceHasNotices(effectiveExperience)) {
     debugLog(
       options.debug,
-      `No relevant notices in the privacy experience. Skipping overlay initialization.`,
-      effectiveExperience
+      `Privacy experience has no notices. Skipping overlay initialization.`
     );
     return false;
   }
+  // @ts-ignore
   if (effectiveExperience.component !== ComponentType.OVERLAY) {
     debugLog(
       options.debug,
       "No experience found with overlay component. Skipping overlay initialization."
     );
     return false;
   }
+  // @ts-ignore
   if (!effectiveExperience.experience_config) {
     debugLog(
       options.debug,