Merge branch 'main' into welcome-back-phone-number

Author: MichaelT372

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.23.9"
+  "version": "0.23.10"
 }

packages/scripts/dist/data-layer.d.ts

@@ -20,7 +20,6 @@ export declare class DataLayer {
     private handleFieldValueChange;
     private geRetainedFieldsValue;
     private hash;
-    private shaHash;
     private getFieldLabel;
     addEndOfGiftProcessEvent(eventName: string, eventProperties?: object): void;
     addEndOfGiftProcessVariable(variableName: string, variableValue?: any): void;

packages/scripts/dist/data-layer.js

@@ -188,7 +188,7 @@ export class DataLayer {
             if (el.value === "" || this.excludedFields.includes(el.name))
                 return;
             const value = this.hashedFields.includes(el.name)
-                ? this.hash(el.value)
+                ? yield this.hash(el.value)
                 : el.value;
             if (["checkbox", "radio"].includes(el.type)) {
                 if (el.checked) {
@@ -216,7 +216,7 @@ export class DataLayer {
             }
             if (el.name === this.retainedEmailField) {
                 const retainedEmailValue = this.geRetainedFieldsValue("email");
-                const sha256value = yield this.shaHash(retainedEmailValue);
+                const sha256value = yield this.hash(retainedEmailValue);
                 localStorage.setItem(`EN_HASH_EMAIL`, sha256value);
                 this.dataLayer.push({
                     event: "EN_HASH_VALUE_UPDATED",
@@ -228,7 +228,7 @@ export class DataLayer {
             }
             else if (this.retainedAddressFields.includes(el.name)) {
                 const retainedAddressValue = this.geRetainedFieldsValue("address");
-                const sha256value = yield this.shaHash(retainedAddressValue);
+                const sha256value = yield this.hash(retainedAddressValue);
                 localStorage.setItem(`EN_HASH_ADDRESS`, sha256value);
                 this.dataLayer.push({
                     event: "EN_HASH_VALUE_UPDATED",
@@ -239,7 +239,7 @@ export class DataLayer {
             }
             else if (this.retainedPhoneFields.includes(el.name)) {
                 const retainedPhoneValue = this.geRetainedFieldsValue("phone");
-                const sha256value = yield this.shaHash(retainedPhoneValue);
+                const sha256value = yield this.hash(retainedPhoneValue);
                 localStorage.setItem(`EN_HASH_PHONE`, sha256value);
                 this.dataLayer.push({
                     event: "EN_HASH_VALUE_UPDATED",
@@ -281,10 +281,6 @@ export class DataLayer {
         }
     }
     hash(value) {
-        return btoa(value);
-    }
-    // TODO: Replace the hash function with this secure SHA-256 implementation later
-    shaHash(value) {
         return __awaiter(this, void 0, void 0, function* () {
             const data = this.encoder.encode(value);
             const hashBuffer = yield crypto.subtle.digest("SHA-256", data);

packages/scripts/dist/version.d.ts

@@ -1 +1 @@
-export declare const AppVersion = "0.23.9";
+export declare const AppVersion = "0.23.10";

packages/scripts/dist/version.js

@@ -1 +1 @@
-export const AppVersion = "0.23.9";
+export const AppVersion = "0.23.10";

packages/scripts/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@4site/engrid-scripts",
-  "version": "0.23.9",
+  "version": "0.23.10",
   "description": "Scripts for the ENGRID Project",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

packages/scripts/package.json

@@ -229,7 +229,7 @@ export class DataLayer {
     if (el.value === "" || this.excludedFields.includes(el.name)) return;
 
     const value = this.hashedFields.includes(el.name)
-      ? this.hash(el.value)
+      ? await this.hash(el.value)
       : el.value;
 
     if (["checkbox", "radio"].includes(el.type)) {
@@ -263,7 +263,7 @@ export class DataLayer {
 
     if (el.name === this.retainedEmailField) {
       const retainedEmailValue = this.geRetainedFieldsValue("email");
-      const sha256value = await this.shaHash(retainedEmailValue);
+      const sha256value = await this.hash(retainedEmailValue);
       localStorage.setItem(`EN_HASH_EMAIL`, sha256value);
       this.dataLayer.push({
         event: "EN_HASH_VALUE_UPDATED",
@@ -274,7 +274,7 @@ export class DataLayer {
       return;
     } else if (this.retainedAddressFields.includes(el.name)) {
       const retainedAddressValue = this.geRetainedFieldsValue("address");
-      const sha256value = await this.shaHash(retainedAddressValue);
+      const sha256value = await this.hash(retainedAddressValue);
       localStorage.setItem(`EN_HASH_ADDRESS`, sha256value);
       this.dataLayer.push({
         event: "EN_HASH_VALUE_UPDATED",
@@ -284,7 +284,7 @@ export class DataLayer {
       });
     } else if (this.retainedPhoneFields.includes(el.name)) {
       const retainedPhoneValue = this.geRetainedFieldsValue("phone");
-      const sha256value = await this.shaHash(retainedPhoneValue);
+      const sha256value = await this.hash(retainedPhoneValue);
       localStorage.setItem(`EN_HASH_PHONE`, sha256value);
       this.dataLayer.push({
         event: "EN_HASH_VALUE_UPDATED",
@@ -327,12 +327,7 @@ export class DataLayer {
     }
   }
 
-  private hash(value: string): string {
-    return btoa(value);
-  }
-
-  // TODO: Replace the hash function with this secure SHA-256 implementation later
-  private async shaHash(value: string): Promise<string> {
+  private async hash(value: string): Promise<string> {
     const data = this.encoder.encode(value);
     const hashBuffer = await crypto.subtle.digest("SHA-256", data);
     return Array.from(new Uint8Array(hashBuffer))

packages/scripts/src/data-layer.ts

@@ -1 +1 @@
-export const AppVersion = "0.23.9";
+export const AppVersion = "0.23.10";