Sticky pre-population: do not run on chained pages & move cookie parsing into try/catch block

Author: MichaelT372

packages/scripts/dist/sticky-prepopulation.js

@@ -33,14 +33,16 @@ export class StickyPrepopulation {
     /*
       * Determine if we should run the script
       * Do not run if RememberMe is active
+      * Do not run if on a chain link
       * Only run if StickyPrepopulation option is set with fields
      */
     shouldRun() {
         if (ENGrid.getOption("RememberMe")) {
             return false;
         }
+        const url = new URL(window.location.href);
         const options = ENGrid.getOption("StickyPrepopulation");
-        if (options && (options === null || options === void 0 ? void 0 : options.fields.length) > 0) {
+        if (options && (options === null || options === void 0 ? void 0 : options.fields.length) > 0 && !url.searchParams.get("chain")) {
             this.options = options;
             return true;
         }
@@ -97,13 +99,13 @@ export class StickyPrepopulation {
                 this.logger.log("SupporterId present, not applying sticky prepopulation");
                 return;
             }
-            const encryptedSupporterDetails = JSON.parse(window.atob(cookieData));
-            if (!encryptedSupporterDetails || (encryptedSupporterDetails === null || encryptedSupporterDetails === void 0 ? void 0 : encryptedSupporterDetails.pageId) !== ENGrid.getPageID()) {
-                this.logger.log("No encrypted supporter details found in cookie, or page ID does not match");
-                return;
-            }
             let supporterDetails = {};
             try {
+                const encryptedSupporterDetails = JSON.parse(window.atob(cookieData));
+                if (!encryptedSupporterDetails || (encryptedSupporterDetails === null || encryptedSupporterDetails === void 0 ? void 0 : encryptedSupporterDetails.pageId) !== ENGrid.getPageID()) {
+                    this.logger.log("No encrypted supporter details found in cookie, or page ID does not match");
+                    return;
+                }
                 supporterDetails = JSON.parse(yield this.decryptSupporterDetails(this.base64ToArrayBuffer(encryptedSupporterDetails.encryptedData), new Uint8Array(this.base64ToArrayBuffer(encryptedSupporterDetails.iv))));
             }
             catch (e) {

packages/scripts/src/sticky-prepopulation.ts

@@ -32,14 +32,16 @@ export class StickyPrepopulation {
   /*
     * Determine if we should run the script
     * Do not run if RememberMe is active
+    * Do not run if on a chain link
     * Only run if StickyPrepopulation option is set with fields
    */
   private shouldRun(): boolean {
     if (ENGrid.getOption("RememberMe")) {
       return false;
     }
+    const url = new URL(window.location.href);
     const options = ENGrid.getOption("StickyPrepopulation");
-    if (options && options?.fields.length > 0) {
+    if (options && options?.fields.length > 0 && !url.searchParams.get("chain")) {
       this.options = options;
       return true;
     } else {
@@ -102,18 +104,18 @@ export class StickyPrepopulation {
       return;
     }
 
-    const encryptedSupporterDetails = JSON.parse(
-      window.atob(cookieData)
-    );
-
-    if (!encryptedSupporterDetails || encryptedSupporterDetails?.pageId !== ENGrid.getPageID()) {
-      this.logger.log("No encrypted supporter details found in cookie, or page ID does not match");
-      return;
-    }
-
     let supporterDetails: { [key: string]: string } = {};
 
     try {
+      const encryptedSupporterDetails = JSON.parse(
+        window.atob(cookieData)
+      );
+
+      if (!encryptedSupporterDetails || encryptedSupporterDetails?.pageId !== ENGrid.getPageID()) {
+        this.logger.log("No encrypted supporter details found in cookie, or page ID does not match");
+        return;
+      }
+
       supporterDetails = JSON.parse(
         await this.decryptSupporterDetails(
           this.base64ToArrayBuffer(encryptedSupporterDetails.encryptedData),