@4site/engrid-scripts 0.24.1 → 0.24.3

package/dist/freshaddress.js

@@ -210,17 +210,28 @@ export class FreshAddress {
         return true;
     }
     callProxy() {
-        var _a;
+        var _a, _b;
         if (!this.options || !this.shouldRun)
             return;
         window.FreshAddressStatus = "validating";
         ENGrid.disableSubmit("Validating Email Address...");
+        // Before calling the API, do a basic check to see if the email is in a valid format.
+        // This is to prevent unnecessary API calls.
+        const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+        if (!emailRegex.test(this.emailField.value)) {
+            this.logger.log("Invalid Email Format from Basic Check");
+            this.writeToFields("Invalid", "Invalid Email Format");
+            ENGrid.setError(this.emailWrapper, "This email address is not valid.");
+            (_a = this.emailField) === null || _a === void 0 ? void 0 : _a.focus();
+            ENGrid.enableSubmit();
+            return;
+        }
         fetch(this.options.proxyUrl, {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
             },
-            body: JSON.stringify({ email: (_a = this.emailField) === null || _a === void 0 ? void 0 : _a.value }),
+            body: JSON.stringify({ email: (_b = this.emailField) === null || _b === void 0 ? void 0 : _b.value }),
             signal: AbortSignal.timeout(5000),
         })
             .then((response) => {
@@ -234,14 +245,20 @@ export class FreshAddress {
             this.validateProxyResponse(data);
         })
             .catch((error) => {
+            // 422 (Unprocessable Content) - This means the email is in an invalid format.
+            if (error.message.includes("422")) {
+                this.logger.log("Invalid Email Format");
+                this.writeToFields("Invalid", "Invalid Email Format");
+                ENGrid.setError(this.emailWrapper, "This email address is not valid.");
+                return;
+            }
             if (error.name === "AbortError") {
                 this.logger.log("Proxy API request timed out");
                 this.writeToFields("Request Timeout", "The request took too long.");
+                return;
             }
-            else {
-                this.logger.log("Proxy API Error", error);
-                this.writeToFields("Service Error", error.toString());
-            }
+            this.logger.log("Proxy API Error", error);
+            this.writeToFields("Service Error", error.toString());
         })
             .finally(() => {
             window.FreshAddressStatus = "idle";
@@ -270,6 +287,7 @@ export class FreshAddress {
             ENGrid.setError(this.emailWrapper, "This email address is not valid.");
             (_a = this.emailField) === null || _a === void 0 ? void 0 : _a.focus();
             if (res.email_corrections && res.email_corrections.length > 0) {
+                this.emailField.value = res.email_corrections[0];
                 ENGrid.setError(this.emailWrapper, `This email address is not valid. Did you mean ${res.email_corrections[0]}?`);
             }
         }

package/dist/interfaces/options.d.ts

@@ -148,6 +148,7 @@ export interface Options {
             editText: string;
             anchor: string;
             placement: "beforebegin" | "afterbegin" | "beforeend" | "afterend";
+            showPhoneNumber?: boolean;
         };
     };
     OptInLadder?: false | {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const AppVersion = "0.24.1";
+export declare const AppVersion = "0.24.3";

package/dist/version.js

@@ -1 +1 @@
-export const AppVersion = "0.24.1";
+export const AppVersion = "0.24.3";

package/dist/welcome-back.js

@@ -100,7 +100,7 @@ export class WelcomeBack {
         ${this.supporterDetails["firstName"]} ${this.supporterDetails["lastName"]}
         <br>
         ${this.supporterDetails["emailAddress"]}
-        ${this.supporterDetails["mobilePhone"]
+        ${this.supporterDetails["mobilePhone"] && options.showPhoneNumber
             ? `<br>${this.supporterDetails["mobilePhone"]}`
             : ""}
      </p>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4site/engrid-scripts",
-  "version": "0.24.1",
+  "version": "0.24.3",
   "description": "Scripts for the ENGRID Project",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -25,7 +25,7 @@
     "strongly-typed-events": "^2.0.9"
   },
   "homepage": "https://github.com/4site-interactive-studios/engrid#readme",
-  "gitHead": "ca933a40728608f61a724761ce9a6f7abc8db035",
+  "gitHead": "6f807e8e6ad0b1fcf0b6d3f72de44cc93cdd2fe1",
   "devDependencies": {
     "nodemon": "^2.0.20"
   }