refactor: Simplify cookie sync manager

Author: rmi22186

src/cookieSyncManager.ts

@@ -1,4 +1,9 @@
-import { Dictionary, isEmpty, replaceAmpWithAmpersand, replaceMPID } from './utils';
+import {
+    Dictionary,
+    isEmpty,
+    replaceAmpWithAmpersand,
+    combineUrlWithRedirect,
+} from './utils';
 import Constants from './constants';
 import { MParticleWebSDK } from './sdkRuntimeModels';
 import { MPID } from '@mparticle/web-sdk';
@@ -25,7 +30,6 @@ export interface IPixelConfiguration {
 }
 export interface ICookieSyncManager {
     attemptCookieSync: (
-        previousMPID: MPID,
         mpid: MPID,
         mpidIsNotInCookies?: boolean
     ) => void;
@@ -34,7 +38,6 @@ export interface ICookieSyncManager {
         moduleId: string,
         mpid: MPID,
         cookieSyncDates: CookieSyncDates,
-        filteringConsentRuleValues: IConsentRules,
         mpidIsNotInCookies: boolean,
         requiresConsent: boolean
     ) => void;
@@ -47,17 +50,19 @@ export interface ICookieSyncManager {
 
 const hasFrequencyCapExpired = (
     frequencyCap: number,
-    lastSyncDate?: number,
+    lastSyncDate?: number
 ): boolean => {
+    // If there is no lastSyncDate, then there is no previous cookie sync, so we should sync the cookie
     if (!lastSyncDate) {
         return true;
     }
 
+    // Otherwise, compare the last sync date to determine if it should do a cookie sync again
     return (
         new Date().getTime() >
         new Date(lastSyncDate).getTime() + frequencyCap * DAYS_IN_MILLISECONDS
     );
-}
+};
 
 export default function CookieSyncManager(
     this: ICookieSyncManager,
@@ -67,17 +72,20 @@ export default function CookieSyncManager(
 
     // Public
     this.attemptCookieSync = (
-        previousMPID: MPID,
         mpid: MPID,
         mpidIsNotInCookies?: boolean
     ): void => {
         if (!mpid || mpInstance._Store.webviewBridgeEnabled) {
             return;
         }
 
-        const { pixelConfigurations } = mpInstance._Store;
         const persistence = mpInstance._Persistence.getPersistence();
 
+        if (isEmpty(persistence)) {
+            return;
+        }
+
+        const { pixelConfigurations } = mpInstance._Store;
         pixelConfigurations.forEach((pixelSettings: IPixelConfiguration) => {
             // set requiresConsent to false to start each additional pixel configuration
             // set to true only if filteringConsenRuleValues.values.length exists
@@ -91,6 +99,17 @@ export default function CookieSyncManager(
                 requiresConsent = true;
             }
 
+            // if MPID is new to cookies, we should not try to perform the cookie sync
+            // because a cookie sync can only occur once a user either consents or doesn't
+            // we should not check if its enabled if the user has a blank consent
+            if (requiresConsent && mpidIsNotInCookies) {
+                return;
+            }
+
+            if (isEmpty(pixelSettings.pixelUrl) && isEmpty(pixelSettings.redirectUrl)) {
+                return;
+            }
+
             // Kit Module ID
             const moduleId = pixelSettings.moduleId.toString();
 
@@ -104,98 +123,58 @@ export default function CookieSyncManager(
                 ? replaceAmpWithAmpersand(pixelSettings.redirectUrl)
                 : null;
 
-            const urlWithRedirect = this.combineUrlWithRedirect(
+            const urlWithRedirect = combineUrlWithRedirect(
                 mpid,
                 pixelUrl,
                 redirectUrl
             );
 
-            // reset shouldPerformCookieSync to false
-            let shouldPerformCookieSync = false;
-            if (previousMPID && previousMPID !== mpid) {
-                if (persistence && persistence[mpid]) {
-                    if (!persistence[mpid].csd) {
-                        persistence[mpid].csd = {};
-                    }
-                    shouldPerformCookieSync = true;
-                }
-            } else {
-                if (!persistence || !persistence[mpid]) {
-                    return;
-                }
-
+            // set up csd object if it doesn't exist
+            if (persistence && persistence[mpid]) {
                 if (!persistence[mpid].csd) {
                     persistence[mpid].csd = {};
                 }
+            }
 
-                const lastSyncDateForModule = persistence[mpid].csd[moduleId] || null;
+            const lastSyncDateForModule = persistence[mpid].csd[moduleId] || null;
 
-                // Check to see if we need to refresh cookieSync
-                if (hasFrequencyCapExpired(frequencyCap, lastSyncDateForModule)) {
-                    shouldPerformCookieSync = true;
-                }
+            const { isEnabledForUserConsent } = mpInstance._Consent;
+            if (!isEnabledForUserConsent(filteringConsentRuleValues, mpInstance.Identity.getCurrentUser())) {
+                return;
             }
 
-            if (shouldPerformCookieSync) {
-                self.performCookieSync(
-                    urlWithRedirect,
-                    moduleId,
-                    mpid,
-                    persistence[mpid].csd,
-                    filteringConsentRuleValues,
-                    mpidIsNotInCookies,
-                    requiresConsent
-                );
+            if (!hasFrequencyCapExpired(frequencyCap, lastSyncDateForModule)) {
+                return;
             }
 
+            self.performCookieSync(
+                urlWithRedirect,
+                moduleId,
+                mpid,
+                persistence[mpid].csd,
+                mpidIsNotInCookies,
+                requiresConsent
+            );
         });
     };
 
-    this.combineUrlWithRedirect = (
-        mpid: MPID,
-        pixelUrl: string,
-        redirectUrl: string,
-    ): string => {
-        const url = replaceMPID(pixelUrl, mpid);
-        const redirect = redirectUrl ? replaceMPID(redirectUrl, mpid) : '';
-        return url + encodeURIComponent(redirect);
-    };
-
     // Private
     this.performCookieSync = (
         url: string,
         moduleId: string,
         mpid: MPID,
         cookieSyncDates: CookieSyncDates,
-        filteringConsentRuleValues: IConsentRules,
-        mpidIsNotInCookies: boolean,
-        requiresConsent: boolean
     ): void => {
-        // if MPID is new to cookies, we should not try to perform the cookie sync
-        // because a cookie sync can only occur once a user either consents or doesn't
-        // we should not check if its enabled if the user has a blank consent
-        if (requiresConsent && mpidIsNotInCookies) {
-            return;
-        }
+        const img = document.createElement('img');
 
-        if (
-            // https://go.mparticle.com/work/SQDSDKS-5009
-            mpInstance._Consent.isEnabledForUserConsent(
-                filteringConsentRuleValues,
-                mpInstance.Identity.getCurrentUser()
-            )
-        ) {
-            const img = document.createElement('img');
-
-            mpInstance.Logger.verbose(InformationMessages.CookieSync);
-            img.onload = function() {
-                cookieSyncDates[moduleId] = new Date().getTime();
-                mpInstance._Persistence.saveUserCookieSyncDatesToPersistence(
-                    mpid,
-                    cookieSyncDates
-                );
-            };
-            img.src = url;
-        }
+        mpInstance.Logger.verbose(InformationMessages.CookieSync);
+        img.onload = function() {
+            cookieSyncDates[moduleId] = new Date().getTime();
+            mpInstance._Persistence.saveUserCookieSyncDatesToPersistence(
+                mpid,
+                cookieSyncDates
+            );
+        };
+        img.src = url;
     };
 }

src/identity.js

@@ -1230,10 +1230,7 @@ export default function Identity(mpInstance) {
                     this.getUserIdentities().userIdentities,
                     mpInstance._APIClient.prepareForwardingStats
                 );
-                mpInstance._CookieSyncManager.attemptCookieSync(
-                    null,
-                    this.getMPID()
-                );
+                mpInstance._CookieSyncManager.attemptCookieSync(this.getMPID());
             },
             isLoggedIn: function() {
                 return isLoggedIn;
@@ -1562,7 +1559,6 @@ export default function Identity(mpInstance) {
                     );
 
                     mpInstance._CookieSyncManager.attemptCookieSync(
-                        previousMPID,
                         identityApiResult.mpid,
                         mpidIsNotInCookies
                     );

src/utils.ts

@@ -180,6 +180,16 @@ const replaceMPID = (value: string, mpid: MPID): string => value.replace('%%mpid
 
 const replaceAmpWithAmpersand = (value: string): string => value.replace(/&/g, '&');
 
+const combineUrlWithRedirect = (
+    mpid: MPID,
+    pixelUrl: string,
+    redirectUrl: string,
+): string => {
+    const url = replaceMPID(pixelUrl, mpid);
+    const redirect = redirectUrl ? replaceMPID(redirectUrl, mpid) : '';
+    return url + encodeURIComponent(redirect);
+};
+
 // FIXME: REFACTOR for V3
 // only used in store.js to sanitize server-side formatting of
 // booleans when checking for `isDevelopmentMode`
@@ -373,4 +383,5 @@ export {
     getHref,
     replaceMPID,
     replaceAmpWithAmpersand,
+    combineUrlWithRedirect,
 };