From 1240ef92c0de2529712532bb9f3d1d60ae39c1da Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Wed, 22 Jan 2025 15:11:52 -0500
Subject: [PATCH 1/7] CASH-139

CASH-139 remove fromHeritage querystring once validation is checked so expiration works on service location
---
 src/router/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index d956af773..963a0b552 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -58,6 +58,11 @@ const routes = [
 
                 await analyticsMixin.methods.validateSession();
 
+                // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
+                if (to.query) {
+                    delete to.query[queryStrings.FROM_HERITAGE];
+                }
+
                 if (getFunnelCookie()?.SuppressConceptFunnel) {
                     log(" --go to heritage suppressConceptFunnel: ");
                     await navigateToHeritageFunnel({ shouldSaveSession: false });
@@ -185,7 +190,6 @@ const routes = [
                             log( " --clear to.query");
                             delete to.query[queryStrings.FMG_PAGE];
 
-                            //to.query[queryStrings.FMG_PAGE] = "";
                             log(" --to.query cleared ", JSON.stringify(to.query));
                         }
 

From fc87763e5dd98fc230df50587177208b7d0fea25 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 22 Jan 2025 15:26:30 -0500
Subject: [PATCH 2/7] Parse string -> bool without eval.

---
 src/layouts/payment-method/payment-method.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index c45a5c98c..38fa19611 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -429,7 +429,8 @@ export default {
             // prettier-ignore
             {
                 const log = getQuerystringParameter(queryStrings.LOG);
-                if (eval(log) || !preReqResult) {
+                const logAsBool = (log?.toLowerCase() === "true");
+                if (logAsBool || !preReqResult) {
                     console.log("------------- payment-method.vue pagePrereqs start -----------------");
                     console.log(new Date() + " serviceLocationReqs::isMobile: " + isMobile);
                     console.log(new Date() + " serviceLocationReqs::mobileReqs: " + mobileReqs);

From 3d7e8b00e23b14402cc12b28ca69cb97c235a1bf Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 22 Jan 2025 15:34:01 -0500
Subject: [PATCH 3/7] CASH-147 move contine scheduling/start over block lower
 in page.

---
 src/layouts/return-user/return-user.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 5facfde0a..69b389026 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -8,7 +8,7 @@
                         <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
                     </div>
                 </div>
-                <div class="row justify-content-center">
+                <div class="row justify-content-center return-user-spacing">
                     <div class="col-md-6 col-xl-4 mt-4">
                         <funnelSubHeader
                             ref="funnelSubHeader"
@@ -121,4 +121,9 @@ export default {
         text-decoration: underline;
     }
 }
+.return-user {
+    .return-user-spacing {
+        margin-top: 225px;
+    }
+}
 </style>

From dc5a1ac6215c5780d00aac2e02fa4e7869ad27f7 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 22 Jan 2025 15:37:10 -0500
Subject: [PATCH 4/7] Change px to rem.

---
 src/layouts/return-user/return-user.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 69b389026..adf55ce2b 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -123,7 +123,7 @@ export default {
 }
 .return-user {
     .return-user-spacing {
-        margin-top: 225px;
+        margin-top: 14rem;
     }
 }
 </style>

From e7fee443985e3a4f7ddb64f9b25aca7c743e3cc3 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 23 Jan 2025 07:14:57 -0500
Subject: [PATCH 5/7] CASH-144

CASH-144 checking expired session and routing to return user from the validateSession function in analytics does not prevent the forward click.  So move the expiration check and routing to the forward and back buttons and skip the emit click when expired.
---
 src/fmg-components/nav-bar/nav-bar.vue        | 15 ++++++++++++-
 src/mixins/analytics-mixin.js                 | 21 +++++++++---------
 src/ux-components/button-main/button-main.vue | 22 +++++++++++++++++--
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index 631e5c0e5..95100c639 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -45,6 +45,9 @@
 <script>
 import textLink from "@/ux-components/text-link/text-link";
 import buttonMain from "@/ux-components/button-main/button-main";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router/index.js";
 
 export default {
     name: "navbar",
@@ -97,7 +100,17 @@ export default {
             this.$emit("ForwardClicked");
         },
         linkClick() {
-            this.$emit("BackClicked");
+             // check session expired and initSession to recreate cookies
+             if (analyticsMixin.methods.sessionExpired()) {
+                analyticsMixin.methods.initSession();
+
+                router.push({
+                    path: "/",
+                    query: { fmgPage: fmgPageValues.RETURN_USER },
+                });
+            } else {
+                this.$emit("BackClicked");
+            }
         },
     },
 };
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 6f7f67c6f..9bc3cd15e 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -712,11 +712,8 @@ export default {
             return !areAllSessionCookiesSet();
         },
 
-        async validateSession() {
-            // The noSession function checks the cookies related to analytics logging(sid).  it is not the funnel info cookie.
-            // The sid cookie for analytics will expire every 30 minutes and get recreated in initSession.  If this happens
-            // and we also have the funnel cookie present, that indicates they have an existing session that is now expired
-            // so route them to the return user page.
+        // sessionExpired is true when one of the analytics cookies(sid, dxdev) has expired but we still have the funnelSessionInfo cookie
+        sessionExpired() {
             const fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE) === "true";
             const funnelCookieLastTouched = getFunnelCookie()?.LastTouched;
             if (
@@ -725,11 +722,15 @@ export default {
                 funnelCookieLastTouched !== null &&
                 funnelCookieLastTouched !== undefined
             ) {
-                await this.initSession();
-                router.push({
-                    path: "/",
-                    query: { fmgPage: fmgPageValues.RETURN_USER },
-                });
+                return true;
+            } else {
+                return false;
+            }
+        },
+
+        async validateSession() {
+            // do not init session if it is expired.  let the click event on button-main handle session expired logic
+            if (this.sessionExpired()) {
                 return;
             }
 
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index 7980adf99..dbf00b725 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -18,6 +18,10 @@
 
 <script>
 import loader from "@/ux-components/loader/loader";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router/index.js";
+
 
 export default {
     name: "buttonMain",
@@ -46,9 +50,23 @@ export default {
                 this.buttonText,
                 true
             );
+
             if (!this.isDisabled) {
-                if (!this.suppressLoader) this.isLoaderDisplayed = true;
-                this.$emit("click-event");
+                if (!this.suppressLoader) {
+                    this.isLoaderDisplayed = true;
+                }
+                
+                // check session expired and initSession to recreate cookies
+                if (analyticsMixin.methods.sessionExpired()) {
+                    analyticsMixin.methods.initSession();
+
+                    router.push({
+                        path: "/",
+                        query: { fmgPage: fmgPageValues.RETURN_USER },
+                    });
+                } else {
+                    this.$emit("click-event");
+                }
             }
         },
         resetButtonStyle() {

From 64c09c242946806ad7c0aa8984f7b5a2c6c8258e Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 23 Jan 2025 09:42:19 -0500
Subject: [PATCH 6/7] Revert "CASH-139"

This reverts commit 1240ef92c0de2529712532bb9f3d1d60ae39c1da.
---
 src/router/index.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 963a0b552..d956af773 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -58,11 +58,6 @@ const routes = [
 
                 await analyticsMixin.methods.validateSession();
 
-                // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
-                if (to.query) {
-                    delete to.query[queryStrings.FROM_HERITAGE];
-                }
-
                 if (getFunnelCookie()?.SuppressConceptFunnel) {
                     log(" --go to heritage suppressConceptFunnel: ");
                     await navigateToHeritageFunnel({ shouldSaveSession: false });
@@ -190,6 +185,7 @@ const routes = [
                             log( " --clear to.query");
                             delete to.query[queryStrings.FMG_PAGE];
 
+                            //to.query[queryStrings.FMG_PAGE] = "";
                             log(" --to.query cleared ", JSON.stringify(to.query));
                         }
 

From 856ae819938770b458b8196bb721f15bcc0fcd66 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 23 Jan 2025 09:47:28 -0500
Subject: [PATCH 7/7] Revert "CASH-144"

This reverts commit e7fee443985e3a4f7ddb64f9b25aca7c743e3cc3.
---
 src/fmg-components/nav-bar/nav-bar.vue        | 15 +------------
 src/mixins/analytics-mixin.js                 | 21 +++++++++---------
 src/ux-components/button-main/button-main.vue | 22 ++-----------------
 3 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index 95100c639..631e5c0e5 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -45,9 +45,6 @@
 <script>
 import textLink from "@/ux-components/text-link/text-link";
 import buttonMain from "@/ux-components/button-main/button-main";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router/index.js";
 
 export default {
     name: "navbar",
@@ -100,17 +97,7 @@ export default {
             this.$emit("ForwardClicked");
         },
         linkClick() {
-             // check session expired and initSession to recreate cookies
-             if (analyticsMixin.methods.sessionExpired()) {
-                analyticsMixin.methods.initSession();
-
-                router.push({
-                    path: "/",
-                    query: { fmgPage: fmgPageValues.RETURN_USER },
-                });
-            } else {
-                this.$emit("BackClicked");
-            }
+            this.$emit("BackClicked");
         },
     },
 };
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 9bc3cd15e..6f7f67c6f 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -712,8 +712,11 @@ export default {
             return !areAllSessionCookiesSet();
         },
 
-        // sessionExpired is true when one of the analytics cookies(sid, dxdev) has expired but we still have the funnelSessionInfo cookie
-        sessionExpired() {
+        async validateSession() {
+            // The noSession function checks the cookies related to analytics logging(sid).  it is not the funnel info cookie.
+            // The sid cookie for analytics will expire every 30 minutes and get recreated in initSession.  If this happens
+            // and we also have the funnel cookie present, that indicates they have an existing session that is now expired
+            // so route them to the return user page.
             const fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE) === "true";
             const funnelCookieLastTouched = getFunnelCookie()?.LastTouched;
             if (
@@ -722,15 +725,11 @@ export default {
                 funnelCookieLastTouched !== null &&
                 funnelCookieLastTouched !== undefined
             ) {
-                return true;
-            } else {
-                return false;
-            }
-        },
-
-        async validateSession() {
-            // do not init session if it is expired.  let the click event on button-main handle session expired logic
-            if (this.sessionExpired()) {
+                await this.initSession();
+                router.push({
+                    path: "/",
+                    query: { fmgPage: fmgPageValues.RETURN_USER },
+                });
                 return;
             }
 
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index dbf00b725..7980adf99 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -18,10 +18,6 @@
 
 <script>
 import loader from "@/ux-components/loader/loader";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router/index.js";
-
 
 export default {
     name: "buttonMain",
@@ -50,23 +46,9 @@ export default {
                 this.buttonText,
                 true
             );
-
             if (!this.isDisabled) {
-                if (!this.suppressLoader) {
-                    this.isLoaderDisplayed = true;
-                }
-                
-                // check session expired and initSession to recreate cookies
-                if (analyticsMixin.methods.sessionExpired()) {
-                    analyticsMixin.methods.initSession();
-
-                    router.push({
-                        path: "/",
-                        query: { fmgPage: fmgPageValues.RETURN_USER },
-                    });
-                } else {
-                    this.$emit("click-event");
-                }
+                if (!this.suppressLoader) this.isLoaderDisplayed = true;
+                this.$emit("click-event");
             }
         },
         resetButtonStyle() {