Merge pull request #1140 from Safelite/feature/jzimmerman/INSR-8742

Feature/jzimmerman/insr 8742
This commit is contained in:
Jeremy-Z 2026-03-10 14:40:45 -04:00 committed by GitHub
commit 0e8f9d521d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 23 additions and 12 deletions

View file

@ -14,8 +14,7 @@ const cookieNames = Object.freeze({
// Existing Safelite.com cookies // Existing Safelite.com cookies
DXDEV: 'dxdev', DXDEV: 'dxdev',
SESSION_ID: 'sid', SESSION_ID: 'sid'
SESSION_KEY: 'skey'
}); });
const cookieExpirations = Object.freeze({ const cookieExpirations = Object.freeze({

View file

@ -165,7 +165,7 @@ export function getDeviceIdValue() {
Gets value of skey cookie, returns 0 if not found. Gets value of skey cookie, returns 0 if not found.
*/ */
export function getSessionKeyValue() { export function getSessionKeyValue() {
const cookieValue = getCookieValueByName(cookieNames.SESSION_KEY); const cookieValue = getCookieValueByName(cookieNames.ISS_SESSION_KEY);
if (cookieValue) { if (cookieValue) {
return cookieValue; return cookieValue;
@ -281,7 +281,7 @@ export function setSessionIdIfUnset(value) {
} }
export function setSessionKeyIfUnset(value) { export function setSessionKeyIfUnset(value) {
if (!isCookieSet(cookieNames.ISS_SESSION_KEY)) { if (getSessionKeyValue() === 0) {
setCookieProperties( setCookieProperties(
{ {
[cookieNames.ISS_SESSION_KEY]: value [cookieNames.ISS_SESSION_KEY]: value

View file

@ -46,38 +46,45 @@ export default {
return ''; return '';
}, },
logPageView(pageEvent) { logPageView(pageEvent) {
const store = useMainStore();
const currentPageName = this.getPageNameByQueryString(); const currentPageName = this.getPageNameByQueryString();
const payload = { const payload = {
userId: getDeviceIdValue(), userId: getDeviceIdValue(),
sessionKey: getSessionKeyValue(), sessionKey: getSessionKeyValue(),
pageName: currentPageName, pageName: currentPageName,
referralSequenceNumber: store.order.referralSequenceNumber,
parentAccountNumber: store.order.parentAccountNumber ?? 0,
sessionId: getSessionIdValue(), sessionId: getSessionIdValue(),
action: '', action: '',
event: pageEvent, event: pageEvent,
shouldUseSessionId: false, shouldUseSessionId: false,
experimentsForUser: useMainStore().applicationUser.experiments experimentsForUser: store.applicationUser.experiments
}; };
useMainStore().logPageView(payload); store.logPageView(payload);
}, },
logCustomEvent(category, action, label, value) { logCustomEvent(category, action, label, value) {
const store = useMainStore();
const currentPageName = this.getPageNameByQueryString(); const currentPageName = this.getPageNameByQueryString();
const payload = { const payload = {
userId: getDeviceIdValue(), userId: getDeviceIdValue(),
sessionKey: getSessionKeyValue(), sessionKey: getSessionKeyValue(),
pageName: currentPageName, pageName: currentPageName,
referralSequenceNumber: store.order.referralSequenceNumber,
parentAccountNumber: store.order.parentAccountNumber ?? 0,
sessionId: getSessionIdValue(), sessionId: getSessionIdValue(),
category, category,
action, action,
label, label,
value, value,
shouldUseSessionId: false, shouldUseSessionId: false,
experimentsForUser: useMainStore().applicationUser.experiments experimentsForUser: store.applicationUser.experiments
}; };
useMainStore().logCustomEvent(payload); store.logCustomEvent(payload);
}, },
pushEventToGA(category, action, label, pushToLogApp = false, valueToLogType = null) { pushEventToGA(category, action, label, pushToLogApp = false, valueToLogType = null) {

View file

@ -2524,12 +2524,14 @@ export const useMainStore = defineStore({
this.logExperimentExposure(pageName, experiment); this.logExperimentExposure(pageName, experiment);
} }
}, },
logPageView({ userId, sessionKey, pageName, sessionId, action, event, shouldUseSessionId, experimentsForUser }) { logPageView({ userId, sessionKey, pageName, referralSequenceNumber, parentAccountNumber, sessionId, action, event, shouldUseSessionId, experimentsForUser }) {
const payload = { const payload = {
userId, userId,
sessionKey, sessionKey,
sessionId, sessionId,
pageName, pageName,
referralSequenceNumber,
parentAccountNumber,
applicationName: applicationConfig.APPLICATION_NAME, applicationName: applicationConfig.APPLICATION_NAME,
action, action,
event, event,
@ -2541,7 +2543,8 @@ export const useMainStore = defineStore({
method: endpoints.LogPageView.method, method: endpoints.LogPageView.method,
endpoint: endpoints.LogPageView.url, endpoint: endpoints.LogPageView.url,
payload, payload,
logApiCall: false logApiCall: false,
bailoutOnError: false
}).then( }).then(
(response) => response, (response) => response,
(error) => { (error) => {
@ -2570,7 +2573,8 @@ export const useMainStore = defineStore({
method: endpoints.LogCustomEvent.method, method: endpoints.LogCustomEvent.method,
endpoint: endpoints.LogCustomEvent.url, endpoint: endpoints.LogCustomEvent.url,
payload, payload,
logApiCall: false logApiCall: false,
bailoutOnError: false
}).then( }).then(
(response) => response, (response) => response,
(error) => { (error) => {
@ -2598,7 +2602,8 @@ export const useMainStore = defineStore({
method: endpoints.InitializeSession.method, method: endpoints.InitializeSession.method,
endpoint: endpoints.InitializeSession.url, endpoint: endpoints.InitializeSession.url,
payload, payload,
logApiCall: false logApiCall: false,
bailoutOnError: false
}).then( }).then(
(response) => response, (response) => response,
(error) => { (error) => {