move from mpinstance to store, use workspace token instead of apikey

Author: rmi22186

src/mp-instance.ts

@@ -35,7 +35,6 @@ import Identity from './identity';
 import Consent, { IConsent } from './consent';
 import KitBlocker from './kitBlocking';
 import ConfigAPIClient from './configAPIClient';
-import ForegroundTimer from './foregroundTimeTracker';
 import IdentityAPIClient from './identityApiClient';
 import { isFunction, valueof } from './utils';
 import { LocalStorageVault } from './vault';
@@ -67,7 +66,6 @@ export type IntegrationDelays = Dictionary<boolean>;
 // https://go.mparticle.com/work/SQDSDKS-6949
 export interface IMParticleWebSDKInstance extends MParticleWebSDK {
     // Private Properties
-    _timeOnSiteTimer: ForegroundTimer;
     _APIClient: IAPIClient;
     _Consent: IConsent;
     _CookieSyncManager: ICookieSyncManager;
@@ -151,7 +149,6 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
         }
     }
     this.init = function(apiKey, config) {
-        self._timeOnSiteTimer = new ForegroundTimer(apiKey);
         if (!config) {
             console.warn(
                 'You did not pass a config object to init(). mParticle will not initialize properly'

src/serverModel.ts

@@ -345,7 +345,7 @@ export default function ServerModel(
                         event.data,
                         event.name
                     ),
-                    ActiveTimeOnSite: mpInstance._timeOnSiteTimer?.getTimeInForeground(),
+                    ActiveTimeOnSite: mpInstance._Store.timeOnSiteTimer?.getTimeInForeground(),
                     SourceMessageId:
                         event.sourceMessageId ||
                         mpInstance._Helpers.generateUniqueId(),

src/sessionManager.ts

@@ -132,7 +132,7 @@ export default function SessionManager(
             });
 
             mpInstance._Store.nullifySession();
-            mpInstance._timeOnSiteTimer.resetTimer();
+            mpInstance._Store.timeOnSiteTimer.resetTimer();
             return;
         }
 
@@ -144,7 +144,7 @@ export default function SessionManager(
             mpInstance.Logger.verbose(
                 Messages.InformationMessages.AbandonEndSession
             );
-            mpInstance._timeOnSiteTimer.resetTimer();
+            mpInstance._Store.timeOnSiteTimer.resetTimer();
 
             return;
         }
@@ -158,7 +158,7 @@ export default function SessionManager(
             mpInstance.Logger.verbose(
                 Messages.InformationMessages.NoSessionToEnd
             );
-            mpInstance._timeOnSiteTimer.resetTimer();
+            mpInstance._Store.timeOnSiteTimer.resetTimer();
 
             return;
         }
@@ -186,7 +186,7 @@ export default function SessionManager(
             }
         }
 
-        mpInstance._timeOnSiteTimer.resetTimer();
+        mpInstance._Store.timeOnSiteTimer.resetTimer();
     };
 
     this.setSessionTimer = function(): void {

src/store.ts

@@ -38,6 +38,7 @@ import {
 } from './persistence.interfaces';
 import { CookieSyncDates, IPixelConfiguration } from './cookieSyncManager';
 import { IMParticleWebSDKInstance } from './mp-instance';
+import ForegroundTimer from './foregroundTimeTracker';
 
 // This represents the runtime configuration of the SDK AFTER
 // initialization has been complete and all settings and
@@ -165,6 +166,7 @@ export interface IStore {
     configurationLoaded: boolean;
     identityCallInFlight: boolean;
     SDKConfig: Partial<SDKConfig>;
+    timeOnSiteTimer: ForegroundTimer;
     nonCurrentUserMPIDs: Record<MPID, Dictionary>;
     identifyCalled: boolean;
     isLoggedIn: boolean;
@@ -680,6 +682,7 @@ export default function Store(
 
         if (workspaceToken) {
             this.SDKConfig.workspaceToken = workspaceToken;
+            mpInstance._Store.timeOnSiteTimer = new ForegroundTimer(workspaceToken);
         } else {
             mpInstance.Logger.warning(
                 'You should have a workspaceToken on your config object for security purposes.'

test/src/tests-core-sdk.js

@@ -1511,7 +1511,5 @@ describe('core SDK', function() {
 
             done();
         });
-
-
     });
 });