Merge pull request #2259 from Safelite/feature/CASH-164

CASH-164

src/digital-components/modal/modal.vue

@@ -45,6 +45,9 @@
 </template>
 
 <script>
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router/index.js";
 import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
@@ -86,7 +89,15 @@ export default {
         async validateAndEmit() {
             const validationResult = await this.validate();
             if (validationResult.valid) {
-                this.$emit("footer-button-event");
+                if (analyticsMixin.methods.sessionExpired()) {
+                    analyticsMixin.methods.initSession();
+                    router.push({
+                        path: "/",
+                        query: { fmgPage: fmgPageValues.RETURN_USER },
+                    });
+                } else {
+                    this.$emit("footer-button-event");
+                }
             } else {
                 this.resetButtonStyle();
             }

src/helpers/querystring-helper.js

@@ -10,10 +10,10 @@ export function getQuerystringParameter(key) {
 }
 
 // if you add the fmgPage to the querystringobject before calling, then pass true for skipFmgPageName
-export function buildQuerystringObject(qso, skipFmgPageName=false) {
+export function buildQuerystringObject(qso, skipFmgPageName = false) {
     const queryString = window.location.search;
     const urlParams = new URLSearchParams(queryString);
-    
+
     for (const [name, value] of urlParams) {
         if (name.toLowerCase() === "fmgpage" && skipFmgPageName) {
             continue;
@@ -21,4 +21,4 @@ export function buildQuerystringObject(qso, skipFmgPageName=false) {
         qso[name] = value;
     }
     return qso;
-}
+}