@maxzima/wa-communicator 1.0.19 → 1.0.21

package/dist/engine/AccountTracker/Enums/AccountTrackerEnum.d.ts

@@ -1,7 +1,7 @@
-declare const enum GTMEventEnum {
+declare const enum GA4EventActionEnum {
     VERIFY_CONTACT = "verify_contact"
 }
-declare const enum GTMEventContactEnum {
+declare const enum GA4EventContactEnum {
     PHONE = "phone",
     EMAIL = "email"
 }

package/dist/engine/AccountTracker/Public/AccountTracker.d.ts

@@ -4,6 +4,6 @@ export declare class AccountTracker {
     sendPhoneVerifyEvent(): void;
     sendEmailVerifyEvent(): void;
     sendRegistrationSuccessEvent(): void;
-    private sendGtmEvent;
+    private sendGA4Event;
     private sendLinkedInEvent;
 }

package/dist/engine/AccountTracker/Public/AccountTracker.js

@@ -1,14 +1,15 @@
 export class AccountTracker {
     constructor(props) {
-        this.sendGtmEvent = (event, contact) => {
-            if (typeof this.props.gtmDataLayer === 'undefined') {
+        this.sendGA4Event = (action, contact) => {
+            if (typeof this.props.gtag === 'undefined' || !this.props.ga4Id) {
                 return;
             }
-            this.props.gtmDataLayer.push({
-                event,
-                contact,
+            const params = {
+                contact: contact,
                 origin: this.props.origin || null,
-            });
+                send_to: this.props.ga4Id,
+            };
+            this.props.gtag('event', action, params);
         };
         this.sendLinkedInEvent = (id) => {
             if (typeof this.props.lintrk === 'undefined') {
@@ -21,11 +22,11 @@ export class AccountTracker {
         this.props = props;
     }
     sendPhoneVerifyEvent() {
-        this.sendGtmEvent("verify_contact", "phone");
+        this.sendGA4Event("verify_contact", "phone");
         this.sendLinkedInEvent(8612332);
     }
     sendEmailVerifyEvent() {
-        this.sendGtmEvent("verify_contact", "email");
+        this.sendGA4Event("verify_contact", "email");
         this.sendLinkedInEvent(8612340);
     }
     sendRegistrationSuccessEvent() {

package/dist/engine/AccountTracker/Types/TAccountTracker.d.ts

@@ -1,8 +1,15 @@
+/// <reference types="gtag.js" />
 declare type TLintrkOptions = {
     conversation_id: LintrkEventIdEnum;
 };
+declare type TGA4Event = {
+    contact: GA4EventContactEnum;
+    send_to: TAccountTrackerProps['ga4Id'];
+    origin?: TAccountTrackerProps['origin'];
+};
 declare type TAccountTrackerProps = {
     origin?: string;
-    gtmDataLayer?: object[];
+    gtag?: Gtag.Gtag;
     lintrk?: (action: LintrkActionTypeEnum, options: TLintrkOptions) => void;
+    ga4Id?: string;
 };

package/dist/engine/Communicator/Public/Communicator.js

@@ -42,7 +42,8 @@ export class Communicator {
             const headers = this.getHeaders();
             const meta = this.getMeta(data.browserData);
             const body = JSON.stringify({
-                captcha_response: '_',
+                captcha_solution: '_',
+                device_id: data.deviceId,
                 meta,
                 mobile: data.phoneNumber,
             });

package/dist/types/TCommunicator.d.ts

@@ -18,7 +18,8 @@ declare type TResponse = {
     ok: boolean;
 };
 declare type TSignInStartRequestBody = {
-    captcha_response?: string;
+    captcha_solution?: string;
+    device_id: string;
     meta: TAccountMeta;
     mobile?: string;
 };
@@ -39,6 +40,7 @@ declare type TAccountBrowserData = {
 };
 declare type TSignInByMobileRequestData = {
     phoneNumber: string;
+    deviceId: string;
     browserData: TAccountBrowserData;
 };
 declare type TSignInByMobileResponse = {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.19",
+  "version": "1.0.21",
   "name": "@maxzima/wa-communicator",
   "description": "",
   "author": "Noname",
@@ -7,7 +7,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">=14"
+    "node": ">=20.11.1 <21"
   },
   "repository": {
     "type": "git",
@@ -23,7 +23,8 @@
     }
   ],
   "scripts": {
-    "prepublishOnly": "npm run test && npm run build && npm run size",
+    "postinstall": "engine-version",
+    "prepublishOnly": "engine-version && npm run test && npm run build && npm run size",
     "clean": "node tools/cleanup",
     "build": "npm run clean && run-p build:*",
     "build:esm": "tsc -p config/tsconfig.esm.json",
@@ -40,6 +41,7 @@
     "@types/jest": "28.1.8",
     "@typescript-eslint/eslint-plugin": "5.59.5",
     "@typescript-eslint/parser": "5.59.5",
+    "engine-version": "^1.0.2",
     "eslint": "8.40.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-editorconfig": "4.0.3",

package/src/engine/AccountTracker/Enums/AccountTrackerEnum.ts

@@ -1,8 +1,8 @@
-const enum GTMEventEnum {
+const enum GA4EventActionEnum {
   VERIFY_CONTACT = 'verify_contact',
 }
 
-const enum GTMEventContactEnum {
+const enum GA4EventContactEnum {
   PHONE = 'phone',
   EMAIL = 'email',
 }

package/src/engine/AccountTracker/Public/AccountTracker.ts

@@ -6,12 +6,12 @@ export class AccountTracker {
   }
 
   public sendPhoneVerifyEvent () {
-    this.sendGtmEvent(GTMEventEnum.VERIFY_CONTACT, GTMEventContactEnum.PHONE);
+    this.sendGA4Event(GA4EventActionEnum.VERIFY_CONTACT, GA4EventContactEnum.PHONE);
     this.sendLinkedInEvent(LintrkEventIdEnum.PHONE);
   }
 
   public sendEmailVerifyEvent () {
-    this.sendGtmEvent(GTMEventEnum.VERIFY_CONTACT, GTMEventContactEnum.EMAIL);
+    this.sendGA4Event(GA4EventActionEnum.VERIFY_CONTACT, GA4EventContactEnum.EMAIL);
     this.sendLinkedInEvent(LintrkEventIdEnum.EMAIL);
   }
 
@@ -19,16 +19,18 @@ export class AccountTracker {
     this.sendLinkedInEvent(LintrkEventIdEnum.REGISTRATION);
   }
 
-  private sendGtmEvent = (event: GTMEventEnum, contact: GTMEventContactEnum) => {
-    if (typeof this.props.gtmDataLayer === 'undefined') {
+  private sendGA4Event = (action: GA4EventActionEnum, contact: GA4EventContactEnum) => {
+    if (typeof this.props.gtag === 'undefined' || !this.props.ga4Id) {
       return;
     }
 
-    this.props.gtmDataLayer.push({
-      event,
-      contact,
+    const params: TGA4Event = {
+      contact: contact,
       origin: this.props.origin || null,
-    });
+      send_to: this.props.ga4Id,
+    };
+
+    this.props.gtag('event', action, params);
   };
 
   private sendLinkedInEvent = (id: LintrkEventIdEnum) => {

package/src/engine/AccountTracker/Types/TAccountTracker.ts

@@ -2,8 +2,15 @@ type TLintrkOptions = {
   conversation_id: LintrkEventIdEnum;
 }
 
+type TGA4Event = {
+  contact: GA4EventContactEnum;
+  send_to: TAccountTrackerProps['ga4Id'];
+  origin?: TAccountTrackerProps['origin'];
+}
+
 type TAccountTrackerProps = {
   origin?: string;
-  gtmDataLayer?: object[];
+  gtag?: Gtag.Gtag;
   lintrk?: (action: LintrkActionTypeEnum, options: TLintrkOptions) => void;
+  ga4Id?: string;
 }

package/src/engine/Communicator/Public/Communicator.ts

@@ -35,7 +35,8 @@ export class Communicator {
     const headers = this.getHeaders();
     const meta = this.getMeta(data.browserData);
     const body = JSON.stringify({
-      captcha_response: '_',
+      captcha_solution: '_',
+      device_id: data.deviceId,
       meta,
       mobile: data.phoneNumber,
     } as TSignInStartRequestBody);

package/src/types/TCommunicator.ts

@@ -23,7 +23,8 @@ type TResponse = {
 
 /* region signIn */
 type TSignInStartRequestBody =  {
-  captcha_response?: string,
+  captcha_solution?: string,
+  device_id: string,
   meta: TAccountMeta,
   mobile?: string,
 }
@@ -47,6 +48,7 @@ type TAccountBrowserData = {
 
 type TSignInByMobileRequestData = {
   phoneNumber: string,
+  deviceId: string,
   browserData: TAccountBrowserData,
 }
 

package/test/__snapshots__/communicator.spec.ts.snap

@@ -125,7 +125,7 @@ Object {
 
 exports[`Communicator requests signIn 1`] = `
 Object {
-  "body": "{\\"captcha_response\\":\\"_\\",\\"meta\\":{\\"audit_source_type\\":\\"Backend\\",\\"browser_page_resolution\\":\\"800x600\\",\\"cookies_enabled\\":true,\\"ip\\":\\"127.0.0.1\\",\\"js_enabled\\":true,\\"language\\":\\"ENG\\",\\"user_agent\\":\\"_userAgent_\\"},\\"mobile\\":\\"+16234401486\\"}",
+  "body": "{\\"captcha_solution\\":\\"_\\",\\"device_id\\":\\"ov4lNmyk7armoC5DMiOpL5hl846kVQgS\\",\\"meta\\":{\\"audit_source_type\\":\\"Backend\\",\\"browser_page_resolution\\":\\"800x600\\",\\"cookies_enabled\\":true,\\"ip\\":\\"127.0.0.1\\",\\"js_enabled\\":true,\\"language\\":\\"ENG\\",\\"user_agent\\":\\"_userAgent_\\"},\\"mobile\\":\\"+16234401486\\"}",
   "headers": Object {
     "Accept": "application/json, text/plain, */*",
     "Content-Type": "application/json",

package/test/accountTracker.spec.ts

@@ -2,15 +2,13 @@ import {AccountTracker} from "../src";
 import {accountTrackerInitPropsNormal} from "./testunits/accountTracker/general";
 import {emailVerifyEvents, phoneVerifyEvents, registrationSuccessEvents} from "./testunits/accountTracker/events";
 
+const mockGtag = jest.fn().mockImplementation();
 const mockLintrk = jest.fn().mockImplementation();
-const mockGtmDataLayer = [];
-
 const accountTrackerInitProps = {
   ...accountTrackerInitPropsNormal,
-  gtmDataLayer: mockGtmDataLayer,
+  gtag: mockGtag,
   lintrk: mockLintrk,
 };
-
 const accountTracker = new AccountTracker(accountTrackerInitProps);
 
 describe('AccountTracker', () => {
@@ -21,7 +19,9 @@ describe('AccountTracker', () => {
   test('sendPhoneVerifyEvent', () => {
     accountTracker.sendPhoneVerifyEvent();
 
-    expect(mockGtmDataLayer[0]).toEqual({...phoneVerifyEvents.gtm});
+    expect(mockGtag.mock.calls[0][1]).toBe(phoneVerifyEvents.ga4.action);
+    expect(mockGtag.mock.calls[0][2]).toEqual(phoneVerifyEvents.ga4.event);
+    expect(mockGtag).toHaveBeenCalled();
 
     expect(mockLintrk.mock.calls[0][0]).toBe(phoneVerifyEvents.linkedIn.action);
     expect(mockLintrk.mock.calls[0][1]).toEqual(phoneVerifyEvents.linkedIn.event);
@@ -31,7 +31,9 @@ describe('AccountTracker', () => {
   test('sendEmailVerifyEvent', () => {
     accountTracker.sendEmailVerifyEvent();
 
-    expect(mockGtmDataLayer[1]).toEqual({...emailVerifyEvents.gtm});
+    expect(mockGtag.mock.calls[0][1]).toBe(emailVerifyEvents.ga4.action);
+    expect(mockGtag.mock.calls[0][2]).toEqual(emailVerifyEvents.ga4.event);
+    expect(mockGtag).toHaveBeenCalled();
 
     expect(mockLintrk.mock.calls[0][0]).toBe(emailVerifyEvents.linkedIn.action);
     expect(mockLintrk.mock.calls[0][1]).toEqual(emailVerifyEvents.linkedIn.event);
@@ -41,7 +43,7 @@ describe('AccountTracker', () => {
   test('sendRegistrationSuccessEvent', () => {
     accountTracker.sendRegistrationSuccessEvent();
 
-    expect(mockGtmDataLayer).toHaveLength(2);
+    expect(mockGtag).not.toHaveBeenCalled();
 
     expect(mockLintrk.mock.calls[0][0]).toBe(registrationSuccessEvents.linkedIn.action);
     expect(mockLintrk.mock.calls[0][1]).toEqual(registrationSuccessEvents.linkedIn.event);

package/test/testunits/accountTracker/events.ts

@@ -1,10 +1,13 @@
 import {accountTrackerInitPropsNormal} from "./general";
 
 const phoneVerifyEvents = {
-  gtm: {
-    event: 'verify_contact',
-    contact: 'phone',
-    origin: accountTrackerInitPropsNormal.origin,
+  ga4: {
+    action: 'verify_contact',
+    event: {
+      contact: 'phone',
+      origin: accountTrackerInitPropsNormal.origin,
+      send_to: accountTrackerInitPropsNormal.ga4Id,
+    },
   },
   linkedIn: {
     action: 'track',
@@ -15,10 +18,13 @@ const phoneVerifyEvents = {
 };
 
 const emailVerifyEvents = {
-  gtm: {
-    event: 'verify_contact',
-    contact: 'email',
-    origin: accountTrackerInitPropsNormal.origin,
+  ga4: {
+    action: 'verify_contact',
+    event: {
+      contact: 'email',
+      origin: accountTrackerInitPropsNormal.origin,
+      send_to: accountTrackerInitPropsNormal.ga4Id,
+    },
   },
   linkedIn: {
     action: 'track',

package/test/testunits/accountTracker/general.ts

@@ -1,5 +1,6 @@
 const accountTrackerInitPropsNormal = {
   origin: '_origin_',
+  ga4Id: '_ga4Id_',
 };
 
 export {

package/test/testunits/communicator/general.ts

@@ -18,6 +18,7 @@ const communicatorTestData = {
   challenge: 'email_otp' as TChallenge,
   companyName: '_companyName_',
   deviceType: 'mobile' as TRegistrationRequestBodySourceDeviceType,
+  deviceId: 'ov4lNmyk7armoC5DMiOpL5hl846kVQgS',
   otpCode: '123456',
   countryCode: 'CAN',
   authToken: '_authToken_',

package/test/testunits/communicator/requests.ts

@@ -14,6 +14,7 @@ import {communicatorTestData} from "./general";
 import {CountryTypeEnum} from "../../../src/enums";
 
 const signInData: TSignInByMobileRequestData = {
+  deviceId: communicatorTestData.deviceId,
   phoneNumber: communicatorTestData.phoneNumber,
   browserData: communicatorTestData.browserData,
 };