@wildix/xbees-connect 1.2.13 → 1.2.15

package/dist-cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wildix/xbees-connect",
-    "version": "1.2.13",
+    "version": "1.2.15",
     "description": "This library provides easy communication between x-bees and integrated web applications",
     "author": "dimitri.chernykh <dimitri.chernykh@wildix.com>",
     "homepage": "",
@@ -42,8 +42,5 @@
     },
     "engines": {
         "node": ">=16"
-    },
-    "dependencies": {
-        "jwt-decode": "^4.0.0"
     }
 }

package/dist-cjs/src/Client.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
 const package_json_1 = __importDefault(require("../package.json"));
+const types_1 = require("../types");
 const enums_1 = require("./enums");
 const LocalStorageManager_1 = __importDefault(require("./helpers/LocalStorageManager"));
 const MessageListener_1 = require("./helpers/MessageListener");
 const PostMessageControllerNative_1 = __importDefault(require("./helpers/PostMessageControllerNative"));
 const PostMessageControllerWeb_1 = __importDefault(require("./helpers/PostMessageControllerWeb"));
 const TechnicalSupport_1 = __importDefault(require("./helpers/TechnicalSupport"));
-const getPbxDomainFromJwt_1 = require("./utils/getPbxDomainFromJwt");
 const getUrlSearchParamsMap_1 = require("./utils/url/getUrlSearchParamsMap");
 /**
  * Client provides functionality of communication between xBees and integrated web applications via iFrame or ReactNative WebView
@@ -34,9 +34,6 @@ class Client {
                 console.error('Error on init rendering widget:', error);
             }
         }
-        else {
-            void this.getInstance().ready();
-        }
     }
     worker;
     listeners = [];
@@ -44,6 +41,8 @@ class Client {
     userToken = '';
     pbxDomain = '';
     visible = false;
+    user = null;
+    userExtension = null;
     userEmail;
     referrer;
     needAuthorize;
@@ -51,13 +50,11 @@ class Client {
     iframeId;
     variant = null;
     localStorageManager = LocalStorageManager_1.default.getInstance();
-    userExtension;
     constructor() {
         const params = (0, getUrlSearchParamsMap_1.getUrlSearchParamsMap)();
         this.iframeId = params.get(enums_1.UrlParams.ID);
         this.variant = params.get(enums_1.UrlParams.VARIANT);
         this.userEmail = params.get(enums_1.UrlParams.USER);
-        this.userExtension = params.get(enums_1.UrlParams.EXTENSION);
         this.referrer = params.get(enums_1.UrlParams.REFERRER);
         this.needAuthorize = params.has(enums_1.UrlParams.AUTHORIZE);
         // @ts-expect-error window.ReactNativeWebView will be provided by ReactNative WebView
@@ -65,7 +62,6 @@ class Client {
         this.worker = this.isParentReactNativeWebView ? new PostMessageControllerNative_1.default() : new PostMessageControllerWeb_1.default();
         this.addEventListener(enums_1.EventType.PBX_TOKEN, (token) => {
             this.userToken = token;
-            this.pbxDomain = (0, getPbxDomainFromJwt_1.getPbxDomainFromJwt)(token);
         });
         this.addEventListener(enums_1.EventType.VISIBILITY, (isActive) => (this.visible = isActive));
     }
@@ -124,12 +120,33 @@ class Client {
             this.saveToStorage('sendedUsageAnalyticsDate', today);
         }
     }
-    ready(templateId, platform = 'all') {
+    ready(props = types_1.SupportedPlatformVariant.ALL) {
+        const payload = typeof props === 'string' ? { version: this.version(), platform: props } : { version: this.version(), ...props };
+        this.getXBeesUser();
         return this.sendAsync({
             type: enums_1.ClientEventType.READY,
-            payload: { version: this.version(), platform, templateId },
+            payload,
         });
     }
+    async requestXbeesUser() {
+        const responseMessageUser = await this.sendAsync({ type: enums_1.ClientEventType.USER });
+        if (responseMessageUser.payload) {
+            const { extension, domain } = responseMessageUser.payload;
+            this.user = { ...responseMessageUser.payload, email: this.getUserEmail() };
+            if (extension) {
+                this.userExtension = extension;
+            }
+            if (domain) {
+                this.pbxDomain = domain;
+            }
+        }
+    }
+    getXBeesUser() {
+        if (!this.user) {
+            this.requestXbeesUser();
+        }
+        return this.user;
+    }
     version() {
         return package_json_1.default.version;
     }

package/dist-cjs/src/enums/index.js

@@ -39,6 +39,7 @@ var ClientEventType;
     ClientEventType["LOGOUT_IS_SUPPORTED"] = "xBeesLogoutIsSupported";
     ClientEventType["SEND_ANALYTICS"] = "xBeesSendAnalytics";
     ClientEventType["SEND_TECHNICAL_SUPPORT_INFORMATION"] = "xBeesSendTechInfo";
+    ClientEventType["USER"] = "xBeesUser";
 })(ClientEventType || (exports.ClientEventType = ClientEventType = {}));
 var UrlParams;
 (function (UrlParams) {

package/dist-cjs/types/Platform.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SupportedPlatformVariant = void 0;
+var SupportedPlatformVariant;
+(function (SupportedPlatformVariant) {
+    SupportedPlatformVariant["ALL"] = "all";
+    SupportedPlatformVariant["MOBILE"] = "mobile";
+    SupportedPlatformVariant["WEB"] = "web";
+})(SupportedPlatformVariant || (exports.SupportedPlatformVariant = SupportedPlatformVariant = {}));

package/dist-cjs/types/XBeesUser.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist-cjs/types/index.js

@@ -1,2 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SupportedPlatformVariant = void 0;
+var Platform_1 = require("./Platform");
+Object.defineProperty(exports, "SupportedPlatformVariant", { enumerable: true, get: function () { return Platform_1.SupportedPlatformVariant; } });

package/dist-es/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wildix/xbees-connect",
-    "version": "1.2.13",
+    "version": "1.2.15",
     "description": "This library provides easy communication between x-bees and integrated web applications",
     "author": "dimitri.chernykh <dimitri.chernykh@wildix.com>",
     "homepage": "",
@@ -42,8 +42,5 @@
     },
     "engines": {
         "node": ">=16"
-    },
-    "dependencies": {
-        "jwt-decode": "^4.0.0"
     }
 }

package/dist-es/src/Client.js

@@ -1,11 +1,11 @@
 import packageJson from '../package.json';
+import { SupportedPlatformVariant, } from '../types';
 import { ClientEventType, EventType, UrlParams } from './enums';
 import LocalStorageManager from './helpers/LocalStorageManager';
 import { MessageListener } from './helpers/MessageListener';
 import PostMessageControllerNative from './helpers/PostMessageControllerNative';
 import PostMessageControllerWeb from './helpers/PostMessageControllerWeb';
 import TechnicalSupport from './helpers/TechnicalSupport';
-import { getPbxDomainFromJwt } from './utils/getPbxDomainFromJwt';
 import { getUrlSearchParamsMap } from './utils/url/getUrlSearchParamsMap';
 /**
  * Client provides functionality of communication between xBees and integrated web applications via iFrame or ReactNative WebView
@@ -28,9 +28,6 @@ export class Client {
                 console.error('Error on init rendering widget:', error);
             }
         }
-        else {
-            void this.getInstance().ready();
-        }
     }
     worker;
     listeners = [];
@@ -38,6 +35,8 @@ export class Client {
     userToken = '';
     pbxDomain = '';
     visible = false;
+    user = null;
+    userExtension = null;
     userEmail;
     referrer;
     needAuthorize;
@@ -45,13 +44,11 @@ export class Client {
     iframeId;
     variant = null;
     localStorageManager = LocalStorageManager.getInstance();
-    userExtension;
     constructor() {
         const params = getUrlSearchParamsMap();
         this.iframeId = params.get(UrlParams.ID);
         this.variant = params.get(UrlParams.VARIANT);
         this.userEmail = params.get(UrlParams.USER);
-        this.userExtension = params.get(UrlParams.EXTENSION);
         this.referrer = params.get(UrlParams.REFERRER);
         this.needAuthorize = params.has(UrlParams.AUTHORIZE);
         // @ts-expect-error window.ReactNativeWebView will be provided by ReactNative WebView
@@ -59,7 +56,6 @@ export class Client {
         this.worker = this.isParentReactNativeWebView ? new PostMessageControllerNative() : new PostMessageControllerWeb();
         this.addEventListener(EventType.PBX_TOKEN, (token) => {
             this.userToken = token;
-            this.pbxDomain = getPbxDomainFromJwt(token);
         });
         this.addEventListener(EventType.VISIBILITY, (isActive) => (this.visible = isActive));
     }
@@ -118,12 +114,33 @@ export class Client {
             this.saveToStorage('sendedUsageAnalyticsDate', today);
         }
     }
-    ready(templateId, platform = 'all') {
+    ready(props = SupportedPlatformVariant.ALL) {
+        const payload = typeof props === 'string' ? { version: this.version(), platform: props } : { version: this.version(), ...props };
+        this.getXBeesUser();
         return this.sendAsync({
             type: ClientEventType.READY,
-            payload: { version: this.version(), platform, templateId },
+            payload,
         });
     }
+    async requestXbeesUser() {
+        const responseMessageUser = await this.sendAsync({ type: ClientEventType.USER });
+        if (responseMessageUser.payload) {
+            const { extension, domain } = responseMessageUser.payload;
+            this.user = { ...responseMessageUser.payload, email: this.getUserEmail() };
+            if (extension) {
+                this.userExtension = extension;
+            }
+            if (domain) {
+                this.pbxDomain = domain;
+            }
+        }
+    }
+    getXBeesUser() {
+        if (!this.user) {
+            this.requestXbeesUser();
+        }
+        return this.user;
+    }
     version() {
         return packageJson.version;
     }

package/dist-es/src/enums/index.js

@@ -36,6 +36,7 @@ export var ClientEventType;
     ClientEventType["LOGOUT_IS_SUPPORTED"] = "xBeesLogoutIsSupported";
     ClientEventType["SEND_ANALYTICS"] = "xBeesSendAnalytics";
     ClientEventType["SEND_TECHNICAL_SUPPORT_INFORMATION"] = "xBeesSendTechInfo";
+    ClientEventType["USER"] = "xBeesUser";
 })(ClientEventType || (ClientEventType = {}));
 export var UrlParams;
 (function (UrlParams) {

package/dist-es/types/Platform.js

@@ -1 +1,6 @@
-export {};
+export var SupportedPlatformVariant;
+(function (SupportedPlatformVariant) {
+    SupportedPlatformVariant["ALL"] = "all";
+    SupportedPlatformVariant["MOBILE"] = "mobile";
+    SupportedPlatformVariant["WEB"] = "web";
+})(SupportedPlatformVariant || (SupportedPlatformVariant = {}));

package/dist-es/types/XBeesUser.js

@@ -0,0 +1 @@
+export {};

package/dist-es/types/index.js

@@ -1 +1 @@
-export {};
+export { SupportedPlatformVariant } from './Platform';

package/dist-types/src/Client.d.ts

@@ -1,4 +1,5 @@
-import { Callback, ConnectClient, Contact, ContactQuery, IPayloadViewPort, LookupAndMatchContactsResolver, Message, Reject, RemoveEventListener, ResponseMessage, StorageEventCallback, SuggestContactsResolver, SupportedPlatformVariant, ToastSeverity } from '../types';
+import { Callback, ConnectClient, Contact, ContactQuery, IPayloadViewPort, LookupAndMatchContactsResolver, Message, Reject, RemoveEventListener, ResponseMessage, StorageEventCallback, SuggestContactsResolver, SupportedPlatformVariant, ToastSeverity, XBeesUser } from '../types';
+import { ReadyExtendedProps } from '../types/Event';
 import { ClientEventType, EventType } from './enums';
 import TechnicalSupport from './helpers/TechnicalSupport';
 /**
@@ -15,6 +16,8 @@ export declare class Client implements ConnectClient {
     private userToken;
     private pbxDomain;
     private visible;
+    private user;
+    private userExtension;
     private readonly userEmail;
     private readonly referrer;
     private readonly needAuthorize;
@@ -22,14 +25,15 @@ export declare class Client implements ConnectClient {
     private readonly iframeId;
     private readonly variant;
     private readonly localStorageManager;
-    private readonly userExtension;
     constructor();
     private sendAsync;
     private sendAsyncErrorSafe;
     private parseMessage;
     private onMessage;
     private sendDailyIntegrationUsageAnalytics;
-    ready(templateId?: string, platform?: SupportedPlatformVariant | undefined): Promise<ResponseMessage>;
+    ready(props?: SupportedPlatformVariant | ReadyExtendedProps | undefined): Promise<ResponseMessage>;
+    private requestXbeesUser;
+    getXBeesUser(): XBeesUser | null;
     version(): string;
     isPlatformNative(): boolean;
     isPlatformWeb(): boolean;

package/dist-types/src/enums/index.d.ts

@@ -33,7 +33,8 @@ export declare enum ClientEventType {
     CONTACT_LOOK_UP_AND_MATCH_IS_SUPPORTED = "xBeesContactLookupAndMatchIsSupported",
     LOGOUT_IS_SUPPORTED = "xBeesLogoutIsSupported",
     SEND_ANALYTICS = "xBeesSendAnalytics",
-    SEND_TECHNICAL_SUPPORT_INFORMATION = "xBeesSendTechInfo"
+    SEND_TECHNICAL_SUPPORT_INFORMATION = "xBeesSendTechInfo",
+    USER = "xBeesUser"
 }
 export declare enum UrlParams {
     TOKEN = "t",

package/dist-types/types/Client.d.ts

@@ -2,6 +2,7 @@ import { ClientEventType, EventType } from '../src/enums';
 import TechnicalSupport from '../src/helpers/TechnicalSupport';
 import { Callback } from './Callback';
 import { Contact, ContactQuery } from './Contact';
+import { ReadyExtendedProps } from './Event';
 import { RemoveEventListener } from './Listener';
 import { ResponseMessage } from './Message';
 import { IPayloadViewPort } from './Payload';
@@ -9,16 +10,20 @@ import { SupportedPlatformVariant } from './Platform';
 import { LookupAndMatchContactsResolver, Reject, SuggestContactsResolver } from './Resolver';
 import { StorageEventCallback } from './Storage';
 import { ToastSeverity } from './Toast';
+import { XBeesUser } from './XBeesUser';
 export interface ConnectClient {
     /**
      * Sends to x-bees signal that iFrame is ready to be shown. iFrame should send it when the application starts and ready */
-    ready: (templateId?: string, platform?: SupportedPlatformVariant) => Promise<ResponseMessage>;
+    ready: (props?: SupportedPlatformVariant | ReadyExtendedProps) => Promise<ResponseMessage>;
     /**
      * Retrieves current pbx token */
     getUserPbxToken: () => string;
     /**
      * Retrieves current user's email */
     getUserEmail: () => string;
+    /**
+     * Retrieves current user's data */
+    getXBeesUser: () => XBeesUser | null;
     /**
      * Retrieves current pbx domain */
     getPbxDomain: () => string;

package/dist-types/types/Event.d.ts

@@ -2,7 +2,9 @@ import { ClientEventType, EventType } from '../src/enums';
 import { ContactQuery } from './Contact';
 import { Message, MessageType } from './Message';
 import { IPayloadAutoSuggestResult, IPayloadCallStart, IPayloadCallStartedInfo, IPayloadContactMatchResult, IPayloadContactMatchResultNotFound, IPayloadContactResult, IPayloadContextResult, IPayloadConversationResult, IPayloadSendAnalytics, IPayloadTechSupport, IPayloadThemeChange, IPayloadToast, IPayloadVersion, IPayloadViewPort } from './Payload';
-export type EventPayload<T extends MessageType> = T extends EventType.GET_CONTACTS_AUTO_SUGGEST ? string : T extends ClientEventType.CONTACTS_AUTO_SUGGEST ? IPayloadAutoSuggestResult : T extends ClientEventType.CONTACT_LOOKUP_AND_MATCH | ClientEventType.CONTACT_CREATE_OR_UPDATE | ClientEventType.CONTACT_MATCH_UPDATE ? IPayloadContactMatchResult : T extends ClientEventType.CONTACT_LOOKUP_AND_MATCH_NOT_FOUND ? IPayloadContactMatchResultNotFound : T extends ClientEventType.CONTEXT ? IPayloadContextResult : T extends ClientEventType.CURRENT_CONTACT ? IPayloadContactResult : T extends ClientEventType.CURRENT_CONVERSATION ? IPayloadConversationResult : T extends EventType.ADD_CALL ? IPayloadCallStartedInfo : T extends ClientEventType.START_CALL ? IPayloadCallStart : T extends ClientEventType.READY ? IPayloadVersion : T extends ClientEventType.VIEW_PORT ? IPayloadViewPort : T extends ClientEventType.THEME ? IPayloadThemeChange : T extends EventType.USE_THEME ? IPayloadThemeChange : T extends ClientEventType.TOAST ? IPayloadToast : T extends ClientEventType.SEND_ANALYTICS ? IPayloadSendAnalytics : T extends ClientEventType.SEND_TECHNICAL_SUPPORT_INFORMATION ? IPayloadTechSupport : T extends EventType.PBX_TOKEN ? string : T extends ClientEventType.TOKEN ? string : T extends ClientEventType.TO_CLIPBOARD ? string : T extends EventType.GET_LOOK_UP_AND_MATCH ? ContactQuery : T extends EventType.VISIBILITY ? boolean : never;
+import { SupportedPlatformVariant } from './Platform';
+import { XBeesUser } from './XBeesUser';
+export type EventPayload<T extends MessageType> = T extends EventType.GET_CONTACTS_AUTO_SUGGEST ? string : T extends ClientEventType.CONTACTS_AUTO_SUGGEST ? IPayloadAutoSuggestResult : T extends ClientEventType.CONTACT_LOOKUP_AND_MATCH | ClientEventType.CONTACT_CREATE_OR_UPDATE | ClientEventType.CONTACT_MATCH_UPDATE ? IPayloadContactMatchResult : T extends ClientEventType.CONTACT_LOOKUP_AND_MATCH_NOT_FOUND ? IPayloadContactMatchResultNotFound : T extends ClientEventType.CONTEXT ? IPayloadContextResult : T extends ClientEventType.CURRENT_CONTACT ? IPayloadContactResult : T extends ClientEventType.CURRENT_CONVERSATION ? IPayloadConversationResult : T extends EventType.ADD_CALL ? IPayloadCallStartedInfo : T extends ClientEventType.START_CALL ? IPayloadCallStart : T extends ClientEventType.READY ? IPayloadVersion : T extends ClientEventType.VIEW_PORT ? IPayloadViewPort : T extends ClientEventType.THEME ? IPayloadThemeChange : T extends EventType.USE_THEME ? IPayloadThemeChange : T extends ClientEventType.TOAST ? IPayloadToast : T extends ClientEventType.SEND_ANALYTICS ? IPayloadSendAnalytics : T extends ClientEventType.SEND_TECHNICAL_SUPPORT_INFORMATION ? IPayloadTechSupport : T extends EventType.PBX_TOKEN ? string : T extends ClientEventType.TOKEN ? string : T extends ClientEventType.TO_CLIPBOARD ? string : T extends EventType.GET_LOOK_UP_AND_MATCH ? ContactQuery : T extends EventType.VISIBILITY ? boolean : T extends ClientEventType.USER ? XBeesUser : never;
 export type EventPayloadMap = {
     [EventType.GET_CONTACTS_AUTO_SUGGEST]: string;
     [EventType.GET_LOOK_UP_AND_MATCH]: ContactQuery;
@@ -22,3 +24,7 @@ export type EventCallbackMap = {
     [EventType.REDIRECT_QUERY]: (query: EventPayloadMap[EventType.REDIRECT_QUERY]) => void;
 };
 export type RawMessageEvent = MessageEvent<string | Message>;
+export type ReadyExtendedProps = {
+    templateId?: string;
+    platform?: SupportedPlatformVariant;
+};

package/dist-types/types/Platform.d.ts

@@ -1 +1,5 @@
-export type SupportedPlatformVariant = 'all' | 'web' | 'mobile';
+export declare enum SupportedPlatformVariant {
+    ALL = "all",
+    MOBILE = "mobile",
+    WEB = "web"
+}

package/dist-types/types/XBeesUser.d.ts

@@ -0,0 +1,6 @@
+export interface XBeesUser {
+    email: string;
+    extension: string;
+    domain: string;
+    name: string;
+}

package/dist-types/types/index.d.ts

@@ -7,8 +7,9 @@ export type { Listener, RemoveEventListener } from './Listener';
 export type { Message, MessageIFrameResponse, MessageType, ResponseMessage } from './Message';
 export type { MessageSender } from './MessageSender';
 export type { IPayloadAutoSuggestResult, IPayloadCallStart, IPayloadCallStartedInfo, IPayloadContactMatchResult, IPayloadContactMatchResultNotFound, IPayloadContactResult, IPayloadContextResult, IPayloadConversationResult, IPayloadSendAnalytics, IPayloadTechSupport, IPayloadThemeChange, IPayloadToast, IPayloadVersion, IPayloadViewPort, } from './Payload';
-export type { SupportedPlatformVariant } from './Platform';
+export { SupportedPlatformVariant } from './Platform';
 export type { LookupAndMatchContactsResolver, Reject, SuggestContactsResolver } from './Resolver';
 export type { StorageEventCallback } from './Storage';
 export type { ToastSeverity } from './Toast';
 export type { WorkVariants } from './WorkVariant';
+export type { XBeesUser } from './XBeesUser';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wildix/xbees-connect",
-  "version": "1.2.13",
+  "version": "1.2.15",
   "description": "This library provides easy communication between x-bees and integrated web applications",
   "author": "dimitri.chernykh <dimitri.chernykh@wildix.com>",
   "homepage": "",
@@ -43,8 +43,5 @@
   "engines": {
     "node": ">=16"
   },
-  "dependencies": {
-    "jwt-decode": "^4.0.0"
-  },
-  "gitHead": "0f28736f8508d1ec0520f8f4cad83aa49546c141"
+  "gitHead": "c2fd946559ddb3cb6efce78cd93f605dc6280d38"
 }

package/dist-cjs/src/utils/getPbxDomainFromJwt.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPbxDomainFromJwt = void 0;
-const jwt_decode_1 = require("jwt-decode");
-function getPbxDomainFromJwt(jwt) {
-    try {
-        if (!jwt) {
-            return '';
-        }
-        const tokenDecode = (0, jwt_decode_1.jwtDecode)(jwt);
-        return tokenDecode['custom:pbx_domain'] || '';
-    }
-    catch (error) {
-        console.error('Failed to decode JWT:', error);
-        return '';
-    }
-}
-exports.getPbxDomainFromJwt = getPbxDomainFromJwt;

package/dist-es/src/utils/getPbxDomainFromJwt.js

@@ -1,14 +0,0 @@
-import { jwtDecode } from 'jwt-decode';
-export function getPbxDomainFromJwt(jwt) {
-    try {
-        if (!jwt) {
-            return '';
-        }
-        const tokenDecode = jwtDecode(jwt);
-        return tokenDecode['custom:pbx_domain'] || '';
-    }
-    catch (error) {
-        console.error('Failed to decode JWT:', error);
-        return '';
-    }
-}

package/dist-types/src/utils/getPbxDomainFromJwt.d.ts

@@ -1 +0,0 @@
-export declare function getPbxDomainFromJwt(jwt: string): string;