Address PR Comments

Author: alexs-mparticle

src/cookieSyncManager.interfaces.ts

@@ -3,6 +3,19 @@ import { Dictionary } from './utils';
 import { IConsentRules } from './consent';
 
 export type CookieSyncDates = Dictionary<number>; 
+
+export interface IPixelConfiguration {
+    name?: string;
+    moduleId: number;
+    esId?: number;
+    isDebug?: boolean;
+    isProduction?: boolean;
+    settings: Dictionary<string>;
+    frequencyCap: number;
+    pixelUrl: string;
+    redirectUrl: string;
+    filteringConsentRuleValues?: IConsentRules;
+}
 export interface ICookieSyncManager {
     attemptCookieSync: (
         previousMPID: MPID,

src/cookieSyncManager.ts

@@ -8,14 +8,6 @@ import { IConsentRules } from './consent';
 const { Messages } = Constants;
 const { InformationMessages } = Messages;
 
-interface PixelConfig {
-    moduleId: string;
-    frequencyCap: number;
-    pixelUrl: string;
-    redirectUrl: string;
-    filteringConsentRuleValues: IConsentRules;
-}
-
 export const DAYS_IN_MILLISECONDS = 1000 * 60 * 60 * 24;
 
 const hasFrequencyCapExpired = (
@@ -107,9 +99,7 @@ export default function CookieSyncManager(
                     persistence[mpid].csd = {};
                 }
 
-                const lastSyncDateForModule = persistence[mpid].csd[moduleId]
-                    ? persistence[mpid].csd[moduleId]
-                    : null;
+                const lastSyncDateForModule = persistence[mpid].csd[moduleId] || null;
 
                 // Check to see if we need to refresh cookieSync
                 if (hasFrequencyCapExpired(lastSyncDateForModule, frequencyCap)) {
@@ -123,7 +113,6 @@ export default function CookieSyncManager(
                         requiresConsent
                     );
                 }
-
             }
         });
     };

src/sdkRuntimeModels.ts

@@ -6,7 +6,7 @@ import {
     Callback,
     IdentityApiData,
 } from '@mparticle/web-sdk';
-import { IStore, PixelConfiguration } from './store';
+import { IStore } from './store';
 import Validators from './validators';
 import { Dictionary } from './utils';
 import { IServerModel } from './serverModel';
@@ -31,7 +31,7 @@ import {
 } from './identity-user-interfaces';
 import { IIdentityType } from './types.interfaces';
 import IntegrationCapture from './integrationCapture';
-import { ICookieSyncManager } from './cookieSyncManager.interfaces';
+import { ICookieSyncManager, IPixelConfiguration } from './cookieSyncManager.interfaces';
 
 // TODO: Resolve this with version in @mparticle/web-sdk
 export type SDKEventCustomFlags = Dictionary<any>;
@@ -230,7 +230,7 @@ export interface SDKInitConfig
     sideloadedKits?: MPForwarder[];
     dataPlanOptions?: KitBlockerOptions;
     flags?: Dictionary;
-    pixelConfigs?: PixelConfiguration[];
+    pixelConfigs?: IPixelConfiguration[];
 
     aliasMaxWindow?: number;
     deviceId?: string;

src/store.ts

@@ -37,7 +37,7 @@ import {
     IGlobalStoreV2MinifiedKeys,
     IPersistenceMinified,
 } from './persistence.interfaces';
-import { CookieSyncDates } from './cookieSyncManager.interfaces';
+import { CookieSyncDates, IPixelConfiguration } from './cookieSyncManager.interfaces';
 
 // This represents the runtime configuration of the SDK AFTER
 // initialization has been complete and all settings and
@@ -119,7 +119,6 @@ function createSDKConfig(config: SDKInitConfig): SDKConfig {
 
 // TODO: Placeholder Types to be filled in as we migrate more modules
 //       to TypeScript
-export type PixelConfiguration = Dictionary;
 export type ServerSettings = Dictionary;
 export type SessionAttributes = Dictionary;
 export type IntegrationAttributes = Dictionary<Dictionary<string>>;
@@ -179,7 +178,7 @@ export interface IStore {
     kits: Dictionary<MPForwarder>;
     sideloadedKits: MPForwarder[];
     configuredForwarders: MPForwarder[];
-    pixelConfigurations: PixelConfiguration[];
+    pixelConfigurations: IPixelConfiguration[];
     integrationDelayTimeoutStart: number; // UNIX Timestamp
     webviewBridgeEnabled?: boolean;
     wrapperSDKInfo: WrapperSDKInfo;

test/jest/cookieSyncManager.spec.ts

@@ -1,9 +1,9 @@
 import CookieSyncManager, { DAYS_IN_MILLISECONDS } from '../../src/cookieSyncManager';
+import { IPixelConfiguration } from '../../src/cookieSyncManager.interfaces';
 import { MParticleWebSDK } from '../../src/sdkRuntimeModels';
-import { PixelConfiguration } from '../../src/store';
 import { testMPID } from '../src/config/constants';
 
-const pixelSettings: PixelConfiguration = {
+const pixelSettings: IPixelConfiguration = {
     name: 'TestPixel',
     moduleId: 5,
     esId: 24053,
@@ -90,11 +90,11 @@ describe.only('CookieSyncManager', () => {
         });
 
         it('should toggle requiresConsent value if filtering filteringConsentRuleValues are defined', () => {
-            const myPixelSettings: PixelConfiguration = {
+            const myPixelSettings: IPixelConfiguration = {
                 filteringConsentRuleValues: {
                     values: ['test'],
                 },
-            };
+            } as unknown as IPixelConfiguration;
 
             const mockMPInstance = ({
                 _Store: {
@@ -125,10 +125,10 @@ describe.only('CookieSyncManager', () => {
         });
 
         it('should update the urlWithRedirect if a redirectUrl is defined', () => {
-            const myPixelSettings: PixelConfiguration = {
+            const myPixelSettings: IPixelConfiguration = {
                 pixelUrl: 'https://test.com',
                 redirectUrl: '?redirect=https://redirect.com&mpid=%%mpid%%',
-            };
+            } as unknown as IPixelConfiguration;
 
             const mockMPInstance = ({
                 _Store: {

test/src/tests-cookie-syncing.ts

@@ -3,13 +3,14 @@ import Utils from './config/utils';
 import fetchMock from 'fetch-mock/esm/client';
 import { urls, testMPID, MPConfig, v4LSKey, apiKey } from './config/constants';
 import { MParticleWebSDK } from '../../src/sdkRuntimeModels';
-import { PixelConfiguration } from '../../src/store';
 import { IMParticleUser } from '../../src/identity-user-interfaces';
+import { IPixelConfiguration } from '../../src/cookieSyncManager.interfaces';
+import { IConsentRules } from '../../src/consent';
 const { fetchMockSuccess, waitForCondition, hasIdentifyReturned } = Utils;
 
 const { setLocalStorage, MockForwarder, getLocalStorage } = Utils;
 
-const pixelSettings: PixelConfiguration = {
+const pixelSettings: IPixelConfiguration = {
     name: 'TestPixel',
     moduleId: 5,
     esId: 24053,
@@ -343,7 +344,7 @@ describe('cookie syncing', function() {
     it('should perform a cookiesync when consent is not configured on the cookiesync setting', function(done) {
         mParticle._resetForTests(MPConfig);
 
-        pixelSettings.filteringConsentRuleValues = {};
+        pixelSettings.filteringConsentRuleValues = {} as unknown as IConsentRules;
         window.mParticle.config.pixelConfigs = [pixelSettings];
 
         mParticle.init(apiKey, window.mParticle.config);
@@ -1213,7 +1214,7 @@ describe('cookie syncing', function() {
         mParticle.config.isDevelopmentMode = false;
 
         //  pixelSetting1 has consent required, and so should only perform a cookiesync after consent is saved to the user
-        const pixelSettings1: PixelConfiguration = {
+        const pixelSettings1: IPixelConfiguration = {
             name: 'TestPixel',
             moduleId: 1,
             esId: 24053,