@maxzima/wa-communicator 1.0.15 → 1.0.17

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

@@ -1,7 +1,4 @@
-declare const enum GA4EventActionEnum {
-    VERIFY_CONTACT = "verify_contact"
-}
-declare const enum GA4EventContactEnum {
+declare const enum GTMEventEnum {
     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 sendGA4Event;
+    private sendGtmEvent;
     private sendLinkedInEvent;
 }

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

@@ -1,15 +1,13 @@
 export class AccountTracker {
     constructor(props) {
-        this.sendGA4Event = (action, contact) => {
-            if (typeof this.props.gtag === 'undefined' || !this.props.ga4Id) {
+        this.sendGtmEvent = (event) => {
+            if (typeof this.props.gtmDataLayer === 'undefined' || !this.props.gtmId) {
                 return;
             }
-            const params = {
-                contact: contact,
+            this.props.gtmDataLayer.push({
+                event,
                 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') {
@@ -22,11 +20,11 @@ export class AccountTracker {
         this.props = props;
     }
     sendPhoneVerifyEvent() {
-        this.sendGA4Event("verify_contact", "phone");
+        this.sendGtmEvent("phone");
         this.sendLinkedInEvent(8612332);
     }
     sendEmailVerifyEvent() {
-        this.sendGA4Event("verify_contact", "email");
+        this.sendGtmEvent("email");
         this.sendLinkedInEvent(8612340);
     }
     sendRegistrationSuccessEvent() {

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

@@ -1,15 +1,9 @@
-/// <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;
-    gtag?: Gtag.Gtag;
+    gtmDataLayer?: object[];
     lintrk?: (action: LintrkActionTypeEnum, options: TLintrkOptions) => void;
-    ga4Id?: string;
+    gtmId?: string;
 };

package/dist/engine/Communicator/Enums/CommunicatorEnum.d.ts

@@ -2,7 +2,8 @@ declare const enum CommunicatorFAPIEndpointEnum {
     GEO_BY_IP = "geo-by-ip",
     USER = "user",
     REGISTRATION = "clients/registration",
-    STORAGE = "storage"
+    STORAGE = "storage",
+    RESTRICTED_COUNTRIES = "access-control/restricted-countries"
 }
 declare const enum CommunicatorAuthAPIEndpointEnum {
     SIGN_IN = "sign-in",

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

@@ -1,4 +1,4 @@
-import { TCreateSessionRequestData, TEmailUpdateRequestData, TGetCurrentUserProfileRequestData, TRegistrationRequestData, TResponse, TSetupChallengeRequestData, TSignInByMobileRequestData, TSignUpByMobileRequestData, TVerifyChallengeRequestData, TStorageRequestData } from "@root/types";
+import type { TCreateSessionRequestData, TEmailUpdateRequestData, TGetCurrentUserProfileRequestData, TRegistrationRequestData, TResponse, TSetupChallengeRequestData, TSignInByMobileRequestData, TSignUpByMobileRequestData, TVerifyChallengeRequestData, TStorageRequestData, TGetRestrictedCountriesData } from "@root/types";
 export declare class Communicator {
     private props;
     constructor(props: TCommunicatorProps);
@@ -11,6 +11,7 @@ export declare class Communicator {
     getCurrentUserProfile(data: TGetCurrentUserProfileRequestData): Promise<TResponse>;
     registration(data: TRegistrationRequestData): Promise<TResponse>;
     setStorageValues(data: TStorageRequestData): Promise<TResponse>;
+    getRestrictedCountries(data?: TGetRestrictedCountriesData): Promise<TResponse>;
     private send;
     private getHeaders;
     private getMeta;

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

@@ -163,6 +163,12 @@ export class Communicator {
             });
         });
     }
+    getRestrictedCountries(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const headers = this.getHeaders();
+            return yield this.send(Object.assign({ method: 'GET', url: `${this.props.clientFAPIBaseUrl}${"access-control/restricted-countries"}`, headers }, ((data === null || data === void 0 ? void 0 : data.entityType) && { queryParams: { entity_type: data.entityType } })));
+        });
+    }
     send(requestInitProps) {
         return __awaiter(this, void 0, void 0, function* () {
             let url = requestInitProps.url;

package/dist/enums/CommunicatorCountriesTypes.d.ts

@@ -0,0 +1,10 @@
+export declare enum CountryTypeEnum {
+    COUNTRIES = "countries",
+    EMPLOYEE = "employee",
+    CARD_USER = "carduser",
+    CLIENT_INFORMATION = "client_information",
+    CLIENT_PERSON = "client_person",
+    CLIENT_COMPANY = "client_company",
+    USER = "user",
+    GLOBAL = "global"
+}

package/dist/enums/CommunicatorCountriesTypes.js

@@ -0,0 +1,11 @@
+export var CountryTypeEnum;
+(function (CountryTypeEnum) {
+    CountryTypeEnum["COUNTRIES"] = "countries";
+    CountryTypeEnum["EMPLOYEE"] = "employee";
+    CountryTypeEnum["CARD_USER"] = "carduser";
+    CountryTypeEnum["CLIENT_INFORMATION"] = "client_information";
+    CountryTypeEnum["CLIENT_PERSON"] = "client_person";
+    CountryTypeEnum["CLIENT_COMPANY"] = "client_company";
+    CountryTypeEnum["USER"] = "user";
+    CountryTypeEnum["GLOBAL"] = "global";
+})(CountryTypeEnum || (CountryTypeEnum = {}));

package/dist/enums/index.d.ts

@@ -1 +1,2 @@
 export * from "./CommunicatorErrorEnum";
+export * from "./CommunicatorCountriesTypes";

package/dist/enums/index.js

@@ -1 +1,2 @@
 export * from "./CommunicatorErrorEnum";
+export * from "./CommunicatorCountriesTypes";

package/dist/types/TCommunicator.d.ts

@@ -123,4 +123,7 @@ declare type TStorageRequestData = {
     accessToken: string;
     origin: string;
 };
-export { TRegistrationRequestBodySourceDeviceType, TChallenge, TAuditSource, TRequestProps, TRequestQueryParams, TResponse, TSignInStartRequestBody, TAccountMeta, TAccountBrowserData, TSignInByMobileRequestData, TSignInByMobileResponse, TSignUpStartRequestBody, TSignUpByMobileRequestData, TSetupChallengeRequestData, TSetupChallengeResponse, TVerifyChallengeRequestBody, TVerifyChallengeRequestData, TVerifyChallengeResponse, TEmailUpdateRequestData, TCreateSessionRequestData, TCreateSessionResponse, TGetCurrentUserProfileResponseUser, TGetCurrentUserProfileRequestData, TRegistrationRequestData, TStorageRequestData, };
+declare type TGetRestrictedCountriesData = {
+    entityType?: import('@root/enums').CountryTypeEnum;
+};
+export { TRegistrationRequestBodySourceDeviceType, TChallenge, TAuditSource, TRequestProps, TRequestQueryParams, TResponse, TSignInStartRequestBody, TAccountMeta, TAccountBrowserData, TSignInByMobileRequestData, TSignInByMobileResponse, TSignUpStartRequestBody, TSignUpByMobileRequestData, TSetupChallengeRequestData, TSetupChallengeResponse, TVerifyChallengeRequestBody, TVerifyChallengeRequestData, TVerifyChallengeResponse, TEmailUpdateRequestData, TCreateSessionRequestData, TCreateSessionResponse, TGetCurrentUserProfileResponseUser, TGetCurrentUserProfileRequestData, TRegistrationRequestData, TStorageRequestData, TGetRestrictedCountriesData, };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.15",
+  "version": "1.0.17",
   "name": "@maxzima/wa-communicator",
   "description": "",
   "author": "Noname",

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

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

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

@@ -6,12 +6,12 @@ export class AccountTracker {
   }
 
   public sendPhoneVerifyEvent () {
-    this.sendGA4Event(GA4EventActionEnum.VERIFY_CONTACT, GA4EventContactEnum.PHONE);
+    this.sendGtmEvent(GTMEventEnum.PHONE);
     this.sendLinkedInEvent(LintrkEventIdEnum.PHONE);
   }
 
   public sendEmailVerifyEvent () {
-    this.sendGA4Event(GA4EventActionEnum.VERIFY_CONTACT, GA4EventContactEnum.EMAIL);
+    this.sendGtmEvent(GTMEventEnum.EMAIL);
     this.sendLinkedInEvent(LintrkEventIdEnum.EMAIL);
   }
 
@@ -19,18 +19,15 @@ export class AccountTracker {
     this.sendLinkedInEvent(LintrkEventIdEnum.REGISTRATION);
   }
 
-  private sendGA4Event = (action: GA4EventActionEnum, contact: GA4EventContactEnum) => {
-    if (typeof this.props.gtag === 'undefined' || !this.props.ga4Id) {
+  private sendGtmEvent = (event: GTMEventEnum) => {
+    if (typeof this.props.gtmDataLayer === 'undefined' || !this.props.gtmId) {
       return;
     }
 
-    const params: TGA4Event = {
-      contact: contact,
+    this.props.gtmDataLayer.push({
+      event,
       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,15 +2,9 @@ type TLintrkOptions = {
   conversation_id: LintrkEventIdEnum;
 }
 
-type TGA4Event = {
-  contact: GA4EventContactEnum;
-  send_to: TAccountTrackerProps['ga4Id'];
-  origin?: TAccountTrackerProps['origin'];
-}
-
 type TAccountTrackerProps = {
   origin?: string;
-  gtag?: Gtag.Gtag;
+  gtmDataLayer?: object[];
   lintrk?: (action: LintrkActionTypeEnum, options: TLintrkOptions) => void;
-  ga4Id?: string;
+  gtmId?: string;
 }

package/src/engine/Communicator/Enums/CommunicatorEnum.ts

@@ -3,6 +3,7 @@ const enum CommunicatorFAPIEndpointEnum {
   USER = 'user',
   REGISTRATION = 'clients/registration',
   STORAGE = 'storage',
+  RESTRICTED_COUNTRIES = 'access-control/restricted-countries',
 }
 
 const enum CommunicatorAuthAPIEndpointEnum {

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

@@ -1,4 +1,4 @@
-import {
+import type {
   TAccountBrowserData,
   TAccountMeta,
   TCreateSessionRequestData,
@@ -15,7 +15,8 @@ import {
   TSignUpStartRequestBody,
   TVerifyChallengeRequestBody,
   TVerifyChallengeRequestData,
-  TStorageRequestData
+  TStorageRequestData,
+  TGetRestrictedCountriesData
 } from "@root/types";
 import {CommunicatorDefaultRequestData} from "./../Constants/Communicator";
 
@@ -160,6 +161,17 @@ export class Communicator {
     });
   }
 
+  public async getRestrictedCountries(data?: TGetRestrictedCountriesData) {
+    const headers = this.getHeaders();
+
+    return await this.send({
+      method: 'GET',
+      url: `${this.props.clientFAPIBaseUrl}${CommunicatorFAPIEndpointEnum.RESTRICTED_COUNTRIES}`,
+      headers,
+      ...(data?.entityType && {queryParams: {entity_type: data.entityType}}),
+    });
+  }
+
   private async send(requestInitProps: TRequestProps): Promise<TResponse> {
     let url = requestInitProps.url;
 

package/src/enums/CommunicatorCountriesTypes.ts

@@ -0,0 +1,11 @@
+/* Categories can change during some times, check FAPI for validating this list. */
+export enum CountryTypeEnum {
+  COUNTRIES = 'countries',
+  EMPLOYEE = 'employee',
+  CARD_USER = 'carduser',
+  CLIENT_INFORMATION = 'client_information',
+  CLIENT_PERSON = 'client_person',
+  CLIENT_COMPANY = 'client_company',
+  USER = 'user',
+  GLOBAL = 'global',
+}

package/src/enums/index.ts

@@ -1 +1,2 @@
 export * from "./CommunicatorErrorEnum";
+export * from "./CommunicatorCountriesTypes";

package/src/types/TCommunicator.ts

@@ -175,6 +175,12 @@ type TStorageRequestData = {
 }
 /* endregion registration */
 
+/* region getRestrictedCountries */
+type TGetRestrictedCountriesData = {
+  entityType?: import('@root/enums').CountryTypeEnum;
+}
+/* endregion getRestrictedCountries */
+
 export {
   TRegistrationRequestBodySourceDeviceType,
   TChallenge,
@@ -201,4 +207,5 @@ export {
   TGetCurrentUserProfileRequestData,
   TRegistrationRequestData,
   TStorageRequestData,
+  TGetRestrictedCountriesData,
 };

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

@@ -68,6 +68,20 @@ Object {
 }
 `;
 
+exports[`Communicator requests getRestrictedCountries 1`] = `
+Object {
+  "headers": Object {
+    "Accept": "application/json, text/plain, */*",
+    "Content-Type": "application/json",
+  },
+  "method": "GET",
+  "queryParams": Object {
+    "entity_type": "global",
+  },
+  "url": "https://google.com/access-control/restricted-countries",
+}
+`;
+
 exports[`Communicator requests registration 1`] = `
 Object {
   "body": "{\\"name\\":\\"_companyName_\\",\\"country_code\\":\\"CAN\\",\\"source\\":{\\"hash\\":\\"_hash_\\",\\"device_type\\":\\"mobile\\",\\"ga_id\\":\\"_gaId_\\",\\"origin\\":\\"_origin_\\"}}",

package/test/accountTracker.spec.ts

@@ -2,13 +2,15 @@ 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,
-  gtag: mockGtag,
+  gtmDataLayer: mockGtmDataLayer,
   lintrk: mockLintrk,
 };
+
 const accountTracker = new AccountTracker(accountTrackerInitProps);
 
 describe('AccountTracker', () => {
@@ -19,9 +21,7 @@ describe('AccountTracker', () => {
   test('sendPhoneVerifyEvent', () => {
     accountTracker.sendPhoneVerifyEvent();
 
-    expect(mockGtag.mock.calls[0][1]).toBe(phoneVerifyEvents.ga4.action);
-    expect(mockGtag.mock.calls[0][2]).toEqual(phoneVerifyEvents.ga4.event);
-    expect(mockGtag).toHaveBeenCalled();
+    expect(mockGtmDataLayer[0]).toEqual({...phoneVerifyEvents.gtm});
 
     expect(mockLintrk.mock.calls[0][0]).toBe(phoneVerifyEvents.linkedIn.action);
     expect(mockLintrk.mock.calls[0][1]).toEqual(phoneVerifyEvents.linkedIn.event);
@@ -31,9 +31,7 @@ describe('AccountTracker', () => {
   test('sendEmailVerifyEvent', () => {
     accountTracker.sendEmailVerifyEvent();
 
-    expect(mockGtag.mock.calls[0][1]).toBe(emailVerifyEvents.ga4.action);
-    expect(mockGtag.mock.calls[0][2]).toEqual(emailVerifyEvents.ga4.event);
-    expect(mockGtag).toHaveBeenCalled();
+    expect(mockGtmDataLayer[1]).toEqual({...emailVerifyEvents.gtm});
 
     expect(mockLintrk.mock.calls[0][0]).toBe(emailVerifyEvents.linkedIn.action);
     expect(mockLintrk.mock.calls[0][1]).toEqual(emailVerifyEvents.linkedIn.event);
@@ -43,7 +41,7 @@ describe('AccountTracker', () => {
   test('sendRegistrationSuccessEvent', () => {
     accountTracker.sendRegistrationSuccessEvent();
 
-    expect(mockGtag).not.toHaveBeenCalled();
+    expect(mockGtmDataLayer).toHaveLength(2);
 
     expect(mockLintrk.mock.calls[0][0]).toBe(registrationSuccessEvents.linkedIn.action);
     expect(mockLintrk.mock.calls[0][1]).toEqual(registrationSuccessEvents.linkedIn.event);

package/test/communicator.spec.ts

@@ -14,6 +14,7 @@ import {
   signUpData,
   verifyChallengeData,
   setStorageValuesData,
+  getRestrictedCountriesData,
 } from "./testunits/communicator/requests";
 import {communicatorTestData} from "./testunits/communicator/general";
 
@@ -102,4 +103,9 @@ describe('Communicator requests', () => {
     const setStorageValuesRequestData = await communicator.setStorageValues(setStorageValuesData);
     expect(setStorageValuesRequestData).toMatchSnapshot();
   });
+
+  test('getRestrictedCountries', async () => {
+    const getRestrictedCountriesRequestData = await communicator.getRestrictedCountries(getRestrictedCountriesData);
+    expect(getRestrictedCountriesRequestData).toMatchSnapshot();
+  });
 });

package/test/testunits/accountTracker/events.ts

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

package/test/testunits/accountTracker/general.ts

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

package/test/testunits/communicator/requests.ts

@@ -1,13 +1,17 @@
-import {
+import type {
   TCreateSessionRequestData,
-  TEmailUpdateRequestData, TGetCurrentUserProfileRequestData, TRegistrationRequestData,
+  TEmailUpdateRequestData,
+  TGetCurrentUserProfileRequestData,
+  TGetRestrictedCountriesData,
+  TRegistrationRequestData,
   TSetupChallengeRequestData,
   TSignInByMobileRequestData,
   TSignUpByMobileRequestData,
-  TVerifyChallengeRequestData,
   TStorageRequestData,
+  TVerifyChallengeRequestData,
 } from "../../../src/types";
 import {communicatorTestData} from "./general";
+import {CountryTypeEnum} from "../../../src/enums";
 
 const signInData: TSignInByMobileRequestData = {
   phoneNumber: communicatorTestData.phoneNumber,
@@ -59,6 +63,10 @@ const setStorageValuesData: TStorageRequestData = {
   origin: communicatorTestData.origin,
 };
 
+const getRestrictedCountriesData: TGetRestrictedCountriesData = {
+  entityType: CountryTypeEnum.GLOBAL
+};
+
 export {
   signInData,
   signUpData,
@@ -69,4 +77,5 @@ export {
   getCurrentUserProfileData,
   registrationData,
   setStorageValuesData,
+  getRestrictedCountriesData,
 };